diff options
| author | Tausif Rahman <tausif.rahman@mongodb.com> | 2022-05-24 22:55:22 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-05-25 17:40:16 +0000 |
| commit | 9ea1d6f0419938770eea612479c75838f75752b7 (patch) | |
| tree | 26b57fa102878dba3251b40f7ddf9c50ab8b275a /src/mongo/db | |
| parent | 3ad805fea14b2f1d5c5a367f6ec05ece93502f32 (diff) | |
| download | mongo-9ea1d6f0419938770eea612479c75838f75752b7.tar.gz | |
SERVER-66490 Apply pylinters to build system code
Diffstat (limited to 'src/mongo/db')
36 files changed, 317 insertions, 348 deletions
diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript index 1cdea6aa03b..1943337fcdc 100644 --- a/src/mongo/db/SConscript +++ b/src/mongo/db/SConscript @@ -77,7 +77,7 @@ env.Library( ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/catalog/collection_uuid_mismatch_info', - ] + ], ) env.Library( @@ -94,7 +94,7 @@ env.Library( '$BUILD_DIR/mongo/db/auth/security_token', '$BUILD_DIR/mongo/idl/feature_flag', 'server_feature_flags', - ] + ], ) env.Library( @@ -117,7 +117,6 @@ env.Library( ], ) - env.Library( target="dbmessage", source=[ @@ -127,7 +126,7 @@ env.Library( '$BUILD_DIR/mongo/db/server_options_core', '$BUILD_DIR/mongo/transport/transport_layer_common', '$BUILD_DIR/mongo/util/net/network', - ] + ], ) env.Library( @@ -139,7 +138,7 @@ env.Library( '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/client/authentication', '$BUILD_DIR/mongo/util/net/ssl_manager', - ] + ], ) env.Library( @@ -152,7 +151,7 @@ env.Library( '$BUILD_DIR/mongo/db/repl/repl_settings', '$BUILD_DIR/mongo/util/processinfo', 'startup_warnings_common', - ] + ], ) env.Library( @@ -169,7 +168,6 @@ env.Library( target='curop', source=[ 'curop.cpp', - ], LIBDEPS=[ '$BUILD_DIR/mongo/bson/mutable/mutable_bson', @@ -180,8 +178,8 @@ env.Library( '$BUILD_DIR/mongo/db/stats/timer_stats', '$BUILD_DIR/mongo/rpc/client_metadata', '$BUILD_DIR/mongo/transport/service_executor', - '$BUILD_DIR/mongo/util/diagnostic_info' if get_option( - 'use-diagnostic-latches') == 'on' else [], + '$BUILD_DIR/mongo/util/diagnostic_info' + if get_option('use-diagnostic-latches') == 'on' else [], '$BUILD_DIR/mongo/util/fail_point', '$BUILD_DIR/mongo/util/net/network', '$BUILD_DIR/mongo/util/progress_meter', @@ -216,7 +214,7 @@ env.Library( LIBDEPS=[ '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/commands/test_commands_enabled', - ] + ], ) env.Library( @@ -227,7 +225,7 @@ env.Library( LIBDEPS=[ '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/util/md5', - ] + ], ) # Range arithmetic library, used by both mongod and mongos @@ -270,7 +268,7 @@ env.Library( env.Library( target='update_index_data', source=[ - 'update_index_data.cpp' + 'update_index_data.cpp', ], LIBDEPS=[ 'common', @@ -289,7 +287,7 @@ env.Library( ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/index_names', - ] + ], ) env.Library( @@ -445,7 +443,7 @@ env.Library( 'global_settings', 'server_options_base', 'server_options_servers', - ] + ], ) env.Library( @@ -475,8 +473,8 @@ env.Library( 'read_write_concern_provenance', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/db/server_options_core', # For serverGlobalParams - ] + '$BUILD_DIR/mongo/db/server_options_core', # For serverGlobalParams + ], ) env.Library( @@ -524,14 +522,14 @@ env.Library( env.Library( target='change_stream_change_collection_manager', source=[ - 'change_stream_change_collection_manager.cpp' + 'change_stream_change_collection_manager.cpp', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/catalog/catalog_helpers', "$BUILD_DIR/mongo/db/catalog/clustered_collection_options", '$BUILD_DIR/mongo/db/dbhelpers', '$BUILD_DIR/mongo/db/service_context', - ] + ], ) env.Library( @@ -776,7 +774,7 @@ env.Library( '$BUILD_DIR/mongo/idl/feature_flag', '$BUILD_DIR/mongo/idl/server_parameter', 'server_options_core', - ] + ], ) env.Library( @@ -786,7 +784,7 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/idl/feature_flag', - ] + ], ) env.Library( @@ -802,7 +800,7 @@ env.Library( LIBDEPS_PRIVATE=[ 'internal_transactions_feature_flag', 'service_context', - ] + ], ) env.Library( @@ -822,7 +820,7 @@ env.Library( '$BUILD_DIR/mongo/db/catalog/local_oplog_info', '$BUILD_DIR/mongo/db/s/sharding_api_d', 'multitenancy', - ] + ], ) env.Library( @@ -871,7 +869,7 @@ env.Library( 'stats/top', 'stats/transaction_stats', 'update/update_driver', - ] + ], ) env.Library( @@ -902,7 +900,7 @@ env.Library( target='fle_crud', source=[ 'fle_crud.cpp', - 'query/fle/server_rewrite.cpp' + 'query/fle/server_rewrite.cpp', ], LIBDEPS=[ '$BUILD_DIR/mongo/crypto/encrypted_field_config', @@ -1325,7 +1323,7 @@ env.Library( LIBDEPS_PRIVATE=[ "commands/server_status_core", "curop", - ] + ], ) env.Library( @@ -1445,7 +1443,7 @@ env.Library( 'commands/server_status_core', 'service_context', 'write_ops', - ] + ], ) env.Library( @@ -1460,7 +1458,8 @@ env.Library( '$BUILD_DIR/mongo/db/catalog/clustered_collection_options', '$BUILD_DIR/mongo/db/query/collation/collator_interface', '$BUILD_DIR/mongo/db/storage/key_string', - ],) + ], +) env.Library( target='query_exec', @@ -1839,7 +1838,7 @@ env.Library( LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/s/sharding_api_d', 'internal_transactions_feature_flag', - ] + ], ) env.Library( @@ -1946,7 +1945,7 @@ env.Library( ], LIBDEPS_PRIVATE=[ 'session_catalog', - 'transaction' + 'transaction', ], ) @@ -2027,7 +2026,7 @@ env.Library( ], LIBDEPS=[ 'logical_time', - 'time_proof_service' + 'time_proof_service', ], ) @@ -2104,7 +2103,7 @@ env.Library( target='vector_clock_mongod', source=[ 's/topology_time_ticker.cpp', - 'vector_clock_mongod.cpp' + 'vector_clock_mongod.cpp', ], LIBDEPS=[ 'vector_clock_mutable', @@ -2353,7 +2352,7 @@ env.Library( env.Program( target="mongotrafficreader", source=[ - "traffic_reader_main.cpp" + "traffic_reader_main.cpp", ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -2372,11 +2371,10 @@ env.Library( '$BUILD_DIR/mongo/base', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/util/net/ssl_options_server' if get_option( - 'ssl') == 'on' else '', + '$BUILD_DIR/mongo/util/net/ssl_options_server' if get_option('ssl') == 'on' else '', '$BUILD_DIR/mongo/util/options_parser/options_parser', 'mongod_options', - ] + ], ) env.Library( @@ -2399,8 +2397,8 @@ env.Library( '$BUILD_DIR/mongo/util/clock_sources', '$BUILD_DIR/mongo/util/elapsed_tracker', '$BUILD_DIR/mongo/util/fail_point', - '$BUILD_DIR/mongo/util/latch_analyzer' if get_option( - 'use-diagnostic-latches') == 'on' else [], + '$BUILD_DIR/mongo/util/latch_analyzer' + if get_option('use-diagnostic-latches') == 'on' else [], '$BUILD_DIR/mongo/util/net/network', '$BUILD_DIR/mongo/util/ntservice', '$BUILD_DIR/mongo/util/options_parser/options_parser_init', @@ -2526,8 +2524,8 @@ env.Library( '$BUILD_DIR/mongo/transport/transport_layer_manager', '$BUILD_DIR/mongo/util/cmdline_utils/cmdline_utils', '$BUILD_DIR/mongo/util/concurrency/thread_pool', - '$BUILD_DIR/mongo/util/latch_analyzer' if get_option( - 'use-diagnostic-latches') == 'on' else [], + '$BUILD_DIR/mongo/util/latch_analyzer' + if get_option('use-diagnostic-latches') == 'on' else [], '$BUILD_DIR/mongo/util/net/http_client_impl', '$BUILD_DIR/mongo/util/net/ssl_manager', '$BUILD_DIR/mongo/util/signal_handlers', @@ -2605,16 +2603,15 @@ if env.TargetOSIs('windows'): ('@mongo_version_patch@', version_parts[2]), ('@mongo_version_extra@', version_parts[3]), ('@mongo_version_extra_str@', version_extra), - ]) + ], + ) env.Alias('generated-sources', generatedDbManifest) env.Depends("mongod.res", generatedDbManifest) env.Program( target="mongod", - source=[ - 'mongod.cpp' - ] + env.WindowsResourceFile("mongod.rc"), + source=['mongod.cpp'] + env.WindowsResourceFile("mongod.rc"), LIBDEPS=[ # NOTE: Do not add new libdeps (public or private) here unless # required by the linker to satisfy symbol dependencies from diff --git a/src/mongo/db/auth/SConscript b/src/mongo/db/auth/SConscript index a2bcc5b3295..3df9d6922f2 100644 --- a/src/mongo/db/auth/SConscript +++ b/src/mongo/db/auth/SConscript @@ -87,7 +87,7 @@ env.Library( '$BUILD_DIR/mongo/db/op_observer_util', '$BUILD_DIR/mongo/db/repl/oplog_entry', 'auth', - ] + ], ) env.Library( @@ -120,7 +120,7 @@ env.Library( '$BUILD_DIR/mongo/db/db_raii', '$BUILD_DIR/mongo/db/multitenancy', 'auth_types', - ] + ], ) env.Library( @@ -208,7 +208,7 @@ env.Library( ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/api_parameters', - '$BUILD_DIR/mongo/db/audit', # audit:logLogout in AuthZSession. + '$BUILD_DIR/mongo/db/audit', # audit:logLogout in AuthZSession. '$BUILD_DIR/mongo/db/stats/counters', '$BUILD_DIR/mongo/idl/server_parameter', '$BUILD_DIR/mongo/util/caching', @@ -304,7 +304,7 @@ env.Library( "$BUILD_DIR/mongo/util/net/ssl_manager", "$BUILD_DIR/mongo/util/net/ssl_parameters_auth", 'cluster_auth_mode', - 'security_key' + 'security_key', ], LIBDEPS=[ '$BUILD_DIR/mongo/db/server_options_core', @@ -407,7 +407,7 @@ env.Library( 'sasl_options.idl', ], LIBDEPS=[ - 'sasl_options' + 'sasl_options', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/util/net/network', @@ -466,7 +466,7 @@ env.Library( 'authz_session_external_state_s.cpp', 'user_cache_invalidator_job.cpp', 'user_cache_invalidator_job_parameters.idl', - ], + ], LIBDEPS=[ '$BUILD_DIR/mongo/base', ], @@ -513,7 +513,7 @@ env.Library( source=[ 'ldap_operation_stats.cpp', 'ldap_cumulative_operation_stats.cpp', - 'user_cache_acquisition_stats.cpp' + 'user_cache_acquisition_stats.cpp', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/base', diff --git a/src/mongo/db/catalog/SConscript b/src/mongo/db/catalog/SConscript index 3fbdbcd6dcb..debf1c0f2cf 100644 --- a/src/mongo/db/catalog/SConscript +++ b/src/mongo/db/catalog/SConscript @@ -25,7 +25,7 @@ env.Library( '$BUILD_DIR/mongo/db/namespace_string', '$BUILD_DIR/mongo/idl/basic_types', '$BUILD_DIR/mongo/idl/idl_parser', - '$BUILD_DIR/mongo/idl/server_parameter' + '$BUILD_DIR/mongo/idl/server_parameter', ], ) @@ -126,7 +126,7 @@ env.Library( '$BUILD_DIR/mongo/db/index/index_access_method', '$BUILD_DIR/mongo/db/storage/key_string', 'validate_state', - ] + ], ) env.Library( @@ -144,7 +144,7 @@ env.Library( '$BUILD_DIR/mongo/db/storage/storage_repair_observer', 'index_repair', 'multi_index_block', - ] + ], ) env.Library( @@ -218,7 +218,7 @@ env.Library( 'collection', 'collection_catalog', 'collection_query_info', - ] + ], ) env.Library( @@ -271,7 +271,7 @@ env.Library( 'collection_query_info', 'index_build_block', 'index_catalog', - ] + ], ) env.Library( @@ -294,7 +294,7 @@ env.Library( '$BUILD_DIR/mongo/db/views/views', '$BUILD_DIR/mongo/idl/server_parameter', 'collection', - ] + ], ) env.Benchmark( @@ -327,9 +327,7 @@ env.Library( env.Library( target="validate_state", - source=[ - "validate_state.cpp" - ], + source=["validate_state.cpp"], LIBDEPS_PRIVATE=[ "$BUILD_DIR/mongo/base", "$BUILD_DIR/mongo/db/catalog_raii", @@ -341,7 +339,7 @@ env.Library( "database_holder", "index_catalog", "throttle_cursor", - ] + ], ) env.Library( @@ -418,7 +416,7 @@ env.Library( '$BUILD_DIR/mongo/db/multitenancy', '$BUILD_DIR/mongo/db/views/views', 'database_holder', - ] + ], ) env.Library( @@ -448,7 +446,7 @@ env.Library( 'index_key_validate', 'throttle_cursor', 'validate_state', - ] + ], ) env.Library( diff --git a/src/mongo/db/catalog/util/SConscript b/src/mongo/db/catalog/util/SConscript index e6f8b00c3c9..7431dcb165e 100644 --- a/src/mongo/db/catalog/util/SConscript +++ b/src/mongo/db/catalog/util/SConscript @@ -6,9 +6,6 @@ env = env.Clone() env.CppUnitTest( target='db_catalog_util_test', - source=[ - 'partitioned_test.cpp' - ], - LIBDEPS=[ - ] + source=['partitioned_test.cpp'], + LIBDEPS=[], ) diff --git a/src/mongo/db/commands/SConscript b/src/mongo/db/commands/SConscript index b1aaa872559..adddad9dfd7 100644 --- a/src/mongo/db/commands/SConscript +++ b/src/mongo/db/commands/SConscript @@ -15,7 +15,7 @@ env.Library( LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/idl/server_parameter', "server_status_core", - ] + ], ) env.Library( @@ -27,7 +27,7 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/base', - ] + ], ) env.Library( @@ -190,7 +190,7 @@ env.Library( 'feature_compatibility_parsers', 'server_status', 'test_commands_enabled', - ] + ], ) env.Library( @@ -200,7 +200,7 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/db/read_write_concern_defaults', - ] + ], ) env.Library( @@ -219,7 +219,7 @@ env.Library( '$BUILD_DIR/mongo/rpc/client_metadata', '$BUILD_DIR/mongo/util/net/ssl_manager', 'test_commands_enabled', - ] + ], ) env.Library( @@ -235,7 +235,7 @@ env.Library( '$BUILD_DIR/mongo/db/curop', '$BUILD_DIR/mongo/db/storage/backup_cursor_hooks', 'fsync_locked', - ] + ], ) env.Library( @@ -262,8 +262,7 @@ env.Library( source=[ 'fsync_locked.cpp', ], - LIBDEPS=[ - ], + LIBDEPS=[], ) env.Library( @@ -618,7 +617,7 @@ env.Library( LIBDEPS=[ '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/s/write_ops/cluster_write_ops', - 'cluster_server_parameter_cmds_idl' + 'cluster_server_parameter_cmds_idl', ], ) @@ -641,7 +640,7 @@ env.Library( env.Library( target='current_op_common', source=[ - 'current_op_common.cpp' + 'current_op_common.cpp', ], LIBDEPS=[ '$BUILD_DIR/mongo/db/commands', @@ -651,7 +650,7 @@ env.Library( '$BUILD_DIR/mongo/db/pipeline/aggregation_request_helper', '$BUILD_DIR/mongo/db/query/command_request_response', '$BUILD_DIR/mongo/db/service_context', - 'test_commands_enabled' + 'test_commands_enabled', ], ) @@ -701,7 +700,7 @@ env.Library( '$BUILD_DIR/mongo/db/serverless/serverless_types_idl', '$BUILD_DIR/mongo/idl/feature_flag', '$BUILD_DIR/mongo/idl/idl_parser', - ] + ], ) env.Library( target='txn_cmd_request', @@ -713,7 +712,7 @@ env.Library( '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/auth/authprivilege', '$BUILD_DIR/mongo/idl/idl_parser', - ] + ], ) env.Library( @@ -725,7 +724,7 @@ env.Library( LIBDEPS=[ '$BUILD_DIR/mongo/db/write_concern_options', '$BUILD_DIR/mongo/idl/idl_parser', - ] + ], ) env.Library( @@ -734,16 +733,13 @@ env.Library( 'map_reduce_agg.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/db/commands/servers', - '$BUILD_DIR/mongo/db/db_raii', + '$BUILD_DIR/mongo/db/commands/servers', '$BUILD_DIR/mongo/db/db_raii', '$BUILD_DIR/mongo/db/index/index_access_methods', '$BUILD_DIR/mongo/db/pipeline/process_interface/mongo_process_interface', '$BUILD_DIR/mongo/db/pipeline/process_interface/mongod_process_interface_factory', - '$BUILD_DIR/mongo/db/query/map_reduce_output_format', - '$BUILD_DIR/mongo/db/query_exec', - '$BUILD_DIR/mongo/idl/idl_parser', - 'map_reduce_parser' - ] + '$BUILD_DIR/mongo/db/query/map_reduce_output_format', '$BUILD_DIR/mongo/db/query_exec', + '$BUILD_DIR/mongo/idl/idl_parser', 'map_reduce_parser' + ], ) env.CppUnitTest( diff --git a/src/mongo/db/concurrency/SConscript b/src/mongo/db/concurrency/SConscript index 916d353bf05..26403ec4a90 100644 --- a/src/mongo/db/concurrency/SConscript +++ b/src/mongo/db/concurrency/SConscript @@ -92,7 +92,8 @@ env.Benchmark( ], LIBDEPS=[ 'lock_manager', - ]) + ], +) env.CppUnitTest( target='db_concurrency_test', @@ -112,5 +113,5 @@ env.CppUnitTest( '$BUILD_DIR/mongo/util/progress_meter', 'exception_util', 'lock_manager', - ] + ], ) diff --git a/src/mongo/db/cst/SConscript b/src/mongo/db/cst/SConscript index 16f5a25932f..09c46385bf1 100644 --- a/src/mongo/db/cst/SConscript +++ b/src/mongo/db/cst/SConscript @@ -22,7 +22,7 @@ env.Library( '$BUILD_DIR/mongo/db/pipeline/pipeline', '$BUILD_DIR/mongo/db/pipeline/variable_validation', '$BUILD_DIR/mongo/db/query/datetime/date_time_support', - ] + ], ) env.CppUnitTest( @@ -43,7 +43,7 @@ env.CppUnitTest( '$BUILD_DIR/mongo/db/matcher/expressions_mongod_only', '$BUILD_DIR/mongo/db/query/query_test_service_context', 'cst', - ] + ], ) env.CppUnitTest( @@ -56,7 +56,7 @@ env.CppUnitTest( LIBDEPS=[ '$BUILD_DIR/mongo/db/query/query_test_service_context', 'cst', - ] + ], ) # Disabled under SERVER-64949. # env.Benchmark( diff --git a/src/mongo/db/exec/SConscript b/src/mongo/db/exec/SConscript index c2caf69f0f2..b2368e49830 100644 --- a/src/mongo/db/exec/SConscript +++ b/src/mongo/db/exec/SConscript @@ -16,11 +16,11 @@ env.SConscript( # WorkingSet target and associated test env.Library( - target = "working_set", - source = [ + target="working_set", + source=[ "working_set.cpp", ], - LIBDEPS = [ + LIBDEPS=[ "$BUILD_DIR/mongo/base", "$BUILD_DIR/mongo/db/bson/dotted_path_support", "$BUILD_DIR/mongo/db/service_context", @@ -29,21 +29,21 @@ env.Library( ) env.Library( - target = "scoped_timer", - source = [ + target="scoped_timer", + source=[ "scoped_timer.cpp", ], - LIBDEPS = [ + LIBDEPS=[ '$BUILD_DIR/mongo/util/net/network', ], ) env.Library( - target = "js_function", - source = [ + target="js_function", + source=[ "js_function.cpp", ], - LIBDEPS = [ + LIBDEPS=[ '$BUILD_DIR/mongo/db/auth/auth', '$BUILD_DIR/mongo/db/query/query_knobs', '$BUILD_DIR/mongo/db/service_context', @@ -52,15 +52,15 @@ env.Library( ) env.Library( - target = "bucket_unpacker", - source = [ + target="bucket_unpacker", + source=[ "bucket_unpacker.cpp", ], - LIBDEPS = [ + LIBDEPS=[ "$BUILD_DIR/mongo/db/matcher/expressions", "document_value/document_value", ], - LIBDEPS_PRIVATE = [ + LIBDEPS_PRIVATE=[ "$BUILD_DIR/mongo/bson/util/bson_column", "$BUILD_DIR/mongo/db/timeseries/timeseries_options", ], @@ -95,17 +95,17 @@ env.Library( 'inclusion_projection_executor.cpp', 'projection_executor_builder.cpp', 'projection_executor_utils.cpp', - 'projection_node.cpp' + 'projection_node.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/db/matcher/expressions' + '$BUILD_DIR/mongo/db/matcher/expressions', ], ) env.Library( target='stagedebug_cmd', source=[ - 'stagedebug_cmd.cpp' + 'stagedebug_cmd.cpp', ], LIBDEPS=[ "$BUILD_DIR/mongo/db/index/index_access_methods", @@ -139,7 +139,7 @@ env.CppUnitTest( ], LIBDEPS=[ "$BUILD_DIR/mongo/base", - "$BUILD_DIR/mongo/bson/util/bson_column", + "$BUILD_DIR/mongo/bson/util/bson_column", "$BUILD_DIR/mongo/db/auth/authmocks", "$BUILD_DIR/mongo/db/query/collation/collator_factory_mock", "$BUILD_DIR/mongo/db/query/collation/collator_interface_mock", diff --git a/src/mongo/db/exec/document_value/SConscript b/src/mongo/db/exec/document_value/SConscript index 41e729f9a4c..cce805bac71 100644 --- a/src/mongo/db/exec/document_value/SConscript +++ b/src/mongo/db/exec/document_value/SConscript @@ -10,14 +10,14 @@ env.Library( 'document_metadata_fields.cpp', 'value.cpp', 'value_comparator.cpp', - ], + ], LIBDEPS=[ '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/pipeline/field_path', '$BUILD_DIR/mongo/db/query/datetime/date_time_support', '$BUILD_DIR/mongo/util/intrusive_counter', - ] - ) + ], +) env.Library( target='document_value_test_util', diff --git a/src/mongo/db/exec/sbe/SConscript b/src/mongo/db/exec/sbe/SConscript index c2731874467..6a2503d7f26 100644 --- a/src/mongo/db/exec/sbe/SConscript +++ b/src/mongo/db/exec/sbe/SConscript @@ -6,11 +6,11 @@ env.Library( target='query_sbe_plan_stats', source=[ 'stages/plan_stats.cpp', - ], + ], LIBDEPS=[ '$BUILD_DIR/mongo/base', - ] - ) + ], +) env.Library( target='query_sbe_values', @@ -29,7 +29,7 @@ env.Library( '$BUILD_DIR/mongo/db/query/query_index_bounds', '$BUILD_DIR/mongo/db/storage/key_string', '$BUILD_DIR/mongo/util/regex_util', - ] + ], ) sbeEnv = env.Clone() @@ -50,19 +50,19 @@ sbeEnv.Library( 'vm/arith.cpp', 'vm/datetime.cpp', 'vm/vm.cpp', - ], + ], LIBDEPS=[ '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/mongohasher', '$BUILD_DIR/mongo/db/storage/record_store_base', '$BUILD_DIR/third_party/shim_snappy', 'query_sbe_values', - ], + ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/bson/dotted_path_support', '$BUILD_DIR/mongo/db/sorter/sorter_idl', - ] - ) + ], +) sbeEnv.Library( target='query_sbe_stages', @@ -87,7 +87,7 @@ sbeEnv.Library( 'stages/union.cpp', 'stages/unique.cpp', 'stages/unwind.cpp', - ], + ], LIBDEPS=[ '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/concurrency/lock_manager', @@ -103,14 +103,14 @@ sbeEnv.Library( '$BUILD_DIR/third_party/shim_snappy', 'query_sbe_plan_stats', 'query_sbe_values', - ], + ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/bson/dotted_path_support', '$BUILD_DIR/mongo/db/sorter/sorter_idl', 'query_sbe', 'query_sbe_storage', - ] - ) + ], +) env.Library( target='query_sbe_storage', @@ -119,27 +119,25 @@ env.Library( 'stages/column_scan.cpp', 'stages/ix_scan.cpp', 'stages/scan.cpp', - ], + ], LIBDEPS=[ - '$BUILD_DIR/mongo/db/db_raii', - '$BUILD_DIR/mongo/db/index/index_access_method', - '$BUILD_DIR/mongo/db/storage/execution_context', - 'query_sbe' - ] - ) + '$BUILD_DIR/mongo/db/db_raii', '$BUILD_DIR/mongo/db/index/index_access_method', + '$BUILD_DIR/mongo/db/storage/execution_context', 'query_sbe' + ], +) env.Library( target='query_sbe_abt', source=[ 'abt/abt_lower.cpp', - ], + ], LIBDEPS=[ '$BUILD_DIR/mongo/db/query/optimizer/optimizer', 'query_sbe', 'query_sbe_stages', 'query_sbe_storage', - ] - ) + ], +) env.Library( target='sbe_plan_stage_test', @@ -216,7 +214,7 @@ env.CppUnitTest( 'values/slot_printer_test.cpp', 'values/value_serialization_test.cpp', "values/value_test.cpp", - 'values/write_value_to_stream_test.cpp' + 'values/write_value_to_stream_test.cpp', ], LIBDEPS=[ '$BUILD_DIR/mongo/db/auth/authmocks', @@ -233,15 +231,15 @@ env.Library( target='sbe_abt_test_util', source=[ 'abt/sbe_abt_test_util.cpp', - ], + ], LIBDEPS=[ - "$BUILD_DIR/mongo/db/auth/authmocks", - '$BUILD_DIR/mongo/db/query/query_test_service_context', - '$BUILD_DIR/mongo/db/query_exec', - '$BUILD_DIR/mongo/db/service_context_test_fixture', - 'query_sbe_abt', - ] - ) + "$BUILD_DIR/mongo/db/auth/authmocks", + '$BUILD_DIR/mongo/db/query/query_test_service_context', + '$BUILD_DIR/mongo/db/query_exec', + '$BUILD_DIR/mongo/db/service_context_test_fixture', + 'query_sbe_abt', + ], +) env.CppUnitTest( target='sbe_abt_test', @@ -251,6 +249,6 @@ env.CppUnitTest( ], LIBDEPS=[ '$BUILD_DIR/mongo/unittest/unittest', - 'sbe_abt_test_util' + 'sbe_abt_test_util', ], ) diff --git a/src/mongo/db/free_mon/SConscript b/src/mongo/db/free_mon/SConscript index c1fe6d83627..949e1cc31ae 100644 --- a/src/mongo/db/free_mon/SConscript +++ b/src/mongo/db/free_mon/SConscript @@ -68,7 +68,6 @@ else: ], ) - fmEnv.CppUnitTest( target='db_free_mon_test', source=[ diff --git a/src/mongo/db/ftdc/SConscript b/src/mongo/db/ftdc/SConscript index 72a96523195..ccbb8d4d8e3 100644 --- a/src/mongo/db/ftdc/SConscript +++ b/src/mongo/db/ftdc/SConscript @@ -21,14 +21,14 @@ ftdcEnv.Library( 'file_reader.cpp', 'file_writer.cpp', 'util.cpp', - 'varint.cpp' + 'varint.cpp', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/bson/util/bson_extract', '$BUILD_DIR/mongo/db/server_options_core', '$BUILD_DIR/mongo/db/service_context', - '$BUILD_DIR/third_party/s2/s2', # For VarInt + '$BUILD_DIR/third_party/s2/s2', # For VarInt '$BUILD_DIR/third_party/shim_zlib', ], ) @@ -51,7 +51,7 @@ env.Library( '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/commands', '$BUILD_DIR/mongo/util/processinfo', - 'ftdc' + 'ftdc', ] + platform_libs, LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/idl/server_parameter', @@ -77,7 +77,7 @@ env.Library( '$BUILD_DIR/mongo/db/auth/authprivilege', '$BUILD_DIR/mongo/db/storage/storage_options', '$BUILD_DIR/mongo/idl/server_parameter', - 'ftdc_server' + 'ftdc_server', ], ) diff --git a/src/mongo/db/fts/SConscript b/src/mongo/db/fts/SConscript index c6ceb5abb4d..a7a6f125c42 100644 --- a/src/mongo/db/fts/SConscript +++ b/src/mongo/db/fts/SConscript @@ -31,14 +31,18 @@ stop_word_languages = [ 'turkish', ] -generateStopWordsList = env.Command( [ "stop_words_list.h", "stop_words_list.cpp"], - [ "generate_stop_words.py"] + [ 'stop_words_%s.txt' % x for x in stop_word_languages ], - "$PYTHON $SOURCES $TARGETS" ) +generateStopWordsList = env.Command( + ["stop_words_list.h", "stop_words_list.cpp"], + ["generate_stop_words.py"] + ['stop_words_%s.txt' % x for x in stop_word_languages], + "$PYTHON $SOURCES $TARGETS", +) env.Alias('generated-sources', generateStopWordsList) -baseEnv=env.Clone() +baseEnv = env.Clone() baseEnv.InjectThirdParty(libraries=['stemmer']) -baseEnv.Library('base_fts', [ +baseEnv.Library( + 'base_fts', + [ 'fts_index_format.cpp', 'fts_matcher.cpp', 'fts_query_impl.cpp', @@ -56,14 +60,17 @@ baseEnv.Library('base_fts', [ 'stop_words.cpp', 'stop_words_list.cpp', 'tokenizer.cpp', - ], LIBDEPS=["$BUILD_DIR/mongo/base", - "$BUILD_DIR/mongo/db/bson/dotted_path_support", - "$BUILD_DIR/mongo/db/common", - "$BUILD_DIR/mongo/db/fts/unicode/unicode", - "$BUILD_DIR/mongo/db/matcher/expressions", - "$BUILD_DIR/mongo/util/md5", - "$BUILD_DIR/third_party/shim_stemmer", - ]) + ], + LIBDEPS=[ + "$BUILD_DIR/mongo/base", + "$BUILD_DIR/mongo/db/bson/dotted_path_support", + "$BUILD_DIR/mongo/db/common", + "$BUILD_DIR/mongo/db/fts/unicode/unicode", + "$BUILD_DIR/mongo/db/matcher/expressions", + "$BUILD_DIR/mongo/util/md5", + "$BUILD_DIR/third_party/shim_stemmer", + ], +) env.Library( target='fts_query_noop', diff --git a/src/mongo/db/fts/unicode/SConscript b/src/mongo/db/fts/unicode/SConscript index 2b783364d64..1571f1403c3 100644 --- a/src/mongo/db/fts/unicode/SConscript +++ b/src/mongo/db/fts/unicode/SConscript @@ -4,36 +4,39 @@ Import("env") env = env.Clone() -env.Command( +env.Command( target="codepoints_casefold.cpp", source=[ "gen_casefold_map.py", "#/src/third_party/unicode-8.0.0/CaseFolding.txt", "gen_helper.py", ], - action="$PYTHON ${SOURCES[0]} ${SOURCES[1]} $TARGETS") + action="$PYTHON ${SOURCES[0]} ${SOURCES[1]} $TARGETS", +) env.Alias('generated-sources', "codepoints_casefold.cpp") -env.Command( +env.Command( target="codepoints_delimiter_list.cpp", source=[ "gen_delimiter_list.py", "#/src/third_party/unicode-8.0.0/PropList.txt", "gen_helper.py", ], - action="$PYTHON ${SOURCES[0]} ${SOURCES[1]} $TARGETS") + action="$PYTHON ${SOURCES[0]} ${SOURCES[1]} $TARGETS", +) env.Alias('generated-sources', "codepoints_delimiter_list.cpp") -env.Command( +env.Command( target="codepoints_diacritic_list.cpp", source=[ "gen_diacritic_list.py", "#/src/third_party/unicode-8.0.0/PropList.txt", "gen_helper.py", ], - action="$PYTHON ${SOURCES[0]} ${SOURCES[1]} $TARGETS") + action="$PYTHON ${SOURCES[0]} ${SOURCES[1]} $TARGETS", +) env.Alias('generated-sources', "codepoints_diacritic_list.cpp") @@ -49,7 +52,7 @@ env.Library( LIBDEPS=[ '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/shell/linenoise_utf8', - ] + ], ) env.CppUnitTest( diff --git a/src/mongo/db/geo/SConscript b/src/mongo/db/geo/SConscript index 1a32eefac8a..e43299f0d2a 100644 --- a/src/mongo/db/geo/SConscript +++ b/src/mongo/db/geo/SConscript @@ -7,33 +7,23 @@ env = env.Clone() # Core geometry shape libraries env.Library( target="geometry", - source=[ - "hash.cpp", - "shapes.cpp", - "big_polygon.cpp", - "r2_region_coverer.cpp" - ], + source=["hash.cpp", "shapes.cpp", "big_polygon.cpp", "r2_region_coverer.cpp"], LIBDEPS=[ - "$BUILD_DIR/mongo/base", - "$BUILD_DIR/mongo/db/common", - "$BUILD_DIR/mongo/db/storage/key_string", - "$BUILD_DIR/third_party/s2/s2" - ] + "$BUILD_DIR/mongo/base", "$BUILD_DIR/mongo/db/common", + "$BUILD_DIR/mongo/db/storage/key_string", "$BUILD_DIR/third_party/s2/s2" + ], ) # Geometry / BSON parsing and wrapping env.Library( target="geoparser", - source=[ - "geoparser.cpp", - "geometry_container.cpp" - ], + source=["geoparser.cpp", "geometry_container.cpp"], LIBDEPS=[ "$BUILD_DIR/mongo/base", "$BUILD_DIR/mongo/db/bson/dotted_path_support", "$BUILD_DIR/third_party/s2/s2", "geometry", - ] + ], ) env.CppUnitTest( @@ -48,5 +38,5 @@ env.CppUnitTest( "$BUILD_DIR/mongo/db/common", "geometry", "geoparser", - ] + ], ) diff --git a/src/mongo/db/index/SConscript b/src/mongo/db/index/SConscript index b8e2be6c825..9ccff04ff89 100644 --- a/src/mongo/db/index/SConscript +++ b/src/mongo/db/index/SConscript @@ -60,10 +60,7 @@ env.Benchmark( env.Library( target='expression_params', - source=[ - 'expression_params.cpp', - 's2_common.cpp' - ], + source=['expression_params.cpp', 's2_common.cpp'], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/bson/util/bson_extract', @@ -73,7 +70,7 @@ env.Library( '$BUILD_DIR/mongo/db/query/collation/collator_interface', '$BUILD_DIR/mongo/db/storage/key_string', '$BUILD_DIR/third_party/s2/s2', - ] + ], ) env.Library( @@ -145,7 +142,7 @@ env.Library( 'columnar_index', 'expression_params', 'key_generator', - ] + ], ) env.Library( @@ -155,7 +152,7 @@ env.Library( ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/base', - ] + ], ) env.CppUnitTest( diff --git a/src/mongo/db/matcher/SConscript b/src/mongo/db/matcher/SConscript index 4d484b0fadb..a53845a04f4 100644 --- a/src/mongo/db/matcher/SConscript +++ b/src/mongo/db/matcher/SConscript @@ -8,7 +8,7 @@ env.Library( target='path', source=[ 'path.cpp', - 'path_internal.cpp' + 'path_internal.cpp', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', diff --git a/src/mongo/db/ops/SConscript b/src/mongo/db/ops/SConscript index 999ff2b85fe..0b736897acc 100644 --- a/src/mongo/db/ops/SConscript +++ b/src/mongo/db/ops/SConscript @@ -79,7 +79,7 @@ env.Library( source='parsed_update.cpp', LIBDEPS=[ '$BUILD_DIR/mongo/db/update/update_driver', - 'parsed_update_array_filters' + 'parsed_update_array_filters', ], ) diff --git a/src/mongo/db/pipeline/SConscript b/src/mongo/db/pipeline/SConscript index ddde981fbb9..c1cf7801e29 100644 --- a/src/mongo/db/pipeline/SConscript +++ b/src/mongo/db/pipeline/SConscript @@ -17,9 +17,9 @@ env.SConscript( env.Library( target='change_stream_pre_and_post_images_options', source=[ - 'change_stream_pre_and_post_images_options.idl' + 'change_stream_pre_and_post_images_options.idl', ], - LIBDEPS=[ + LIBDEPS=[ '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/idl/idl_parser', ], @@ -46,21 +46,21 @@ env.Library( 'aggregation_request_helper', 'expression_context', 'pipeline', - ] + ], ) env.Library( target='field_path', source=[ 'field_path.cpp', - ], + ], LIBDEPS=[ '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/query/query_knobs', '$BUILD_DIR/mongo/db/server_options', '$BUILD_DIR/mongo/idl/feature_flag', - ] - ) + ], +) env.Library( target='aggregation_request_helper', @@ -80,7 +80,7 @@ env.Library( '$BUILD_DIR/mongo/db/write_concern_options', '$BUILD_DIR/mongo/idl/idl_parser', 'document_sources_idl', - ] + ], ) env.Library( @@ -90,7 +90,7 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/base', - ] + ], ) env.Library( target='expression_context', @@ -135,11 +135,11 @@ env.Library( target='dependencies', source=[ 'dependencies.cpp', - ], + ], LIBDEPS=[ '$BUILD_DIR/mongo/db/exec/document_value/document_value', 'field_path', - ] + ], ) env.Library( @@ -169,7 +169,7 @@ env.Library( 'window_function/window_function_integral.cpp', 'window_function/window_function_shift.cpp', 'window_function/window_function_sum.cpp', - ], + ], LIBDEPS=[ '$BUILD_DIR/mongo/db/exec/document_value/document_value', '$BUILD_DIR/mongo/db/query/query_knobs', @@ -179,9 +179,8 @@ env.Library( 'field_path', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/db/exec/sort_executor', - '$BUILD_DIR/mongo/db/index/key_generator' - ] + '$BUILD_DIR/mongo/db/exec/sort_executor', '$BUILD_DIR/mongo/db/index/key_generator' + ], ) env.Library( @@ -190,12 +189,12 @@ env.Library( 'granularity_rounder.cpp', 'granularity_rounder_powers_of_two.cpp', 'granularity_rounder_preferred_numbers.cpp', - ], + ], LIBDEPS=[ '$BUILD_DIR/mongo/db/exec/document_value/document_value', 'expression_context', 'field_path', - ] + ], ) env.Library( @@ -203,11 +202,11 @@ env.Library( source=[ 'document_source_mock.cpp', 'process_interface/stub_lookup_single_document_process_interface.cpp', - ], + ], LIBDEPS=[ '$BUILD_DIR/mongo/db/query/query_test_service_context', 'pipeline', - ] + ], ) env.Library( @@ -227,12 +226,12 @@ env.Library( source=[ 'lite_parsed_document_source.cpp', 'lite_parsed_pipeline.cpp', - ], + ], LIBDEPS=[ '$BUILD_DIR/mongo/db/query/common_query_enums_and_helpers', '$BUILD_DIR/mongo/db/stats/counters', 'aggregation_request_helper', - ] + ], ) env.Library( @@ -391,7 +390,7 @@ pipelineEnv.Library( '$BUILD_DIR/mongo/db/timeseries/timeseries_conversion_util', '$BUILD_DIR/mongo/db/timeseries/timeseries_options', '$BUILD_DIR/mongo/rpc/command_status', - ] + ], ) env.Library( @@ -441,7 +440,6 @@ env.Library( ], ) - env.Library( target='runtime_constants_idl', source=[ @@ -487,7 +485,7 @@ env.Library( env.Library( target='change_stream_expired_pre_image_remover', source=[ - 'change_stream_expired_pre_image_remover.cpp' + 'change_stream_expired_pre_image_remover.cpp', ], LIBDEPS=[ '$BUILD_DIR/mongo/db/change_stream_options_manager', @@ -499,13 +497,13 @@ env.Library( '$BUILD_DIR/mongo/db/repl/storage_interface', '$BUILD_DIR/mongo/util/periodic_runner', 'change_stream_preimage', - ] + ], ) env.Library( target='change_stream_pre_image_helpers', source=[ - 'change_stream_pre_image_helpers.cpp' + 'change_stream_pre_image_helpers.cpp', ], LIBDEPS=[ '$BUILD_DIR/mongo/db/service_context', @@ -516,7 +514,7 @@ env.Library( '$BUILD_DIR/mongo/db/concurrency/lock_manager_defs', '$BUILD_DIR/mongo/db/dbhelpers', '$BUILD_DIR/mongo/db/namespace_string', - ] + ], ) env.Library( @@ -527,8 +525,7 @@ env.Library( LIBDEPS=[ "change_stream_pipeline", ], - LIBDEPS_PRIVATE=[ - ], + LIBDEPS_PRIVATE=[], ) env.CppUnitTest( @@ -686,7 +683,7 @@ env.CppUnitTest( 'process_interface/mongos_process_interface', 'process_interface/shardsvr_process_interface', 'sharded_agg_helpers', - ] + ], ) env.Benchmark( diff --git a/src/mongo/db/pipeline/process_interface/SConscript b/src/mongo/db/pipeline/process_interface/SConscript index c18bde43241..1230f427a39 100644 --- a/src/mongo/db/pipeline/process_interface/SConscript +++ b/src/mongo/db/pipeline/process_interface/SConscript @@ -129,5 +129,5 @@ env.CppUnitTest( '$BUILD_DIR/mongo/s/sharding_router_test_fixture', 'mongos_process_interface', 'shardsvr_process_interface', - ] + ], ) diff --git a/src/mongo/db/query/SConscript b/src/mongo/db/query/SConscript index 1f42baff54c..38ad7e51499 100644 --- a/src/mongo/db/query/SConscript +++ b/src/mongo/db/query/SConscript @@ -12,7 +12,7 @@ env.SConscript( 'optimizer', ], exports=[ - 'env' + 'env', ], ) @@ -86,7 +86,7 @@ env.Library( LIBDEPS=[ "$BUILD_DIR/mongo/base", "$BUILD_DIR/mongo/db/matcher/expressions", - ] + ], ) env.Library( @@ -101,7 +101,7 @@ env.Library( "$BUILD_DIR/mongo/base", "$BUILD_DIR/mongo/db/exec/sbe/query_sbe", "canonical_query", - ] + ], ) env.Library( @@ -268,7 +268,7 @@ env.Library( '$BUILD_DIR/mongo/idl/feature_flag', '$BUILD_DIR/mongo/idl/server_parameter', '$BUILD_DIR/third_party/shim_pcrecpp', - ] + ], ) env.Library( @@ -281,8 +281,7 @@ env.Library( "$BUILD_DIR/mongo/db/service_context", "collation/collator_factory_mock", ], - LIBDEPS_PRIVATE=[ - ], + LIBDEPS_PRIVATE=[], ) env.Library( @@ -329,7 +328,7 @@ env.Library( '$BUILD_DIR/mongo/db/exec/document_value/document_value', '$BUILD_DIR/mongo/db/pipeline/expression_context', ], - ) +) env.Library( target="plan_yield_policy", @@ -345,7 +344,7 @@ env.Library( '$BUILD_DIR/mongo/db/concurrency/exception_util', '$BUILD_DIR/mongo/db/storage/recovery_unit_base', ], - ) +) env.CppUnitTest( target="db_query_test", diff --git a/src/mongo/db/query/ce/SConscript b/src/mongo/db/query/ce/SConscript index 8ab2ca62f51..c570a88b23f 100644 --- a/src/mongo/db/query/ce/SConscript +++ b/src/mongo/db/query/ce/SConscript @@ -12,5 +12,5 @@ env.Library( LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/exec/sbe/query_sbe_abt', '$BUILD_DIR/mongo/db/query/optimizer/optimizer', - ] -)
\ No newline at end of file + ], +) diff --git a/src/mongo/db/query/collation/SConscript b/src/mongo/db/query/collation/SConscript index 653878dc5be..79578fe98b8 100644 --- a/src/mongo/db/query/collation/SConscript +++ b/src/mongo/db/query/collation/SConscript @@ -78,8 +78,7 @@ if not use_system_version_of_library("icu"): ("U_DISABLE_RENAMING", 1), ("U_STATIC_IMPLEMENTATION", 1), ("U_USING_ICU_NAMESPACE", 0), - ], - ) + ], ) icuEnv.Library( target="collator_icu", diff --git a/src/mongo/db/query/datetime/SConscript b/src/mongo/db/query/datetime/SConscript index e8a45118d4f..6bfd4e3ed63 100644 --- a/src/mongo/db/query/datetime/SConscript +++ b/src/mongo/db/query/datetime/SConscript @@ -8,25 +8,21 @@ timeZoneEnv = env.Clone() timeZoneEnv.InjectThirdParty(libraries=['timelib']) timeZoneEnv.Library( target='date_time_support', - source=[ - 'date_time_support.cpp' - ], + source=['date_time_support.cpp'], LIBDEPS=[ '$BUILD_DIR/mongo/db/service_context', '$BUILD_DIR/third_party/shim_timelib', - ] + ], ) timeZoneEnv.Library( target='init_timezone_data', - source=[ - 'init_timezone_data.cpp' - ], + source=['init_timezone_data.cpp'], LIBDEPS=[ '$BUILD_DIR/mongo/db/server_options_core', '$BUILD_DIR/third_party/shim_timelib', 'date_time_support', - ] + ], ) timeZoneEnv.CppUnitTest( @@ -36,7 +32,7 @@ timeZoneEnv.CppUnitTest( ], LIBDEPS=[ 'date_time_support', - ] + ], ) timeZoneEnv.CppLibfuzzerTest( @@ -46,5 +42,5 @@ timeZoneEnv.CppLibfuzzerTest( ], LIBDEPS=[ 'date_time_support', - ] + ], ) diff --git a/src/mongo/db/query/optimizer/SConscript b/src/mongo/db/query/optimizer/SConscript index 6d49e5d92bd..c91ceec6cae 100644 --- a/src/mongo/db/query/optimizer/SConscript +++ b/src/mongo/db/query/optimizer/SConscript @@ -9,7 +9,7 @@ env.SConscript( "algebra", ], exports=[ - 'env' + 'env', ], ) @@ -41,7 +41,7 @@ env.Library( "utils/abt_hash.cpp", "utils/interval_utils.cpp", "utils/memo_utils.cpp", - "utils/utils.cpp" + "utils/utils.cpp", ], LIBDEPS=[ "$BUILD_DIR/mongo/db/exec/sbe/query_sbe_values", @@ -73,5 +73,5 @@ env.CppUnitTest( LIBDEPS=[ "optimizer", "unit_test_utils", - ] + ], ) diff --git a/src/mongo/db/query/optimizer/algebra/SConscript b/src/mongo/db/query/optimizer/algebra/SConscript index 0d2a48c24d3..b6a73de1e35 100644 --- a/src/mongo/db/query/optimizer/algebra/SConscript +++ b/src/mongo/db/query/optimizer/algebra/SConscript @@ -9,7 +9,5 @@ env.CppUnitTest( source=[ 'algebra_test.cpp', ], - LIBDEPS=[ - - ] + LIBDEPS=[], ) diff --git a/src/mongo/db/repl/SConscript b/src/mongo/db/repl/SConscript index f12237cf395..7f496a55383 100644 --- a/src/mongo/db/repl/SConscript +++ b/src/mongo/db/repl/SConscript @@ -14,7 +14,7 @@ env.Library( '$BUILD_DIR/mongo/client/read_preference', '$BUILD_DIR/mongo/idl/feature_flag', '$BUILD_DIR/mongo/idl/server_parameter', - ] + ], ) env.Library( @@ -24,7 +24,7 @@ env.Library( ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/base', - ] + ], ) env.Library( @@ -36,7 +36,7 @@ env.Library( LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/base', 'oplog_entry', - ] + ], ) env.Library( @@ -127,7 +127,7 @@ env.Library( ], LIBDEPS_PRIVATE=[ 'replication_auth', - ] + ], ) env.Library( @@ -173,7 +173,7 @@ env.Library( ], LIBDEPS_PRIVATE=[ 'repl_server_parameters', - ] + ], ) env.Library( @@ -296,8 +296,7 @@ env.Library( source=[ 'replication_recovery.cpp', ], - LIBDEPS=[ - ], + LIBDEPS=[], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/index_builds_coordinator_interface', @@ -389,7 +388,6 @@ env.Library( ], ) - env.Library( target='oplog_interface_local', source=[ @@ -550,7 +548,7 @@ env.Library( env.Library( target='optime_base', source=[ - 'optime_base.idl' + 'optime_base.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -626,7 +624,7 @@ env.Library( '$BUILD_DIR/mongo/db/namespace_string', 'oplog_entry', 'optime', - ] + ], ) env.Library( @@ -639,7 +637,7 @@ env.Library( LIBDEPS=[ '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/common', - '$BUILD_DIR/mongo/db/exec/document_value/document_value' + '$BUILD_DIR/mongo/db/exec/document_value/document_value', ], ) @@ -662,7 +660,7 @@ env.Library( ], LIBDEPS=[ 'replica_set_messages', - ] + ], ) env.Library( @@ -686,7 +684,7 @@ env.Library( '$BUILD_DIR/mongo/db/catalog/commit_quorum_options', '$BUILD_DIR/mongo/idl/server_parameter', 'repl_server_parameters', - ] + ], ) env.Library( @@ -816,26 +814,30 @@ env.Library( ], ) -env.Library('read_concern_args', - [ - 'read_concern_args.cpp' - ], - LIBDEPS=[ - '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/bson/util/bson_extract', - '$BUILD_DIR/mongo/db/logical_time', - '$BUILD_DIR/mongo/db/read_write_concern_provenance', - 'optime', - ]) +env.Library( + 'read_concern_args', + [ + 'read_concern_args.cpp', + ], + LIBDEPS=[ + '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/bson/util/bson_extract', + '$BUILD_DIR/mongo/db/logical_time', + '$BUILD_DIR/mongo/db/read_write_concern_provenance', + 'optime', + ], +) -env.Library('speculative_majority_read_info', - [ - 'speculative_majority_read_info.cpp' - ], - LIBDEPS=[ - '$BUILD_DIR/mongo/base', - 'optime', - ]) +env.Library( + 'speculative_majority_read_info', + [ + 'speculative_majority_read_info.cpp', + ], + LIBDEPS=[ + '$BUILD_DIR/mongo/base', + 'optime', + ], +) env.Library( target='replica_set_messages', @@ -873,7 +875,7 @@ env.Library( '$BUILD_DIR/mongo/idl/server_parameter', 'repl_server_parameters', 'split_horizon', - ] + ], ) env.Library( @@ -1027,7 +1029,7 @@ env.Library( '$BUILD_DIR/mongo/util/progress_meter', 'repl_server_parameters', 'replication_auth', - ] + ], ) env.Library( @@ -1056,7 +1058,7 @@ env.Library( '$BUILD_DIR/mongo/util/progress_meter', 'oplog', 'repl_server_parameters', - ] + ], ) env.Library( @@ -1149,7 +1151,7 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/base', - ] + ], ) env.Library( @@ -1166,7 +1168,7 @@ env.Library( LIBDEPS_PRIVATE=[ 'repl_server_parameters', 'replication_consistency_markers_impl', - ] + ], ) env.Library( @@ -1184,7 +1186,7 @@ env.Library( '$BUILD_DIR/mongo/db/namespace_string', '$BUILD_DIR/mongo/idl/idl_parser', 'read_concern_args', - ] + ], ) env.Library( @@ -1210,14 +1212,14 @@ env.Library( 'repl_sync_shared_data', 'rollback_checker', 'storage_interface', - 'tenant_migration_access_blocker' + 'tenant_migration_access_blocker', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/commands/feature_compatibility_parsers', '$BUILD_DIR/mongo/db/index_builds_coordinator_interface', '$BUILD_DIR/mongo/executor/scoped_task_executor', 'repl_server_parameters', - ] + ], ) env.Library( @@ -1401,7 +1403,7 @@ env.Library( 'tenant_migration_cloners', 'tenant_migration_state_machine_idl', 'tenant_oplog_processing', - ] + ], ) env.Library( @@ -1430,7 +1432,7 @@ env.Library( 'repl_coordinator_interface', 'tenant_migration_decoration', 'tenant_migration_errors', - 'tenant_migration_state_machine_idl' + 'tenant_migration_state_machine_idl', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/catalog/local_oplog_info', @@ -1530,7 +1532,7 @@ env.Library( 'oplog', 'oplog_entry', 'replmocks', - ] + ], ) env.Library( @@ -1611,7 +1613,7 @@ if wiredtiger: '$BUILD_DIR/mongo/util/version_impl', 'idempotency_test_fixture', 'tenant_migration_donor_service', - ] + ], ) env.CppUnitTest( @@ -1779,7 +1781,7 @@ env.CppUnitTest( 'repl_coordinator_test_fixture', 'repl_server_parameters', 'topology_coordinator', - ] + ], ) env.CppUnitTest( @@ -1793,7 +1795,7 @@ env.CppUnitTest( 'repl_coordinator_impl', 'repl_coordinator_test_fixture', 'topology_version_observer', - ] + ], ) env.Library( @@ -1960,7 +1962,7 @@ env.Library( target='tenant_oplog_processing', source=[ 'tenant_oplog_batcher.cpp', - 'tenant_oplog_applier.cpp' + 'tenant_oplog_applier.cpp', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/base', @@ -1970,7 +1972,7 @@ env.Library( 'oplog', 'oplog_application', 'oplog_application_interface', - 'repl_server_parameters' + 'repl_server_parameters', ], ) diff --git a/src/mongo/db/s/SConscript b/src/mongo/db/s/SConscript index 3d14f8ee931..d6900c40b54 100644 --- a/src/mongo/db/s/SConscript +++ b/src/mongo/db/s/SConscript @@ -36,8 +36,8 @@ env.Library( '$BUILD_DIR/mongo/s/sharding_routing_table', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/db/write_block_bypass' - ] + '$BUILD_DIR/mongo/db/write_block_bypass', + ], ) env.Library( @@ -187,7 +187,7 @@ env.Library( '$BUILD_DIR/mongo/db/repl/replica_set_aware_service', '$BUILD_DIR/mongo/db/rw_concern_d', 'sharding_api_d', - ] + ], ) env.Library( @@ -222,14 +222,14 @@ env.Library( '$BUILD_DIR/mongo/executor/task_executor_pool', '$BUILD_DIR/mongo/s/grid', 'sharding_api_d', - ] + ], ) env.Library( target='forwardable_operation_metadata', source=[ 'forwardable_operation_metadata.cpp', - 'forwardable_operation_metadata.idl' + 'forwardable_operation_metadata.idl', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -237,7 +237,7 @@ env.Library( ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/write_block_bypass', - ] + ], ) env.Library( @@ -485,7 +485,7 @@ env.Library( '$BUILD_DIR/mongo/db/pipeline/sharded_agg_helpers', '$BUILD_DIR/mongo/s/sessions_collection_sharded', '$BUILD_DIR/mongo/s/sharding_api', - ] + ], ) env.Library( @@ -676,7 +676,7 @@ env.CppUnitTest( 'topology_time_ticker_test.cpp', 'type_lockpings_test.cpp', 'type_locks_test.cpp', - 'vector_clock_config_server_test.cpp' + 'vector_clock_config_server_test.cpp', ], LIBDEPS=[ '$BUILD_DIR/mongo/db/auth/authmocks', @@ -701,7 +701,7 @@ env.Benchmark( LIBDEPS=[ '$BUILD_DIR/mongo/db/auth/authmocks', '$BUILD_DIR/mongo/db/auth/authorization_manager_global', - 'sharding_runtime_d' + 'sharding_runtime_d', ], ) diff --git a/src/mongo/db/serverless/SConscript b/src/mongo/db/serverless/SConscript index e724d78a83e..a06609a6e55 100644 --- a/src/mongo/db/serverless/SConscript +++ b/src/mongo/db/serverless/SConscript @@ -11,7 +11,7 @@ env.Library( LIBDEPS=[ '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/idl/basic_types', - '$BUILD_DIR/mongo/idl/idl_parser' + '$BUILD_DIR/mongo/idl/idl_parser', ], ) @@ -24,7 +24,7 @@ env.Library( '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/client/connection_string', '$BUILD_DIR/mongo/db/repl/tenant_migration_utils', - '$BUILD_DIR/mongo/idl/idl_parser' + '$BUILD_DIR/mongo/idl/idl_parser', ], ) @@ -42,20 +42,20 @@ env.Library( '$BUILD_DIR/mongo/db/repl/tenant_migration_utils', '$BUILD_DIR/mongo/idl/idl_parser', 'shard_split_donor_service', - ] + ], ) env.Library( target='shard_split_utils', source=[ - 'shard_split_utils.cpp' + 'shard_split_utils.cpp', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/concurrency/exception_util', '$BUILD_DIR/mongo/db/dbhelpers', '$BUILD_DIR/mongo/db/repl/replica_set_messages', 'shard_split_state_machine', - ] + ], ) env.Library( @@ -78,8 +78,8 @@ env.Library( '$BUILD_DIR/mongo/db/namespace_string', '$BUILD_DIR/mongo/db/repl/oplog', '$BUILD_DIR/mongo/db/repl/tenant_migration_access_blocker', - 'shard_split_utils' - ] + 'shard_split_utils', + ], ) env.CppUnitTest( @@ -99,5 +99,5 @@ env.CppUnitTest( '$BUILD_DIR/mongo/dbtests/mocklib', 'shard_split_donor_service', 'shard_split_utils', - ] + ], ) diff --git a/src/mongo/db/sorter/SConscript b/src/mongo/db/sorter/SConscript index ae8184f222d..fc796b9319f 100644 --- a/src/mongo/db/sorter/SConscript +++ b/src/mongo/db/sorter/SConscript @@ -29,5 +29,5 @@ env.Library( LIBDEPS=[ "$BUILD_DIR/mongo/base", '$BUILD_DIR/mongo/idl/idl_parser', - ] + ], ) diff --git a/src/mongo/db/stats/SConscript b/src/mongo/db/stats/SConscript index 17bbe0cb144..4769af29bea 100644 --- a/src/mongo/db/stats/SConscript +++ b/src/mongo/db/stats/SConscript @@ -19,7 +19,7 @@ env.Library( target='top', source=[ 'top.cpp', - 'operation_latency_histogram.cpp' + 'operation_latency_histogram.cpp', ], LIBDEPS=[ '$BUILD_DIR/mongo/db/server_options_core', @@ -38,7 +38,7 @@ env.Library( LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/shared_request_handling', '$BUILD_DIR/mongo/rpc/client_metadata', - ] + ], ) env.Library( @@ -94,7 +94,7 @@ env.Library( env.Library( target="transaction_stats", source=[ - "single_transaction_stats.cpp" + "single_transaction_stats.cpp", ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -109,7 +109,7 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/db/concurrency/lock_manager' + '$BUILD_DIR/mongo/db/concurrency/lock_manager', ], ) @@ -126,9 +126,9 @@ env.Library( '$BUILD_DIR/mongo/db/catalog/index_catalog', '$BUILD_DIR/mongo/db/commands/server_status', '$BUILD_DIR/mongo/db/db_raii', - '$BUILD_DIR/mongo/db/dbdirectclient', # TODO (SERVER-64162) remove + '$BUILD_DIR/mongo/db/dbdirectclient', # TODO (SERVER-64162) remove '$BUILD_DIR/mongo/db/index/index_access_method', - '$BUILD_DIR/mongo/db/pipeline/aggregation_request_helper', # TODO (SERVER-64162) remove + '$BUILD_DIR/mongo/db/pipeline/aggregation_request_helper', # TODO (SERVER-64162) remove '$BUILD_DIR/mongo/db/pipeline/document_sources_idl', '$BUILD_DIR/mongo/db/timeseries/bucket_catalog', '$BUILD_DIR/mongo/db/timeseries/timeseries_stats', diff --git a/src/mongo/db/storage/SConscript b/src/mongo/db/storage/SConscript index 6097874f3f5..9ac78a1409f 100644 --- a/src/mongo/db/storage/SConscript +++ b/src/mongo/db/storage/SConscript @@ -10,7 +10,7 @@ env.SConscript( 'wiredtiger', ], exports=[ - 'env' + 'env', ], ) @@ -209,7 +209,7 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/db/service_context' + '$BUILD_DIR/mongo/db/service_context', ], ) @@ -285,11 +285,10 @@ env.Library( ], ) - env.Library( target='recovery_unit_test_harness', source=[ - 'recovery_unit_test_harness.cpp' + 'recovery_unit_test_harness.cpp', ], LIBDEPS=[ '$BUILD_DIR/mongo/db/concurrency/lock_manager', @@ -314,7 +313,7 @@ env.Library( env.Library( target='storage_change_lock', source=[ - 'storage_change_lock.cpp' + 'storage_change_lock.cpp', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -325,10 +324,9 @@ env.Library( target='storage_engine_common', source=[ 'storage_engine_init.cpp', - 'storage_engine_change_context.cpp' - ], - LIBDEPS=[ + 'storage_engine_change_context.cpp', ], + LIBDEPS=[], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/concurrency/lock_manager', '$BUILD_DIR/mongo/db/service_context', @@ -351,8 +349,8 @@ env.Library( ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/commands/server_status', - 'backup_cursor_hooks' - ] + 'backup_cursor_hooks', + ], ) env.Library( @@ -363,7 +361,7 @@ env.Library( LIBDEPS_PRIVATE=[ "$BUILD_DIR/mongo/base", '$BUILD_DIR/mongo/db/namespace_string', - ] + ], ) env.Library( @@ -420,7 +418,7 @@ env.Library( env.Benchmark( target='storage_key_string_bm', source=[ - 'key_string_bm.cpp' + 'key_string_bm.cpp', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -431,7 +429,7 @@ env.Benchmark( env.Benchmark( target='storage_record_id_bm', source=[ - 'record_id_bm.cpp' + 'record_id_bm.cpp', ], LIBDEPS=[ '$BUILD_DIR/mongo/base', @@ -448,7 +446,7 @@ env.Library( '$BUILD_DIR/mongo/base', 'encryption_hooks', 'storage_options', - ] + ], ) env.Library( diff --git a/src/mongo/db/storage/kv/SConscript b/src/mongo/db/storage/kv/SConscript index 67f6904300a..9d98220d97d 100644 --- a/src/mongo/db/storage/kv/SConscript +++ b/src/mongo/db/storage/kv/SConscript @@ -35,4 +35,3 @@ env.Library( '$BUILD_DIR/mongo/util/clock_source_mock', ], ) - diff --git a/src/mongo/db/storage/wiredtiger/SConscript b/src/mongo/db/storage/wiredtiger/SConscript index 1d25c612bba..f322d6c6b92 100644 --- a/src/mongo/db/storage/wiredtiger/SConscript +++ b/src/mongo/db/storage/wiredtiger/SConscript @@ -15,7 +15,7 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/db/service_context' + '$BUILD_DIR/mongo/db/service_context', ], ) @@ -157,7 +157,7 @@ wtEnv.CppUnitTest( '$BUILD_DIR/mongo/util/clock_source_mock', 'storage_wiredtiger', 'storage_wiredtiger_core', - ] + ], ) wtEnv.Library( @@ -197,7 +197,6 @@ wtEnv.Library( ], ) - wtEnv.Library( target='storage_wiredtiger_import', source=[ @@ -214,7 +213,6 @@ wtEnv.Library( ], ) - wtEnv.CppUnitTest( target='storage_wiredtiger_record_store_and_index_test', source=[ diff --git a/src/mongo/db/timeseries/SConscript b/src/mongo/db/timeseries/SConscript index 1e38fb6b81f..8aa49e5fd8c 100644 --- a/src/mongo/db/timeseries/SConscript +++ b/src/mongo/db/timeseries/SConscript @@ -15,7 +15,7 @@ env.Library( '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/idl/idl_parser', '$BUILD_DIR/mongo/idl/server_parameter', - '$BUILD_DIR/mongo/util/processinfo' + '$BUILD_DIR/mongo/util/processinfo', ], ) @@ -49,7 +49,7 @@ env.Library( '$BUILD_DIR/mongo/db/server_options_core', '$BUILD_DIR/mongo/db/storage/storage_options', '$BUILD_DIR/mongo/util/fail_point', - ] + ], ) env.Library( diff --git a/src/mongo/db/views/SConscript b/src/mongo/db/views/SConscript index 1515599e61b..c0b69a4e6ba 100644 --- a/src/mongo/db/views/SConscript +++ b/src/mongo/db/views/SConscript @@ -57,7 +57,7 @@ env.Library( LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/timeseries/timeseries_conversion_util', '$BUILD_DIR/mongo/db/timeseries/timeseries_options', - ] + ], ) env.CppUnitTest( |