Acquire Write Intent for base table only

Author: xiexiaoy

concourse/scripts/build_tarball.bash

@@ -169,7 +169,7 @@ copy_libraries() {
     libraries=$(ldd "$executable" | awk 'NF==4{print $(NF-1)}{}')
     mkdir -p "$path"
     for lib in $libraries; do
-        rsync -avL --ignore-existing "$lib" "$path/"
+        rsync -aL --ignore-existing "$lib" "$path/"
         libname=$(basename "$lib")
         # Align with nightly: ensure each copied library has rpath set to $ORIGIN
         if [ -f "${path}/${libname}" ]; then

concourse/scripts/build_tarball_open.bash

@@ -134,7 +134,7 @@ copy_libraries() {
 
   mkdir -p "$path"
   for lib in $libraries; do
-    rsync -avL --ignore-existing "$lib" "$path/"
+    rsync -aL --ignore-existing "$lib" "$path/"
     libname=$(basename "$lib")
     if [ -f "${path}/${libname}" ]; then
       patchelf --set-rpath '$ORIGIN' "${path}/${libname}"

src/mongo/db/modules/eloq/src/base/eloq_util.cpp

@@ -12,7 +12,7 @@ Status TxErrorCodeToMongoStatus(txservice::TxErrorCode txErr) {
     if (MONGO_likely(txErr == txservice::TxErrorCode::NO_ERROR))
         return Status::OK();
 
-    log() << "eloq engine error report: " << txservice::TxErrorMessage(txErr);
+    log() << "Eloq engine error report: " << txservice::TxErrorMessage(txErr);
 
     ErrorCodes::Error err;
     switch (txErr) {
@@ -30,6 +30,9 @@ Status TxErrorCodeToMongoStatus(txservice::TxErrorCode txErr) {
             err = ErrorCodes::CannotCreateIndex;
             break;
         case txservice::TxErrorCode::READ_WRITE_CONFLICT:
+            // err = ErrorCodes::SnapshotUnavailable;
+            err = ErrorCodes::ConflictingOperationInProgress;
+            break;
         case txservice::TxErrorCode::WRITE_WRITE_CONFLICT:
         case txservice::TxErrorCode::OCC_BREAK_REPEATABLE_READ:
         case txservice::TxErrorCode::DEAD_LOCK_ABORT:
@@ -59,6 +62,9 @@ Status TxErrorCodeToMongoStatus(txservice::TxErrorCode txErr) {
         case txservice::TxErrorCode::UPSERT_TABLE_PREPARE_FAIL:
             err = ErrorCodes::OperationFailed;
             break;
+        case txservice::TxErrorCode::REQUESTD_TABLE_NOT_EXISTS:
+            err = ErrorCodes::NamespaceNotFound;
+            break;
         default:
             err = ErrorCodes::UnknownError;
             break;

src/mongo/db/modules/eloq/src/eloq_index.cpp

@@ -274,15 +274,16 @@ class EloqIndexCursor final : public SortedDataInterface::Cursor {
             }
         }
 
-        bool isForWrite = _opCtx->isUpsert();
+        bool endInclusive = false;
+        bool isForWrite = _opCtx->isUpsert() && _indexName->IsBase();
         // end_inclusive semantics has been handled by _endPosition
         _cursor->indexScanOpen(_indexName,
                                _indexSchema->SchemaTs(),
                                _scanType,
                                &_startKey,
                                startInclusive,
                                &_endKey,
-                               false,
+                               endInclusive,
                                direction,
                                isForWrite);
 

src/mongo/db/modules/eloq/src/eloq_kv_engine.cpp

@@ -644,6 +644,7 @@ void EloqKVEngine::initDataStoreService() {
     //     "/home/lzx/test-eloqsql/eloq_ds.ini";
     INIReader fake_config_reader(nullptr, 0);
     EloqDS::RocksDBConfig rocksdb_config(fake_config_reader, _dbPath);
+    rocksdb_config.query_worker_num_ = 10 * serverGlobalParams.reservedThreadNum;
     rocksdb_config.max_background_jobs_ = eloqGlobalOptions.rocksdbMaxBackgroundJobs;
     rocksdb_config.max_subcompactions_ = eloqGlobalOptions.rocksdbMaxSubCompactions;
 

src/mongo/db/modules/eloq/src/eloq_record_store.cpp

@@ -573,14 +573,15 @@ class EloqRecordStoreCursor : public SeekableRecordCursor {
             _endKey = Eloq::MongoKey::GetNegInfTxKey();
         }
 
+        bool endInclusive = false;
         bool isForWrite = _opCtx->isUpsert();
         _cursor->indexScanOpen(_tableName,
                                _keySchema->SchemaTs(),
                                txservice::ScanIndexType::Primary,
                                &_startKey,
-                               false,
+                               startInclusive,
                                &_endKey,
-                               false,
+                               endInclusive,
                                _forward ? txservice::ScanDirection::Forward
                                         : txservice::ScanDirection::Backward,
                                isForWrite);