diff options
| author | Dan Pasette <dan@10gen.com> | 2014-11-08 01:53:02 -0500 |
|---|---|---|
| committer | Dan Pasette <dan@mongodb.com> | 2014-11-08 01:53:02 -0500 |
| commit | 18c94ba44d37ef8e430f1e04633c0ae32efddae4 (patch) | |
| tree | f8ba391e6a4350f230540467255ff2d8cddcd45a /src/mongo | |
| parent | e0f8376cf7e3496af394df5ce6132f9b0cfb3af3 (diff) | |
| download | mongo-18c94ba44d37ef8e430f1e04633c0ae32efddae4.tar.gz | |
Finish changing --wiredTigerDatabaseConfig to --wiredTigerEngineConfig
Diffstat (limited to 'src/mongo')
3 files changed, 6 insertions, 6 deletions
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_global_options.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_global_options.cpp index dbfb6ba257e..2383363204e 100644 --- a/src/mongo/db/storage/wiredtiger/wiredtiger_global_options.cpp +++ b/src/mongo/db/storage/wiredtiger/wiredtiger_global_options.cpp @@ -56,10 +56,10 @@ namespace mongo { Status WiredTigerGlobalOptions::store(const moe::Environment& params, const std::vector<std::string>& args) { - if (params.count("storage.wiredtiger.databaseConfig")) { - wiredTigerGlobalOptions.databaseConfig = - params["storage.wiredtiger.databaseConfig"].as<string>(); - std::cerr << "DB option: " << wiredTigerGlobalOptions.databaseConfig << std::endl; + if (params.count("storage.wiredtiger.engineConfig")) { + wiredTigerGlobalOptions.engineConfig = + params["storage.wiredtiger.engineConfig"].as<string>(); + std::cerr << "Engine option: " << wiredTigerGlobalOptions.engineConfig << std::endl; } if (params.count("storage.wiredtiger.collectionConfig")) { wiredTigerGlobalOptions.collectionConfig = diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_global_options.h b/src/mongo/db/storage/wiredtiger/wiredtiger_global_options.h index 9e96d0a165d..558a3d97773 100644 --- a/src/mongo/db/storage/wiredtiger/wiredtiger_global_options.h +++ b/src/mongo/db/storage/wiredtiger/wiredtiger_global_options.h @@ -45,7 +45,7 @@ namespace mongo { bool handlePreValidation(const moe::Environment& params); Status store(const moe::Environment& params, const std::vector<std::string>& args); - std::string databaseConfig; + std::string engineConfig; std::string collectionConfig; std::string indexConfig; }; diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_init.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_init.cpp index b4681a456a4..8bf013cbf28 100644 --- a/src/mongo/db/storage/wiredtiger/wiredtiger_init.cpp +++ b/src/mongo/db/storage/wiredtiger/wiredtiger_init.cpp @@ -46,7 +46,7 @@ namespace mongo { virtual ~WiredTigerFactory(){} virtual StorageEngine* create( const StorageGlobalParams& params ) const { WiredTigerKVEngine* kv = new WiredTigerKVEngine( params.dbpath, - wiredTigerGlobalOptions.databaseConfig, + wiredTigerGlobalOptions.engineConfig, params.dur ); kv->setRecordStoreExtraOptions( wiredTigerGlobalOptions.collectionConfig ); kv->setSortedDataInterfaceExtraOptions( wiredTigerGlobalOptions.indexConfig ); |