diff options
Diffstat (limited to 'src/mongo/db')
26 files changed, 58 insertions, 64 deletions
diff --git a/src/mongo/db/auth/security_file.cpp b/src/mongo/db/auth/security_file.cpp index 8f2d103c7b5..9539eb958c0 100644 --- a/src/mongo/db/auth/security_file.cpp +++ b/src/mongo/db/auth/security_file.cpp @@ -27,20 +27,17 @@ * it in the license file. */ -#include "mongo/platform/basic.h" - -#include "mongo/db/auth/security_key.h" #include <algorithm> #include <string> #include <sys/stat.h> #include <vector> +#include <yaml-cpp/yaml.h> #include "mongo/base/status_with.h" +#include "mongo/db/auth/security_key.h" #include "mongo/util/str.h" -#include "yaml-cpp/yaml.h" - namespace mongo { namespace { std::string stripString(const std::string& filename, const std::string& str) { diff --git a/src/mongo/db/exec/geo_near.cpp b/src/mongo/db/exec/geo_near.cpp index 03347fc9302..d8341637222 100644 --- a/src/mongo/db/exec/geo_near.cpp +++ b/src/mongo/db/exec/geo_near.cpp @@ -30,13 +30,11 @@ #include "mongo/db/exec/geo_near.h" -#include "mongo/logv2/log.h" +#include <algorithm> #include <memory> +#include <third_party/s2/s2regionintersection.h> // For s2 search #include <vector> -// For s2 search -#include "third_party/s2/s2regionintersection.h" - #include "mongo/db/bson/dotted_path_support.h" #include "mongo/db/exec/document_value/value.h" #include "mongo/db/exec/fetch.h" @@ -47,8 +45,8 @@ #include "mongo/db/matcher/expression.h" #include "mongo/db/query/expression_index.h" #include "mongo/db/query/expression_index_knobs_gen.h" +#include "mongo/logv2/log.h" -#include <algorithm> #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kQuery diff --git a/src/mongo/db/exec/geo_near.h b/src/mongo/db/exec/geo_near.h index d29d7536bea..eb1b9bbf859 100644 --- a/src/mongo/db/exec/geo_near.h +++ b/src/mongo/db/exec/geo_near.h @@ -29,6 +29,8 @@ #pragma once +#include <third_party/s2/s2cellunion.h> + #include "mongo/db/exec/index_scan.h" #include "mongo/db/exec/near.h" #include "mongo/db/exec/plan_stats.h" @@ -40,7 +42,7 @@ #include "mongo/db/matcher/expression.h" #include "mongo/db/matcher/expression_geo.h" #include "mongo/db/query/index_bounds.h" -#include "third_party/s2/s2cellunion.h" + namespace mongo { diff --git a/src/mongo/db/exec/working_set.h b/src/mongo/db/exec/working_set.h index 31b7e82ab78..13688799b3b 100644 --- a/src/mongo/db/exec/working_set.h +++ b/src/mongo/db/exec/working_set.h @@ -29,7 +29,7 @@ #pragma once -#include "boost/optional.hpp" +#include <boost/optional.hpp> #include <vector> #include "mongo/db/exec/document_value/document.h" diff --git a/src/mongo/db/fle_crud.h b/src/mongo/db/fle_crud.h index 290bf4a7742..eb58ceadb7a 100644 --- a/src/mongo/db/fle_crud.h +++ b/src/mongo/db/fle_crud.h @@ -29,10 +29,9 @@ #pragma once +#include <boost/smart_ptr/intrusive_ptr.hpp> #include <cstdint> -#include "boost/smart_ptr/intrusive_ptr.hpp" - #include "mongo/bson/bsonobj.h" #include "mongo/bson/oid.h" #include "mongo/crypto/fle_crypto.h" diff --git a/src/mongo/db/fle_crud_test.cpp b/src/mongo/db/fle_crud_test.cpp index a24ef102902..3267433a989 100644 --- a/src/mongo/db/fle_crud_test.cpp +++ b/src/mongo/db/fle_crud_test.cpp @@ -27,17 +27,15 @@ * it in the license file. */ -#include "mongo/platform/basic.h" #include <algorithm> #include <array> +#include <boost/smart_ptr/intrusive_ptr.hpp> #include <string> #include <third_party/murmurhash3/MurmurHash3.h> #include <unordered_map> #include <vector> -#include "boost/smart_ptr/intrusive_ptr.hpp" - #include "mongo/base/data_range.h" #include "mongo/base/error_codes.h" #include "mongo/base/string_data.h" diff --git a/src/mongo/db/fts/stemmer.h b/src/mongo/db/fts/stemmer.h index e3608071010..3294e9e1d97 100644 --- a/src/mongo/db/fts/stemmer.h +++ b/src/mongo/db/fts/stemmer.h @@ -30,9 +30,11 @@ #pragma once +#include <third_party/libstemmer_c/include/libstemmer.h> + #include "mongo/base/string_data.h" #include "mongo/db/fts/fts_language.h" -#include "third_party/libstemmer_c/include/libstemmer.h" + namespace mongo { diff --git a/src/mongo/db/geo/big_polygon.h b/src/mongo/db/geo/big_polygon.h index e7a38ecaf0e..af64ef7c0f4 100644 --- a/src/mongo/db/geo/big_polygon.h +++ b/src/mongo/db/geo/big_polygon.h @@ -29,15 +29,15 @@ #pragma once +#include <third_party/s2/s2cap.h> +#include <third_party/s2/s2cell.h> +#include <third_party/s2/s2loop.h> +#include <third_party/s2/s2polygon.h> +#include <third_party/s2/s2polyline.h> +#include <third_party/s2/s2region.h> #include <vector> #include "mongo/db/geo/s2.h" -#include "third_party/s2/s2cap.h" -#include "third_party/s2/s2cell.h" -#include "third_party/s2/s2loop.h" -#include "third_party/s2/s2polygon.h" -#include "third_party/s2/s2polyline.h" -#include "third_party/s2/s2region.h" namespace mongo { diff --git a/src/mongo/db/geo/geometry_container.h b/src/mongo/db/geo/geometry_container.h index 849996e9244..aa9bd0c15de 100644 --- a/src/mongo/db/geo/geometry_container.h +++ b/src/mongo/db/geo/geometry_container.h @@ -30,11 +30,12 @@ #pragma once #include <string> +#include <third_party/s2/s2regionunion.h> #include "mongo/base/clonable_ptr.h" #include "mongo/db/bson/dotted_path_support.h" #include "mongo/db/geo/shapes.h" -#include "third_party/s2/s2regionunion.h" + namespace mongo { diff --git a/src/mongo/db/geo/geoparser.cpp b/src/mongo/db/geo/geoparser.cpp index 893d7832b18..3d2694c4c5d 100644 --- a/src/mongo/db/geo/geoparser.cpp +++ b/src/mongo/db/geo/geoparser.cpp @@ -33,6 +33,7 @@ #include <cmath> #include <memory> #include <string> +#include <third_party/s2/s2polygonbuilder.h> #include <vector> #include "mongo/db/bson/dotted_path_support.h" @@ -40,7 +41,6 @@ #include "mongo/db/jsobj.h" #include "mongo/util/str.h" #include "mongo/util/transitional_tools_do_not_use/vector_spooling.h" -#include "third_party/s2/s2polygonbuilder.h" #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kGeo diff --git a/src/mongo/db/geo/s2.h b/src/mongo/db/geo/s2.h index d497eb7d67f..3f1b77158d5 100644 --- a/src/mongo/db/geo/s2.h +++ b/src/mongo/db/geo/s2.h @@ -38,7 +38,7 @@ #pragma GCC diagnostic ignored "-Wmismatched-tags" #endif -#include "third_party/s2/s2.h" +#include <third_party/s2/s2.h> #ifdef __clang__ #pragma GCC diagnostic pop diff --git a/src/mongo/db/geo/shapes.h b/src/mongo/db/geo/shapes.h index 9bfa711adb4..30a75a4e574 100644 --- a/src/mongo/db/geo/shapes.h +++ b/src/mongo/db/geo/shapes.h @@ -31,17 +31,17 @@ #include <cmath> #include <string> +#include <third_party/s2/s2cap.h> +#include <third_party/s2/s2cell.h> +#include <third_party/s2/s2latlng.h> +#include <third_party/s2/s2polygon.h> +#include <third_party/s2/s2polyline.h> #include <vector> #include "mongo/base/clonable_ptr.h" #include "mongo/db/geo/big_polygon.h" #include "mongo/db/geo/s2.h" #include "mongo/db/jsobj.h" -#include "third_party/s2/s2cap.h" -#include "third_party/s2/s2cell.h" -#include "third_party/s2/s2latlng.h" -#include "third_party/s2/s2polygon.h" -#include "third_party/s2/s2polyline.h" #ifndef M_PI #define M_PI 3.14159265358979323846 diff --git a/src/mongo/db/index/expression_keys_private.cpp b/src/mongo/db/index/expression_keys_private.cpp index 5463cc9de8d..8f8d857c9c3 100644 --- a/src/mongo/db/index/expression_keys_private.cpp +++ b/src/mongo/db/index/expression_keys_private.cpp @@ -30,6 +30,8 @@ #include "mongo/db/index/expression_keys_private.h" +#include <third_party/s2/s2cell.h> +#include <third_party/s2/s2regioncoverer.h> #include <utility> #include "mongo/bson/bsonelement_comparator_interface.h" @@ -53,9 +55,6 @@ #include "mongo/util/assert_util.h" #include "mongo/util/str.h" -#include "third_party/s2/s2cell.h" -#include "third_party/s2/s2regioncoverer.h" - #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kIndex diff --git a/src/mongo/db/index/expression_params.cpp b/src/mongo/db/index/expression_params.cpp index ddd7a500056..5464b628a4c 100644 --- a/src/mongo/db/index/expression_params.cpp +++ b/src/mongo/db/index/expression_params.cpp @@ -29,6 +29,8 @@ #include "mongo/db/index/expression_params.h" +#include <third_party/s2/s2.h> + #include "mongo/bson/util/bson_extract.h" #include "mongo/db/geo/geoconstants.h" #include "mongo/db/hasher.h" @@ -36,7 +38,6 @@ #include "mongo/db/index/s2_common.h" #include "mongo/db/index_names.h" #include "mongo/util/str.h" -#include "third_party/s2/s2.h" namespace mongo { diff --git a/src/mongo/db/index/s2_bucket_key_generator_test.cpp b/src/mongo/db/index/s2_bucket_key_generator_test.cpp index 11a3515a6a2..b73bf0fb010 100644 --- a/src/mongo/db/index/s2_bucket_key_generator_test.cpp +++ b/src/mongo/db/index/s2_bucket_key_generator_test.cpp @@ -28,17 +28,13 @@ */ -#include "mongo/platform/basic.h" - -#include "mongo/db/index/expression_keys_private.h" - #include <algorithm> - -#include "third_party/s2/s2cell.h" -#include "third_party/s2/s2latlng.h" +#include <third_party/s2/s2cell.h> +#include <third_party/s2/s2latlng.h> #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/simple_bsonobj_comparator.h" +#include "mongo/db/index/expression_keys_private.h" #include "mongo/db/index/expression_params.h" #include "mongo/db/index/s2_common.h" #include "mongo/db/json.h" diff --git a/src/mongo/db/index/s2_common.cpp b/src/mongo/db/index/s2_common.cpp index 5b9ac7e005f..fe4ab60c1bd 100644 --- a/src/mongo/db/index/s2_common.cpp +++ b/src/mongo/db/index/s2_common.cpp @@ -30,12 +30,12 @@ #include "mongo/db/index/s2_common.h" #include <cstdlib> +#include <third_party/s2/s2cellid.h> +#include <third_party/s2/s2regioncoverer.h> #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/geo/geometry_container.h" #include "mongo/db/query/collation/collator_interface.h" -#include "third_party/s2/s2cellid.h" -#include "third_party/s2/s2regioncoverer.h" namespace mongo { diff --git a/src/mongo/db/matcher/expression_internal_bucket_geo_within.cpp b/src/mongo/db/matcher/expression_internal_bucket_geo_within.cpp index 860384bf102..b76c2f85c58 100644 --- a/src/mongo/db/matcher/expression_internal_bucket_geo_within.cpp +++ b/src/mongo/db/matcher/expression_internal_bucket_geo_within.cpp @@ -29,8 +29,9 @@ #include <boost/optional.hpp> - -#include "mongo/platform/basic.h" +#include <third_party/s2/s2cellid.h> +#include <third_party/s2/s2cellunion.h> +#include <third_party/s2/s2regioncoverer.h> #include "mongo/bson/bsonobj.h" #include "mongo/db/bson/dotted_path_support.h" @@ -39,9 +40,6 @@ #include "mongo/db/pipeline/field_path.h" #include "mongo/db/timeseries/timeseries_constants.h" -#include "third_party/s2/s2cellid.h" -#include "third_party/s2/s2cellunion.h" -#include "third_party/s2/s2regioncoverer.h" namespace mongo { constexpr StringData InternalBucketGeoWithinMatchExpression::kName; diff --git a/src/mongo/db/query/expression_index.cpp b/src/mongo/db/query/expression_index.cpp index 5ca2dfce2d1..450a3bdf561 100644 --- a/src/mongo/db/query/expression_index.cpp +++ b/src/mongo/db/query/expression_index.cpp @@ -31,6 +31,9 @@ #include "mongo/db/query/expression_index.h" #include <iostream> +#include <third_party/s2/s2cellid.h> +#include <third_party/s2/s2region.h> +#include <third_party/s2/s2regioncoverer.h> #include <unordered_set> #include "mongo/db/geo/geoconstants.h" @@ -39,9 +42,6 @@ #include "mongo/db/index/expression_params.h" #include "mongo/db/query/expression_index_knobs_gen.h" #include "mongo/logv2/log.h" -#include "third_party/s2/s2cellid.h" -#include "third_party/s2/s2region.h" -#include "third_party/s2/s2regioncoverer.h" #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kQuery diff --git a/src/mongo/db/query/index_bounds_builder.cpp b/src/mongo/db/query/index_bounds_builder.cpp index d87cd5f1667..8cc114cad35 100644 --- a/src/mongo/db/query/index_bounds_builder.cpp +++ b/src/mongo/db/query/index_bounds_builder.cpp @@ -32,6 +32,8 @@ #include <cmath> #include <limits> +#include <third_party/s2/s2cell.h> +#include <third_party/s2/s2regioncoverer.h> #include "mongo/base/string_data.h" #include "mongo/bson/bsontypes.h" @@ -52,8 +54,6 @@ #include "mongo/db/query/planner_wildcard_helpers.h" #include "mongo/db/query/query_knobs_gen.h" #include "mongo/logv2/log.h" -#include "third_party/s2/s2cell.h" -#include "third_party/s2/s2regioncoverer.h" #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kQuery diff --git a/src/mongo/db/query/optimizer/bool_expression.h b/src/mongo/db/query/optimizer/bool_expression.h index 502c161a565..b6dd517c203 100644 --- a/src/mongo/db/query/optimizer/bool_expression.h +++ b/src/mongo/db/query/optimizer/bool_expression.h @@ -30,7 +30,7 @@ #pragma once -#include "boost/optional.hpp" +#include <boost/optional.hpp> #include <vector> #include "mongo/db/query/optimizer/algebra/operator.h" diff --git a/src/mongo/db/query/serialization_options.h b/src/mongo/db/query/serialization_options.h index 301617a8768..9ab6fbc1c33 100644 --- a/src/mongo/db/query/serialization_options.h +++ b/src/mongo/db/query/serialization_options.h @@ -29,8 +29,9 @@ #pragma once +#include <boost/optional.hpp> + #include "mongo/base/string_data.h" -#include "third_party/boost/boost/optional.hpp" namespace mongo { diff --git a/src/mongo/db/repl/tenant_file_importer_service.h b/src/mongo/db/repl/tenant_file_importer_service.h index 95184f68618..6741aa11519 100644 --- a/src/mongo/db/repl/tenant_file_importer_service.h +++ b/src/mongo/db/repl/tenant_file_importer_service.h @@ -29,7 +29,7 @@ #pragma once -#include "boost/optional/optional.hpp" +#include <boost/optional/optional.hpp> #include "mongo/client/dbclient_connection.h" #include "mongo/db/operation_context.h" diff --git a/src/mongo/db/s/migration_batch_inserter.h b/src/mongo/db/s/migration_batch_inserter.h index 47f8a598e74..342a713d55b 100644 --- a/src/mongo/db/s/migration_batch_inserter.h +++ b/src/mongo/db/s/migration_batch_inserter.h @@ -27,7 +27,10 @@ * it in the license file. */ -#include "boost/optional/optional.hpp" +#pragma once + +#include <boost/optional/optional.hpp> + #include "mongo/bson/bsonobjbuilder.h" #include "mongo/db/cancelable_operation_context.h" #include "mongo/db/catalog/document_validation.h" @@ -47,8 +50,6 @@ #include "mongo/s/grid.h" #include "mongo/util/uuid.h" -#pragma once - namespace mongo { // The purpose of this type is to allow inserters to communicate diff --git a/src/mongo/db/s/sharding_runtime_d_params.h b/src/mongo/db/s/sharding_runtime_d_params.h index 49838a2ca6c..7dc3c253343 100644 --- a/src/mongo/db/s/sharding_runtime_d_params.h +++ b/src/mongo/db/s/sharding_runtime_d_params.h @@ -29,7 +29,8 @@ #pragma once -#include "fmt/core.h" +#include <fmt/core.h> + #include "mongo/base/status.h" #include "mongo/db/commands/test_commands_enabled.h" #include "mongo/s/sharding_feature_flags_gen.h" diff --git a/src/mongo/db/timeseries/timeseries_dotted_path_support.h b/src/mongo/db/timeseries/timeseries_dotted_path_support.h index fa2ebba941b..b9a35b8cb3e 100644 --- a/src/mongo/db/timeseries/timeseries_dotted_path_support.h +++ b/src/mongo/db/timeseries/timeseries_dotted_path_support.h @@ -29,7 +29,7 @@ #pragma once -#include "boost/any.hpp" +#include <boost/any.hpp> #include <cstddef> #include "mongo/bson/bsonelement_comparator_interface.h" diff --git a/src/mongo/db/update/document_diff_calculator.h b/src/mongo/db/update/document_diff_calculator.h index f1850a34e03..6eb5b603c49 100644 --- a/src/mongo/db/update/document_diff_calculator.h +++ b/src/mongo/db/update/document_diff_calculator.h @@ -29,7 +29,7 @@ #pragma once -#include "boost/dynamic_bitset.hpp" +#include <boost/dynamic_bitset.hpp> #include "mongo/bson/bsonobj.h" #include "mongo/db/update/document_diff_serialization.h" |