SERVER-67092 Delete 'featureFlagSBEGroupPushdown' and 'featureFlagSBELookupPushdown'

2 files changed, 4 insertions, 17 deletions

diff --git a/jstests/sharding/query/lookup_graph_lookup_foreign_becomes_sharded.js b/jstests/sharding/query/lookup_graph_lookup_foreign_becomes_sharded.js
index c3924654a74..ae525d14c17 100644
--- a/jstests/sharding/query/lookup_graph_lookup_foreign_becomes_sharded.js
+++ b/jstests/sharding/query/lookup_graph_lookup_foreign_becomes_sharded.js
@@ -116,12 +116,10 @@ const isShardedLookupEnabled = getShardedLookupParam.hasOwnProperty("featureFlag
 
 let res = st.getPrimaryShard(jsTestName()).getDB("admin").adminCommand({
     getParameter: 1,
-    featureFlagSBELookupPushdown: 1,
     internalQueryForceClassicEngine: 1
 });
-let isSBELookupEnabled = res.ok && res.hasOwnProperty("featureFlagSBELookupPushdown") &&
-    res.hasOwnProperty("internalQueryForceClassicEngine") &&
-    res.featureFlagSBELookupPushdown.value && !res.internalQueryForceClassicEngine;
+let isSBELookupEnabled = res.ok && res.hasOwnProperty("internalQueryForceClassicEngine") &&
+    !res.internalQueryForceClassicEngine;
 
 // Now run a getMore for each of the test cases. The collection has become sharded mid-iteration, so
 // we should observe the error code associated with the test case.
@@ -198,13 +196,6 @@ assert.commandWorked(shard0.getPrimary().adminCommand({fsync: 1}));
 // both the source and foreign collections.
 shard0.restart(shard0.getPrimary());
 
-// Refreshes the SBE lookup feature availability just in case that a different version of mongod
-// is running after restart.
-res = shard0.getPrimary().getDB("admin").adminCommand(
-    {getParameter: 1, featureFlagSBELookupPushdown: 1});
-isSBELookupEnabled = res.ok && res.hasOwnProperty("featureFlagSBELookupPushdown") &&
-    res.featureFlagSBELookupPushdown.value;
-
 // Enable profiling on shard0 to capture stale shard version exceptions.
 const primaryDB = shard0.getPrimary().getDB(jsTestName());
 assert.commandWorked(primaryDB.setProfilingLevel(2));
diff --git a/jstests/sharding/query/lookup_unionWith_subpipeline_local_read.js b/jstests/sharding/query/lookup_unionWith_subpipeline_local_read.js
index 894e094bc4c..c5018e52c6a 100644
--- a/jstests/sharding/query/lookup_unionWith_subpipeline_local_read.js
+++ b/jstests/sharding/query/lookup_unionWith_subpipeline_local_read.js
@@ -14,7 +14,6 @@ load('jstests/libs/profiler.js');             // For various profiler helpers.
 load('jstests/aggregation/extras/utils.js');  // For arrayEq()
 load("jstests/libs/fail_point_util.js");      // for configureFailPoint.
 load("jstests/libs/log.js");                  // For findMatchingLogLines.
-load("jstests/libs/feature_flag_util.js");    // For isEnabled.
 
 const st = new ShardingTest({name: jsTestName(), mongos: 1, shards: 2, rs: {nodes: 2}});
 
@@ -510,15 +509,12 @@ assertAggResultAndRouting(pipeline, expectedRes, {comment: "lookup_foreign_does_
     // collection and needs to target shards to properly resolve it. Then, it can use the local
     // read path for each subpipeline query.
     subPipelineLocal: [4, 0],
-    // If the $lookup is pushed down, we will try to take a lock on the foreign collection to check
+    // Because $lookup is pushed down, we will try to take a lock on the foreign collection to check
     // foreign collection's sharding state. Given that the stale shard version is resolved earlier
     // and we've figured out that the foreign collection is unsharded, we no longer need to target a
     // shard and instead can read locally. As such, we will not generate an entry in the profiler
     // for querying the foreign collection.
-    subPipelineRemote:
-        FeatureFlagUtil.isEnabled(st.configRS.getPrimary().getDB(dbName), "SBELookupPushdown")
-        ? [0, 0]
-        : [1, 0],
+    subPipelineRemote: [0, 0],
 });
 
 //