SERVER-52273 Deleted feature flag for Slot-based execution

4 files changed, 6 insertions, 16 deletions

diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index a56a6bd6f0d..8e403878d6c 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -9155,7 +9155,7 @@ buildvariants:
     large_distro_name: rhel80-medium
     num_scons_link_jobs_available: 0.99
     test_flags: >-
-      --mongodSetParameters="{internalQueryForceClassicEngine: true, featureFlagSBE: false}"
+      --mongodSetParameters="{internalQueryForceClassicEngine: true}"
       --additionalFeatureFlags=featureFlagTimeseriesCollection
   tasks:
   - name: compile_test_and_package_parallel_core_stream_TG
@@ -10859,7 +10859,7 @@ buildvariants:
     san_options: LSAN_OPTIONS="suppressions=etc/lsan.suppressions:report_objects=1:external_symbolizer_path=/opt/mongodbtoolchain/v3/bin/llvm-symbolizer" ASAN_OPTIONS="detect_leaks=1:check_initialization_order=true:strict_init_order=true:abort_on_error=1:disable_coredump=0:handle_abort=1:external_symbolizer_path=/opt/mongodbtoolchain/v3/bin/llvm-symbolizer"
     compile_flags: --variables-files=etc/scons/mongodbtoolchain_v3_clang.vars --dbg=on --opt=on --allocator=system --sanitize=address --ssl --ocsp-stapling=off --enable-free-mon=on -j$(grep -c ^processor /proc/cpuinfo)
     test_flags: >-
-      --mongodSetParameters="{internalQueryForceClassicEngine: true, featureFlagSBE: false}"
+      --mongodSetParameters="{internalQueryForceClassicEngine: true}"
       --excludeWithAnyTags=requires_fast_memory,requires_ocsp_stapling
     multiversion_platform: ubuntu1804
     multiversion_edition: enterprise
@@ -11089,7 +11089,7 @@ buildvariants:
     san_options: UBSAN_OPTIONS="print_stacktrace=1:external_symbolizer_path=/opt/mongodbtoolchain/v3/bin/llvm-symbolizer"
     compile_flags: --variables-files=etc/scons/mongodbtoolchain_v3_clang.vars --dbg=on --opt=on --sanitize=undefined --ssl --ocsp-stapling=off --enable-free-mon=on -j$(grep -c ^processor /proc/cpuinfo)
     test_flags: >-
-      --mongodSetParameters="{internalQueryForceClassicEngine: true, featureFlagSBE: false}"
+      --mongodSetParameters="{internalQueryForceClassicEngine: true}"
       --excludeWithAnyTags=requires_ocsp_stapling
     multiversion_platform: ubuntu1804
     multiversion_edition: enterprise
diff --git a/jstests/libs/sbe_util.js b/jstests/libs/sbe_util.js
index 9ebfdfa702b..ea5c2f4eece 100644
--- a/jstests/libs/sbe_util.js
+++ b/jstests/libs/sbe_util.js
@@ -32,11 +32,9 @@ function checkSBEEnabled(theDB) {
                     continue;
                 }
 
-                const getParam = conn.adminCommand(
-                    {getParameter: 1, featureFlagSBE: 1, internalQueryForceClassicEngine: 1});
-                checkResult = getParam.hasOwnProperty("featureFlagSBE") &&
-                    getParam.featureFlagSBE.value &&
-                    getParam.hasOwnProperty("internalQueryForceClassicEngine") &&
+                const getParam =
+                    conn.adminCommand({getParameter: 1, internalQueryForceClassicEngine: 1});
+                checkResult = getParam.hasOwnProperty("internalQueryForceClassicEngine") &&
                     !getParam.internalQueryForceClassicEngine.value;
                 return true;
             } catch (e) {
diff --git a/src/mongo/db/query/get_executor.cpp b/src/mongo/db/query/get_executor.cpp
index 066507502c3..c334226d01d 100644
--- a/src/mongo/db/query/get_executor.cpp
+++ b/src/mongo/db/query/get_executor.cpp
@@ -1202,7 +1202,6 @@ StatusWith<std::unique_ptr<PlanExecutor, PlanExecutor::Deleter>> getExecutor(
     PlanYieldPolicy::YieldPolicy yieldPolicy,
     size_t plannerOptions) {
     return !canonicalQuery->getForceClassicEngine() &&
-            feature_flags::gSBE.isEnabledAndIgnoreFCV() &&
             isQuerySbeCompatible(opCtx, canonicalQuery.get(), plannerOptions)
         ? getSlotBasedExecutor(
               opCtx, collection, std::move(canonicalQuery), yieldPolicy, plannerOptions)
diff --git a/src/mongo/db/query/query_feature_flags.idl b/src/mongo/db/query/query_feature_flags.idl
index 2ee336c68e4..5d9e5777415 100644
--- a/src/mongo/db/query/query_feature_flags.idl
+++ b/src/mongo/db/query/query_feature_flags.idl
@@ -37,13 +37,6 @@ feature_flags:
       default: true
       version: 5.0
 
-    featureFlagSBE:
-        description: >-
-          When set to true, SBE engine is used instead of the classic engine.
-        cpp_varname: gSBE
-        default: true
-        version: 5.0
-
     featureFlagChangeStreamsOptimization:
       description: "Feature flag for enabling change streams optimization"
       cpp_varname: gFeatureFlagChangeStreamsOptimization