Merge pull request #177 from mongodb-partners/v4.0.3

V4.0.3 fix failed cpptest

Author: wolfkdy

SConscript

@@ -30,6 +30,7 @@ env.Library(
         'src/rocks_begin_transaction_block.cpp',
         'src/rocks_prepare_conflict.cpp',
         'src/mongo_rate_limiter_checker.cpp',
+        'src/rocks_parameters.cpp',
     ],
     LIBDEPS= [
         '$BUILD_DIR/mongo/base',
@@ -60,7 +61,6 @@ env.Library(
     source= [
         'src/rocks_init.cpp',
         'src/rocks_options_init.cpp',
-        'src/rocks_parameters.cpp',
         'src/rocks_record_store_mongod.cpp',
         'src/rocks_server_status.cpp',
         ],

src/rocks_engine.cpp

@@ -552,6 +552,8 @@ namespace mongo {
         _counterManager->sync();
         _counterManager.reset();
         _compactionScheduler.reset();
+        _defaultCf.reset();
+        _oplogCf.reset();
         _db.reset();
     }
 

src/rocks_engine.h

@@ -211,6 +211,11 @@ namespace mongo {
         bool canRecoverToStableTimestamp() const;
         std::uint64_t getStableTimestamp() const;
         std::uint64_t getInitialDataTimestamp() const;
+        rocksdb::ColumnFamilyHandle* getDefaultCf_ForTest() const { return _defaultCf.get(); }
+        rocksdb::ColumnFamilyHandle* getOplogCf_ForTest() const { return _oplogCf.get(); }
+        rocksdb::ColumnFamilyHandle* getCf_ForTest(const std::string& ns) const {
+            return NamespaceString::oplog(ns)? getOplogCf_ForTest() : getDefaultCf_ForTest();
+        }
 
     private:
         Status _createIdent(StringData ident, BSONObjBuilder* configBuilder);

src/rocks_index_test.cpp

@@ -68,11 +68,13 @@ namespace mongo {
                 RocksIndexBase::generateConfig(&configBuilder, 3,
                                                IndexDescriptor::IndexVersion::kV2);
                 if (unique) {
-                    return stdx::make_unique<RocksUniqueIndex>(_engine.getDB(), "prefix", "ident",
+                    return stdx::make_unique<RocksUniqueIndex>(_engine.getDB(), _engine.getDefaultCf_ForTest(),
+                                                               "prefix", "ident",
                                                                _order, configBuilder.obj(),
                                                                "test.rocks", "testIndex");
                 } else {
-                    return stdx::make_unique<RocksStandardIndex>(_engine.getDB(), "prefix", "ident",
+                    return stdx::make_unique<RocksStandardIndex>(_engine.getDB(), _engine.getDefaultCf_ForTest(),
+                                                                 "prefix", "ident",
                                                                  _order, configBuilder.obj());
                 }
             }
@@ -81,8 +83,8 @@ namespace mongo {
                 return stdx::make_unique<RocksRecoveryUnit>(
                     _engine.getDB(), _engine.getOplogManager(),
                     checked_cast<RocksSnapshotManager*>(_engine.getSnapshotManager()),
-                    _engine.getCounterManager(), _engine.getCompactionScheduler(),
-                    _engine.getDurabilityManager(), true /* durale */, _engine);
+                    _engine.getCompactionScheduler(),
+                    _engine.getDurabilityManager(), true /* durale */, &_engine);
             }
 
         private:

src/rocks_record_store_test.cpp

@@ -89,7 +89,7 @@ namespace mongo {
         std::unique_ptr<RecordStore> newNonCappedRecordStore(const std::string& ns) {
             RocksRecoveryUnit* ru = dynamic_cast<RocksRecoveryUnit*>(_engine.newRecoveryUnit());
             OperationContextNoop opCtx(ru);
-            return stdx::make_unique<RocksRecordStore>(&_engine, &opCtx, ns, "1", "prefix");
+            return stdx::make_unique<RocksRecordStore>(&_engine, _engine.getCf_ForTest(ns), &opCtx, ns, "1", "prefix");
         }
 
         std::unique_ptr<RecordStore> newCappedRecordStore(int64_t cappedMaxSize,
@@ -102,7 +102,7 @@ namespace mongo {
                                                           int64_t cappedMaxDocs) {
             RocksRecoveryUnit* ru = dynamic_cast<RocksRecoveryUnit*>(_engine.newRecoveryUnit());
             OperationContextNoop opCtx(ru);
-            return stdx::make_unique<RocksRecordStore>(&_engine, &opCtx, ns, "1", "prefix",
+            return stdx::make_unique<RocksRecordStore>(&_engine, _engine.getCf_ForTest(ns), &opCtx, ns, "1", "prefix",
                                                        true /* isCapped */, cappedMaxSize,
                                                        cappedMaxDocs);
         }

src/rocks_recovery_unit_test.cpp

@@ -89,7 +89,7 @@ namespace mongo {
 
         virtual std::unique_ptr<RecordStore> createRecordStore(OperationContext* opCtx,
                                                                const std::string& ns) final {
-            return stdx::make_unique<RocksRecordStore>(&_engine, opCtx, ns, "1", "prefix");
+            return stdx::make_unique<RocksRecordStore>(&_engine, _engine.getCf_ForTest(ns), opCtx, ns, "1", "prefix");
         }
 
     private: