diff options
| author | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2015-12-11 19:36:04 -0500 |
|---|---|---|
| committer | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2015-12-15 18:57:33 -0500 |
| commit | c7b065227470a27c40c45f07a8c967b7aa7af9db (patch) | |
| tree | 7f43a776a2bcd918ea663fd0291adee5e26734bb | |
| parent | f99421466679478b8aba02344fa2c9b126946350 (diff) | |
| download | mongo-c7b065227470a27c40c45f07a8c967b7aa7af9db.tar.gz | |
Revert "SERVER-20991 Change WiredTiger caching strategy on Windows"
This reverts commit 884644ac56de2edc2223b75ceabe9e1a6fef6dab.
| -rw-r--r-- | src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp | 3 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/SConscript | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp index 0cac0b0a642..22ae293a595 100644 --- a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp +++ b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp @@ -158,9 +158,6 @@ WiredTigerKVEngine::WiredTigerKVEngine(const std::string& canonicalName, ss << ",log_size=2GB),"; ss << "statistics_log=(wait=" << wiredTigerGlobalOptions.statisticsLogDelaySecs << "),"; ss << WiredTigerCustomizationHooks::get(getGlobalServiceContext())->getOpenConfig("system"); -#ifdef _WIN32 - ss << "direct_io=(data),"; -#endif ss << extraOpenOptions; if (!_durable) { // If we started without the journal, but previously used the journal then open with the diff --git a/src/third_party/wiredtiger/SConscript b/src/third_party/wiredtiger/SConscript index 38be047f56d..dbff3006239 100644 --- a/src/third_party/wiredtiger/SConscript +++ b/src/third_party/wiredtiger/SConscript @@ -44,7 +44,6 @@ if env.TargetOSIs('windows'): if get_option('allocator') == 'tcmalloc': env.InjectThirdPartyIncludePaths(libraries=['gperftools']) env.Append(CPPDEFINES=['HAVE_LIBTCMALLOC']) - env.Append(CPPDEFINES=['HAVE_POSIX_MEMALIGN']) elif env.TargetOSIs('osx'): env.Append(CPPPATH=["build_darwin"]) elif env.TargetOSIs('solaris'): |