SERVER-94735 Set the default value of 'internalQueryFrameworkControl' to 'forceClassicEngine' (#30164)

GitOrigin-RevId: f3e56838b6b9c16d9a0b71f715e3e7cc6f8a7dbf

Author: mtandrei

etc/evergreen.yml

@@ -1289,10 +1289,10 @@ buildvariants:
   - name: vector_search_auth
   - name: vector_search_ssl
 
-- &enterprise-rhel-8-64-bit-dynamic-classic-engine
+- &enterprise-rhel-8-64-bit-dynamic-sbe-engine
   <<: *linux_x86_dynamic_compile_variant_dependency
-  name: enterprise-rhel-8-64-bit-dynamic-classic-engine
-  display_name: "Shared Library Enterprise RHEL 8 (Classic Engine)"
+  name: enterprise-rhel-8-64-bit-dynamic-sbe-engine
+  display_name: "Shared Library Enterprise RHEL 8 (SBE)"
   cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
   run_on:
   - rhel80-small
@@ -1304,7 +1304,7 @@ buildvariants:
     target_resmoke_time: 10
     max_sub_suites: 5
     test_flags: >-
-      --mongodSetParameters="{internalQueryFrameworkControl: forceClassicEngine}"
+      --mongodSetParameters="{internalQueryFrameworkControl: trySbeRestricted}"
     large_distro_name: rhel80-medium
   depends_on:
   - name: archive_dist_test_debug
@@ -1315,8 +1315,8 @@ buildvariants:
     # Without this we are adding extra dependencies on evergreen and it is causing strain
     omit_generated_tasks: true
   tasks:
-  - name: .aggfuzzer !.sbe_only
-  - name: .aggregation !.sbe_only
+  - name: .aggfuzzer !.column_store
+  - name: .aggregation !.column_store
   - name: .auth
   - name: .causally_consistent !.sharding
   - name: .change_stream_fuzzer
@@ -1326,7 +1326,7 @@ buildvariants:
     distros:
     - rhel80-medium
   - name: .encrypt
-  - name: .jscore .common !jsCore !.sbe_only
+  - name: .jscore .common !jsCore !.column_store
   - name: .jstestfuzz !.flow_control
   - name: .misc_js
   - name: .multi_shard
@@ -1370,7 +1370,6 @@ buildvariants:
   - name: lint_fuzzer_sanity_patch
   - name: multi_stmt_txn_jscore_passthrough_with_migration_gen
   - name: multiversion_gen
-  - name: .multiversion_sanity_check
   - name: replica_sets_api_version_jscore_passthrough_gen
   - name: replica_sets_reconfig_jscore_passthrough_gen
   - name: replica_sets_reconfig_jscore_stepdown_passthrough_gen
@@ -1865,8 +1864,8 @@ buildvariants:
 #     Experimental buildvariants          #
 ###########################################
 
-- name: &rhel8-debug-asan-classic-engine rhel8-debug-asan-classic-engine
-  display_name: "* ASAN Enterprise RHEL 8 DEBUG (Classic Engine)"
+- name: &rhel8-debug-asan-sbe-engine rhel8-debug-asan-sbe-engine
+  display_name: "* ASAN Enterprise RHEL 8 DEBUG (SBE)"
   cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
   run_on:
   - rhel80-build
@@ -1886,9 +1885,9 @@ buildvariants:
       --ssl
       --ocsp-stapling=off
       -j$(grep -c ^processor /proc/cpuinfo)
-    compile_variant: *rhel8-debug-asan-classic-engine
+    compile_variant: *rhel8-debug-asan-sbe-engine
     test_flags: >-
-      --mongodSetParameters="{internalQueryFrameworkControl: forceClassicEngine}"
+      --mongodSetParameters="{internalQueryFrameworkControl: trySbeRestricted}"
       --excludeWithAnyTags=requires_fast_memory,requires_ocsp_stapling,requires_increased_memlock_limits,requires_latch_analyzer
     multiversion_platform: rhel80
     multiversion_platform_50_or_later: rhel8
@@ -1902,7 +1901,7 @@ buildvariants:
   tasks:
   - name: compile_test_benchmark_and_package_serial_TG
   - name: compile_test_and_package_parallel_unittest_stream_TG
-  - name: .aggregation !.sbe_only
+  - name: .aggregation !.column_store
   - name: .auth
   - name: audit
   - name: .benchmarks
@@ -1918,7 +1917,7 @@ buildvariants:
   - name: compile_integration_and_test_parallel_stream_TG
     distros:
     - rhel80-large
-  - name: .jscore .common !.sbe_only
+  - name: .jscore .common !.column_store
   - name: jsCore_min_batch_repeat_queries_ese_gsm
   - name: jsCore_txns_large_txns_format
   - name: json_schema
@@ -1990,8 +1989,8 @@ buildvariants:
   - name: disk_wiredtiger
   - name: generate_buildid_to_debug_symbols_mapping
 
-- name: &rhel8-debug-ubsan-classic-engine rhel8-debug-ubsan-classic-engine
-  display_name: "* UBSAN Enterprise RHEL 8 DEBUG (Classic Engine)"
+- name: &rhel8-debug-ubsan-sbe-engine rhel8-debug-ubsan-sbe-engine
+  display_name: "* UBSAN Enterprise RHEL 8 DEBUG (SBE)"
   cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
   run_on:
   - rhel80-build
@@ -2002,7 +2001,7 @@ buildvariants:
       archive-mongocryptd-debug
     lang_environment: LANG=C
     san_options: *ubsan_options
-    compile_variant: *rhel8-debug-ubsan-classic-engine
+    compile_variant: *rhel8-debug-ubsan-sbe-engine
     compile_flags: >-
       --variables-files=etc/scons/mongodbtoolchain_stable_clang.vars
       --dbg=on
@@ -2012,7 +2011,7 @@ buildvariants:
       --ocsp-stapling=off
       -j$(grep -c ^processor /proc/cpuinfo)
     test_flags: >-
-      --mongodSetParameters="{internalQueryFrameworkControl: forceClassicEngine}"
+      --mongodSetParameters="{internalQueryFrameworkControl: trySbeRestricted}"
       --excludeWithAnyTags=requires_ocsp_stapling,requires_increased_memlock_limits,requires_latch_analyzer
     multiversion_platform: rhel80
     multiversion_platform_50_or_later: rhel8
@@ -2024,7 +2023,7 @@ buildvariants:
   tasks:
   - name: compile_test_benchmark_and_package_serial_TG
   - name: compile_test_and_package_parallel_unittest_stream_TG
-  - name: .aggregation !.sbe_only
+  - name: .aggregation !.column_store
   - name: .auth
   - name: audit
   - name: .benchmarks
@@ -2038,7 +2037,7 @@ buildvariants:
   - name: compile_integration_and_test_parallel_stream_TG
     distros:
     - rhel80-large
-  - name: .jscore .common !.sbe_only
+  - name: .jscore .common !.column_store
   - name: jsCore_min_batch_repeat_queries_ese_gsm
   - name: jsCore_txns_large_txns_format
   - name: json_schema
@@ -2841,9 +2840,9 @@ buildvariants:
   - name: vector_search_auth
   - name: vector_search_ssl
 
-- <<: *enterprise-rhel-8-64-bit-dynamic-classic-engine
-  name: &enterprise-rhel-8-64-bit-dynamic-classic-engine-query-patch-only enterprise-rhel-8-64-bit-dynamic-classic-engine-query-patch-only
-  display_name: "~ Shared Library Enterprise RHEL 8 Query Patch Only (Classic Engine)"
+- <<: *enterprise-rhel-8-64-bit-dynamic-sbe-engine
+  name: &enterprise-rhel-8-64-bit-dynamic-sbe-engine-query-patch-only enterprise-rhel-8-64-bit-dynamic-sbe-engine-query-patch-only
+  display_name: "~ Shared Library Enterprise RHEL 8 Query Patch Only (SBE)"
   cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter # This is a patch-only variant but we run on mainline to pick up task history.
   expansions:
     <<: *enterprise-rhel-8-64-bit-dynamic-expansions
@@ -2852,7 +2851,7 @@ buildvariants:
     target_resmoke_time: 30
     max_sub_suites: 3
     test_flags: >-
-      --mongodSetParameters="{internalQueryFrameworkControl: forceClassicEngine}"
+      --mongodSetParameters="{internalQueryFrameworkControl: trySbeRestricted}"
       --excludeWithAnyTags=resource_intensive
 
 - <<: *enterprise-rhel-8-64-bit-dynamic-all-feature-flags-required-template

etc/evergreen_nightly.yml

@@ -16,7 +16,7 @@ include:
 - filename: etc/evergreen_yml_components/variants/ninja.yml
 - filename: etc/evergreen_yml_components/variants/compile_static_analysis.yml
 ### Uncomment when using this file for a LTS or Rapid release branch. ###
-- filename: etc/evergreen_yml_components/variants/classic_engine.yml
+- filename: etc/evergreen_yml_components/variants/sbe.yml
 ### Uncomment when using this file for a LTS or Rapid release branch. ###
 # TODO: (SERVER-86211) Re-enable config shard evergreen variant.
 # - filename: etc/evergreen_yml_components/variants/config_shard.yml

etc/evergreen_timeouts.yml

@@ -67,7 +67,7 @@ overrides:
   - task: replica_sets_jscore_passthrough
     exec_timeout: 180  # 3 hours.
 
-  rhel8-debug-ubsan-classic-engine:
+  rhel8-debug-ubsan-sbe-engine:
   - task: update_timeseries_fuzzer
     exec_timeout: 150  # 2.5 hours
 

etc/evergreen_yml_components/definitions.yml

@@ -3880,7 +3880,7 @@ tasks:
 ## Standalone fuzzer for checking columnstore index correctness ##
 - <<: *jstestfuzz_template
   name: aggregation_columnstore_fuzzer_gen
-  tags: ["aggfuzzer", "common", "columnstore", "require_npm", "random_name", "sbe_only", "feature_flag_guarded"]
+  tags: ["aggfuzzer", "common", "require_npm", "random_name", "column_store", "feature_flag_guarded"]
   commands:
   - func: "generate resmoke tasks"
     vars:
@@ -4746,7 +4746,7 @@ tasks:
   name: aggregation_column_store_index_passthrough
   # TODO SERVER-75026 Remove the 'feature_flag_guarded' tag and ensure this suite is run on all
   # variants.
-  tags: ["aggregation", "sbe_only", "feature_flag_guarded"]
+  tags: ["aggregation", "column_store", "feature_flag_guarded"]
   depends_on:
   - name: aggregation
   commands:
@@ -5536,7 +5536,7 @@ tasks:
   # variants.
   depends_on:
   - name: jsCore
-  tags: ["jscore", "sbe_only", "feature_flag_guarded"]
+  tags: ["jscore", "column_store", "feature_flag_guarded"]
   commands:
   - func: "do setup"
   - func: "run tests"

etc/evergreen_yml_components/variants/classic_engine.yml renamed to etc/evergreen_yml_components/variants/sbe.yml

@@ -1,4 +1,4 @@
-# Build variants for testing the classic engine.
+# Build variants for testing the sbe engine.
 
 variables:
 - &linux_x86_dynamic_compile_variant_dependency
@@ -45,10 +45,10 @@ variables:
 - ubsan_options: &ubsan_options UBSAN_OPTIONS="print_stacktrace=1:external_symbolizer_path=/opt/mongodbtoolchain/v4/bin/llvm-symbolizer"
 
 buildvariants:
-- &enterprise-rhel-8-64-bit-dynamic-classic-engine
+- &enterprise-rhel-8-64-bit-dynamic-sbe-engine
   <<: *linux_x86_dynamic_compile_variant_dependency
-  name: enterprise-rhel-8-64-bit-dynamic-classic-engine
-  display_name: "Shared Library Enterprise RHEL 8 (Classic Engine)"
+  name: enterprise-rhel-8-64-bit-dynamic-sbe-engine
+  display_name: "Shared Library Enterprise RHEL 8 (SBE)"
   cron: "0 0 * * 0"  # once a week (Sunday midnight UTC)
   run_on:
   - rhel80-small
@@ -60,7 +60,7 @@ buildvariants:
     target_resmoke_time: 10
     max_sub_suites: 5
     test_flags: >-
-      --mongodSetParameters="{internalQueryFrameworkControl: forceClassicEngine}"
+      --mongodSetParameters="{internalQueryFrameworkControl: trySbeRestricted}"
       --excludeWithAnyTags=requires_latch_analyzer
     large_distro_name: rhel80-medium
   depends_on:
@@ -72,8 +72,8 @@ buildvariants:
     # Without this we are adding extra dependencies on evergreen and it is causing strain
     omit_generated_tasks: true
   tasks:
-  - name: .aggfuzzer !.sbe_only
-  - name: .aggregation !.sbe_only
+  - name: .aggfuzzer !.column_store
+  - name: .aggregation !.column_store
   - name: .auth
   - name: .causally_consistent !.sharding
   - name: .change_stream_fuzzer
@@ -83,7 +83,7 @@ buildvariants:
     distros:
     - rhel80-medium
   - name: .encrypt
-  - name: .jscore .common !jsCore !.sbe_only
+  - name: .jscore .common !jsCore !.column_store
   - name: .jstestfuzz !.flow_control
   - name: .misc_js
   - name: .multi_shard
@@ -127,7 +127,6 @@ buildvariants:
   - name: lint_fuzzer_sanity_patch
   - name: multi_stmt_txn_jscore_passthrough_with_migration_gen
   - name: multiversion_gen
-  - name: .multiversion_sanity_check
   - name: replica_sets_api_version_jscore_passthrough_gen
   - name: replica_sets_reconfig_jscore_passthrough_gen
   - name: replica_sets_reconfig_jscore_stepdown_passthrough_gen
@@ -152,8 +151,8 @@ buildvariants:
   - name: vector_search_auth
   - name: vector_search_ssl
 
-- name: &rhel8-debug-asan-classic-engine rhel8-debug-asan-classic-engine
-  display_name: "* ASAN Enterprise RHEL 8 DEBUG (Classic Engine)"
+- name: &rhel8-debug-asan-sbe-engine rhel8-debug-asan-sbe-engine
+  display_name: "* ASAN Enterprise RHEL 8 DEBUG (SBE)"
   cron: "0 0 * * 2"  # once a week (Tuesday midnight UTC)
   run_on:
   - rhel80-build
@@ -173,9 +172,9 @@ buildvariants:
       --ssl
       --ocsp-stapling=off
       -j$(grep -c ^processor /proc/cpuinfo)
-    compile_variant: *rhel8-debug-asan-classic-engine
+    compile_variant: *rhel8-debug-asan-sbe-engine
     test_flags: >-
-      --mongodSetParameters="{internalQueryFrameworkControl: forceClassicEngine}"
+      --mongodSetParameters="{internalQueryFrameworkControl: trySbeRestricted}"
       --excludeWithAnyTags=requires_fast_memory,requires_ocsp_stapling,requires_increased_memlock_limits,requires_latch_analyzer
     multiversion_platform: rhel80
     multiversion_platform_50_or_later: rhel8
@@ -189,7 +188,7 @@ buildvariants:
   tasks:
   - name: compile_test_benchmark_and_package_serial_TG
   - name: compile_test_and_package_parallel_unittest_stream_TG
-  - name: .aggregation !.sbe_only
+  - name: .aggregation !.column_store
   - name: .auth
   - name: audit
   - name: .benchmarks
@@ -205,7 +204,7 @@ buildvariants:
   - name: compile_integration_and_test_parallel_stream_TG
     distros:
     - rhel80-large
-  - name: .jscore .common !.sbe_only
+  - name: .jscore .common !.column_store
   - name: jsCore_min_batch_repeat_queries_ese_gsm
   - name: jsCore_txns_large_txns_format
   - name: json_schema
@@ -235,8 +234,8 @@ buildvariants:
   - name: server_selection_json_test_TG
   - name: generate_buildid_to_debug_symbols_mapping
 
-- name: &rhel8-debug-ubsan-classic-engine rhel8-debug-ubsan-classic-engine
-  display_name: "* UBSAN Enterprise RHEL 8 DEBUG (Classic Engine)"
+- name: &rhel8-debug-ubsan-sbe-engine rhel8-debug-ubsan-sbe-engine
+  display_name: "* UBSAN Enterprise RHEL 8 DEBUG (SBE)"
   cron: "0 0 * * 4"  # once a week (Thursday midnight UTC)
   run_on:
   - rhel80-build
@@ -247,7 +246,7 @@ buildvariants:
       archive-mongocryptd-debug
     lang_environment: LANG=C
     san_options: *ubsan_options
-    compile_variant: *rhel8-debug-ubsan-classic-engine
+    compile_variant: *rhel8-debug-ubsan-sbe-engine
     compile_flags: >-
       --variables-files=etc/scons/mongodbtoolchain_stable_clang.vars
       --dbg=on
@@ -257,7 +256,7 @@ buildvariants:
       --ocsp-stapling=off
       -j$(grep -c ^processor /proc/cpuinfo)
     test_flags: >-
-      --mongodSetParameters="{internalQueryFrameworkControl: forceClassicEngine}"
+      --mongodSetParameters="{internalQueryFrameworkControl: trySbeRestricted}"
       --excludeWithAnyTags=requires_ocsp_stapling,requires_increased_memlock_limits,requires_latch_analyzer
     multiversion_platform: rhel80
     multiversion_platform_50_or_later: rhel8
@@ -269,7 +268,7 @@ buildvariants:
   tasks:
   - name: compile_test_benchmark_and_package_serial_TG
   - name: compile_test_and_package_parallel_unittest_stream_TG
-  - name: .aggregation !.sbe_only
+  - name: .aggregation !.column_store
   - name: .auth
   - name: audit
   - name: .benchmarks
@@ -283,7 +282,7 @@ buildvariants:
   - name: compile_integration_and_test_parallel_stream_TG
     distros:
     - rhel80-large
-  - name: .jscore .common !.sbe_only
+  - name: .jscore .common !.column_store
   - name: jsCore_min_batch_repeat_queries_ese_gsm
   - name: jsCore_txns_large_txns_format
   - name: json_schema

etc/generate_subtasks_config.yml

@@ -46,12 +46,12 @@ build_variant_large_distro_exceptions:
   - rhel8
   - rhel8-debug-asan
   - rhel8-debug-asan-all-feature-flags
-  - rhel8-debug-asan-classic-engine
+  - rhel8-debug-asan-sbe-engine
   - rhel8-debug-aubsan-lite
   - rhel8-debug-suggested
   - rhel8-debug-ubsan
   - rhel8-debug-ubsan-all-feature-flags
-  - rhel8-debug-ubsan-classic-engine
+  - rhel8-debug-ubsan-sbe-engine
   - rhel-8-arm64
   - rhel90
   - rhel90-arm64

jstests/aggregation/sources/lookup/lookup_numeric_field.js

@@ -8,6 +8,7 @@
 "use strict";
 
 load("jstests/libs/analyze_plan.js");  // For getWinningPlan.
+load("jstests/libs/sbe_util.js");      // For checkSbeFullyEnabled.
 
 const outer = db.outer;
 const inner = db.inner;
@@ -112,8 +113,7 @@ function testGraphLookupFieldTraversal(localField, localDoc, shouldMatchDoc, pre
     testLookupFieldTraversal("a.b.c.1", {a: {b: {c: [1, 3]}}}, true, ["a", "b", "c"]);
 
     // TODO after SERVER-76470 this should be able to be removed.
-    if (assert.commandWorked(db.adminCommand({getParameter: 1, internalQueryFrameworkControl: 1}))
-            .internalQueryFrameworkControl == "forceClassicEngine") {
+    if (checkSbeCompletelyDisabled(db)) {
         // These are cases where "00"-type fields are treated as an index, and SBE does not behave
         // this way.
         testLookupFieldTraversal("a.00", {a: [3]}, true, ["a"]);