SERVER-111398 : Mark query_execution_sbe owned headers in src/mongo/db/query/stage_builder/sbe for modularity (#42615)

GitOrigin-RevId: da23e5b21c98c3b8a2e57cfdf91c46b783dab979

src/mongo/db/query/stage_builder/sbe/abt_lower.h

@@ -33,6 +33,7 @@
 #include "mongo/db/exec/sbe/expressions/runtime_environment.h"
 #include "mongo/db/query/stage_builder/sbe/abt/reference_tracker.h"
 #include "mongo/db/query/stage_builder/sbe/abt_lower_defs.h"
+#include "mongo/util/modules.h"
 
 namespace mongo::stage_builder::abt_lower {
 

src/mongo/db/query/stage_builder/sbe/abt_lower_defs.h

@@ -31,6 +31,7 @@
 
 #include "mongo/db/exec/sbe/values/slot.h"
 #include "mongo/db/query/stage_builder/sbe/abt/syntax/syntax.h"
+#include "mongo/util/modules.h"
 
 
 namespace mongo::stage_builder::abt_lower {

src/mongo/db/query/stage_builder/sbe/analysis.h

@@ -31,11 +31,11 @@
 
 #include "mongo/db/query/stage_builder/sbe/gen_helpers.h"
 #include "mongo/util/field_set.h"
+#include "mongo/util/modules.h"
 #include "mongo/util/string_map.h"
 
 #include <algorithm>
 #include <cstddef>
-#include <cstdint>
 #include <memory>
 #include <string>
 #include <vector>

src/mongo/db/query/stage_builder/sbe/builder.h

@@ -30,11 +30,6 @@
 #pragma once
 
 #include "mongo/base/string_data.h"
-#include "mongo/bson/ordering.h"
-#include "mongo/db/exec/plan_stats.h"
-#include "mongo/db/exec/sbe/expressions/expression.h"
-#include "mongo/db/exec/sbe/stages/collection_helpers.h"
-#include "mongo/db/exec/sbe/stages/plan_stats.h"
 #include "mongo/db/exec/sbe/stages/stages.h"
 #include "mongo/db/exec/sbe/values/value.h"
 #include "mongo/db/exec/trial_period_utils.h"
@@ -45,14 +40,12 @@
 #include "mongo/db/query/compiler/physical_model/query_solution/query_solution.h"
 #include "mongo/db/query/multiple_collection_accessor.h"
 #include "mongo/db/query/plan_yield_policy_sbe.h"
-#include "mongo/db/query/shard_filterer_factory_interface.h"
 #include "mongo/db/query/stage_builder/sbe/analysis.h"
 #include "mongo/db/query/stage_builder/sbe/builder_data.h"
 #include "mongo/db/query/stage_builder/sbe/gen_helpers.h"
-#include "mongo/db/query/stage_builder/sbe/type_signature.h"
 #include "mongo/db/query/stage_builder/stage_builder.h"
-#include "mongo/db/storage/key_string/key_string.h"
 #include "mongo/util/assert_util.h"
+#include "mongo/util/modules.h"
 #include "mongo/util/str.h"
 
 #include <algorithm>
@@ -63,7 +56,6 @@
 #include <string>
 #include <type_traits>
 #include <utility>
-#include <variant>
 #include <vector>
 
 #include <absl/container/flat_hash_map.h>

src/mongo/db/query/stage_builder/sbe/builder_data.h

@@ -34,14 +34,13 @@
 #include "mongo/db/exec/sbe/expressions/runtime_environment.h"
 #include "mongo/db/exec/sbe/in_list.h"
 #include "mongo/db/exec/sbe/values/slot.h"
-#include "mongo/db/matcher/expression.h"
 #include "mongo/db/namespace_string.h"
 #include "mongo/db/query/collation/collator_interface.h"
 #include "mongo/db/query/compiler/metadata/index_entry.h"
 #include "mongo/db/query/compiler/optimizer/index_bounds_builder/interval_evaluation_tree.h"
 #include "mongo/db/query/plan_cache/plan_cache_debug_info.h"
 #include "mongo/stdx/unordered_map.h"
-#include "mongo/util/string_listset.h"
+#include "mongo/util/modules.h"
 
 namespace mongo::stage_builder {
 

src/mongo/db/query/stage_builder/sbe/builder_state.h

@@ -31,8 +31,7 @@
 
 #include "mongo/db/exec/sbe/values/slot.h"
 #include "mongo/db/query/plan_yield_policy_sbe.h"
-
-#include <memory>
+#include "mongo/util/modules.h"
 
 #include <absl/container/flat_hash_map.h>
 #include <absl/container/flat_hash_set.h>

src/mongo/db/query/stage_builder/sbe/expression_const_eval.h

@@ -35,6 +35,7 @@
 #include "mongo/db/query/stage_builder/sbe/abt/reference_tracker.h"
 #include "mongo/db/query/stage_builder/sbe/abt/syntax/expr.h"
 #include "mongo/db/query/stage_builder/sbe/abt/syntax/syntax.h"
+#include "mongo/util/modules.h"
 
 #include <cstddef>
 #include <vector>

src/mongo/db/query/stage_builder/sbe/gen_abt_helpers.cpp

@@ -29,19 +29,9 @@
 
 #include "mongo/db/query/stage_builder/sbe/gen_abt_helpers.h"
 
-#include "mongo/bson/bsontypes.h"
-#include "mongo/db/query/algebra/polyvalue.h"
-#include "mongo/db/query/bson_typemask.h"
-#include "mongo/db/query/stage_builder/sbe/abt_defs.h"
-#include "mongo/util/assert_util.h"
+#include "mongo/db/query/query_feature_flags_gen.h"
 
-#include <algorithm>
 #include <cstddef>
-#include <cstdint>
-#include <iterator>
-#include <limits>
-#include <numeric>
-
 
 namespace mongo::stage_builder {
 abt::ABT makeVariable(abt::ProjectionName var) {

src/mongo/db/query/stage_builder/sbe/gen_abt_helpers.h

@@ -29,14 +29,12 @@
 
 #pragma once
 
-#include "mongo/base/error_codes.h"
 #include "mongo/base/string_data.h"
-#include "mongo/db/exec/sbe/values/slot.h"
 #include "mongo/db/exec/sbe/values/value.h"
 #include "mongo/db/query/stage_builder/sbe/abt/comparison_op.h"
 #include "mongo/db/query/stage_builder/sbe/abt/syntax/expr.h"
 #include "mongo/db/query/stage_builder/sbe/abt/syntax/syntax.h"
-#include "mongo/db/query/stage_builder/sbe/sbexpr.h"
+#include "mongo/util/modules.h"
 
 #include <utility>
 #include <vector>

src/mongo/db/query/stage_builder/sbe/gen_accumulator.h

@@ -33,6 +33,7 @@
 #include "mongo/db/pipeline/accumulation_statement.h"
 #include "mongo/db/query/stage_builder/sbe/gen_helpers.h"
 #include "mongo/db/query/stage_builder/sbe/sbexpr.h"
+#include "mongo/util/modules.h"
 
 #include <memory>
 #include <vector>

src/mongo/db/query/stage_builder/sbe/gen_coll_scan.cpp

@@ -30,8 +30,6 @@
 
 #include "mongo/db/query/stage_builder/sbe/gen_coll_scan.h"
 
-#include "mongo/base/error_codes.h"
-#include "mongo/base/string_data.h"
 #include "mongo/db/exec/collection_scan_common.h"
 #include "mongo/db/exec/sbe/expressions/runtime_environment.h"
 #include "mongo/db/exec/sbe/stages/scan.h"
@@ -44,11 +42,9 @@
 #include "mongo/db/query/stage_builder/sbe/builder.h"
 #include "mongo/db/query/stage_builder/sbe/gen_filter.h"
 #include "mongo/db/query/stage_builder/sbe/sbexpr_helpers.h"
-#include "mongo/db/repl/optime.h"
 #include "mongo/db/storage/record_store.h"
 #include "mongo/db/storage/recovery_unit.h"
 #include "mongo/util/assert_util.h"
-#include "mongo/util/str.h"
 
 #include <cstddef>
 #include <tuple>

src/mongo/db/query/stage_builder/sbe/gen_coll_scan.h

@@ -32,6 +32,7 @@
 #include "mongo/db/local_catalog/collection.h"
 #include "mongo/db/query/compiler/physical_model/query_solution/query_solution.h"
 #include "mongo/db/query/stage_builder/sbe/gen_helpers.h"
+#include "mongo/util/modules.h"
 
 #include <string>
 #include <utility>

src/mongo/db/query/stage_builder/sbe/gen_expression.cpp

@@ -50,14 +50,10 @@
 #include "mongo/db/pipeline/expression_walker.h"
 #include "mongo/db/pipeline/field_path.h"
 #include "mongo/db/pipeline/variables.h"
-#include "mongo/db/query/algebra/polyvalue.h"
 #include "mongo/db/query/bson_typemask.h"
 #include "mongo/db/query/datetime/date_time_support.h"
 #include "mongo/db/query/expression_walker.h"
 #include "mongo/db/query/stage_builder/sbe/abt/comparison_op.h"
-#include "mongo/db/query/stage_builder/sbe/abt/syntax/expr.h"
-#include "mongo/db/query/stage_builder/sbe/abt/syntax/syntax.h"
-#include "mongo/db/query/stage_builder/sbe/abt_defs.h"
 #include "mongo/db/query/stage_builder/sbe/builder.h"
 #include "mongo/db/query/stage_builder/sbe/gen_helpers.h"
 #include "mongo/db/query/stage_builder/sbe/sbexpr_helpers.h"
@@ -70,7 +66,6 @@
 #include <iterator>
 #include <limits>
 #include <map>
-#include <numeric>
 #include <stack>
 #include <string>
 #include <utility>

src/mongo/db/query/stage_builder/sbe/gen_expression.h

@@ -32,6 +32,7 @@
 #include "mongo/db/exec/sbe/values/value.h"
 #include "mongo/db/pipeline/expression.h"
 #include "mongo/db/query/stage_builder/sbe/sbexpr.h"
+#include "mongo/util/modules.h"
 
 #include <boost/optional/optional.hpp>
 

src/mongo/db/query/stage_builder/sbe/gen_extract_field_paths.h

@@ -29,6 +29,7 @@
 
 #include "mongo/db/query/stage_builder/sbe/builder.h"
 #include "mongo/db/query/stage_builder/sbe/gen_helpers.h"
+#include "mongo/util/modules.h"
 
 namespace mongo::stage_builder {
 

src/mongo/db/query/stage_builder/sbe/gen_filter.h

@@ -35,6 +35,7 @@
 #include "mongo/db/matcher/expression_leaf.h"
 #include "mongo/db/matcher/expression_visitor.h"
 #include "mongo/db/query/stage_builder/sbe/gen_helpers.h"
+#include "mongo/util/modules.h"
 
 #include <utility>
 

src/mongo/db/query/stage_builder/sbe/gen_helpers.cpp

@@ -35,9 +35,7 @@
 #include <boost/none.hpp>
 #include <boost/optional/optional.hpp>
 // IWYU pragma: no_include "ext/alloc_traits.h"
-#include "mongo/bson/bsonobjbuilder.h"
 #include "mongo/bson/bsontypes.h"
-#include "mongo/db/exec/sbe/expressions/expression.h"
 #include "mongo/db/index/index_access_method.h"
 #include "mongo/db/index/multikey_paths.h"
 #include "mongo/db/index/preallocated_container_pool.h"
@@ -65,9 +63,7 @@
 #include "mongo/logv2/log.h"
 #include "mongo/util/decorable.h"
 #include "mongo/util/shared_buffer_fragment.h"
-#include "mongo/util/stacktrace.h"
 #include "mongo/util/str.h"
-#include "mongo/util/time_support.h"
 
 #include <algorithm>
 

src/mongo/db/query/stage_builder/sbe/gen_helpers.h

@@ -45,13 +45,13 @@
 #include "mongo/db/query/compiler/logical_model/projection/projection_ast.h"
 #include "mongo/db/query/compiler/logical_model/sort_pattern/sort_pattern.h"
 #include "mongo/db/query/compiler/physical_model/query_solution/stage_types.h"
-#include "mongo/db/query/stage_builder/sbe/abt/comparison_op.h"
 #include "mongo/db/query/stage_builder/sbe/builder_state.h"
 #include "mongo/db/query/stage_builder/sbe/sbexpr.h"
 #include "mongo/db/repl/oplog.h"
 #include "mongo/db/storage/index_entry_comparison.h"
 #include "mongo/db/storage/key_string/key_string.h"
 #include "mongo/util/assert_util.h"
+#include "mongo/util/modules.h"
 #include "mongo/util/string_map.h"
 
 #include <cstddef>

src/mongo/db/query/stage_builder/sbe/gen_index_scan.h

@@ -39,6 +39,7 @@
 #include "mongo/db/query/compiler/physical_model/query_solution/stage_types.h"
 #include "mongo/db/query/stage_builder/sbe/gen_helpers.h"
 #include "mongo/db/storage/key_string/key_string.h"
+#include "mongo/util/modules.h"
 
 #include <memory>
 #include <string>

src/mongo/db/query/stage_builder/sbe/gen_projection.h

@@ -33,6 +33,7 @@
 #include "mongo/db/exec/sbe/values/value.h"
 #include "mongo/db/query/compiler/logical_model/projection/projection.h"
 #include "mongo/db/query/stage_builder/sbe/analysis.h"
+#include "mongo/util/modules.h"
 
 namespace mongo::stage_builder {
 class PlanStageSlots;

src/mongo/db/query/stage_builder/sbe/gen_window_function.h

@@ -32,6 +32,7 @@
 #include "mongo/db/pipeline/window_function/window_function_statement.h"
 #include "mongo/db/query/stage_builder/sbe/gen_accumulator.h"
 #include "mongo/db/query/stage_builder/sbe/gen_helpers.h"
+#include "mongo/util/modules.h"
 
 namespace mongo::stage_builder {
 struct WindowOpInfo;

src/mongo/db/query/stage_builder/sbe/sbexpr.h

@@ -32,11 +32,10 @@
 #include "mongo/db/exec/sbe/expressions/expression.h"
 #include "mongo/db/exec/sbe/stages/hash_agg_accumulator.h"
 #include "mongo/db/exec/sbe/values/slot.h"
-#include "mongo/db/pipeline/accumulator.h"
-#include "mongo/db/query/stage_builder/sbe/abt/syntax/expr.h"
 #include "mongo/db/query/stage_builder/sbe/abt/syntax/syntax.h"
 #include "mongo/db/query/stage_builder/sbe/abt_defs.h"
 #include "mongo/db/query/stage_builder/sbe/type_signature.h"
+#include "mongo/util/modules.h"
 
 #include <variant>
 #include <vector>

src/mongo/db/query/stage_builder/sbe/sbexpr_helpers.h

@@ -35,6 +35,7 @@
 #include "mongo/db/exec/sbe/values/cell_interface.h"
 #include "mongo/db/query/stage_builder/sbe/builder_state.h"
 #include "mongo/db/query/stage_builder/sbe/sbexpr.h"
+#include "mongo/util/modules.h"
 
 namespace mongo::stage_builder {
 inline void makeSbExprOptSbSlotVecHelper(SbExprOptSlotVector& result) {}

src/mongo/db/query/stage_builder/sbe/type_checker.h

@@ -33,6 +33,7 @@
 #include "mongo/db/query/stage_builder/sbe/abt/syntax/syntax.h"
 #include "mongo/db/query/stage_builder/sbe/type_signature.h"
 #include "mongo/stdx/unordered_map.h"
+#include "mongo/util/modules.h"
 
 #include <cstddef>
 #include <list>

src/mongo/db/query/stage_builder/sbe/type_signature.h

@@ -30,6 +30,7 @@
 #pragma once
 
 #include "mongo/db/exec/sbe/values/value.h"
+#include "mongo/util/modules.h"
 
 namespace mongo::stage_builder {
 

src/mongo/db/query/stage_builder/sbe/value_lifetime.h

@@ -32,6 +32,7 @@
 #include "mongo/db/query/stage_builder/sbe/abt/syntax/expr.h"
 #include "mongo/db/query/stage_builder/sbe/abt/syntax/syntax.h"
 #include "mongo/stdx/unordered_map.h"
+#include "mongo/util/modules.h"
 
 namespace mongo::stage_builder {
 

src/mongo/db/query/stage_builder/sbe/vectorizer.h

@@ -34,6 +34,7 @@
 #include "mongo/db/query/stage_builder/sbe/sbexpr.h"
 #include "mongo/db/query/stage_builder/sbe/type_signature.h"
 #include "mongo/stdx/unordered_map.h"
+#include "mongo/util/modules.h"
 
 #include <list>