SERVER-92880 Tag more jstests as owned by query (#29826)

GitOrigin-RevId: 85cc9997a93019158ec027f02fe66d4e76ea21af

.github/CODEOWNERS

@@ -186,7 +186,7 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot
 /jstests/auth/**/* @10gen/server-security @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/change_streams/OWNERS.yml
-/jstests/change_streams/**/* @10gen/query-execution @svc-auto-approve-bot
+/jstests/change_streams/**/* @10gen/query-execution-change-streams @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/client_encrypt/OWNERS.yml
 /jstests/client_encrypt/**/* @10gen/query-integration-fle @svc-auto-approve-bot
@@ -195,7 +195,7 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot
 /jstests/concurrency/fsm_libs/**/reshard_collection_util.js @10gen/server-cluster-scalability @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/concurrency/fsm_workloads/OWNERS.yml
-/jstests/concurrency/fsm_workloads/**/*write_without_shard_key* @10gen/query-execution @svc-auto-approve-bot
+/jstests/concurrency/fsm_workloads/**/*write_without_shard_key* @10gen/query-execution-router-write-exec @svc-auto-approve-bot
 /jstests/concurrency/fsm_workloads/**/timeseries* @10gen/server-storage-execution @svc-auto-approve-bot
 /jstests/concurrency/fsm_workloads/**/timeseries_agg* @10gen/query-integration @svc-auto-approve-bot
 /jstests/concurrency/fsm_workloads/**/timeseries_deletes_and_inserts.js @10gen/query-integration @svc-auto-approve-bot
@@ -221,30 +221,31 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/concurrency/fsm_workloads/query/OWNERS.yml
 /jstests/concurrency/fsm_workloads/query/**/* @10gen/query @svc-auto-approve-bot
-/jstests/concurrency/fsm_workloads/query/**/find_flip_sbe_enabled.js @10gen/query-execution @svc-auto-approve-bot
+/jstests/concurrency/fsm_workloads/query/**/find_flip_sbe_enabled.js @10gen/query-execution-sbe @svc-auto-approve-bot
-/jstests/concurrency/fsm_workloads/query/**/plan_cache_drop_database.js @10gen/query-optimization @svc-auto-approve-bot
+/jstests/concurrency/fsm_workloads/query/**/plan_cache_drop_database.js @10gen/query-optimization-plan-cache @svc-auto-approve-bot
 /jstests/concurrency/fsm_workloads/query/**/profile_command.js @10gen/query-integration-observability @svc-auto-approve-bot
+/jstests/concurrency/fsm_workloads/query/**/drop_index_during_replan.js @10gen/query-optimization-runtime-planners @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/concurrency/fsm_workloads/query/explain/OWNERS.yml
-/jstests/concurrency/fsm_workloads/query/explain/**/* @10gen/query-optimization @svc-auto-approve-bot
+/jstests/concurrency/fsm_workloads/query/explain/**/* @10gen/query-optimization-explain @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/concurrency/fsm_workloads/query/map_reduce/OWNERS.yml
-/jstests/concurrency/fsm_workloads/query/map_reduce/**/* @10gen/query-optimization @svc-auto-approve-bot
+/jstests/concurrency/fsm_workloads/query/map_reduce/**/* @10gen/query-integration-staff-leads @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/concurrency/fsm_workloads/query/query_stats/OWNERS.yml
 /jstests/concurrency/fsm_workloads/query/query_stats/**/* @10gen/query-integration-query-stats @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/concurrency/fsm_workloads/query/remove/OWNERS.yml
-/jstests/concurrency/fsm_workloads/query/remove/**/* @10gen/query-execution @svc-auto-approve-bot
+/jstests/concurrency/fsm_workloads/query/remove/**/* @10gen/query-execution-write-exec @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/concurrency/fsm_workloads/query/timeseries/OWNERS.yml
 /jstests/concurrency/fsm_workloads/query/timeseries/**/* @10gen/query-integration-timeseries @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/concurrency/fsm_workloads/query/update/OWNERS.yml
-/jstests/concurrency/fsm_workloads/query/update/**/* @10gen/query-execution @svc-auto-approve-bot
+/jstests/concurrency/fsm_workloads/query/update/**/* @10gen/query-execution-write-exec @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/concurrency/fsm_workloads/query/yield/OWNERS.yml
-/jstests/concurrency/fsm_workloads/query/yield/**/* @10gen/query-execution @svc-auto-approve-bot
+/jstests/concurrency/fsm_workloads/query/yield/**/* @10gen/query-execution-yielding @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/concurrency/fsm_workloads/server_status/OWNERS.yml
 /jstests/concurrency/fsm_workloads/server_status/**/* @10gen/server-networking-and-observability @svc-auto-approve-bot
@@ -265,11 +266,14 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot
 /jstests/concurrency/fsm_workloads/txns/multi_statement_transaction/**/* @10gen/server-cluster-scalability @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/concurrency/fsm_workloads/updateOne_without_shard_key/OWNERS.yml
-/jstests/concurrency/fsm_workloads/updateOne_without_shard_key/**/* @10gen/query-execution @svc-auto-approve-bot
+/jstests/concurrency/fsm_workloads/updateOne_without_shard_key/**/* @10gen/query-execution-router-write-exec @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/concurrency/fsm_workloads/view_catalog/OWNERS.yml
 /jstests/concurrency/fsm_workloads/view_catalog/**/* @10gen/server-catalog-and-routing @svc-auto-approve-bot
 
+# The following patterns are parsed from ./jstests/concurrency/fsm_workloads_no_passthrough_with_mongod/OWNERS.yml
+/jstests/concurrency/fsm_workloads_no_passthrough_with_mongod/**/external_data_source.js @10gen/query-integration-analytic-extensions @svc-auto-approve-bot
+
 # The following patterns are parsed from ./jstests/core/OWNERS.yml
 /jstests/core/**/connection_string_validation.js @10gen/server-networking-and-observability @svc-auto-approve-bot
 /jstests/core/**/hostinfo.js @10gen/server-networking-and-observability @svc-auto-approve-bot
@@ -278,6 +282,12 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot
 /jstests/core/capped/* @10gen/server-storage-execution @svc-auto-approve-bot
 /jstests/core/clustered/* @10gen/server-storage-execution @svc-auto-approve-bot
 /jstests/core/**/splitvector.js @10gen/server-cluster-scalability @svc-auto-approve-bot
+/jstests/core/**/opcounters_write_cmd.js @10gen/query-integration-observability @svc-auto-approve-bot
+/jstests/core/**/operation_latency_histogram.js @10gen/query-integration-observability @svc-auto-approve-bot
+/jstests/core/**/version_api* @10gen/query-optimization-parsers @svc-auto-approve-bot
+
+# The following patterns are parsed from ./jstests/core/administrative/current_op/OWNERS.yml
+/jstests/core/administrative/current_op/**/* @10gen/query-integration-observability @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/core/administrative/profile/OWNERS.yml
 /jstests/core/administrative/profile/**/* @10gen/query-integration @svc-auto-approve-bot
@@ -299,28 +309,28 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/core/query/OWNERS.yml
 /jstests/core/query/**/* @10gen/query @svc-auto-approve-bot
-/jstests/core/query/**/boolean_expression_simplification.js @10gen/query-optimization @svc-auto-approve-bot
+/jstests/core/query/**/boolean_expression_simplification.js @10gen/query-optimization-heuristic-rewrite @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/core/query/api/OWNERS.yml
-/jstests/core/query/api/**/* @10gen/query-optimization @svc-auto-approve-bot
+/jstests/core/query/api/**/* @10gen/query-optimization-parsers @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/core/query/collation/OWNERS.yml
-/jstests/core/query/collation/**/* @10gen/query-execution @svc-auto-approve-bot
+/jstests/core/query/collation/**/* @10gen/query-execution-collation @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/core/query/collstats/OWNERS.yml
 /jstests/core/query/collstats/**/* @10gen/query-integration-observability @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/core/query/doc_validation/OWNERS.yml
-/jstests/core/query/doc_validation/**/* @10gen/query-execution @svc-auto-approve-bot
+/jstests/core/query/doc_validation/**/* @10gen/query-execution-doc-validation @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/core/query/explain/OWNERS.yml
-/jstests/core/query/explain/**/* @10gen/query-optimization @svc-auto-approve-bot
+/jstests/core/query/explain/**/* @10gen/query-optimization-explain @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/core/query/geo/OWNERS.yml
 /jstests/core/query/geo/**/* @10gen/query-integration-geo @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/core/query/inc/OWNERS.yml
-/jstests/core/query/inc/**/* @10gen/query-execution @svc-auto-approve-bot
+/jstests/core/query/inc/**/* @10gen/query-execution-write-exec @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/core/query/js/OWNERS.yml
 /jstests/core/query/js/**/* @10gen/query-integration-javascript @svc-auto-approve-bot
@@ -332,36 +342,35 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot
 /jstests/core/query/map_reduce/**/* @10gen/query-integration-staff-leads @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/core/query/plan_cache/OWNERS.yml
-/jstests/core/query/plan_cache/**/* @10gen/query-optimization @svc-auto-approve-bot
+/jstests/core/query/plan_cache/**/* @10gen/query-optimization-plan-cache @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/core/query/pull/OWNERS.yml
-/jstests/core/query/pull/**/* @10gen/query-execution @svc-auto-approve-bot
+/jstests/core/query/pull/**/* @10gen/query-execution-write-exec @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/core/query/push/OWNERS.yml
-/jstests/core/query/push/**/* @10gen/query-execution @svc-auto-approve-bot
+/jstests/core/query/push/**/* @10gen/query-execution-write-exec @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/core/query/query_settings/OWNERS.yml
-/jstests/core/query/query_settings/**/* @10gen/query-execution @svc-auto-approve-bot
+/jstests/core/query/query_settings/**/* @10gen/query-execution-query-settings @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/core/query/queryable_encryption/OWNERS.yml
 /jstests/core/query/queryable_encryption/**/* @10gen/query-integration-fle @10gen/server-security @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/core/query/regex/OWNERS.yml
-/jstests/core/query/regex/**/* @10gen/query-execution @svc-auto-approve-bot
+/jstests/core/query/regex/**/* @10gen/query-execution-regex @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/core/query/sbe/OWNERS.yml
-/jstests/core/query/sbe/**/* @10gen/query-execution @svc-auto-approve-bot
+/jstests/core/query/sbe/**/* @10gen/query-execution-sbe @svc-auto-approve-bot
-/jstests/core/query/sbe/**/from_plan_cache_flag.js @10gen/query-optimization @svc-auto-approve-bot
+/jstests/core/query/sbe/**/*plan_cache* @10gen/query-optimization-plan-cache @svc-auto-approve-bot
-/jstests/core/query/sbe/**/*plan_cache* @10gen/query-optimization @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/core/query/set/OWNERS.yml
-/jstests/core/query/set/**/* @10gen/query-execution @svc-auto-approve-bot
+/jstests/core/query/set/**/* @10gen/query-execution-write-exec @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/core/query/top/OWNERS.yml
 /jstests/core/query/top/**/* @10gen/query-integration-observability @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/core/query/unset/OWNERS.yml
-/jstests/core/query/unset/**/* @10gen/query-execution @svc-auto-approve-bot
+/jstests/core/query/unset/**/* @10gen/query-execution-write-exec @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/core/query/where/OWNERS.yml
 /jstests/core/query/where/**/* @10gen/query-integration-staff-leads @svc-auto-approve-bot
@@ -405,7 +414,7 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot
 /jstests/core/views/**/* @10gen/server-catalog-and-routing @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/core/write/OWNERS.yml
-/jstests/core/write/**/* @10gen/query-execution @svc-auto-approve-bot
+/jstests/core/write/**/* @10gen/query-execution-write-exec @svc-auto-approve-bot
 /jstests/core/write/**/*empty_ts*.js @10gen/server-collection-write-path @svc-auto-approve-bot
 /jstests/core/write/**/autoid.js @10gen/server-collection-write-path @svc-auto-approve-bot
 /jstests/core/write/**/validate_user_documents.js @10gen/server-collection-write-path @svc-auto-approve-bot
@@ -449,6 +458,8 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/decimal/OWNERS.yml
 /jstests/decimal/**/* @10gen/server-programmability @svc-auto-approve-bot
+/jstests/decimal/**/decimal_find* @10gen/query-execution @svc-auto-approve-bot
+/jstests/decimal/**/decimal_update.js @10gen/query-execution-write-exec @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/disk/OWNERS.yml
 /jstests/disk/**/* @10gen/server-rss-sydney @svc-auto-approve-bot
@@ -461,6 +472,7 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/hooks/OWNERS.yml
 /jstests/hooks/**/run_analyze_shard_key_background.js @10gen/server-cluster-scalability @svc-auto-approve-bot
+/jstests/hooks/**/run_enable_change_stream.js @10gen/query-execution-change-streams @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/httpinterface/OWNERS.yml
 /jstests/httpinterface/**/network_options.js @10gen/server-networking-and-observability @svc-auto-approve-bot
@@ -469,21 +481,59 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot
 /jstests/libs/**/replsettest.js @10gen/server-replication @svc-auto-approve-bot
 /jstests/libs/**/shardingtest.js @10gen/server-cluster-scalability @svc-auto-approve-bot
 /jstests/libs/**/*golden_test.js @10gen/query-optimization @svc-auto-approve-bot
-/jstests/libs/**/sharded_cluster_fixture_helpers.js @10gen/server-catalog-and-routing @svc-auto-approve-bot
+/jstests/libs/**/sharded_cluster_fixture_helpers.js @10gen/query-optimization-golden-test @10gen/server-catalog-and-routing @svc-auto-approve-bot
+/jstests/libs/**/assert_schema_match.js @10gen/query-execution-doc-validation @svc-auto-approve-bot
+/jstests/libs/**/doc_validation_utils.js @10gen/query-execution-doc-validation @svc-auto-approve-bot
+/jstests/libs/**/json_schema_test_runner.js @10gen/query-execution-doc-validation @svc-auto-approve-bot
+/jstests/libs/**/*bulk_write* @10gen/query-execution-write-exec @svc-auto-approve-bot
+/jstests/libs/**/curop_helpers.js @10gen/query-integration-observability @svc-auto-approve-bot
+/jstests/libs/**/dateutil.js @10gen/query-execution-datetime @svc-auto-approve-bot
+/jstests/libs/**/fts.js @10gen/query-integration-staff-leads @svc-auto-approve-bot
+/jstests/libs/**/local_reads.js @10gen/query-integration-observability @svc-auto-approve-bot
+/jstests/libs/**/pin_getmore_cursor.js @10gen/query-integration-observability @svc-auto-approve-bot
+/jstests/libs/**/profiler.js @10gen/query-integration-observability @svc-auto-approve-bot
+/jstests/libs/**/stats.js @10gen/query-integration-observability @svc-auto-approve-bot
+/jstests/libs/**/search.js @10gen/query-integration-search-testing @svc-auto-approve-bot
+/jstests/libs/**/shard_targeting_util.js @10gen/query-optimization-cluster-planning @svc-auto-approve-bot
+/jstests/libs/**/api_version_helpers.js @10gen/query-optimization-parsers @svc-auto-approve-bot
+
+# The following patterns are parsed from ./jstests/libs/config_files/OWNERS.yml
+/jstests/libs/config_files/**/set_profiling* @10gen/query-integration-observability @svc-auto-approve-bot
+
+# The following patterns are parsed from ./jstests/libs/config_files/bad_timezone_info/OWNERS.yml
+/jstests/libs/config_files/bad_timezone_info/**/* @10gen/query-execution-datetime @svc-auto-approve-bot
+
+# The following patterns are parsed from ./jstests/libs/config_files/good_timezone_info_fat/OWNERS.yml
+/jstests/libs/config_files/good_timezone_info_fat/**/* @10gen/query-execution-datetime @svc-auto-approve-bot
+
+# The following patterns are parsed from ./jstests/libs/config_files/good_timezone_info_slim/OWNERS.yml
+/jstests/libs/config_files/good_timezone_info_slim/**/* @10gen/query-execution-datetime @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/libs/override_methods/OWNERS.yml
-/jstests/libs/override_methods/**/*golden_overrides.js @10gen/query-optimization @svc-auto-approve-bot
+/jstests/libs/override_methods/**/*golden_overrides.js @10gen/query-optimization-golden-test @svc-auto-approve-bot
+/jstests/libs/override_methods/**/*changestream* @10gen/query-execution-change-streams @svc-auto-approve-bot
+/jstests/libs/override_methods/**/*query_settings* @10gen/query-execution-query-settings @svc-auto-approve-bot
+/jstests/libs/override_methods/**/implicit_wildcard_indexes.js @10gen/query-execution-indexing @svc-auto-approve-bot
+/jstests/libs/override_methods/**/implicitly_wrap_pipelines_in_facets.js @10gen/query-execution-aggregation @svc-auto-approve-bot
+/jstests/libs/override_methods/**/*bulk_write.js @10gen/query-execution-write-exec @svc-auto-approve-bot
+/jstests/libs/override_methods/**/implicit_timeseries_collections.js @10gen/query-integration-timeseries @svc-auto-approve-bot
+/jstests/libs/override_methods/**/query_shape_hash_stability.js @10gen/query-integration-observability @svc-auto-approve-bot
+/jstests/libs/override_methods/**/rerun_queries.js @10gen/query-optimization-plan-cache @svc-auto-approve-bot
+/jstests/libs/override_methods/**/set_api* @10gen/query-optimization-parsers @svc-auto-approve-bot
+
+# The following patterns are parsed from ./jstests/libs/property_test_helpers/OWNERS.yml
+/jstests/libs/property_test_helpers/**/* @10gen/query-optimization @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/libs/query/OWNERS.yml
 /jstests/libs/query/**/* @10gen/query @svc-auto-approve-bot
-/jstests/libs/query/**/analyze_plan.js @10gen/query-optimization @svc-auto-approve-bot
+/jstests/libs/query/**/analyze_plan.js @10gen/query-optimization-explain @svc-auto-approve-bot
 /jstests/libs/query/**/aggregation_pipeline_utils.js @10gen/query @svc-auto-approve-bot
-/jstests/libs/query/**/change_stream*.js @10gen/query-execution @svc-auto-approve-bot
+/jstests/libs/query/**/change_stream*.js @10gen/query-execution-change-streams @svc-auto-approve-bot
 /jstests/libs/query/**/geo*.js @10gen/query-integration @svc-auto-approve-bot
 /jstests/libs/query/**/group_to_distinct_scan_utils.js @10gen/query-integration @svc-auto-approve-bot
-/jstests/libs/query/**/query_settings*.js @10gen/query-execution @svc-auto-approve-bot
+/jstests/libs/query/**/query_settings*.js @10gen/query-execution-query-settings @svc-auto-approve-bot
-/jstests/libs/query/**/sbe*.js @10gen/query-execution @svc-auto-approve-bot
+/jstests/libs/query/**/sbe*.js @10gen/query-execution-sbe @svc-auto-approve-bot
-/jstests/libs/query/**/wildcard_index_helpers.js @10gen/query-optimization @svc-auto-approve-bot
+/jstests/libs/query/**/wildcard_index_helpers.js @10gen/query-optimization-planner @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/libs/txns/OWNERS.yml
 /jstests/libs/txns/**/* @10gen/server-cluster-scalability @svc-auto-approve-bot
@@ -495,6 +545,22 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot
 /jstests/multiVersion/**/migration* @10gen/server-cluster-scalability @svc-auto-approve-bot
 /jstests/multiVersion/**/rs_endpoint* @10gen/server-cluster-scalability @svc-auto-approve-bot
 
+# The following patterns are parsed from ./jstests/multiVersion/genericBinVersion/OWNERS.yml
+/jstests/multiVersion/genericBinVersion/**/*query_stats* @10gen/query-integration-observability @svc-auto-approve-bot
+/jstests/multiVersion/genericBinVersion/**/keystring_index.js @10gen/query-execution-indexing @svc-auto-approve-bot
+/jstests/multiVersion/genericBinVersion/**/timeseries_collection_mixed_type.js @10gen/query-integration-timeseries @svc-auto-approve-bot
+
+# The following patterns are parsed from ./jstests/multiVersion/genericChangeStreams/OWNERS.yml
+/jstests/multiVersion/genericChangeStreams/**/* @10gen/query-execution-change-streams @svc-auto-approve-bot
+
+# The following patterns are parsed from ./jstests/multiVersion/genericSetFCVUsage/OWNERS.yml
+/jstests/multiVersion/genericSetFCVUsage/**/bit_update_mixed_fcv.js @10gen/query-execution-write-exec @svc-auto-approve-bot
+/jstests/multiVersion/genericSetFCVUsage/**/view_definition_feature_compatibility_version.js @10gen/query-optimization-views @svc-auto-approve-bot
+
+# The following patterns are parsed from ./jstests/multiVersion/targetedTestsLastLtsFeatures/OWNERS.yml
+/jstests/multiVersion/targetedTestsLastLtsFeatures/**/bindata_convert_numeric_view_upgrade_downgrade.js @10gen/query-execution-aggregation @svc-auto-approve-bot
+/jstests/multiVersion/targetedTestsLastLtsFeatures/**/error_and_log_validation_action.js @10gen/query-execution-doc-validation @svc-auto-approve-bot
+
 # The following patterns are parsed from ./jstests/noPassthrough/OWNERS.yml
 /jstests/noPassthrough/**/*reproducible_initializer* @10gen/server-programmability @svc-auto-approve-bot
 /jstests/noPassthrough/**/version.js @10gen/server-programmability @svc-auto-approve-bot
@@ -506,6 +572,9 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot
 # The following patterns are parsed from ./jstests/noPassthrough/admission/OWNERS.yml
 /jstests/noPassthrough/admission/**/* @10gen/server-workload-scheduling @svc-auto-approve-bot
 
+# The following patterns are parsed from ./jstests/noPassthrough/api_version/OWNERS.yml
+/jstests/noPassthrough/api_version/**/* @10gen/query-optimization-parsers @svc-auto-approve-bot
+
 # The following patterns are parsed from ./jstests/noPassthrough/backup_restore/OWNERS.yml
 /jstests/noPassthrough/backup_restore/**/* @10gen/server-rss-sydney @svc-auto-approve-bot
 
@@ -537,6 +606,9 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot
 /jstests/noPassthrough/configuration/**/configExpand_* @10gen/server-security @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/noPassthrough/crud/OWNERS.yml
+/jstests/noPassthrough/crud/**/batched_multi_deletes* @10gen/query-execution-write-exec @svc-auto-approve-bot
+/jstests/noPassthrough/crud/**/bulk_write* @10gen/query-execution-write-exec @svc-auto-approve-bot
+/jstests/noPassthrough/crud/**/bulk_write_currentop.js @10gen/query-integration-observability @svc-auto-approve-bot
 /jstests/noPassthrough/crud/**/*capped_deletes* @10gen/server-storage-execution @svc-auto-approve-bot
 /jstests/noPassthrough/crud/**/replset_writes_during_restarts_keep_fast_count_correct.js @10gen/server-storage-execution @svc-auto-approve-bot
 
@@ -573,6 +645,7 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot
 # The following patterns are parsed from ./jstests/noPassthrough/libs/OWNERS.yml
 /jstests/noPassthrough/libs/**/*server_parameter* @10gen/server-programmability @svc-auto-approve-bot
 /jstests/noPassthrough/libs/**/*index_build* @10gen/server-index-builds @svc-auto-approve-bot
+/jstests/noPassthrough/libs/**/*change_stream* @10gen/query-execution-change-streams @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/noPassthrough/logging/OWNERS.yml
 /jstests/noPassthrough/logging/**/* @10gen/server-networking-and-observability @svc-auto-approve-bot
@@ -592,24 +665,39 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/noPassthrough/query/OWNERS.yml
 /jstests/noPassthrough/query/**/* @10gen/query @svc-auto-approve-bot
-/jstests/noPassthrough/query/**/and_hash.js @10gen/query-optimization @svc-auto-approve-bot
+/jstests/noPassthrough/query/**/cluster_analyze_command.js @10gen/query-optimization-statistics @svc-auto-approve-bot
-/jstests/noPassthrough/query/**/and_sorted.js @10gen/query-optimization @svc-auto-approve-bot
+/jstests/noPassthrough/query/**/and_hash.js @10gen/query-optimization-planner @svc-auto-approve-bot
-/jstests/noPassthrough/query/**/doc_validation_options_logging.js @10gen/query-execution @svc-auto-approve-bot
+/jstests/noPassthrough/query/**/and_sorted.js @10gen/query-optimization-planner @svc-auto-approve-bot
-/jstests/noPassthrough/query/**/query_settings* @10gen/query-execution @svc-auto-approve-bot
+/jstests/noPassthrough/query/**/doc_validation_options_logging.js @10gen/query-execution-doc-validation @svc-auto-approve-bot
-/jstests/noPassthrough/query/**/sbe* @10gen/query-execution @svc-auto-approve-bot
+/jstests/noPassthrough/query/**/query_settings* @10gen/query-execution-query-settings @svc-auto-approve-bot
+/jstests/noPassthrough/query/**/sbe* @10gen/query-execution-sbe @svc-auto-approve-bot
 /jstests/noPassthrough/query/**/match_expression_optimization_failpoint.js @10gen/query-optimization @svc-auto-approve-bot
 /jstests/noPassthrough/query/**/pipeline_optimization_failpoint.js @10gen/query-optimization @svc-auto-approve-bot
-/jstests/noPassthrough/query/**/noFetchBonus.js @10gen/query-optimization @svc-auto-approve-bot
+/jstests/noPassthrough/query/**/noFetchBonus.js @10gen/query-optimization-planner @svc-auto-approve-bot
-/jstests/noPassthrough/query/**/optimize_sharded_sample_with_orphaned_docs.js @10gen/query-optimization @svc-auto-approve-bot
+/jstests/noPassthrough/query/**/optimize_sharded_sample_with_orphaned_docs.js @10gen/query-optimization-cluster-planning @svc-auto-approve-bot
-/jstests/noPassthrough/query/**/or_pushdown_disable_optimization.js @10gen/query-optimization @svc-auto-approve-bot
+/jstests/noPassthrough/query/**/or_pushdown_disable_optimization.js @10gen/query-optimization-planner @svc-auto-approve-bot
 /jstests/noPassthrough/query/**/search_hybrid_scoring_feature_flag_test.js @10gen/query-integration-search @svc-auto-approve-bot
 /jstests/noPassthrough/query/**/set_window_fields_read_concern_snapshot.js @10gen/query-integration-analytic-extensions @svc-auto-approve-bot
+/jstests/noPassthrough/query/**/analyze* @10gen/query-optimization-statistics @svc-auto-approve-bot
+/jstests/noPassthrough/query/**/commands_preserve_exec_error_code.js @10gen/query-execution @svc-auto-approve-bot
+/jstests/noPassthrough/query/**/compute_mode.js @10gen/query-integration-analytic-extensions @svc-auto-approve-bot
+/jstests/noPassthrough/query/**/external_data_source* @10gen/query-integration-analytic-extensions @svc-auto-approve-bot
+/jstests/noPassthrough/query/**/fail_point_getmore_after_cursor_checkout.js @10gen/query-execution-client-cursor @svc-auto-approve-bot
+/jstests/noPassthrough/query/**/external_sort_find.js @10gen/query-execution @svc-auto-approve-bot
+/jstests/noPassthrough/query/**/fast_path_counters.js @10gen/query-execution @svc-auto-approve-bot
+/jstests/noPassthrough/query/**/kill_pinned_cursor.js @10gen/query-execution-client-cursor @svc-auto-approve-bot
+/jstests/noPassthrough/query/**/missing_shard_key.js @10gen/query-execution-router-query-exec @svc-auto-approve-bot
+/jstests/noPassthrough/query/**/parse_zone_info.js @10gen/query-execution-datetime @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/noPassthrough/query/change_streams/OWNERS.yml
-/jstests/noPassthrough/query/change_streams/**/* @10gen/query-execution @svc-auto-approve-bot
+/jstests/noPassthrough/query/change_streams/**/* @10gen/query-execution-change-streams @svc-auto-approve-bot
+
+# The following patterns are parsed from ./jstests/noPassthrough/query/current_op/OWNERS.yml
+/jstests/noPassthrough/query/current_op/**/* @10gen/query-integration-observability @svc-auto-approve-bot
+/jstests/noPassthrough/query/current_op/**/OWNERS.yml @10gen/query-integration-staff-leads @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/noPassthrough/query/explain/OWNERS.yml
-/jstests/noPassthrough/query/explain/**/* @10gen/query-optimization @svc-auto-approve-bot
+/jstests/noPassthrough/query/explain/**/* @10gen/query-optimization-explain @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/noPassthrough/query/fle/OWNERS.yml
 /jstests/noPassthrough/query/fle/**/* @10gen/query-integration-fle @svc-auto-approve-bot
@@ -617,14 +705,18 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot
 # The following patterns are parsed from ./jstests/noPassthrough/query/geo/OWNERS.yml
 /jstests/noPassthrough/query/geo/**/* @10gen/query-integration-geo @svc-auto-approve-bot
 
+# The following patterns are parsed from ./jstests/noPassthrough/query/js/OWNERS.yml
+/jstests/noPassthrough/query/js/**/* @10gen/query-integration-javascript @svc-auto-approve-bot
+/jstests/noPassthrough/query/js/**/OWNERS.yml @10gen/query-integration-staff-leads @svc-auto-approve-bot
+
 # The following patterns are parsed from ./jstests/noPassthrough/query/mr/OWNERS.yml
 /jstests/noPassthrough/query/mr/**/* @10gen/query-integration-staff-leads @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/noPassthrough/query/multiplanner/OWNERS.yml
-/jstests/noPassthrough/query/multiplanner/**/* @10gen/query-optimization @svc-auto-approve-bot
+/jstests/noPassthrough/query/multiplanner/**/* @10gen/query-optimization-runtime-planners @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/noPassthrough/query/plan_cache/OWNERS.yml
-/jstests/noPassthrough/query/plan_cache/**/* @10gen/query-optimization @svc-auto-approve-bot
+/jstests/noPassthrough/query/plan_cache/**/* @10gen/query-optimization-plan-cache @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/noPassthrough/query/profile/OWNERS.yml
 /jstests/noPassthrough/query/profile/**/* @10gen/query-integration-observability @svc-auto-approve-bot
@@ -636,10 +728,11 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot
 /jstests/noPassthrough/query/timeseries/**/* @10gen/query-integration-timeseries @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/noPassthrough/query/update/OWNERS.yml
-/jstests/noPassthrough/query/update/**/* @10gen/query-execution @svc-auto-approve-bot
+/jstests/noPassthrough/query/update/**/* @10gen/query-execution-write-exec @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/noPassthrough/query/yield/OWNERS.yml
-/jstests/noPassthrough/query/yield/**/* @10gen/query-execution @svc-auto-approve-bot
+/jstests/noPassthrough/query/yield/**/* @10gen/query-execution-yielding @svc-auto-approve-bot
+/jstests/noPassthrough/query/yield/**/child_op_numyields.js @10gen/query-integration-observability @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/noPassthrough/read_write_concern/OWNERS.yml
 /jstests/noPassthrough/read_write_concern/**/* @10gen/server-replication @svc-auto-approve-bot
@@ -700,14 +793,18 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot
 /jstests/noPassthroughWithMongod/**/log_component_helpers.js @10gen/server-networking-and-observability @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/noPassthroughWithMongod/bulk/OWNERS.yml
-/jstests/noPassthroughWithMongod/bulk/**/* @10gen/query-execution @svc-auto-approve-bot
+/jstests/noPassthroughWithMongod/bulk/**/* @10gen/query-execution-write-exec @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/noPassthroughWithMongod/capped/OWNERS.yml
 /jstests/noPassthroughWithMongod/capped/**/* @10gen/server-storage-execution @svc-auto-approve-bot
+/jstests/noPassthroughWithMongod/capped/**/getmore_awaitdata_opcounters.js @10gen/query-execution-client-cursor @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/noPassthroughWithMongod/collStats/OWNERS.yml
 /jstests/noPassthroughWithMongod/collStats/**/* @10gen/server-storage-execution @svc-auto-approve-bot
 
+# The following patterns are parsed from ./jstests/noPassthroughWithMongod/cursor_server_status_metrics/OWNERS.yml
+/jstests/noPassthroughWithMongod/cursor_server_status_metrics/**/* @10gen/query-execution-client-cursor @svc-auto-approve-bot
+
 # The following patterns are parsed from ./jstests/noPassthroughWithMongod/ddl/OWNERS.yml
 /jstests/noPassthroughWithMongod/ddl/**/* @10gen/server-catalog-and-routing @svc-auto-approve-bot
 
@@ -720,16 +817,18 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot
 # The following patterns are parsed from ./jstests/noPassthroughWithMongod/query/OWNERS.yml
 /jstests/noPassthroughWithMongod/query/**/* @10gen/query @svc-auto-approve-bot
 /jstests/noPassthroughWithMongod/query/**/*query_stats* @10gen/query-integration-query-stats @svc-auto-approve-bot
-/jstests/noPassthroughWithMongod/query/**/plan_cache* @10gen/query-optimization @svc-auto-approve-bot
+/jstests/noPassthroughWithMongod/query/**/plan_cache* @10gen/query-optimization-plan-cache @svc-auto-approve-bot
+/jstests/noPassthroughWithMongod/query/**/cbr_infrastructure.js @10gen/query-optimization-cost-based-ranker @svc-auto-approve-bot
+/jstests/noPassthroughWithMongod/query/**/external_sort_text_agg.js @10gen/query-integration-staff-leads @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/noPassthroughWithMongod/query/explain/OWNERS.yml
-/jstests/noPassthroughWithMongod/query/explain/**/* @10gen/query-optimization @svc-auto-approve-bot
+/jstests/noPassthroughWithMongod/query/explain/**/* @10gen/query-optimization-explain @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/noPassthroughWithMongod/query/geo/OWNERS.yml
 /jstests/noPassthroughWithMongod/query/geo/**/* @10gen/query-integration-geo @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/noPassthroughWithMongod/query/sbe/OWNERS.yml
-/jstests/noPassthroughWithMongod/query/sbe/**/* @10gen/query-execution @svc-auto-approve-bot
+/jstests/noPassthroughWithMongod/query/sbe/**/* @10gen/query-execution-sbe @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/noPassthroughWithMongod/repl/OWNERS.yml
 /jstests/noPassthroughWithMongod/repl/**/* @10gen/server-replication @svc-auto-approve-bot
@@ -744,7 +843,7 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot
 /jstests/noPassthroughWithMongod/validate/**/* @10gen/server-rss-sydney @10gen/server-storage-execution @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/noPassthroughWithMongod/write/OWNERS.yml
-/jstests/noPassthroughWithMongod/write/**/* @10gen/query-execution @svc-auto-approve-bot
+/jstests/noPassthroughWithMongod/write/**/* @10gen/query-execution-write-exec @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/noPassthroughWithMongod/write/delete/OWNERS.yml
 /jstests/noPassthroughWithMongod/write/delete/**/* @10gen/server-collection-write-path @svc-auto-approve-bot
@@ -755,11 +854,14 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot
 # The following patterns are parsed from ./jstests/ocsp/OWNERS.yml
 /jstests/ocsp/**/* @10gen/server-security @svc-auto-approve-bot
 
+# The following patterns are parsed from ./jstests/product_limits/OWNERS.yml
+/jstests/product_limits/**/* @10gen/query-optimization @svc-auto-approve-bot
+
 # The following patterns are parsed from ./jstests/query_golden/OWNERS.yml
-/jstests/query_golden/**/* @10gen/query-optimization @svc-auto-approve-bot
+/jstests/query_golden/**/* @10gen/query-optimization-golden-test @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/query_golden_sharding/OWNERS.yml
-/jstests/query_golden_sharding/**/* @10gen/query-optimization @svc-auto-approve-bot
+/jstests/query_golden_sharding/**/* @10gen/query-optimization-golden-test @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/readonly/OWNERS.yml
 /jstests/readonly/**/* @10gen/server-rss-sydney @svc-auto-approve-bot
@@ -771,6 +873,13 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot
 # The following patterns are parsed from ./jstests/resmoke_selftest/OWNERS.yml
 /jstests/resmoke_selftest/**/* @10gen/devprod-correctness @svc-auto-approve-bot
 
+# The following patterns are parsed from ./jstests/serial_run/OWNERS.yml
+/jstests/serial_run/**/allow_partial_results_with_maxTimeMS* @10gen/query-execution-router-query-exec @svc-auto-approve-bot
+/jstests/serial_run/**/out_max_time_ms.js @10gen/query-execution-aggregation @svc-auto-approve-bot
+
+# The following patterns are parsed from ./jstests/serverless/change_streams/OWNERS.yml
+/jstests/serverless/change_streams/**/* @10gen/query-execution-change-streams @svc-auto-approve-bot
+
 # The following patterns are parsed from ./jstests/sharding/OWNERS.yml
 /jstests/sharding/**/auto_split_vector_basic.js @10gen/server-cluster-scalability @svc-auto-approve-bot
 /jstests/sharding/**/*fsync_lock* @10gen/server-cluster-scalability @svc-auto-approve-bot
@@ -792,9 +901,11 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot
 /jstests/sharding/internal_txns/**/* @10gen/server-cluster-scalability @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/sharding/libs/OWNERS.yml
+/jstests/sharding/libs/**/timeseries_update_multi_util.js @10gen/query-integration-timeseries @svc-auto-approve-bot
 /jstests/sharding/libs/**/chunk_bounds_util.js @10gen/server-cluster-scalability @svc-auto-approve-bot
 /jstests/sharding/libs/**/update_shard_key_helpers.js @10gen/server-cluster-scalability @svc-auto-approve-bot
 /jstests/sharding/libs/**/zone_changes_util.js @10gen/server-cluster-scalability @svc-auto-approve-bot
+/jstests/sharding/libs/**/mongos_api_params_util.js @10gen/query-optimization-parsers @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/sharding/load_balancer_support/OWNERS.yml
 /jstests/sharding/load_balancer_support/**/* @10gen/server-networking-and-observability @svc-auto-approve-bot
@@ -804,31 +915,74 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/sharding/query/OWNERS.yml
 /jstests/sharding/query/**/* @10gen/query @svc-auto-approve-bot
-/jstests/sharding/query/**/*plan_cache* @10gen/query-optimization @svc-auto-approve-bot
+/jstests/sharding/query/**/*plan_cache* @10gen/query-optimization-plan-cache @svc-auto-approve-bot
-/jstests/sharding/query/**/hidden_index.js @10gen/query-optimization @svc-auto-approve-bot
+/jstests/sharding/query/**/exact_shard_key_target.js @10gen/query-optimization-cluster-planning @svc-auto-approve-bot
+/jstests/sharding/query/**/hidden_index.js @10gen/query-optimization-planner @svc-auto-approve-bot
 /jstests/sharding/query/**/sharded_profile.js @10gen/query-integration-observability @svc-auto-approve-bot
+/jstests/sharding/query/**/authwhere.js @10gen/query-integration-javascript @svc-auto-approve-bot
+/jstests/sharding/query/**/batch_write_command_sharded.js @10gen/query-execution-router-write-exec @svc-auto-approve-bot
+/jstests/sharding/query/**/bulk_write* @10gen/query-execution-router-write-exec @svc-auto-approve-bot
+/jstests/sharding/query/**/clustered_coll_scan.js @10gen/query-execution @svc-auto-approve-bot
+/jstests/sharding/query/**/is_not_primary_error_does_not_leak_shard_cursor.js @10gen/query-execution-client-cursor @svc-auto-approve-bot
+/jstests/sharding/query/**/log_remote_op_wait* @10gen/query-execution-router-query-exec @svc-auto-approve-bot
+/jstests/sharding/query/**/lookup_from_config_cache_chunks.js @10gen/query-optimization-cluster-planning @svc-auto-approve-bot
+/jstests/sharding/query/**/*target* @10gen/query-optimization-cluster-planning @svc-auto-approve-bot
+/jstests/sharding/query/**/stats.js @10gen/query-integration-observability @svc-auto-approve-bot
+/jstests/sharding/query/**/unowned_doc_filtering.js @10gen/query-execution-router-query-exec @svc-auto-approve-bot
+/jstests/sharding/query/**/update_delete_many_metrics.js @10gen/query-integration-observability @svc-auto-approve-bot
+
+# The following patterns are parsed from ./jstests/sharding/query/agg/OWNERS.yml
+/jstests/sharding/query/agg/**/* @10gen/query @svc-auto-approve-bot
+/jstests/sharding/query/agg/**/error_during_agg_getmore.js @10gen/query-execution-aggregation @svc-auto-approve-bot
+/jstests/sharding/query/agg/**/agg_currentop.js @10gen/query-integration-observability @svc-auto-approve-bot
+/jstests/sharding/query/agg/**/agg_js_on_mongos.js @10gen/query-integration-javascript @svc-auto-approve-bot
+/jstests/sharding/query/agg/**/agg_percentile.js @10gen/query-integration-analytic-extensions @svc-auto-approve-bot
+/jstests/sharding/query/agg/**/agg_explain_fmt.js @10gen/query-optimization-explain @svc-auto-approve-bot
+/jstests/sharding/query/agg/**/*targeting* @10gen/query-optimization-cluster-planning @svc-auto-approve-bot
+
+# The following patterns are parsed from ./jstests/sharding/query/api_version/OWNERS.yml
+/jstests/sharding/query/api_version/**/* @10gen/query-optimization-parsers @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/sharding/query/change_streams/OWNERS.yml
-/jstests/sharding/query/change_streams/**/* @10gen/query-execution @svc-auto-approve-bot
+/jstests/sharding/query/change_streams/**/* @10gen/query-execution-change-streams @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/sharding/query/collation/OWNERS.yml
-/jstests/sharding/query/collation/**/* @10gen/query-execution @svc-auto-approve-bot
+/jstests/sharding/query/collation/**/* @10gen/query-execution-collation @svc-auto-approve-bot
+
+# The following patterns are parsed from ./jstests/sharding/query/count/OWNERS.yml
+/jstests/sharding/query/count/**/* @10gen/query-execution-router-query-exec @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/sharding/query/explain/OWNERS.yml
-/jstests/sharding/query/explain/**/* @10gen/query-optimization @svc-auto-approve-bot
+/jstests/sharding/query/explain/**/* @10gen/query-optimization-explain @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/sharding/query/geo/OWNERS.yml
 /jstests/sharding/query/geo/**/* @10gen/query-integration-geo @svc-auto-approve-bot
 /jstests/sharding/query/geo/**/OWNERS.yml @10gen/query-integration-staff-leads @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/sharding/query/update/OWNERS.yml
-/jstests/sharding/query/update/**/* @10gen/query-execution @svc-auto-approve-bot
+/jstests/sharding/query/update/**/* @10gen/query-execution-router-write-exec @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/sharding/resharding_timeseries/OWNERS.yml
 /jstests/sharding/resharding_timeseries/**/* @10gen/server-cluster-scalability @svc-auto-approve-bot
 
+# The following patterns are parsed from ./jstests/sharding/timeseries/OWNERS.yml
+/jstests/sharding/timeseries/**/timeseries_change_stream_no_orphans.js @10gen/query-integration-timeseries @svc-auto-approve-bot
+/jstests/sharding/timeseries/**/timeseries_cluster_collstats.js @10gen/query-integration-timeseries @svc-auto-approve-bot
+/jstests/sharding/timeseries/**/timeseries_cluster_indexstats.js @10gen/query-integration-timeseries @svc-auto-approve-bot
+/jstests/sharding/timeseries/**/timeseries_delete* @10gen/query-integration-timeseries @svc-auto-approve-bot
+/jstests/sharding/timeseries/**/timeseries_out* @10gen/query-integration-timeseries @svc-auto-approve-bot
+/jstests/sharding/timeseries/**/timeseries_query* @10gen/query-integration-timeseries @svc-auto-approve-bot
+/jstests/sharding/timeseries/**/timeseries_find_and_modify* @10gen/query-integration-timeseries @svc-auto-approve-bot
+/jstests/sharding/timeseries/**/timeseries_update* @10gen/query-integration-timeseries @svc-auto-approve-bot
+/jstests/sharding/timeseries/**/timeseries_upsert.js @10gen/query-integration-timeseries @svc-auto-approve-bot
+/jstests/sharding/timeseries/**/timeseries_write* @10gen/query-integration-timeseries @svc-auto-approve-bot
+
 # The following patterns are parsed from ./jstests/sharding/updateOne_without_shard_key/OWNERS.yml
-/jstests/sharding/updateOne_without_shard_key/**/* @10gen/query-execution @svc-auto-approve-bot
+/jstests/sharding/updateOne_without_shard_key/**/* @10gen/query-execution-router-write-exec @svc-auto-approve-bot
+
+# The following patterns are parsed from ./jstests/slow1/OWNERS.yml
+/jstests/slow1/**/conc_update.js @10gen/query-execution-write-exec @svc-auto-approve-bot
+/jstests/slow1/**/geo_array1.js @10gen/query-integration-geo @svc-auto-approve-bot
 
 # The following patterns are parsed from ./jstests/ssl/OWNERS.yml
 /jstests/ssl/**/* @10gen/server-security @svc-auto-approve-bot
@@ -842,6 +996,9 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot
 # The following patterns are parsed from ./jstests/ssl_x509/OWNERS.yml
 /jstests/ssl_x509/**/* @10gen/server-security @svc-auto-approve-bot
 
+# The following patterns are parsed from ./jstests/third_party/fast_check/OWNERS.yml
+/jstests/third_party/fast_check/**/* @10gen/query-optimization @svc-auto-approve-bot
+
 # The following patterns are parsed from ./jstests/watchdog/OWNERS.yml
 /jstests/watchdog/**/* @10gen/server-networking-and-observability @svc-auto-approve-bot
 

buildscripts/resmokeconfig/matrix_suites/generated_suites/concurrency_embedded_router_local_read_write_multi_stmt_txn.yml

@@ -60,7 +60,7 @@ selector:
     - jstests/concurrency/fsm_workloads/ddl/create_index_background/create_index_background.js
     - jstests/concurrency/fsm_workloads/ddl/create_index_background/create_index_background_partial_filter.js
     - jstests/concurrency/fsm_workloads/ddl/create_index_background/create_index_background_wildcard.js
-    - jstests/concurrency/fsm_workloads/drop_index_during_replan.js
+    - jstests/concurrency/fsm_workloads/query/drop_index_during_replan.js
     - jstests/concurrency/fsm_workloads/query/drop_index_during_lookup.js
     - jstests/concurrency/fsm_workloads/query/update/update_rename.js
     - jstests/concurrency/fsm_workloads/query/update/update_rename_noindex.js

buildscripts/resmokeconfig/matrix_suites/generated_suites/concurrency_embedded_router_local_read_write_multi_stmt_txn_with_balancer.yml

@@ -65,7 +65,7 @@ executor:
 matrix_suite: true
 selector:
   exclude_files:
-    - jstests/concurrency/fsm_workloads/drop_index_during_replan.js
+    - jstests/concurrency/fsm_workloads/query/drop_index_during_replan.js
     - jstests/concurrency/fsm_workloads/query/drop_index_during_lookup.js
     - jstests/concurrency/fsm_workloads/query/update/update_rename.js
     - jstests/concurrency/fsm_workloads/query/update/update_rename_noindex.js

buildscripts/resmokeconfig/matrix_suites/generated_suites/concurrency_embedded_router_multi_stmt_txn.yml

@@ -57,7 +57,7 @@ selector:
     - jstests/concurrency/fsm_workloads/ddl/create_index_background/create_index_background.js
     - jstests/concurrency/fsm_workloads/ddl/create_index_background/create_index_background_partial_filter.js
     - jstests/concurrency/fsm_workloads/ddl/create_index_background/create_index_background_wildcard.js
-    - jstests/concurrency/fsm_workloads/drop_index_during_replan.js
+    - jstests/concurrency/fsm_workloads/query/drop_index_during_replan.js
     - jstests/concurrency/fsm_workloads/query/drop_index_during_lookup.js
     - jstests/concurrency/fsm_workloads/query/update/update_rename.js
     - jstests/concurrency/fsm_workloads/query/update/update_rename_noindex.js

buildscripts/resmokeconfig/matrix_suites/generated_suites/concurrency_embedded_router_multi_stmt_txn_with_balancer.yml

@@ -58,7 +58,7 @@ executor:
 matrix_suite: true
 selector:
   exclude_files:
-    - jstests/concurrency/fsm_workloads/drop_index_during_replan.js
+    - jstests/concurrency/fsm_workloads/query/drop_index_during_replan.js
     - jstests/concurrency/fsm_workloads/query/drop_index_during_lookup.js
     - jstests/concurrency/fsm_workloads/query/update/update_rename.js
     - jstests/concurrency/fsm_workloads/query/update/update_rename_noindex.js

buildscripts/resmokeconfig/suites/bulk_write_targeted_override.yml

@@ -13,35 +13,35 @@ selector:
     - jstests/sharding/analyze_shard_key/sampling_current_op_and_server_status_sharded.js
     - jstests/sharding/analyze_shard_key/sample_rates_rs.js
     - jstests/sharding/analyze_shard_key/sample_rates_sharded.js
-    - jstests/sharding/timeseries_delete_multi.js
+    - jstests/sharding/timeseries/timeseries_delete_multi.js
-    - jstests/sharding/timeseries_delete_one_with_shard_key.js
+    - jstests/sharding/timeseries/timeseries_delete_one_with_shard_key.js
-    - jstests/sharding/timeseries_delete_with_meta.js
+    - jstests/sharding/timeseries/timeseries_delete_with_meta.js
-    - jstests/sharding/timeseries_insert.js
+    - jstests/sharding/timeseries/timeseries_insert.js
-    - jstests/sharding/timeseries_multiple_mongos.js
+    - jstests/sharding/timeseries/timeseries_multiple_mongos.js
-    - jstests/sharding/timeseries_update.js
+    - jstests/sharding/timeseries/timeseries_update.js
-    - jstests/sharding/timeseries_update_multi.js
+    - jstests/sharding/timeseries/timeseries_update_multi.js
-    - jstests/sharding/timeseries_update_routing.js
+    - jstests/sharding/timeseries/timeseries_update_routing.js
-    - jstests/sharding/timeseries_user_system_buckets_sharding.js
+    - jstests/sharding/timeseries/timeseries_user_system_buckets_sharding.js
-    - jstests/sharding/timeseries_delete_one_without_shard_key.js
+    - jstests/sharding/timeseries/timeseries_delete_one_without_shard_key.js
-    - jstests/sharding/timeseries_write_one_stale_sharding_state.js
+    - jstests/sharding/timeseries/timeseries_write_one_stale_sharding_state.js
-    - jstests/sharding/timeseries_shardkey_update.js
+    - jstests/sharding/timeseries/timeseries_shardkey_update.js
-    - jstests/sharding/timeseries_update_one.js
+    - jstests/sharding/timeseries/timeseries_update_one.js
-    - jstests/sharding/timeseries_upsert.js
+    - jstests/sharding/timeseries/timeseries_upsert.js
     # The following tests are to get coverage of updates that change a document's shard key.
-    - jstests/sharding/update_shard_key_doc_moves_shards.js
+    - jstests/sharding/query/update/update_shard_key_doc_moves_shards.js
-    - jstests/sharding/update_shard_key_pipeline_update.js
+    - jstests/sharding/query/update/update_shard_key_pipeline_update.js
     - jstests/sharding/update_shard_key_doc_moves_shards_without_txn_number.js
-    - jstests/sharding/update_shard_key_doc_on_same_shard.js
+    - jstests/sharding/query/update/update_shard_key_doc_on_same_shard.js
-    - jstests/sharding/update_compound_shard_key.js
+    - jstests/sharding/query/update/update_compound_shard_key.js
-    - jstests/sharding/update_shard_key_conflicting_writes.js
+    - jstests/sharding/query/update/update_shard_key_conflicting_writes.js
     - jstests/sharding/move_chunk_update_shard_key_in_retryable_write.js
     - jstests/sharding/resharding_update_shard_key_in_retryable_write.js
     # End document shard key update tests
-    - jstests/sharding/timeseries_update_multi_explain.js
+    - jstests/sharding/timeseries/timeseries_update_multi_explain.js
     # Test behavior of updateOne/deleteOne with _id without shard key.
     - jstests/sharding/server_status_crud_metrics.js
     - jstests/sharding/server_status_crud_metrics_write_without_shard_key_with_id.js
-    - jstests/sharding/timeseries_buckets_modification_with_id.js
+    - jstests/sharding/timeseries/timeseries_buckets_modification_with_id.js
     - jstests/sharding/updateOne_idempotent_with_move_chunk.js
     - jstests/sharding/updateOne_with_id_without_shard_key_basic.js
     - jstests/sharding/deleteOne_with_id_without_shard_key_basic.js
@@ -50,7 +50,7 @@ selector:
     - jstests/sharding/batched_writes_with_id_without_shard_key_stale_config.js
     - jstests/sharding/batched_writes_with_id_without_shard_key_basic.js
     - jstests/sharding/updateOne_without_shard_key/write_without_shard_key_single_shard_data_placement_change.js
-    - jstests/sharding/timeseries_writes_without_shard_key_single_shard_data_placement_change.js
+    - jstests/sharding/timeseries/timeseries_writes_without_shard_key_single_shard_data_placement_change.js
     - jstests/sharding/retryable_update_one_by_id_chunk_migration.js
   # End updateOne/deleteOne with _id without shard key tests
   exclude_files:

buildscripts/resmokeconfig/suites/concurrency_replication_multi_stmt_txn.yml

@@ -16,7 +16,7 @@ selector:
 
     # Expects reads to die with a particular error, but other errors are possible if the read is part
     # of a transaction (e.g. ErrorCodes.LockTimeout).
-    - jstests/concurrency/fsm_workloads/drop_index_during_replan.js
+    - jstests/concurrency/fsm_workloads/query/drop_index_during_replan.js
     - jstests/concurrency/fsm_workloads/query/drop_index_during_lookup.js
 
     # Performs direct writes to system.views

buildscripts/resmokeconfig/suites/concurrency_replication_multi_stmt_txn_with_replica_set_endpoint.yml

@@ -22,7 +22,7 @@ selector:
 
     # Expects reads to die with a particular error, but other errors are possible if the read is part
     # of a transaction (e.g. ErrorCodes.LockTimeout).
-    - jstests/concurrency/fsm_workloads/drop_index_during_replan.js
+    - jstests/concurrency/fsm_workloads/query/drop_index_during_replan.js
     - jstests/concurrency/fsm_workloads/query/drop_index_during_lookup.js
 
     # Performs direct writes to system.views

buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn.yml

@@ -39,7 +39,7 @@ selector:
 
     # Expects reads to die with a particular error, but other errors are possible if the read is part
     # of a transaction (e.g. ErrorCodes.LockTimeout).
-    - jstests/concurrency/fsm_workloads/drop_index_during_replan.js
+    - jstests/concurrency/fsm_workloads/query/drop_index_during_replan.js
     - jstests/concurrency/fsm_workloads/query/drop_index_during_lookup.js
 
     ##

buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn_with_balancer.yml

@@ -29,7 +29,7 @@ selector:
 
     # Expects reads to die with a particular error, but other errors are possible if the read is part
     # of a transaction (e.g. ErrorCodes.LockTimeout).
-    - jstests/concurrency/fsm_workloads/drop_index_during_replan.js
+    - jstests/concurrency/fsm_workloads/query/drop_index_during_replan.js
     - jstests/concurrency/fsm_workloads/query/drop_index_during_lookup.js
 
     ##

buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn.yml

@@ -39,7 +39,7 @@ selector:
 
     # Expects reads to die with a particular error, but other errors are possible if the read is part
     # of a transaction (e.g. ErrorCodes.LockTimeout).
-    - jstests/concurrency/fsm_workloads/drop_index_during_replan.js
+    - jstests/concurrency/fsm_workloads/query/drop_index_during_replan.js
     - jstests/concurrency/fsm_workloads/query/drop_index_during_lookup.js
 
     ##

buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_stepdown_terminate_kill_primary.yml

@@ -46,7 +46,7 @@ selector:
 
     # Expects reads to die with a particular error, but other errors are possible if the read is part
     # of a transaction (e.g. ErrorCodes.LockTimeout).
-    - jstests/concurrency/fsm_workloads/drop_index_during_replan.js
+    - jstests/concurrency/fsm_workloads/query/drop_index_during_replan.js
     - jstests/concurrency/fsm_workloads/query/drop_index_during_lookup.js
 
     ##

buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_balancer.yml

@@ -29,7 +29,7 @@ selector:
 
     # Expects reads to die with a particular error, but other errors are possible if the read is part
     # of a transaction (e.g. ErrorCodes.LockTimeout).
-    - jstests/concurrency/fsm_workloads/drop_index_during_replan.js
+    - jstests/concurrency/fsm_workloads/query/drop_index_during_replan.js
     - jstests/concurrency/fsm_workloads/query/drop_index_during_lookup.js
 
     ##

buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_balancer_and_config_transitions.yml

@@ -51,7 +51,7 @@ selector:
 
     # Expects reads to die with a particular error, but other errors are possible if the read is part
     # of a transaction (e.g. ErrorCodes.LockTimeout).
-    - jstests/concurrency/fsm_workloads/drop_index_during_replan.js
+    - jstests/concurrency/fsm_workloads/query/drop_index_during_replan.js
     - jstests/concurrency/fsm_workloads/query/drop_index_during_lookup.js
 
     # Relies on having one thread observe writes from the other threads, which won't become visible

buildscripts/resmokeconfig/suites/sharding_clustered_collections.yml

@@ -9,7 +9,7 @@ selector:
     - jstests/sharding/shard2.js
     # Expects the collection creation options not to change.
     - jstests/sharding/move_primary_with_writes.js
-    - jstests/sharding/timeseries_user_system_buckets_sharding.js
+    - jstests/sharding/timeseries/timeseries_user_system_buckets_sharding.js
     # Expects to use the SBE plan cache
     - jstests/sharding/invalidate_plan_cache_entries_when_collection_generation_changes.js
     # TODO SERVER-85395: remove the following exclusion together with the test

buildscripts/resmokeconfig/suites/sharding_csrs_continuous_config_stepdown.yml

@@ -120,12 +120,12 @@ selector:
     - jstests/sharding/shard4.js
     - jstests/sharding/shard5.js
     - jstests/sharding/split_stale_mongos.js
-    - jstests/sharding/stale_mongos_updates_and_removes.js
+    - jstests/sharding/query/update/stale_mongos_updates_and_removes.js
     - jstests/sharding/zero_shard_version.js
     # Already stop or blackholes the primary of the CSRS config shard
     - jstests/sharding/all_shard_and_config_hosts_brought_down_one_by_one.js
     - jstests/sharding/all_config_servers_blackholed_from_mongos.js
-    - jstests/sharding/batch_write_command_sharded.js
+    - jstests/sharding/query/batch_write_command_sharded.js
     - jstests/sharding/config_rs_no_primary.js
     - jstests/sharding/startup_with_all_configs_down.js
     - jstests/sharding/lagged_config_secondary.js
@@ -215,10 +215,10 @@ selector:
     - jstests/sharding/move_primary_with_writes.js
 
     # Expects same CSRS primary and shard primary throughout the test
-    - jstests/sharding/api_params_nontransaction_sharded.js
+    - jstests/sharding/query/api_version/api_params_nontransaction_sharded.js
-    - jstests/sharding/api_params_nontransaction_unsharded.js
+    - jstests/sharding/query/api_version/api_params_nontransaction_unsharded.js
-    - jstests/sharding/api_params_transaction_sharded.js
+    - jstests/sharding/query/api_version/api_params_transaction_sharded.js
-    - jstests/sharding/api_params_transaction_unsharded.js
+    - jstests/sharding/query/api_version/api_params_transaction_unsharded.js
 
     # These tests use the resharding test fixture, which performs its own addShard. Config server stepdowns can
     # interrupt the addShard operation resulting in the test cluster not being initalized properly.
@@ -275,8 +275,8 @@ selector:
     # resumable changestream errors right now.
     # TODO (SERVER-97414): we could make these tests use the ChangeStreamTest fixture and
     # then remove them from the exclusion list.
-    - jstests/sharding/api_version_stage_allowance_checks.js
+    - jstests/sharding/query/api_version/api_version_stage_allowance_checks.js
-    - jstests/sharding/log_remote_op_wait.js
+    - jstests/sharding/query/log_remote_op_wait.js
     - jstests/sharding/query/change_streams/change_stream_against_shard_mongod.js
     - jstests/sharding/query/change_streams/change_stream_chunk_migration.js
     - jstests/sharding/query/change_streams/change_stream_empty_apply_ops.js
@@ -308,7 +308,7 @@ selector:
     - jstests/sharding/query/explain/explain_cmd.js
     - jstests/sharding/resharding_change_stream_namespace_filtering.js
     - jstests/sharding/resharding_oplog_sync_agg_resume_token.js
-    - jstests/sharding/timeseries_change_stream_no_orphans.js
+    - jstests/sharding/timeseries/timeseries_change_stream_no_orphans.js
 
   exclude_with_any_tags:
     - does_not_support_stepdowns

buildscripts/resmokeconfig/suites/timeseries_crud_jscore_passthrough.yml

@@ -152,7 +152,6 @@ selector:
     - jstests/core/query/top/top_drop.js
     # Buckets collection creates compounded secondary indexes, which is not compatible with wildcard indexes.
     - jstests/core/compound_index_max_fields.js
-    - jstests/core/compound_wildcard_index_validation.js
     - jstests/core/write/update/update_with_pipeline.js
     # Operations not allowed on views.
     - jstests/core/datasize2.js # locking
@@ -169,7 +168,7 @@ selector:
     - jstests/core/write/find_and_modify/find_and_modify_server6865.js # $elemMatch
     # Time-series collections are views which don't support map-reduce
     - jstests/core/commands_namespace_parsing.js
-    - jstests/core/constructors.js
+    - jstests/core/query/map_reduce/constructors.js
     - jstests/core/query/function_string_representations.js
     - jstests/core/query/map_reduce/map_reduce_validation.js
     - jstests/core/query/map_reduce/mr_single_reduce.js

etc/backports_required_for_multiversion_tests.yml

@@ -191,7 +191,7 @@ last-continuous:
       ticket: SERVER-87285
     - test_file: jstests/core/exhaust.js
       ticket: SERVER-87285
-    - test_file: jstests/sharding/timeseries_sharding_admin_commands.js
+    - test_file: jstests/sharding/timeseries/timeseries_sharding_admin_commands.js
       ticket: SERVER-80690
     - test_file: jstests/core/sparse_index_supports_ne_null.js
       ticket: SERVER-37164
@@ -245,9 +245,9 @@ last-continuous:
       ticket: SERVER-91195
     - test_file: jstests/replsets/timeseries_mixed_schema_bucket_initial_sync.js
       ticket: SERVER-91195
-    - test_file: jstests/sharding/timeseries_shard_collection_with_deprecation_message.js
+    - test_file: jstests/sharding/timeseries/timeseries_shard_collection_with_deprecation_message.js
       ticket: SERVER-88647
-    - test_file: jstests/sharding/timeseries_out_conflicting_namespace_on_shard.js
+    - test_file: jstests/sharding/timeseries/timeseries_out_conflicting_namespace_on_shard.js
       ticket: SERVER-90720
     - test_file: jstests/sharding/sharded_data_distribution.js
       ticket: SERVER-91522
@@ -319,11 +319,11 @@ last-continuous:
       ticket: SERVER-94156
     - test_file: jstests/core/timeseries/query/timeseries_filter_extended_range.js
       ticket: SERVER-94207
-    - test_file: jstests/sharding/explain_find_transformed_query.js
+    - test_file: jstests/sharding/query/explain/explain_find_transformed_query.js
       ticket: SERVER-82471
     - test_file: jstests/change_streams/ddl_abort_index_build_event.js
       ticket: SERVER-93154
-    - test_file: jstests/sharding/timeseries_query_extended_range.js
+    - test_file: jstests/sharding/timeseries/timeseries_query_extended_range.js
       ticket: SERVER-73641
     - test_file: jstests/core/timeseries/write/timeseries_update_delete_extended_range.js
       ticket: SERVER-95075
@@ -535,7 +535,7 @@ last-lts:
       ticket: SERVER-87285
     - test_file: jstests/core/exhaust.js
       ticket: SERVER-87285
-    - test_file: jstests/sharding/timeseries_sharding_admin_commands.js
+    - test_file: jstests/sharding/timeseries/timeseries_sharding_admin_commands.js
       ticket: SERVER-80690
     - test_file: jstests/core/sparse_index_supports_ne_null.js
       ticket: SERVER-37164
@@ -617,9 +617,9 @@ last-lts:
       ticket: SERVER-91195
     - test_file: jstests/replsets/timeseries_mixed_schema_bucket_initial_sync.js
       ticket: SERVER-91195
-    - test_file: jstests/sharding/timeseries_shard_collection_with_deprecation_message.js
+    - test_file: jstests/sharding/timeseries/timeseries_shard_collection_with_deprecation_message.js
       ticket: SERVER-88647
-    - test_file: jstests/sharding/timeseries_out_conflicting_namespace_on_shard.js
+    - test_file: jstests/sharding/timeseries/timeseries_out_conflicting_namespace_on_shard.js
       ticket: SERVER-90720
     - test_file: jstests/sharding/sharded_data_distribution.js
       ticket: SERVER-91522
@@ -695,11 +695,11 @@ last-lts:
       ticket: SERVER-94156
     - test_file: jstests/core/timeseries/query/timeseries_filter_extended_range.js
       ticket: SERVER-94207
-    - test_file: jstests/sharding/explain_find_transformed_query.js
+    - test_file: jstests/sharding/query/explain/explain_find_transformed_query.js
       ticket: SERVER-82471
     - test_file: jstests/change_streams/ddl_abort_index_build_event.js
       ticket: SERVER-93154
-    - test_file: jstests/sharding/timeseries_query_extended_range.js
+    - test_file: jstests/sharding/timeseries/timeseries_query_extended_range.js
       ticket: SERVER-73641
     - test_file: jstests/core/timeseries/write/timeseries_update_delete_extended_range.js
       ticket: SERVER-95075
@@ -761,7 +761,7 @@ last-lts:
       ticket: SERVER-93149
     - test_file: jstests/sharding/resharding_timeseries/unshard_timeseries.js
       ticket: SERVER-93149
-    - test_file: jstests/sharding/timeseries_insert_move_collection.js
+    - test_file: jstests/sharding/timeseries/timeseries_insert_move_collection.js
       ticket: SERVER-93149
     - test_file: jstests/core_sharding/resharding/reshard_collection_timeseries.js
       ticket: SERVER-93149

etc/test_retrial.yml

@@ -17,7 +17,7 @@
 #
 # Examples:
 #
-#   JS test failed: jstests/sharding/exact_shard_key_target.js
+#   JS test failed: jstests/sharding/query/exact_shard_key_target.js
 #     in task_name: sharding_csrs_continuous_config_stepdown_WT
 # on build_variant: any
 #   with distro_id: any
@@ -44,5 +44,5 @@
 
 selector:
   js_test:
-    # jstests/sharding/exact_shard_key_target.js:
+    # jstests/sharding/query/exact_shard_key_target.js:
     # - retry_on_failure|sharding_csrs_continuous_config_stepdown_WT

jstests/change_streams/OWNERS.yml

@@ -2,4 +2,4 @@ version: 1.0.0
 filters:
   - "*":
     approvers:
-      - 10gen/query-execution
+      - 10gen/query-execution-change-streams

jstests/concurrency/fsm_workloads/OWNERS.yml

@@ -2,7 +2,7 @@ version: 1.0.0
 filters:
   - "*write_without_shard_key*":
     approvers:
-      - 10gen/query-execution
+      - 10gen/query-execution-router-write-exec
   - "timeseries*":
     approvers:
       - 10gen/server-storage-execution

jstests/concurrency/fsm_workloads/query/OWNERS.yml

@@ -5,10 +5,13 @@ filters:
       - 10gen/query
   - "find_flip_sbe_enabled.js":
     approvers:
-      - 10gen/query-execution
+      - 10gen/query-execution-sbe
   - "plan_cache_drop_database.js":
     approvers:
-      - 10gen/query-optimization
+      - 10gen/query-optimization-plan-cache
   - "profile_command.js":
     approvers:
       - 10gen/query-integration-observability
+  - "drop_index_during_replan.js":
+    approvers:
+      - 10gen/query-optimization-runtime-planners

jstests/concurrency/fsm_workloads/query/explain/OWNERS.yml

@@ -2,4 +2,4 @@ version: 1.0.0
 filters:
   - "*":
     approvers:
-      - 10gen/query-optimization
+      - 10gen/query-optimization-explain

jstests/concurrency/fsm_workloads/query/map_reduce/OWNERS.yml

@@ -2,4 +2,4 @@ version: 1.0.0
 filters:
   - "*":
     approvers:
-      - 10gen/query-optimization
+      - 10gen/query-integration-staff-leads

jstests/concurrency/fsm_workloads/query/remove/OWNERS.yml

@@ -2,4 +2,4 @@ version: 1.0.0
 filters:
   - "*":
     approvers:
-      - 10gen/query-execution
+      - 10gen/query-execution-write-exec

jstests/concurrency/fsm_workloads/query/update/OWNERS.yml

@@ -2,4 +2,4 @@ version: 1.0.0
 filters:
   - "*":
     approvers:
-      - 10gen/query-execution
+      - 10gen/query-execution-write-exec

jstests/concurrency/fsm_workloads/query/yield/OWNERS.yml

@@ -2,4 +2,4 @@ version: 1.0.0
 filters:
   - "*":
     approvers:
-      - 10gen/query-execution
+      - 10gen/query-execution-yielding

jstests/concurrency/fsm_workloads/updateOne_without_shard_key/OWNERS.yml

@@ -2,4 +2,4 @@ version: 1.0.0
 filters:
   - "*":
     approvers:
-      - 10gen/query-execution
+      - 10gen/query-execution-router-write-exec

jstests/concurrency/fsm_workloads_no_passthrough_with_mongod/OWNERS.yml

@@ -0,0 +1,5 @@
+version: 1.0.0
+filters:
+  - "external_data_source.js":
+    approvers:
+      - 10gen/query-integration-analytic-extensions

jstests/core/OWNERS.yml

@@ -21,3 +21,12 @@ filters:
   - "splitvector.js":
     approvers:
       - 10gen/server-cluster-scalability
+  - "opcounters_write_cmd.js":
+    approvers:
+      - 10gen/query-integration-observability
+  - "operation_latency_histogram.js":
+    approvers:
+      - 10gen/query-integration-observability
+  - "version_api*":
+    approvers:
+      - 10gen/query-optimization-parsers

jstests/core/administrative/current_op/OWNERS.yml

@@ -0,0 +1,5 @@
+version: 1.0.0
+filters:
+  - "*":
+    approvers:
+      - 10gen/query-integration-observability

jstests/core/query/OWNERS.yml

@@ -5,4 +5,4 @@ filters:
       - 10gen/query
   - "boolean_expression_simplification.js":
     approvers:
-      - 10gen/query-optimization
+      - 10gen/query-optimization-heuristic-rewrite

jstests/core/query/api/OWNERS.yml

@@ -2,4 +2,4 @@ version: 1.0.0
 filters:
   - "*":
     approvers:
-      - 10gen/query-optimization
+      - 10gen/query-optimization-parsers

jstests/core/query/collation/OWNERS.yml

@@ -2,4 +2,4 @@ version: 1.0.0
 filters:
   - "*":
     approvers:
-      - 10gen/query-execution
+      - 10gen/query-execution-collation

jstests/core/query/doc_validation/OWNERS.yml

@@ -2,4 +2,4 @@ version: 1.0.0
 filters:
   - "*":
     approvers:
-      - 10gen/query-execution
+      - 10gen/query-execution-doc-validation

jstests/core/query/explain/OWNERS.yml

@@ -2,4 +2,4 @@ version: 1.0.0
 filters:
   - "*":
     approvers:
-      - 10gen/query-optimization
+      - 10gen/query-optimization-explain

jstests/core/query/inc/OWNERS.yml

@@ -2,4 +2,4 @@ version: 1.0.0
 filters:
   - "*":
     approvers:
-      - 10gen/query-execution
+      - 10gen/query-execution-write-exec

jstests/core/query/plan_cache/OWNERS.yml

@@ -2,4 +2,4 @@ version: 1.0.0
 filters:
   - "*":
     approvers:
-      - 10gen/query-optimization
+      - 10gen/query-optimization-plan-cache

jstests/core/query/pull/OWNERS.yml

@@ -2,4 +2,4 @@ version: 1.0.0
 filters:
   - "*":
     approvers:
-      - 10gen/query-execution
+      - 10gen/query-execution-write-exec

jstests/core/query/push/OWNERS.yml

@@ -2,4 +2,4 @@ version: 1.0.0
 filters:
   - "*":
     approvers:
-      - 10gen/query-execution
+      - 10gen/query-execution-write-exec

jstests/core/query/query_settings/OWNERS.yml

@@ -2,4 +2,4 @@ version: 1.0.0
 filters:
   - "*":
     approvers:
-      - 10gen/query-execution
+      - 10gen/query-execution-query-settings

jstests/core/query/regex/OWNERS.yml

@@ -2,4 +2,4 @@ version: 1.0.0
 filters:
   - "*":
     approvers:
-      - 10gen/query-execution
+      - 10gen/query-execution-regex

jstests/core/query/sbe/OWNERS.yml

@@ -2,10 +2,7 @@ version: 1.0.0
 filters:
   - "*":
     approvers:
-      - 10gen/query-execution
+      - 10gen/query-execution-sbe
-  - "from_plan_cache_flag.js":
-    approvers:
-      - 10gen/query-optimization
   - "*plan_cache*":
     approvers:
-      - 10gen/query-optimization
+      - 10gen/query-optimization-plan-cache

jstests/core/query/set/OWNERS.yml

@@ -2,4 +2,4 @@ version: 1.0.0
 filters:
   - "*":
     approvers:
-      - 10gen/query-execution
+      - 10gen/query-execution-write-exec

jstests/core/query/unset/OWNERS.yml

@@ -2,4 +2,4 @@ version: 1.0.0
 filters:
   - "*":
     approvers:
-      - 10gen/query-execution
+      - 10gen/query-execution-write-exec

jstests/core/write/OWNERS.yml

@@ -2,7 +2,7 @@ version: 1.0.0
 filters:
   - "*":
     approvers:
-      - 10gen/query-execution
+      - 10gen/query-execution-write-exec
   - "*empty_ts*.js":
     approvers:
       - 10gen/server-collection-write-path

jstests/decimal/OWNERS.yml

@@ -3,3 +3,9 @@ filters:
   - "*":
     approvers:
       - 10gen/server-programmability
+  - "decimal_find*":
+    approvers:
+      - 10gen/query-execution
+  - "decimal_update.js":
+    approvers:
+      - 10gen/query-execution-write-exec

jstests/hooks/OWNERS.yml

@@ -3,3 +3,6 @@ filters:
   - "run_analyze_shard_key_background.js":
     approvers:
       - 10gen/server-cluster-scalability
+  - "run_enable_change_stream.js":
+    approvers:
+      - 10gen/query-execution-change-streams

jstests/libs/OWNERS.yml

@@ -12,3 +12,46 @@ filters:
   - "sharded_cluster_fixture_helpers.js":
     approvers:
       - 10gen/server-catalog-and-routing
+      - 10gen/query-optimization-golden-test
+  - "assert_schema_match.js":
+    approvers:
+      - 10gen/query-execution-doc-validation
+  - "doc_validation_utils.js":
+    approvers:
+      - 10gen/query-execution-doc-validation
+  - "json_schema_test_runner.js":
+    approvers:
+      - 10gen/query-execution-doc-validation
+  - "*bulk_write*":
+    approvers:
+      - 10gen/query-execution-write-exec
+  - "curop_helpers.js":
+    approvers:
+      - 10gen/query-integration-observability
+  - "dateutil.js":
+    approvers:
+      - 10gen/query-execution-datetime
+  - "fts.js":
+    approvers:
+      - 10gen/query-integration-staff-leads
+  - "local_reads.js":
+    approvers:
+      - 10gen/query-integration-observability
+  - "pin_getmore_cursor.js":
+    approvers:
+      - 10gen/query-integration-observability
+  - "profiler.js":
+    approvers:
+      - 10gen/query-integration-observability
+  - "stats.js":
+    approvers:
+      - 10gen/query-integration-observability
+  - "search.js":
+    approvers:
+      - 10gen/query-integration-search-testing
+  - "shard_targeting_util.js":
+    approvers:
+      - 10gen/query-optimization-cluster-planning
+  - "api_version_helpers.js":
+    approvers:
+      - 10gen/query-optimization-parsers

jstests/libs/config_files/OWNERS.yml

@@ -0,0 +1,5 @@
+version: 1.0.0
+filters:
+  - "set_profiling*":
+    approvers:
+      - 10gen/query-integration-observability

jstests/libs/config_files/bad_timezone_info/OWNERS.yml

@@ -0,0 +1,5 @@
+version: 1.0.0
+filters:
+  - "*":
+    approvers:
+      - 10gen/query-execution-datetime

jstests/libs/config_files/good_timezone_info_fat/OWNERS.yml

@@ -0,0 +1,5 @@
+version: 1.0.0
+filters:
+  - "*":
+    approvers:
+      - 10gen/query-execution-datetime

jstests/libs/config_files/good_timezone_info_slim/OWNERS.yml

@@ -0,0 +1,5 @@
+version: 1.0.0
+filters:
+  - "*":
+    approvers:
+      - 10gen/query-execution-datetime

jstests/libs/override_methods/OWNERS.yml

@@ -2,4 +2,31 @@ version: 1.0.0
 filters:
   - "*golden_overrides.js":
     approvers:
-      - 10gen/query-optimization
+      - 10gen/query-optimization-golden-test
+  - "*changestream*":
+    approvers:
+      - 10gen/query-execution-change-streams
+  - "*query_settings*":
+    approvers:
+      - 10gen/query-execution-query-settings
+  - "implicit_wildcard_indexes.js":
+    approvers:
+      - 10gen/query-execution-indexing
+  - "implicitly_wrap_pipelines_in_facets.js":
+    approvers:
+      - 10gen/query-execution-aggregation
+  - "*bulk_write.js":
+    approvers:
+      - 10gen/query-execution-write-exec
+  - "implicit_timeseries_collections.js":
+    approvers:
+      - 10gen/query-integration-timeseries
+  - "query_shape_hash_stability.js":
+    approvers:
+      - 10gen/query-integration-observability
+  - "rerun_queries.js":
+    approvers:
+      - 10gen/query-optimization-plan-cache
+  - "set_api*":
+    approvers:
+      - 10gen/query-optimization-parsers

jstests/libs/property_test_helpers/OWNERS.yml

@@ -0,0 +1,5 @@
+version: 1.0.0
+filters:
+  - "*":
+    approvers:
+      - 10gen/query-optimization

jstests/libs/query/OWNERS.yml

@@ -5,13 +5,13 @@ filters:
       - 10gen/query
   - "analyze_plan.js":
     approvers:
-      - 10gen/query-optimization
+      - 10gen/query-optimization-explain
   - "aggregation_pipeline_utils.js":
     approvers:
       - 10gen/query
   - "change_stream*.js":
     approvers:
-      - 10gen/query-execution
+      - 10gen/query-execution-change-streams
   - "geo*.js":
     approvers:
       - 10gen/query-integration
@@ -20,10 +20,10 @@ filters:
       - 10gen/query-integration
   - "query_settings*.js":
     approvers:
-      - 10gen/query-execution
+      - 10gen/query-execution-query-settings
   - "sbe*.js":
     approvers:
-      - 10gen/query-execution
+      - 10gen/query-execution-sbe
   - "wildcard_index_helpers.js":
     approvers:
-      - 10gen/query-optimization
+      - 10gen/query-optimization-planner

jstests/multiVersion/genericBinVersion/OWNERS.yml

@@ -0,0 +1,11 @@
+version: 1.0.0
+filters:
+  - "*query_stats*":
+    approvers:
+      - 10gen/query-integration-observability
+  - "keystring_index.js":
+    approvers:
+      - 10gen/query-execution-indexing
+  - "timeseries_collection_mixed_type.js":
+    approvers:
+      - 10gen/query-integration-timeseries

jstests/multiVersion/genericChangeStreams/OWNERS.yml

@@ -0,0 +1,5 @@
+version: 1.0.0
+filters:
+  - "*":
+    approvers:
+      - 10gen/query-execution-change-streams

jstests/multiVersion/genericSetFCVUsage/OWNERS.yml

@@ -0,0 +1,8 @@
+version: 1.0.0
+filters:
+  - "bit_update_mixed_fcv.js":
+    approvers:
+      - 10gen/query-execution-write-exec
+  - "view_definition_feature_compatibility_version.js":
+    approvers:
+      - 10gen/query-optimization-views

jstests/multiVersion/targetedTestsLastLtsFeatures/OWNERS.yml

@@ -0,0 +1,8 @@
+version: 1.0.0
+filters:
+  - "bindata_convert_numeric_view_upgrade_downgrade.js":
+    approvers:
+      - 10gen/query-execution-aggregation
+  - "error_and_log_validation_action.js":
+    approvers:
+      - 10gen/query-execution-doc-validation

jstests/noPassthrough/api_version/OWNERS.yml

@@ -0,0 +1,5 @@
+version: 1.0.0
+filters:
+  - "*":
+    approvers:
+      - 10gen/query-optimization-parsers

jstests/noPassthrough/crud/OWNERS.yml

@@ -1,5 +1,14 @@
 version: 1.0.0
 filters:
+  - "batched_multi_deletes*":
+    approvers:
+      - 10gen/query-execution-write-exec
+  - "bulk_write*":
+    approvers:
+      - 10gen/query-execution-write-exec
+  - "bulk_write_currentop.js":
+    approvers:
+      - 10gen/query-integration-observability
   - "*capped_deletes*":
     approvers:
       - 10gen/server-storage-execution

jstests/noPassthrough/libs/OWNERS.yml

@@ -6,3 +6,6 @@ filters:
   - "*index_build*":
     approvers:
       - 10gen/server-index-builds
+  - "*change_stream*":
+    approvers:
+      - 10gen/query-execution-change-streams

jstests/noPassthrough/query/OWNERS.yml

@@ -3,21 +3,24 @@ filters:
   - "*":
     approvers:
       - 10gen/query
+  - "cluster_analyze_command.js":
+    approvers:
+      - 10gen/query-optimization-statistics
   - "and_hash.js":
     approvers:
-      - 10gen/query-optimization
+      - 10gen/query-optimization-planner
   - "and_sorted.js":
     approvers:
-      - 10gen/query-optimization
+      - 10gen/query-optimization-planner
   - "doc_validation_options_logging.js":
     approvers:
-      - 10gen/query-execution
+      - 10gen/query-execution-doc-validation
   - "query_settings*":
     approvers:
-      - 10gen/query-execution
+      - 10gen/query-execution-query-settings
   - "sbe*":
     approvers:
-      - 10gen/query-execution
+      - 10gen/query-execution-sbe
   - "match_expression_optimization_failpoint.js":
     approvers:
       - 10gen/query-optimization
@@ -26,16 +29,46 @@ filters:
       - 10gen/query-optimization
   - "noFetchBonus.js":
     approvers:
-      - 10gen/query-optimization
+      - 10gen/query-optimization-planner
   - "optimize_sharded_sample_with_orphaned_docs.js":
     approvers:
-      - 10gen/query-optimization
+      - 10gen/query-optimization-cluster-planning
   - "or_pushdown_disable_optimization.js":
     approvers:
-      - 10gen/query-optimization
+      - 10gen/query-optimization-planner
   - "search_hybrid_scoring_feature_flag_test.js":
     approvers:
       - 10gen/query-integration-search
   - "set_window_fields_read_concern_snapshot.js":
     approvers:
       - 10gen/query-integration-analytic-extensions
+  - "analyze*":
+    approvers:
+      - 10gen/query-optimization-statistics
+  - "commands_preserve_exec_error_code.js":
+    approvers:
+      - 10gen/query-execution
+  - "compute_mode.js":
+    approvers:
+      - 10gen/query-integration-analytic-extensions
+  - "external_data_source*":
+    approvers:
+      - 10gen/query-integration-analytic-extensions
+  - "fail_point_getmore_after_cursor_checkout.js":
+    approvers:
+      - 10gen/query-execution-client-cursor
+  - "external_sort_find.js":
+    approvers:
+      - 10gen/query-execution
+  - "fast_path_counters.js":
+    approvers:
+      - 10gen/query-execution
+  - "kill_pinned_cursor.js":
+    approvers:
+      - 10gen/query-execution-client-cursor
+  - "missing_shard_key.js":
+    approvers:
+      - 10gen/query-execution-router-query-exec
+  - "parse_zone_info.js":
+    approvers:
+      - 10gen/query-execution-datetime

jstests/noPassthrough/query/change_streams/OWNERS.yml

@@ -2,4 +2,4 @@ version: 1.0.0
 filters:
   - "*":
     approvers:
-      - 10gen/query-execution
+      - 10gen/query-execution-change-streams

jstests/noPassthrough/query/current_op/OWNERS.yml

@@ -0,0 +1,8 @@
+version: 1.0.0
+filters:
+  - "*":
+    approvers:
+      - 10gen/query-integration-observability
+  - "OWNERS.yml":
+    approvers:
+      - 10gen/query-integration-staff-leads

jstests/noPassthrough/query/explain/OWNERS.yml

@@ -2,4 +2,4 @@ version: 1.0.0
 filters:
   - "*":
     approvers:
-      - 10gen/query-optimization
+      - 10gen/query-optimization-explain

jstests/noPassthrough/query/explain/explain_optimization_stats.js

@@ -9,7 +9,7 @@ import {ShardingTest} from "jstests/libs/shardingtest.js";
 import {
     runWithFailpoint,
     setupCollectionAndGetExplainTestCases
-} from "jstests/noPassthrough/explain_and_profile_optimization_stats_util.js";
+} from "jstests/noPassthrough/query/explain/explain_and_profile_optimization_stats_util.js";
 
 const collName = "jstests_explain_optimization_stats";
 function runTest(db) {

jstests/noPassthrough/query/external_data_source.js

@@ -263,10 +263,14 @@ function testSimpleAggregationsOverExternalDataSource(pipeDir) {
     (function testRoundtripOverMultiplePipesUsingBsonFile() {
         jsTestLog("Testing testRoundtripOverMultiplePipesUsingBsonFile()");
 
-        _writeTestPipeBsonFile(
+        _writeTestPipeBsonFile(pipeName1,
-            pipeName1, objsPerPipe, "jstests/noPassthrough/external_data_source.bson", pipeDir);
+                               objsPerPipe,
-        _writeTestPipeBsonFile(
+                               "jstests/noPassthrough/query/external_data_source.bson",
-            pipeName2, objsPerPipe, "jstests/noPassthrough/external_data_source.bson", pipeDir);
+                               pipeDir);
+        _writeTestPipeBsonFile(pipeName2,
+                               objsPerPipe,
+                               "jstests/noPassthrough/query/external_data_source.bson",
+                               pipeDir);
         let cursor = db.coll.aggregate([{$project: {_id: 0}}], {
             $_externalDataSources: [{
                 collName: "coll",

jstests/noPassthrough/query/js/OWNERS.yml

@@ -0,0 +1,8 @@
+version: 1.0.0
+filters:
+  - "*":
+    approvers:
+      - 10gen/query-integration-javascript
+  - "OWNERS.yml":
+    approvers:
+      - 10gen/query-integration-staff-leads