diff options
author | Benety Goh <benety@mongodb.com> | 2018-12-10 14:14:27 -0500 |
---|---|---|
committer | Benety Goh <benety@mongodb.com> | 2018-12-10 14:14:48 -0500 |
commit | ba216692a2c1779dcf631f1e676ec9297aaf22e2 (patch) | |
tree | 600b56a6d79b13ab4c507c604a81e4e158823fc1 /src/mongo/dbtests | |
parent | 1bef15e88938c69a96903a92ac20a4416e559a73 (diff) | |
download | mongo-ba216692a2c1779dcf631f1e676ec9297aaf22e2.tar.gz |
SERVER-38330 merge MultiIndexBlock and MultiIndexBlockImpl
Diffstat (limited to 'src/mongo/dbtests')
-rw-r--r-- | src/mongo/dbtests/dbtests.cpp | 3 | ||||
-rw-r--r-- | src/mongo/dbtests/indexupdatetests.cpp | 9 | ||||
-rw-r--r-- | src/mongo/dbtests/storage_timestamp_tests.cpp | 5 | ||||
-rw-r--r-- | src/mongo/dbtests/wildcard_multikey_persistence_test.cpp | 3 |
4 files changed, 8 insertions, 12 deletions
diff --git a/src/mongo/dbtests/dbtests.cpp b/src/mongo/dbtests/dbtests.cpp index e419bdf1015..4b00ad43143 100644 --- a/src/mongo/dbtests/dbtests.cpp +++ b/src/mongo/dbtests/dbtests.cpp @@ -39,7 +39,6 @@ #include "mongo/base/initializer.h" #include "mongo/db/auth/authorization_manager.h" #include "mongo/db/catalog/multi_index_block.h" -#include "mongo/db/catalog/multi_index_block_impl.h" #include "mongo/db/commands.h" #include "mongo/db/commands/test_commands_enabled.h" #include "mongo/db/db_raii.h" @@ -105,7 +104,7 @@ Status createIndexFromSpec(OperationContext* opCtx, StringData ns, const BSONObj invariant(coll); wunit.commit(); } - MultiIndexBlockImpl indexer(opCtx, coll); + MultiIndexBlock indexer(opCtx, coll); Status status = indexer.init(spec).getStatus(); if (status == ErrorCodes::IndexAlreadyExists) { return Status::OK(); diff --git a/src/mongo/dbtests/indexupdatetests.cpp b/src/mongo/dbtests/indexupdatetests.cpp index 9c44428ef6d..a96b827cc14 100644 --- a/src/mongo/dbtests/indexupdatetests.cpp +++ b/src/mongo/dbtests/indexupdatetests.cpp @@ -37,7 +37,6 @@ #include "mongo/db/catalog/collection.h" #include "mongo/db/catalog/index_catalog.h" #include "mongo/db/catalog/multi_index_block.h" -#include "mongo/db/catalog/multi_index_block_impl.h" #include "mongo/db/client.h" #include "mongo/db/db_raii.h" #include "mongo/db/dbdirectclient.h" @@ -77,7 +76,7 @@ protected: bool buildIndexInterrupted(const BSONObj& key, bool allowInterruption) { try { - MultiIndexBlockImpl indexer(&_opCtx, collection()); + MultiIndexBlock indexer(&_opCtx, collection()); if (allowInterruption) indexer.allowInterruption(); @@ -130,7 +129,7 @@ public: wunit.commit(); } - MultiIndexBlockImpl indexer(&_opCtx, coll); + MultiIndexBlock indexer(&_opCtx, coll); indexer.allowBackgroundBuilding(); indexer.allowInterruption(); indexer.ignoreUniqueConstraint(); @@ -186,7 +185,7 @@ public: wunit.commit(); } - MultiIndexBlockImpl indexer(&_opCtx, coll); + MultiIndexBlock indexer(&_opCtx, coll); indexer.allowBackgroundBuilding(); indexer.allowInterruption(); // indexer.ignoreUniqueConstraint(); // not calling this @@ -372,7 +371,7 @@ public: }; Status IndexBuildBase::createIndex(const std::string& dbname, const BSONObj& indexSpec) { - MultiIndexBlockImpl indexer(&_opCtx, collection()); + MultiIndexBlock indexer(&_opCtx, collection()); Status status = indexer.init(indexSpec).getStatus(); if (status == ErrorCodes::IndexAlreadyExists) { return Status::OK(); diff --git a/src/mongo/dbtests/storage_timestamp_tests.cpp b/src/mongo/dbtests/storage_timestamp_tests.cpp index f013904957d..b32b36d3718 100644 --- a/src/mongo/dbtests/storage_timestamp_tests.cpp +++ b/src/mongo/dbtests/storage_timestamp_tests.cpp @@ -40,7 +40,6 @@ #include "mongo/db/catalog/drop_indexes.h" #include "mongo/db/catalog/index_catalog.h" #include "mongo/db/catalog/multi_index_block.h" -#include "mongo/db/catalog/multi_index_block_impl.h" #include "mongo/db/catalog/uuid_catalog.h" #include "mongo/db/client.h" #include "mongo/db/concurrency/write_conflict_exception.h" @@ -231,7 +230,7 @@ public: void createIndex(Collection* coll, std::string indexName, const BSONObj& indexKey) { // Build an index. - MultiIndexBlockImpl indexer(_opCtx, coll); + MultiIndexBlock indexer(_opCtx, coll); BSONObj indexInfoObj; { auto swIndexInfoObj = indexer.init({BSON( @@ -1798,7 +1797,7 @@ public: std::vector<std::string> origIdents = kvCatalog->getAllIdents(_opCtx); // Build an index on `{a: 1}`. This index will be multikey. - MultiIndexBlockImpl indexer(_opCtx, autoColl.getCollection()); + MultiIndexBlock indexer(_opCtx, autoColl.getCollection()); const LogicalTime beforeIndexBuild = _clock->reserveTicks(2); BSONObj indexInfoObj; { diff --git a/src/mongo/dbtests/wildcard_multikey_persistence_test.cpp b/src/mongo/dbtests/wildcard_multikey_persistence_test.cpp index 1f2e0e1334c..3c5e44a16d5 100644 --- a/src/mongo/dbtests/wildcard_multikey_persistence_test.cpp +++ b/src/mongo/dbtests/wildcard_multikey_persistence_test.cpp @@ -33,7 +33,6 @@ #include <memory> #include "mongo/db/catalog/multi_index_block.h" -#include "mongo/db/catalog/multi_index_block_impl.h" #include "mongo/db/db_raii.h" #include "mongo/db/index/wildcard_access_method.h" #include "mongo/db/repl/storage_interface_impl.h" @@ -195,7 +194,7 @@ protected: AutoGetCollection autoColl(opCtx(), nss, MODE_X); auto coll = autoColl.getCollection(); - MultiIndexBlockImpl indexer(opCtx(), coll); + MultiIndexBlock indexer(opCtx(), coll); indexer.allowBackgroundBuilding(); indexer.allowInterruption(); |