Revert "SERVER-65338 Runtime configurable query knob to disable SBE $lookup"

This reverts commit 7ef335b60fe16e4bd846eff3c8ca2828df8af31a.

4 files changed, 3 insertions, 16 deletions

diff --git a/src/mongo/db/commands/run_aggregate.cpp b/src/mongo/db/commands/run_aggregate.cpp
index 71356f55cda..e21bcfbffdf 100644
--- a/src/mongo/db/commands/run_aggregate.cpp
+++ b/src/mongo/db/commands/run_aggregate.cpp
@@ -71,7 +71,6 @@
 #include "mongo/db/query/plan_executor_factory.h"
 #include "mongo/db/query/plan_summary_stats.h"
 #include "mongo/db/query/query_feature_flags_gen.h"
-#include "mongo/db/query/query_knobs_gen.h"
 #include "mongo/db/query/query_planner_common.h"
 #include "mongo/db/read_concern.h"
 #include "mongo/db/repl/oplog.h"
@@ -675,8 +674,7 @@ Status runAggregate(OperationContext* opCtx,
     // Taking locks over multiple collections is not supported outside of $lookup pushdown.
     if (serverGlobalParams.featureCompatibility.isVersionInitialized() &&
         feature_flags::gFeatureFlagSBELookupPushdown.isEnabled(
-            serverGlobalParams.featureCompatibility) &&
-        !internalQuerySlotBasedExecutionDisableLookupPushdown.load()) {
+            serverGlobalParams.featureCompatibility)) {
         secondaryExecNssList = liteParsedPipeline.getForeignExecutionNamespaces();
     }
 
diff --git a/src/mongo/db/pipeline/pipeline_d.cpp b/src/mongo/db/pipeline/pipeline_d.cpp
index 03e1d0f77f5..e15dcf293f6 100644
--- a/src/mongo/db/pipeline/pipeline_d.cpp
+++ b/src/mongo/db/pipeline/pipeline_d.cpp
@@ -80,7 +80,6 @@
 #include "mongo/db/query/plan_executor_factory.h"
 #include "mongo/db/query/plan_summary_stats.h"
 #include "mongo/db/query/query_feature_flags_gen.h"
-#include "mongo/db/query/query_knobs_gen.h"
 #include "mongo/db/query/query_planner.h"
 #include "mongo/db/query/sort_pattern.h"
 #include "mongo/db/s/collection_sharding_state.h"
@@ -160,8 +159,7 @@ std::vector<std::unique_ptr<InnerPipelineStageInterface>> extractSbeCompatibleSt
         !(serverGlobalParams.featureCompatibility.isVersionInitialized() &&
           feature_flags::gFeatureFlagSBELookupPushdown.isEnabled(
               serverGlobalParams.featureCompatibility)) ||
-        internalQuerySlotBasedExecutionDisableLookupPushdown.load() || isMainCollectionSharded ||
-        collections.isAnySecondaryNamespaceAViewOrSharded();
+        isMainCollectionSharded || collections.isAnySecondaryNamespaceAViewOrSharded();
 
     for (auto itr = sources.begin(); itr != sources.end();) {
         // $group pushdown logic.
diff --git a/src/mongo/db/pipeline/process_interface/common_mongod_process_interface.cpp b/src/mongo/db/pipeline/process_interface/common_mongod_process_interface.cpp
index 216c95de3d6..b4f98346cc9 100644
--- a/src/mongo/db/pipeline/process_interface/common_mongod_process_interface.cpp
+++ b/src/mongo/db/pipeline/process_interface/common_mongod_process_interface.cpp
@@ -56,7 +56,6 @@
 #include "mongo/db/pipeline/pipeline_d.h"
 #include "mongo/db/query/collection_index_usage_tracker_decoration.h"
 #include "mongo/db/query/collection_query_info.h"
-#include "mongo/db/query/query_knobs_gen.h"
 #include "mongo/db/query/sbe_plan_cache.h"
 #include "mongo/db/repl/primary_only_service.h"
 #include "mongo/db/s/sharding_state.h"
@@ -436,8 +435,7 @@ CommonMongodProcessInterface::attachCursorSourceToPipelineForLocalRead(Pipeline*
     std::vector<NamespaceStringOrUUID> secondaryNamespaces = [&]() {
         if (serverGlobalParams.featureCompatibility.isVersionInitialized() &&
             feature_flags::gFeatureFlagSBELookupPushdown.isEnabled(
-                serverGlobalParams.featureCompatibility) &&
-            !internalQuerySlotBasedExecutionDisableLookupPushdown.load()) {
+                serverGlobalParams.featureCompatibility)) {
             auto lpp = LiteParsedPipeline(expCtx->ns, pipeline->serializeToBson());
             return lpp.getForeignExecutionNamespaces();
         } else {
diff --git a/src/mongo/db/query/query_knobs.idl b/src/mongo/db/query/query_knobs.idl
index f6df19ee07b..3a759caf0a6 100644
--- a/src/mongo/db/query/query_knobs.idl
+++ b/src/mongo/db/query/query_knobs.idl
@@ -637,13 +637,6 @@ server_parameters:
     validator:
         gt: 0
 
-  internalQuerySlotBasedExecutionDisableLookupPushdown:
-    description: "If true, the system will not push down $lookup to the SBE execution engine."
-    set_at: [ startup, runtime ]
-    cpp_varname: "internalQuerySlotBasedExecutionDisableLookupPushdown"
-    cpp_vartype: AtomicWord<bool>
-    default: false
-
   internalQueryForceClassicEngine:
     description: "If true, the system will use the classic execution engine for all queries,
     otherwise eligible queries will execute using the SBE execution engine."