From 7b7ce786db9fcf4b7b193ed2540317439dfd0658 Mon Sep 17 00:00:00 2001 From: Catalin Sumanaru Date: Mon, 25 May 2026 11:59:22 +0100 Subject: [PATCH] SERVER-127332 Extract query_knobs into a dedicated module (#54119) GitOrigin-RevId: 45013ebe977d92ee5103a7ff44f8685736d56a4b --- src/mongo/db/BUILD.bazel | 2 +- src/mongo/db/exec/trial_period_utils.cpp | 2 +- src/mongo/db/pipeline/expression_context.h | 2 +- src/mongo/db/pipeline/pipeline_d.cpp | 2 +- src/mongo/db/query/BUILD.bazel | 100 +--------------- src/mongo/db/query/OWNERS.yml | 3 - .../db/query/canonical_query_encoder.cpp | 2 +- .../db/query/compiler/metadata/BUILD.bazel | 2 +- src/mongo/db/query/explain.cpp | 2 +- src/mongo/db/query/explain_common.cpp | 2 +- src/mongo/db/query/planner_analysis.cpp | 2 +- .../query/query_knob_descriptors_execution.h | 2 +- .../query_knob_descriptors_optimization.h | 2 +- src/mongo/db/query/query_knobs/BUILD.bazel | 111 ++++++++++++++++++ src/mongo/db/query/query_knobs/OWNERS.yml | 8 ++ .../db/query/{ => query_knobs}/query_knob.cpp | 2 +- .../db/query/{ => query_knobs}/query_knob.h | 0 .../query_knob_configuration.cpp | 6 +- .../query_knob_configuration.h | 4 +- .../query_knob_configuration_bm.cpp | 2 +- .../{ => query_knobs}/query_knob_registry.cpp | 4 +- .../{ => query_knobs}/query_knob_registry.h | 2 +- .../query_knob_registry_test.cpp | 6 +- .../query_knob_registry_test.idl | 0 .../{ => query_knobs}/query_knob_snapshot.h | 2 +- .../query_knob_snapshot_test.cpp | 4 +- .../{ => query_knobs}/query_knob_test.cpp | 4 +- .../{ => query_knobs}/query_knob_test.idl | 0 src/mongo/db/query/query_planner.cpp | 2 +- src/mongo/db/query/query_settings/BUILD.bazel | 6 +- .../query_settings/query_knob_overrides.cpp | 2 +- .../query_settings/query_knob_overrides.h | 2 +- .../query_knob_overrides_test.cpp | 2 +- .../query_settings_hash_test.cpp | 2 +- src/mongo/db/query/query_utils.cpp | 2 +- .../db/query/stage_builder/sbe/BUILD.bazel | 2 +- 36 files changed, 159 insertions(+), 141 deletions(-) create mode 100644 src/mongo/db/query/query_knobs/BUILD.bazel create mode 100644 src/mongo/db/query/query_knobs/OWNERS.yml rename src/mongo/db/query/{ => query_knobs}/query_knob.cpp (97%) rename src/mongo/db/query/{ => query_knobs}/query_knob.h (100%) rename src/mongo/db/query/{ => query_knobs}/query_knob_configuration.cpp (97%) rename src/mongo/db/query/{ => query_knobs}/query_knob_configuration.h (98%) rename src/mongo/db/query/{ => query_knobs}/query_knob_configuration_bm.cpp (99%) rename src/mongo/db/query/{ => query_knobs}/query_knob_registry.cpp (98%) rename src/mongo/db/query/{ => query_knobs}/query_knob_registry.h (98%) rename src/mongo/db/query/{ => query_knobs}/query_knob_registry_test.cpp (98%) rename src/mongo/db/query/{ => query_knobs}/query_knob_registry_test.idl (100%) rename src/mongo/db/query/{ => query_knobs}/query_knob_snapshot.h (99%) rename src/mongo/db/query/{ => query_knobs}/query_knob_snapshot_test.cpp (98%) rename src/mongo/db/query/{ => query_knobs}/query_knob_test.cpp (98%) rename src/mongo/db/query/{ => query_knobs}/query_knob_test.idl (100%) diff --git a/src/mongo/db/BUILD.bazel b/src/mongo/db/BUILD.bazel index e74a45c076c..7b0227a4458 100644 --- a/src/mongo/db/BUILD.bazel +++ b/src/mongo/db/BUILD.bazel @@ -1875,13 +1875,13 @@ mongo_cc_library( "//src/mongo/db/pipeline:aggregation_request_helper", "//src/mongo/db/pipeline:lite_parsed_document_source", "//src/mongo/db/pipeline:variable_validation", - "//src/mongo/db/query:query_knob_configuration", "//src/mongo/db/query:query_knobs", "//src/mongo/db/query:random_utils", "//src/mongo/db/query/collation:collator_factory_interface", "//src/mongo/db/query/collation:collator_interface", "//src/mongo/db/query/compiler/dependency_analysis:dependencies", "//src/mongo/db/query/datetime:date_time_support", + "//src/mongo/db/query/query_knobs:query_knob_configuration", "//src/mongo/db/query/query_settings", "//src/mongo/db/query/query_shape:query_shape_common", "//src/mongo/db/query/util:rank_fusion_util", diff --git a/src/mongo/db/exec/trial_period_utils.cpp b/src/mongo/db/exec/trial_period_utils.cpp index 4a7270bd35c..3f0b04db2ec 100644 --- a/src/mongo/db/exec/trial_period_utils.cpp +++ b/src/mongo/db/exec/trial_period_utils.cpp @@ -30,7 +30,7 @@ #include "mongo/db/exec/trial_period_utils.h" #include "mongo/db/query/find_command.h" -#include "mongo/db/query/query_knob_configuration.h" +#include "mongo/db/query/query_knobs/query_knob_configuration.h" #include "mongo/db/shard_role/shard_catalog/collection.h" #include diff --git a/src/mongo/db/pipeline/expression_context.h b/src/mongo/db/pipeline/expression_context.h index 12a576c6549..bad422b0a52 100644 --- a/src/mongo/db/pipeline/expression_context.h +++ b/src/mongo/db/pipeline/expression_context.h @@ -57,7 +57,7 @@ #include "mongo/db/query/query_execution_knobs_gen.h" #include "mongo/db/query/query_feature_flags_gen.h" #include "mongo/db/query/query_integration_knobs_gen.h" -#include "mongo/db/query/query_knob_configuration.h" +#include "mongo/db/query/query_knobs/query_knob_configuration.h" #include "mongo/db/query/query_optimization_knobs_gen.h" #include "mongo/db/query/query_settings/query_settings_gen.h" #include "mongo/db/query/tailable_mode_gen.h" diff --git a/src/mongo/db/pipeline/pipeline_d.cpp b/src/mongo/db/pipeline/pipeline_d.cpp index 926af80ff1c..ce2806d4ef4 100644 --- a/src/mongo/db/pipeline/pipeline_d.cpp +++ b/src/mongo/db/pipeline/pipeline_d.cpp @@ -98,7 +98,7 @@ #include "mongo/db/query/query_execution_knobs_gen.h" #include "mongo/db/query/query_feature_flags_gen.h" #include "mongo/db/query/query_integration_knobs_gen.h" -#include "mongo/db/query/query_knob_configuration.h" +#include "mongo/db/query/query_knobs/query_knob_configuration.h" #include "mongo/db/query/query_optimization_knobs_gen.h" #include "mongo/db/query/query_planner_params.h" #include "mongo/db/query/query_request_helper.h" diff --git a/src/mongo/db/query/BUILD.bazel b/src/mongo/db/query/BUILD.bazel index 07eb3804d61..e43474ec96f 100644 --- a/src/mongo/db/query/BUILD.bazel +++ b/src/mongo/db/query/BUILD.bazel @@ -310,100 +310,13 @@ mongo_cc_library( ], deps = [ ":on_parameter_change_updaters", - ":query_knob", "//src/mongo/db:server_base", "//src/mongo/db/commands:test_commands_enabled", + "//src/mongo/db/query/query_knobs:query_knob", "//src/mongo/db/topology/cluster_parameters:cluster_server_parameter", ], ) -mongo_cc_library( - name = "query_knob_configuration", - srcs = [ - "query_knob_configuration.cpp", - ], - deps = [ - ":query_knob_registry", - ":query_knobs", - ], -) - -mongo_cc_library( - name = "query_knob", - srcs = [ - "query_knob.cpp", - ], - hdrs = [ - "query_knob.h", - "query_knob_snapshot.h", - ], - deps = [ - "//src/mongo:base", - "//src/mongo/idl:idl_parser", - ], -) - -mongo_cc_library( - name = "query_knob_registry", - srcs = [ - "query_knob_registry.cpp", - ], - hdrs = [ - "query_knob_registry.h", - ], - deps = [ - ":query_knob", - "//src/mongo:base", - "//src/mongo/db:server_base", - ], -) - -idl_generator( - name = "query_knob_registry_test_gen", - src = "query_knob_registry_test.idl", - deps = [ - "//src/mongo/db:basic_types_gen", - ], -) - -mongo_cc_unit_test( - name = "query_knob_registry_test", - srcs = [ - "query_knob_registry_test.cpp", - ":query_knob_registry_test_gen", - ], - tags = ["mongo_unittest_third_group"], - deps = [ - ":query_knob", - ":query_knob_registry", - "//src/mongo:base", - "//src/mongo/db:server_base", - ], -) - -idl_generator( - name = "query_knob_test_gen", - src = "query_knob_test.idl", - deps = [ - "//src/mongo/db:basic_types_gen", - ], -) - -mongo_cc_unit_test( - name = "query_knob_test", - srcs = [ - "query_knob_snapshot_test.cpp", - "query_knob_test.cpp", - ":query_knob_test_gen", - ], - tags = ["mongo_unittest_second_group"], - deps = [ - ":query_knob", - ":query_knobs", - "//src/mongo/db:server_base", - ], -) - idl_generator( name = "distinct_command_gen", src = "distinct_command.idl", @@ -802,17 +715,6 @@ mongo_cc_benchmark( ], ) -mongo_cc_benchmark( - name = "query_knob_configuration_bm", - srcs = ["query_knob_configuration_bm.cpp"], - tags = ["query_bm"], - deps = [ - "query_knob_configuration", - "//src/mongo/db/query:query_fcv_environment_for_test", - "//src/mongo/db/query:query_test_service_context", - ], -) - mongo_cc_benchmark( name = "query_planner_bm", srcs = [ diff --git a/src/mongo/db/query/OWNERS.yml b/src/mongo/db/query/OWNERS.yml index d7eae63e009..23b688a8ae4 100644 --- a/src/mongo/db/query/OWNERS.yml +++ b/src/mongo/db/query/OWNERS.yml @@ -136,9 +136,6 @@ filters: approvers: - 10gen/query-optimization - 10gen/query-execution - - "query_knob_*": - approvers: - - 10gen/query-optimization - "query_knob_descriptors_optimization.h": approvers: - 10gen/query-optimization diff --git a/src/mongo/db/query/canonical_query_encoder.cpp b/src/mongo/db/query/canonical_query_encoder.cpp index 15eeaf65c42..fa17b335de1 100644 --- a/src/mongo/db/query/canonical_query_encoder.cpp +++ b/src/mongo/db/query/canonical_query_encoder.cpp @@ -65,7 +65,7 @@ #include "mongo/db/query/collation/collator_interface.h" #include "mongo/db/query/compiler/logical_model/projection/projection.h" #include "mongo/db/query/find_command.h" -#include "mongo/db/query/query_knob_configuration.h" +#include "mongo/db/query/query_knobs/query_knob_configuration.h" #include "mongo/db/query/query_request_helper.h" #include "mongo/db/query/tree_walker.h" #include "mongo/db/repl/read_concern_args.h" diff --git a/src/mongo/db/query/compiler/metadata/BUILD.bazel b/src/mongo/db/query/compiler/metadata/BUILD.bazel index d051514e0be..ee7af80b84e 100644 --- a/src/mongo/db/query/compiler/metadata/BUILD.bazel +++ b/src/mongo/db/query/compiler/metadata/BUILD.bazel @@ -44,7 +44,7 @@ mongo_cc_library( "//src/mongo/db:common", "//src/mongo/db/commands/server_status:server_status_core", "//src/mongo/db/pipeline:field_path", - "//src/mongo/db/query:query_knob_configuration", + "//src/mongo/db/query/query_knobs:query_knob_configuration", "//src/mongo/db/query/query_settings", ], ) diff --git a/src/mongo/db/query/explain.cpp b/src/mongo/db/query/explain.cpp index 53cbe9285fb..e429b88c2e5 100644 --- a/src/mongo/db/query/explain.cpp +++ b/src/mongo/db/query/explain.cpp @@ -52,7 +52,7 @@ #include "mongo/db/query/plan_ranking_decision.h" #include "mongo/db/query/plan_summary_stats.h" #include "mongo/db/query/query_feature_flags_gen.h" -#include "mongo/db/query/query_knob_configuration.h" +#include "mongo/db/query/query_knobs/query_knob_configuration.h" #include "mongo/db/query/query_settings.h" #include "mongo/db/query/query_settings_decoration.h" #include "mongo/util/assert_util.h" diff --git a/src/mongo/db/query/explain_common.cpp b/src/mongo/db/query/explain_common.cpp index 0c92d48df16..76f7c1b7cc4 100644 --- a/src/mongo/db/query/explain_common.cpp +++ b/src/mongo/db/query/explain_common.cpp @@ -33,7 +33,7 @@ #include "mongo/db/curop.h" #include "mongo/db/query/query_execution_knobs_gen.h" #include "mongo/db/query/query_integration_knobs_gen.h" -#include "mongo/db/query/query_knob_configuration.h" +#include "mongo/db/query/query_knobs/query_knob_configuration.h" #include "mongo/db/query/query_optimization_knobs_gen.h" #include "mongo/db/query/stage_memory_limit_knobs/knobs.h" #include "mongo/db/server_options.h" diff --git a/src/mongo/db/query/planner_analysis.cpp b/src/mongo/db/query/planner_analysis.cpp index 823fd5cea8d..f067fea0a7f 100644 --- a/src/mongo/db/query/planner_analysis.cpp +++ b/src/mongo/db/query/planner_analysis.cpp @@ -65,7 +65,7 @@ #include "mongo/db/query/distinct_access.h" #include "mongo/db/query/find_command.h" #include "mongo/db/query/index_hint.h" -#include "mongo/db/query/query_knob_configuration.h" +#include "mongo/db/query/query_knobs/query_knob_configuration.h" #include "mongo/db/query/query_planner_common.h" #include "mongo/db/query/query_request_helper.h" #include "mongo/logv2/log.h" diff --git a/src/mongo/db/query/query_knob_descriptors_execution.h b/src/mongo/db/query/query_knob_descriptors_execution.h index e6fb881b448..cb8ad48f49d 100644 --- a/src/mongo/db/query/query_knob_descriptors_execution.h +++ b/src/mongo/db/query/query_knob_descriptors_execution.h @@ -35,7 +35,7 @@ #pragma once #include "mongo/db/query/query_execution_knobs_gen.h" -#include "mongo/db/query/query_knob.h" +#include "mongo/db/query/query_knobs/query_knob.h" namespace mongo::query_knobs { diff --git a/src/mongo/db/query/query_knob_descriptors_optimization.h b/src/mongo/db/query/query_knob_descriptors_optimization.h index 379d5f05529..9f50e76524f 100644 --- a/src/mongo/db/query/query_knob_descriptors_optimization.h +++ b/src/mongo/db/query/query_knob_descriptors_optimization.h @@ -34,7 +34,7 @@ #pragma once -#include "mongo/db/query/query_knob.h" +#include "mongo/db/query/query_knobs/query_knob.h" #include "mongo/db/query/query_optimization_knobs_gen.h" namespace mongo::query_knobs { diff --git a/src/mongo/db/query/query_knobs/BUILD.bazel b/src/mongo/db/query/query_knobs/BUILD.bazel new file mode 100644 index 00000000000..3f8a8aa11f7 --- /dev/null +++ b/src/mongo/db/query/query_knobs/BUILD.bazel @@ -0,0 +1,111 @@ +load("//bazel:mongo_src_rules.bzl", "idl_generator", "mongo_cc_benchmark", "mongo_cc_library", "mongo_cc_unit_test") + +package(default_visibility = ["//visibility:public"]) + +exports_files( + glob([ + "*.h", + "*.cpp", + ]), +) + +mongo_cc_library( + name = "query_knob", + srcs = [ + "query_knob.cpp", + ], + hdrs = [ + "query_knob.h", + "query_knob_snapshot.h", + ], + deps = [ + "//src/mongo:base", + "//src/mongo/idl:idl_parser", + ], +) + +mongo_cc_library( + name = "query_knob_registry", + srcs = [ + "query_knob_registry.cpp", + ], + hdrs = [ + "query_knob_registry.h", + ], + deps = [ + ":query_knob", + "//src/mongo:base", + "//src/mongo/db:server_base", + ], +) + +idl_generator( + name = "query_knob_registry_test_gen", + src = "query_knob_registry_test.idl", + deps = [ + "//src/mongo/db:basic_types_gen", + ], +) + +mongo_cc_unit_test( + name = "query_knob_registry_test", + srcs = [ + "query_knob_registry_test.cpp", + ":query_knob_registry_test_gen", + ], + tags = ["mongo_unittest_first_group"], + deps = [ + ":query_knob", + ":query_knob_registry", + "//src/mongo:base", + "//src/mongo/db:server_base", + ], +) + +idl_generator( + name = "query_knob_test_gen", + src = "query_knob_test.idl", + deps = [ + "//src/mongo/db:basic_types_gen", + ], +) + +mongo_cc_library( + name = "query_knob_configuration", + srcs = [ + "query_knob_configuration.cpp", + ], + hdrs = [ + "query_knob_configuration.h", + ], + deps = [ + ":query_knob_registry", + "//src/mongo/db/query:query_knobs", + ], +) + +mongo_cc_benchmark( + name = "query_knob_configuration_bm", + srcs = ["query_knob_configuration_bm.cpp"], + tags = ["query_bm"], + deps = [ + ":query_knob_configuration", + "//src/mongo/db/query:query_fcv_environment_for_test", + "//src/mongo/db/query:query_test_service_context", + ], +) + +mongo_cc_unit_test( + name = "query_knob_test", + srcs = [ + "query_knob_snapshot_test.cpp", + "query_knob_test.cpp", + ":query_knob_test_gen", + ], + tags = ["mongo_unittest_third_group"], + deps = [ + ":query_knob", + "//src/mongo/db:server_base", + "//src/mongo/db/query:query_knobs", + ], +) diff --git a/src/mongo/db/query/query_knobs/OWNERS.yml b/src/mongo/db/query/query_knobs/OWNERS.yml new file mode 100644 index 00000000000..7588896a209 --- /dev/null +++ b/src/mongo/db/query/query_knobs/OWNERS.yml @@ -0,0 +1,8 @@ +version: 1.0.0 +filters: + - "*": + approvers: + - 10gen/query-execution-query-settings + - "OWNERS.yml": + approvers: + - 10gen/query-execution-staff-leads diff --git a/src/mongo/db/query/query_knob.cpp b/src/mongo/db/query/query_knobs/query_knob.cpp similarity index 97% rename from src/mongo/db/query/query_knob.cpp rename to src/mongo/db/query/query_knobs/query_knob.cpp index 05ebeae32d3..76f5776b1c7 100644 --- a/src/mongo/db/query/query_knob.cpp +++ b/src/mongo/db/query/query_knobs/query_knob.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/query/query_knob.h" +#include "mongo/db/query/query_knobs/query_knob.h" #include "mongo/util/static_immortal.h" diff --git a/src/mongo/db/query/query_knob.h b/src/mongo/db/query/query_knobs/query_knob.h similarity index 100% rename from src/mongo/db/query/query_knob.h rename to src/mongo/db/query/query_knobs/query_knob.h diff --git a/src/mongo/db/query/query_knob_configuration.cpp b/src/mongo/db/query/query_knobs/query_knob_configuration.cpp similarity index 97% rename from src/mongo/db/query/query_knob_configuration.cpp rename to src/mongo/db/query/query_knobs/query_knob_configuration.cpp index ff7173daf6f..6f3230d463b 100644 --- a/src/mongo/db/query/query_knob_configuration.cpp +++ b/src/mongo/db/query/query_knobs/query_knob_configuration.cpp @@ -27,12 +27,12 @@ * it in the license file. */ -#include "mongo/db/query/query_knob_configuration.h" +#include "mongo/db/query/query_knobs/query_knob_configuration.h" #include "mongo/db/query/query_knob_descriptors_execution.h" #include "mongo/db/query/query_knob_descriptors_optimization.h" -#include "mongo/db/query/query_knob_registry.h" -#include "mongo/db/query/query_knob_snapshot.h" +#include "mongo/db/query/query_knobs/query_knob_registry.h" +#include "mongo/db/query/query_knobs/query_knob_snapshot.h" #include "mongo/db/query/query_settings/query_settings_gen.h" namespace mongo { diff --git a/src/mongo/db/query/query_knob_configuration.h b/src/mongo/db/query/query_knobs/query_knob_configuration.h similarity index 98% rename from src/mongo/db/query/query_knob_configuration.h rename to src/mongo/db/query/query_knobs/query_knob_configuration.h index c572c068e71..a853f14f757 100644 --- a/src/mongo/db/query/query_knob_configuration.h +++ b/src/mongo/db/query/query_knobs/query_knob_configuration.h @@ -31,8 +31,8 @@ #include "mongo/db/query/query_execution_knobs_gen.h" #include "mongo/db/query/query_integration_knobs_gen.h" -#include "mongo/db/query/query_knob.h" -#include "mongo/db/query/query_knob_snapshot.h" +#include "mongo/db/query/query_knobs/query_knob.h" +#include "mongo/db/query/query_knobs/query_knob_snapshot.h" #include "mongo/db/query/query_optimization_knobs_gen.h" #include "mongo/db/query/query_settings/query_settings_gen.h" #include "mongo/util/modules.h" diff --git a/src/mongo/db/query/query_knob_configuration_bm.cpp b/src/mongo/db/query/query_knobs/query_knob_configuration_bm.cpp similarity index 99% rename from src/mongo/db/query/query_knob_configuration_bm.cpp rename to src/mongo/db/query/query_knobs/query_knob_configuration_bm.cpp index 29978c6553a..761f173bbb7 100644 --- a/src/mongo/db/query/query_knob_configuration_bm.cpp +++ b/src/mongo/db/query/query_knobs/query_knob_configuration_bm.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#include "mongo/db/query/query_knob_configuration.h" +#include "mongo/db/query/query_knobs/query_knob_configuration.h" #include "mongo/db/query/query_fcv_environment_for_test.h" #include "mongo/db/query/query_settings/query_settings_gen.h" diff --git a/src/mongo/db/query/query_knob_registry.cpp b/src/mongo/db/query/query_knobs/query_knob_registry.cpp similarity index 98% rename from src/mongo/db/query/query_knob_registry.cpp rename to src/mongo/db/query/query_knobs/query_knob_registry.cpp index 68582c48a4a..c6efcdcc103 100644 --- a/src/mongo/db/query/query_knob_registry.cpp +++ b/src/mongo/db/query/query_knobs/query_knob_registry.cpp @@ -27,11 +27,11 @@ * it in the license file. */ -#include "mongo/db/query/query_knob_registry.h" +#include "mongo/db/query/query_knobs/query_knob_registry.h" #include "mongo/base/init.h" #include "mongo/bson/bsonobj.h" -#include "mongo/db/query/query_knob.h" +#include "mongo/db/query/query_knobs/query_knob.h" #include "mongo/util/assert_util.h" #include "mongo/util/static_immortal.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/query/query_knob_registry.h b/src/mongo/db/query/query_knobs/query_knob_registry.h similarity index 98% rename from src/mongo/db/query/query_knob_registry.h rename to src/mongo/db/query/query_knobs/query_knob_registry.h index 2687f884b29..b6e27d7099f 100644 --- a/src/mongo/db/query/query_knob_registry.h +++ b/src/mongo/db/query/query_knobs/query_knob_registry.h @@ -30,7 +30,7 @@ #pragma once #include "mongo/base/string_data.h" -#include "mongo/db/query/query_knob.h" +#include "mongo/db/query/query_knobs/query_knob.h" #include "mongo/db/server_parameter.h" #include "mongo/util/string_map.h" #include "mongo/util/version/releases.h" diff --git a/src/mongo/db/query/query_knob_registry_test.cpp b/src/mongo/db/query/query_knobs/query_knob_registry_test.cpp similarity index 98% rename from src/mongo/db/query/query_knob_registry_test.cpp rename to src/mongo/db/query/query_knobs/query_knob_registry_test.cpp index 933eb897492..e67e7cb74b9 100644 --- a/src/mongo/db/query/query_knob_registry_test.cpp +++ b/src/mongo/db/query/query_knobs/query_knob_registry_test.cpp @@ -27,10 +27,10 @@ * it in the license file. */ -#include "mongo/db/query/query_knob_registry.h" +#include "mongo/db/query/query_knobs/query_knob_registry.h" -#include "mongo/db/query/query_knob.h" -#include "mongo/db/query/query_knob_registry_test_gen.h" +#include "mongo/db/query/query_knobs/query_knob.h" +#include "mongo/db/query/query_knobs/query_knob_registry_test_gen.h" #include "mongo/db/server_parameter.h" #include "mongo/unittest/assert.h" #include "mongo/unittest/death_test.h" diff --git a/src/mongo/db/query/query_knob_registry_test.idl b/src/mongo/db/query/query_knobs/query_knob_registry_test.idl similarity index 100% rename from src/mongo/db/query/query_knob_registry_test.idl rename to src/mongo/db/query/query_knobs/query_knob_registry_test.idl diff --git a/src/mongo/db/query/query_knob_snapshot.h b/src/mongo/db/query/query_knobs/query_knob_snapshot.h similarity index 99% rename from src/mongo/db/query/query_knob_snapshot.h rename to src/mongo/db/query/query_knobs/query_knob_snapshot.h index 48c4b33b852..95db842404b 100644 --- a/src/mongo/db/query/query_knob_snapshot.h +++ b/src/mongo/db/query/query_knobs/query_knob_snapshot.h @@ -29,7 +29,7 @@ #pragma once -#include "mongo/db/query/query_knob.h" +#include "mongo/db/query/query_knobs/query_knob.h" #include "mongo/util/assert_util.h" #include diff --git a/src/mongo/db/query/query_knob_snapshot_test.cpp b/src/mongo/db/query/query_knobs/query_knob_snapshot_test.cpp similarity index 98% rename from src/mongo/db/query/query_knob_snapshot_test.cpp rename to src/mongo/db/query/query_knobs/query_knob_snapshot_test.cpp index c4749b6e1ac..38eb13ac9c3 100644 --- a/src/mongo/db/query/query_knob_snapshot_test.cpp +++ b/src/mongo/db/query/query_knobs/query_knob_snapshot_test.cpp @@ -27,10 +27,10 @@ * it in the license file. */ -#include "mongo/db/query/query_knob_snapshot.h" +#include "mongo/db/query/query_knobs/query_knob_snapshot.h" #include "mongo/db/query/query_execution_knobs_gen.h" -#include "mongo/db/query/query_knob.h" +#include "mongo/db/query/query_knobs/query_knob.h" #include "mongo/unittest/assert.h" #include "mongo/unittest/death_test.h" #include "mongo/unittest/framework.h" diff --git a/src/mongo/db/query/query_knob_test.cpp b/src/mongo/db/query/query_knobs/query_knob_test.cpp similarity index 98% rename from src/mongo/db/query/query_knob_test.cpp rename to src/mongo/db/query/query_knobs/query_knob_test.cpp index 2cad8c224f4..84b95e4848c 100644 --- a/src/mongo/db/query/query_knob_test.cpp +++ b/src/mongo/db/query/query_knobs/query_knob_test.cpp @@ -27,11 +27,11 @@ * it in the license file. */ -#include "mongo/db/query/query_knob.h" +#include "mongo/db/query/query_knobs/query_knob.h" #include "mongo/bson/bsonobj.h" #include "mongo/bson/bsonobjbuilder.h" -#include "mongo/db/query/query_knob_test_gen.h" +#include "mongo/db/query/query_knobs/query_knob_test_gen.h" #include "mongo/idl/idl_parser.h" #include "mongo/idl/server_parameter_test_controller.h" #include "mongo/unittest/assert.h" diff --git a/src/mongo/db/query/query_knob_test.idl b/src/mongo/db/query/query_knobs/query_knob_test.idl similarity index 100% rename from src/mongo/db/query/query_knob_test.idl rename to src/mongo/db/query/query_knobs/query_knob_test.idl diff --git a/src/mongo/db/query/query_planner.cpp b/src/mongo/db/query/query_planner.cpp index bb91992f99c..b328de94626 100644 --- a/src/mongo/db/query/query_planner.cpp +++ b/src/mongo/db/query/query_planner.cpp @@ -85,7 +85,7 @@ #include "mongo/db/query/planner_analysis.h" #include "mongo/db/query/planner_ixselect.h" #include "mongo/db/query/query_execution_knobs_gen.h" -#include "mongo/db/query/query_knob_configuration.h" +#include "mongo/db/query/query_knobs/query_knob_configuration.h" #include "mongo/db/query/query_optimization_knobs_gen.h" #include "mongo/db/query/query_planner.h" #include "mongo/db/query/query_planner_common.h" diff --git a/src/mongo/db/query/query_settings/BUILD.bazel b/src/mongo/db/query/query_settings/BUILD.bazel index 34ff9a4ad07..8d553e55f35 100644 --- a/src/mongo/db/query/query_settings/BUILD.bazel +++ b/src/mongo/db/query/query_settings/BUILD.bazel @@ -39,7 +39,7 @@ mongo_cc_library( "//src/mongo/db:server_base", "//src/mongo/db/query:index_hint", # TODO SERVER-127247: Replace this with 'query_knobs' once the knob initialization is explicit. - "//src/mongo/db/query:query_knob_configuration", + "//src/mongo/db/query/query_knobs:query_knob_configuration", "//src/mongo/db/query/query_shape:query_shape_hash", ], ) @@ -145,7 +145,7 @@ mongo_cc_library( hdrs = ["query_knob_overrides.h"], deps = [ "//src/mongo/db:server_base", - "//src/mongo/db/query:query_knob_registry", + "//src/mongo/db/query/query_knobs:query_knob_registry", ], ) @@ -166,7 +166,7 @@ mongo_cc_unit_test( tags = ["mongo_unittest_first_group"], deps = [ ":query_knob_overrides", - "//src/mongo/db/query:query_knob_registry", + "//src/mongo/db/query/query_knobs:query_knob_registry", "//src/mongo/unittest", ], ) diff --git a/src/mongo/db/query/query_settings/query_knob_overrides.cpp b/src/mongo/db/query/query_settings/query_knob_overrides.cpp index 8c9dec41538..f74a6d0c017 100644 --- a/src/mongo/db/query/query_settings/query_knob_overrides.cpp +++ b/src/mongo/db/query/query_settings/query_knob_overrides.cpp @@ -30,7 +30,7 @@ #include "mongo/db/query/query_settings/query_knob_overrides.h" #include "mongo/bson/bsonobjbuilder.h" -#include "mongo/db/query/query_knob_registry.h" +#include "mongo/db/query/query_knobs/query_knob_registry.h" #include "mongo/util/assert_util.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/query/query_settings/query_knob_overrides.h b/src/mongo/db/query/query_settings/query_knob_overrides.h index 480279e9494..8fc8c75a259 100644 --- a/src/mongo/db/query/query_settings/query_knob_overrides.h +++ b/src/mongo/db/query/query_settings/query_knob_overrides.h @@ -30,7 +30,7 @@ #pragma once #include "mongo/bson/bsonobj.h" -#include "mongo/db/query/query_knob.h" +#include "mongo/db/query/query_knobs/query_knob.h" #include #include diff --git a/src/mongo/db/query/query_settings/query_knob_overrides_test.cpp b/src/mongo/db/query/query_settings/query_knob_overrides_test.cpp index 1b7a8c497b8..77631e49bdc 100644 --- a/src/mongo/db/query/query_settings/query_knob_overrides_test.cpp +++ b/src/mongo/db/query/query_settings/query_knob_overrides_test.cpp @@ -31,7 +31,7 @@ #include "mongo/bson/bsonobj.h" #include "mongo/bson/bsonobjbuilder.h" -#include "mongo/db/query/query_knob.h" +#include "mongo/db/query/query_knobs/query_knob.h" #include "mongo/db/query/query_settings/query_knob_overrides_test_gen.h" #include "mongo/unittest/assert.h" #include "mongo/unittest/death_test.h" diff --git a/src/mongo/db/query/query_settings/query_settings_hash_test.cpp b/src/mongo/db/query/query_settings/query_settings_hash_test.cpp index f9901fbad85..3673906544d 100644 --- a/src/mongo/db/query/query_settings/query_settings_hash_test.cpp +++ b/src/mongo/db/query/query_settings/query_settings_hash_test.cpp @@ -35,7 +35,7 @@ #include "mongo/db/basic_types.h" #include "mongo/db/query/query_execution_knobs_gen.h" #include "mongo/db/query/query_integration_knobs_gen.h" -#include "mongo/db/query/query_knob.h" +#include "mongo/db/query/query_knobs/query_knob.h" #include "mongo/db/query/query_optimization_knobs_gen.h" #include "mongo/db/query/query_settings/query_knob_overrides_test_gen.h" #include "mongo/db/query/query_settings/query_settings_gen.h" diff --git a/src/mongo/db/query/query_utils.cpp b/src/mongo/db/query/query_utils.cpp index ac864e7620b..0a0444bf697 100644 --- a/src/mongo/db/query/query_utils.cpp +++ b/src/mongo/db/query/query_utils.cpp @@ -41,7 +41,7 @@ #include "mongo/db/query/compiler/logical_model/projection/projection.h" #include "mongo/db/query/find_command.h" #include "mongo/db/query/query_feature_flags_gen.h" -#include "mongo/db/query/query_knob_configuration.h" +#include "mongo/db/query/query_knobs/query_knob_configuration.h" #include "mongo/db/shard_role/shard_catalog/index_catalog.h" #include "mongo/util/assert_util.h" #include "mongo/util/string_map.h" diff --git a/src/mongo/db/query/stage_builder/sbe/BUILD.bazel b/src/mongo/db/query/stage_builder/sbe/BUILD.bazel index fd255da2c04..59ef1f23742 100644 --- a/src/mongo/db/query/stage_builder/sbe/BUILD.bazel +++ b/src/mongo/db/query/stage_builder/sbe/BUILD.bazel @@ -157,7 +157,6 @@ mongo_cc_library( "//src/mongo/db/query:canonical_query_base", "//src/mongo/db/query:collection_query_info", "//src/mongo/db/query:plan_yield_policy_sbe", - "//src/mongo/db/query:query_knob_configuration", "//src/mongo/db/query:query_planner", "//src/mongo/db/query/algebra", "//src/mongo/db/query/collation:collator_interface", @@ -169,6 +168,7 @@ mongo_cc_library( "//src/mongo/db/query/compiler/physical_model/index_bounds", "//src/mongo/db/query/datetime:date_time_support", "//src/mongo/db/query/plan_cache:query_plan_cache", + "//src/mongo/db/query/query_knobs:query_knob_configuration", "//src/mongo/db/query/search:mongot_cursor", "//src/mongo/db/query/stage_builder/sbe/abt:abt_base", "//src/mongo/db/query/stage_builder/sbe/abt/syntax:syntax_expr",