SERVER-36198 Remove 'internalQueryAllowAllPathsIndexes' server parameter

7 files changed, 0 insertions, 34 deletions

diff --git a/src/mongo/db/catalog/index_key_validate.cpp b/src/mongo/db/catalog/index_key_validate.cpp
index d8bda8fec86..f5b090b40a6 100644
--- a/src/mongo/db/catalog/index_key_validate.cpp
+++ b/src/mongo/db/catalog/index_key_validate.cpp
@@ -121,13 +121,6 @@ Status validateKeyPattern(const BSONObj& key, IndexDescriptor::IndexVersion inde
                 code, mongoutils::str::stream() << "Unknown index plugin '" << pluginName << '\'');
     }
 
-    if (pluginName == IndexNames::WILDCARD && !internalQueryAllowAllPathsIndexes.load()) {
-        // TODO: SERVER-36198 remove this check once wildcard indexes are complete.
-        return Status(
-            ErrorCodes::NotImplemented,
-            "Cannot use a wildcard index without enabling internalQueryAllowAllPathsIndexes");
-    }
-
     BSONObjIterator it(key);
     while (it.more()) {
         BSONElement keyElement = it.next();
diff --git a/src/mongo/db/catalog/index_key_validate_test.cpp b/src/mongo/db/catalog/index_key_validate_test.cpp
index 371cdc62633..1800e6d06d5 100644
--- a/src/mongo/db/catalog/index_key_validate_test.cpp
+++ b/src/mongo/db/catalog/index_key_validate_test.cpp
@@ -56,19 +56,14 @@ public:
     TestCommandQueryKnobGuard() {
         _prevEnabled = getTestCommandsEnabled();
         setTestCommandsEnabled(true);
-
-        _prevKnobEnabled = internalQueryAllowAllPathsIndexes.load();
-        internalQueryAllowAllPathsIndexes.store(true);
     }
 
     ~TestCommandQueryKnobGuard() {
         setTestCommandsEnabled(_prevEnabled);
-        internalQueryAllowAllPathsIndexes.store(_prevKnobEnabled);
     }
 
 private:
     bool _prevEnabled;
-    bool _prevKnobEnabled;
 };
 
 TEST(IndexKeyValidateTest, KeyElementValueOfSmallPositiveIntSucceeds) {
diff --git a/src/mongo/db/catalog/index_spec_validate_test.cpp b/src/mongo/db/catalog/index_spec_validate_test.cpp
index 9481460593c..32255f51ab3 100644
--- a/src/mongo/db/catalog/index_spec_validate_test.cpp
+++ b/src/mongo/db/catalog/index_spec_validate_test.cpp
@@ -68,21 +68,15 @@ public:
         // TODO: Remove test command enabling/disabling in SERVER-36198
         _prevEnabled = getTestCommandsEnabled();
         setTestCommandsEnabled(true);
-
-        // TODO: Remove knob enabling/disabling in SERVER-36198.
-        _prevKnobEnabled = internalQueryAllowAllPathsIndexes.load();
-        internalQueryAllowAllPathsIndexes.store(true);
     }
 
     ~TestCommandFcvGuard() {
         serverGlobalParams.featureCompatibility.setVersion(_prevVersion);
         setTestCommandsEnabled(_prevEnabled);
-        internalQueryAllowAllPathsIndexes.store(_prevKnobEnabled);
     }
 
 private:
     bool _prevEnabled;
-    bool _prevKnobEnabled;
     ServerGlobalParams::FeatureCompatibility::Version _prevVersion;
 };
 
diff --git a/src/mongo/db/query/query_knobs.cpp b/src/mongo/db/query/query_knobs.cpp
index 4d59a177c2e..403cc2ba873 100644
--- a/src/mongo/db/query/query_knobs.cpp
+++ b/src/mongo/db/query/query_knobs.cpp
@@ -116,6 +116,4 @@ MONGO_EXPORT_SERVER_PARAMETER(internalQueryPlannerGenerateCoveredWholeIndexScans
 MONGO_EXPORT_SERVER_PARAMETER(internalQueryIgnoreUnknownJSONSchemaKeywords, bool, false);
 
 MONGO_EXPORT_SERVER_PARAMETER(internalQueryProhibitBlockingMergeOnMongoS, bool, false);
-
-MONGO_EXPORT_SERVER_PARAMETER(internalQueryAllowAllPathsIndexes, bool, false);
 }  // namespace mongo
diff --git a/src/mongo/db/query/query_knobs.h b/src/mongo/db/query/query_knobs.h
index d7f6ab8d1c4..a7bc4a39bee 100644
--- a/src/mongo/db/query/query_knobs.h
+++ b/src/mongo/db/query/query_knobs.h
@@ -137,10 +137,4 @@ extern AtomicInt32 internalDocumentSourceCursorBatchSizeBytes;
 extern AtomicInt32 internalDocumentSourceLookupCacheSizeBytes;
 
 extern AtomicBool internalQueryProhibitBlockingMergeOnMongoS;
-
-//
-// In-progress features.
-//
-// TODO: Remove in SERVER-36198.
-extern AtomicBool internalQueryAllowAllPathsIndexes;
 }  // namespace mongo
diff --git a/src/mongo/dbtests/validate_tests.cpp b/src/mongo/dbtests/validate_tests.cpp
index ddc62bffc0e..f060ed785c1 100644
--- a/src/mongo/dbtests/validate_tests.cpp
+++ b/src/mongo/dbtests/validate_tests.cpp
@@ -66,9 +66,6 @@ public:
           _db(nullptr) {
         _client.createCollection(_ns);
         {
-            _origWildcardKnob = internalQueryAllowAllPathsIndexes.load();
-            internalQueryAllowAllPathsIndexes.store(true);
-
             AutoGetCollection autoGetCollection(&_opCtx, _nss, MODE_X);
             _isInRecordIdOrder =
                 autoGetCollection.getCollection()->getRecordStore()->isInRecordIdOrder();
@@ -78,7 +75,6 @@ public:
     ~ValidateBase() {
         _client.dropCollection(_ns);
         getGlobalServiceContext()->unsetKillAllOperations();
-        internalQueryAllowAllPathsIndexes.store(_origWildcardKnob);
     }
 
 protected:
@@ -140,7 +136,6 @@ protected:
     unique_ptr<AutoGetDb> _autoDb;
     Database* _db;
     bool _isInRecordIdOrder;
-    bool _origWildcardKnob{false};
 };
 
 template <bool full, bool background>
diff --git a/src/mongo/dbtests/wildcard_multikey_persistence_test.cpp b/src/mongo/dbtests/wildcard_multikey_persistence_test.cpp
index 6d31c903035..860fec6bec3 100644
--- a/src/mongo/dbtests/wildcard_multikey_persistence_test.cpp
+++ b/src/mongo/dbtests/wildcard_multikey_persistence_test.cpp
@@ -61,13 +61,10 @@ std::vector<InsertStatement> toInserts(std::vector<BSONObj> docs) {
 class WildcardMultikeyPersistenceTestFixture : public unittest::Test {
 public:
     WildcardMultikeyPersistenceTestFixture() {
-        _origWildcardKnob = internalQueryAllowAllPathsIndexes.load();
-        internalQueryAllowAllPathsIndexes.store(true);
         _opCtx = cc().makeOperationContext();
     }
 
     virtual ~WildcardMultikeyPersistenceTestFixture() {
-        internalQueryAllowAllPathsIndexes.store(_origWildcardKnob);
         _opCtx.reset();
     }