Revert "SERVER-62042 Consolidate query optimization and execution control into a single knob"

This reverts commit c9bbd1cfae470f2b3229e69957f512d2a2db6663.

2 files changed, 13 insertions, 12 deletions

diff --git a/jstests/concurrency/fsm_workloads/agg_lookup.js b/jstests/concurrency/fsm_workloads/agg_lookup.js
index cfc2cfc8086..15bb64c229b 100644
--- a/jstests/concurrency/fsm_workloads/agg_lookup.js
+++ b/jstests/concurrency/fsm_workloads/agg_lookup.js
@@ -72,9 +72,10 @@ var $config = (function() {
         assertWhenOwnColl.eq(this.numDocs, res.nInserted);
         assertWhenOwnColl.eq(this.numDocs, db[collName].find().itcount());
 
-        const getParam = db.adminCommand({getParameter: 1, internalQueryFrameworkControl: 1});
-        const isLookupPushdownEnabled = getParam.hasOwnProperty("internalQueryFrameworkControl") &&
-            getParam.internalQueryFrameworkControl.value != "forceClassicEngine";
+        const getParam = db.adminCommand({getParameter: 1, internalQueryForceClassicEngine: 1});
+        const isLookupPushdownEnabled =
+            getParam.hasOwnProperty("internalQueryForceClassicEngine") &&
+            !getParam.internalQueryForceClassicEngine.value;
 
         this.allowDiskUse = true;
         // If $lookup pushdown into SBE is enabled, we select a random join algorithm to use and
diff --git a/jstests/concurrency/fsm_workloads/find_flip_sbe_enabled.js b/jstests/concurrency/fsm_workloads/find_flip_sbe_enabled.js
index e6bb9549399..51e421f3e26 100644
--- a/jstests/concurrency/fsm_workloads/find_flip_sbe_enabled.js
+++ b/jstests/concurrency/fsm_workloads/find_flip_sbe_enabled.js
@@ -1,8 +1,8 @@
 'use strict';
 
 /**
- * Sets the internalQueryFrameworkControl flag to "forceClassicEngine" and "trySbe", and asserts
- * that find queries using the plan cache produce the correct results.
+ * Sets the internalQueryForceClassicEngine flag to true and false, and asserts that find queries
+ * using the plan cache produce the correct results.
  *
  * @tags: [
  *     # Our test infrastructure prevents tests which use the 'setParameter' command from running in
@@ -20,10 +20,10 @@ var $config = (function() {
 
     function setup(db, collName, cluster) {
         const originalParamValue =
-            db.adminCommand({getParameter: 1, internalQueryFrameworkControl: 1});
+            db.adminCommand({getParameter: 1, internalQueryForceClassicEngine: 1});
         assertAlways.commandWorked(originalParamValue);
-        assert(originalParamValue.hasOwnProperty("internalQueryFrameworkControl"));
-        this.originalParamValue = originalParamValue.internalQueryFrameworkControl;
+        assert(originalParamValue.hasOwnProperty("internalQueryForceClassicEngine"));
+        this.originalParamValue = originalParamValue.internalQueryForceClassicEngine;
         const coll = db.getCollection(getCollectionName(collName));
         for (let i = 0; i < 10; ++i) {
             assertAlways.commandWorked(
@@ -36,13 +36,13 @@ var $config = (function() {
 
     let states = (function() {
         function setForceClassicEngineOn(db, collName) {
-            assertAlways.commandWorked(db.adminCommand(
-                {setParameter: 1, internalQueryFrameworkControl: "forceClassicEngine"}));
+            assertAlways.commandWorked(
+                db.adminCommand({setParameter: 1, internalQueryForceClassicEngine: true}));
         }
 
         function setForceClassicEngineOff(db, collName) {
             assertAlways.commandWorked(
-                db.adminCommand({setParameter: 1, internalQueryFrameworkControl: "trySbeEngine"}));
+                db.adminCommand({setParameter: 1, internalQueryForceClassicEngine: false}));
         }
 
         function runQueriesAndCheckResults(db, collName) {
@@ -126,7 +126,7 @@ var $config = (function() {
         const setParam = this.originalParamValue;
         cluster.executeOnMongodNodes(function(db) {
             assertAlways.commandWorked(
-                db.adminCommand({setParameter: 1, internalQueryFrameworkControl: setParam}));
+                db.adminCommand({setParameter: 1, internalQueryForceClassicEngine: setParam}));
         });
     }