SERVER-16568 "none" is now supported as a valid compressor option

3 files changed, 3 insertions, 30 deletions

diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_index.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_index.cpp
index a9bf3c61ca6..e7d48960cb4 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_index.cpp
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_index.cpp
@@ -289,16 +289,7 @@ namespace {
             ss << "prefix_compression,";
         }
 
-        // TODO: remove this; SERVER-16568
-        std::string localIndexBlockCompressor;
-        if (wiredTigerGlobalOptions.indexBlockCompressor == "none") {
-            localIndexBlockCompressor = "";
-        }
-        else {
-            localIndexBlockCompressor = wiredTigerGlobalOptions.indexBlockCompressor;
-        }
-
-        ss << "block_compressor=" << localIndexBlockCompressor << ",";
+        ss << "block_compressor=" << wiredTigerGlobalOptions.indexBlockCompressor << ",";
         ss << extraConfig;
 
         // Validate configuration object.
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp
index 3e26e9ed20f..eed9e216438 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp
@@ -145,16 +145,7 @@ namespace mongo {
         ss << "statistics=(fast),";
         if ( _durable ) {
             ss << "log=(enabled=true,archive=true,path=journal,compressor=";
-
-            // TODO: remove this; SERVER-16568
-            std::string localJournalCompressor;
-            if (wiredTigerGlobalOptions.journalCompressor == "none") {
-                localJournalCompressor = "";
-            }
-            else {
-                localJournalCompressor = wiredTigerGlobalOptions.journalCompressor;
-            }
-            ss << localJournalCompressor << "),";
+            ss << wiredTigerGlobalOptions.journalCompressor << "),";
         }
         ss << "checkpoint=(wait=" << wiredTigerGlobalOptions.checkpointDelaySecs;
         ss << ",log_size=2GB),";
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_record_store.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_record_store.cpp
index 9b67c4de3ac..7641fcb6442 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_record_store.cpp
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_record_store.cpp
@@ -92,16 +92,7 @@ namespace {
             ss << "prefix_compression,";
         }
 
-        // TODO: remove this; SERVER-16568
-        std::string localCollectionBlockCompressor;
-        if (wiredTigerGlobalOptions.collectionBlockCompressor == "none") {
-            localCollectionBlockCompressor = "";
-        }
-        else {
-            localCollectionBlockCompressor = wiredTigerGlobalOptions.collectionBlockCompressor;
-        }
-
-        ss << "block_compressor=" << localCollectionBlockCompressor << ",";
+        ss << "block_compressor=" << wiredTigerGlobalOptions.collectionBlockCompressor << ",";
 
         ss << extraStrings << ",";