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

This reverts commit c9bbd1cfae470f2b3229e69957f512d2a2db6663.

1 files changed, 22 insertions, 22 deletions

diff --git a/src/mongo/db/query/query_knobs.idl b/src/mongo/db/query/query_knobs.idl
index 422ffea63ff..831334ed790 100644
--- a/src/mongo/db/query/query_knobs.idl
+++ b/src/mongo/db/query/query_knobs.idl
@@ -35,21 +35,6 @@ global:
     - "mongo/platform/atomic_proxy.h"
     - "mongo/platform/atomic_word.h"
 
-enums:
-    QueryFrameworkControl:
-        description: "Enum for possible values of internalQueryFrameworkControl."
-        type: string
-        values:
-            # Force the classic query engine for all queries.
-            kForceClassicEngine: "forceClassicEngine"
-            # Attempt to use SBE for eligible queries, otherwise fallback to the classic engine.
-            kTrySbeEngine: "trySbeEngine"
-            # Attempt to use the Bonsai optimizer and lower to SBE for eligible queries, otherwise
-            # fallback to "trySbeEngine".
-            kTryBonsai: "tryBonsai"
-            # Force the Bonsai optimizer for all queries.
-            kForceBonsai: "forceBonsai"
-
 server_parameters:
 
   #
@@ -671,6 +656,14 @@ server_parameters:
     default: false
     on_update: plan_cache_util::clearSbeCacheOnParameterChange
 
+  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."
+    set_at: [ startup, runtime ]
+    cpp_varname: "internalQueryForceClassicEngine"
+    cpp_vartype: AtomicWord<bool>
+    default: false
+
   internalQueryAppendIdToSetWindowFieldsSort:
     description: "If true, appends _id to the sort stage generated by desugaring $setWindowFields to
     ensure deterministic sort order."
@@ -733,6 +726,14 @@ server_parameters:
     validator:
       callback: ce::validateCEMode
 
+  internalQueryEnableCascadesOptimizer:
+    description: "Set to use the new optimizer path, must be used in conjunction with the feature
+    flag."
+    set_at: [ startup, runtime ]
+    cpp_varname: "internalQueryEnableCascadesOptimizer"
+    cpp_vartype: AtomicWord<bool>
+    default: true
+
   internalCascadesOptimizerDisableScan:
     description: "Disable full collection scans in the Cascades optimizer."
     set_at: [ startup, runtime ]
@@ -783,14 +784,13 @@ server_parameters:
     cpp_vartype: AtomicWord<bool>
     default: false
 
-  internalQueryFrameworkControl:
-    description: "Knob to control the optimizer/execution engine to use."
+  internalQueryForceCommonQueryFramework:
+    description: "Set to always use the bonsai optimizer, regardless of the query."
     set_at: [ startup, runtime ]
-    cpp_class:
-      name: QueryFrameworkControl
-      data: synchronized_value<QueryFrameworkControlEnum>
-    default:
-      expr: QueryFrameworkControlEnum::kTryBonsai
+    cpp_varname: "internalQueryForceCommonQueryFramework"
+    cpp_vartype: AtomicWord<bool>
+    test_only: true
+    default: false
 
   internalQueryCollectionMaxNoOfDocumentsToChooseHashJoin:
     description: "Up to what number of documents do we choose the hash join algorithm when $lookup