diff options
| author | Xiangyu Yao <xiangyu.yao@mongodb.com> | 2019-06-14 22:27:55 -0400 |
|---|---|---|
| committer | Xiangyu Yao <xiangyu.yao@mongodb.com> | 2019-06-20 10:47:10 -0400 |
| commit | 144f8191888b400ffc774401972ac8dff1c9d87b (patch) | |
| tree | 347165c1066ef189bd159351e8e7b35579bd03b7 /src/mongo/db/storage/devnull | |
| parent | 55e76198b1e41b5dbd5868d2ed8b914da29f0f29 (diff) | |
| download | mongo-144f8191888b400ffc774401972ac8dff1c9d87b.tar.gz | |
SERVER-40478 Merge StorageEngine class with KVStorageEngine
Diffstat (limited to 'src/mongo/db/storage/devnull')
| -rw-r--r-- | src/mongo/db/storage/devnull/SConscript | 2 | ||||
| -rw-r--r-- | src/mongo/db/storage/devnull/devnull_init.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mongo/db/storage/devnull/SConscript b/src/mongo/db/storage/devnull/SConscript index 24f10a1b7f1..795b5992c34 100644 --- a/src/mongo/db/storage/devnull/SConscript +++ b/src/mongo/db/storage/devnull/SConscript @@ -26,7 +26,7 @@ env.Library( LIBDEPS=[ 'storage_devnull_core', '$BUILD_DIR/mongo/db/storage/kv/kv_engine_core', - '$BUILD_DIR/mongo/db/storage/kv/kv_storage_engine', + '$BUILD_DIR/mongo/db/storage/kv/storage_engine', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/storage/storage_engine_common', diff --git a/src/mongo/db/storage/devnull/devnull_init.cpp b/src/mongo/db/storage/devnull/devnull_init.cpp index 64eee680fd2..e84b3767899 100644 --- a/src/mongo/db/storage/devnull/devnull_init.cpp +++ b/src/mongo/db/storage/devnull/devnull_init.cpp @@ -32,7 +32,7 @@ #include "mongo/base/init.h" #include "mongo/db/service_context.h" #include "mongo/db/storage/devnull/devnull_kv_engine.h" -#include "mongo/db/storage/kv/kv_storage_engine.h" +#include "mongo/db/storage/kv/storage_engine_impl.h" #include "mongo/db/storage/storage_engine_init.h" #include "mongo/db/storage/storage_options.h" @@ -43,10 +43,10 @@ class DevNullStorageEngineFactory : public StorageEngine::Factory { public: virtual StorageEngine* create(const StorageGlobalParams& params, const StorageEngineLockFile* lockFile) const { - KVStorageEngineOptions options; + StorageEngineOptions options; options.directoryPerDB = params.directoryperdb; options.forRepair = params.repair; - return new KVStorageEngine(new DevNullKVEngine(), options); + return new StorageEngineImpl(new DevNullKVEngine(), options); } virtual StringData getCanonicalName() const { |