From 668da7a6221e7ba2b0f98703925b55bffd625b6a Mon Sep 17 00:00:00 2001 From: Andrew Morrow Date: Thu, 18 May 2017 13:47:32 -0400 Subject: SERVER-29281 Resolve edges related to the dcommands library --- src/mongo/db/SConscript | 7 ++-- src/mongo/db/auth/SConscript | 1 - src/mongo/db/catalog/SConscript | 4 +-- src/mongo/db/commands/SConscript | 55 +++++++++++++++++++++++------- src/mongo/db/ops/SConscript | 5 --- src/mongo/db/repl/SConscript | 6 ++-- src/mongo/db/s/SConscript | 4 +-- src/mongo/db/stats/SConscript | 2 +- src/mongo/db/storage/SConscript | 2 +- src/mongo/db/storage/mmap_v1/SConscript | 1 - src/mongo/db/storage/wiredtiger/SConscript | 2 +- 11 files changed, 57 insertions(+), 32 deletions(-) (limited to 'src/mongo/db') diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript index dc2b8898e6e..8a99cd03103 100644 --- a/src/mongo/db/SConscript +++ b/src/mongo/db/SConscript @@ -586,7 +586,6 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/base', - 'commands/dcommands', 'repl/serveronly', 'views/views_mongod', '$BUILD_DIR/mongo/util/uuid_catalog', @@ -721,8 +720,10 @@ env.Library( "ttl.cpp", ], LIBDEPS=[ - "commands/dcommands", + "commands/dcommands_fsync", "db_raii", + "ops/write_ops", + "query/query", "ttl_collection_cache", ], ) @@ -753,7 +754,7 @@ env.Library( #'introspect', # CYCLE #'$BUILD_DIR/mongo/db/ops/write_ops', # CYCLE #'$BUILD_DIR/mongo/db/catalog/catalog', # CYCLE - #'$BUILD_DIR/mongo/db/commands/dcommands', # CYCLE + #'$BUILD_DIR/mongo/db/commands/dcommands_fsync', # CYCLE ], LIBDEPS_TAGS=[ # TODO(ADAM, 2017-05-16): See `CYCLE` tags above diff --git a/src/mongo/db/auth/SConscript b/src/mongo/db/auth/SConscript index 10121f6967c..6d16605eefd 100644 --- a/src/mongo/db/auth/SConscript +++ b/src/mongo/db/auth/SConscript @@ -146,7 +146,6 @@ env.Library('authmongod', '$BUILD_DIR/mongo/db/dbhelpers', '$BUILD_DIR/mongo/db/repl/repl_coordinator_global', '$BUILD_DIR/mongo/db/server_parameters', - '$BUILD_DIR/mongo/db/commands/core', ], ) diff --git a/src/mongo/db/catalog/SConscript b/src/mongo/db/catalog/SConscript index 827b8e2da55..95f415f208d 100644 --- a/src/mongo/db/catalog/SConscript +++ b/src/mongo/db/catalog/SConscript @@ -145,6 +145,7 @@ env.Library( 'index_create', 'index_key_validate', '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/db/auth/authmongod', '$BUILD_DIR/mongo/db/concurrency/lock_manager', '$BUILD_DIR/mongo/db/curop', '$BUILD_DIR/mongo/db/query/query', @@ -159,9 +160,8 @@ env.Library( '$BUILD_DIR/mongo/db/db_raii', '$BUILD_DIR/mongo/db/index/index_access_methods', '$BUILD_DIR/mongo/db/clientcursor', - '$BUILD_DIR/mongo/db/commands/dcommands', - '$BUILD_DIR/mongo/db/commands/core', '$BUILD_DIR/mongo/db/s/balancer', + '$BUILD_DIR/mongo/db/views/views_mongod', ], ) diff --git a/src/mongo/db/commands/SConscript b/src/mongo/db/commands/SConscript index e829e9a377f..68bab8216d7 100644 --- a/src/mongo/db/commands/SConscript +++ b/src/mongo/db/commands/SConscript @@ -17,12 +17,22 @@ env.Library( source=[ 'server_status_internal.cpp', 'server_status_metric.cpp', - ], + ], LIBDEPS=[ + '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/util/net/network', - '$BUILD_DIR/mongo/base' - ] - ) + ] +) + +env.Library( + target='server_status', + source=[ + 'server_status.cpp', + ], + LIBDEPS=[ + '$BUILD_DIR/mongo/db/commands', + ] +) env.Library( target="core", @@ -41,7 +51,6 @@ env.Library( "mr_common.cpp", "parameters.cpp", "rename_collection_common.cpp", - "server_status.cpp", "user_management_commands_common.cpp", "write_commands/write_commands_common.cpp", ], @@ -84,6 +93,32 @@ env.Library( ], ) +env.Library( + target="dcommands_fsync", + source=[ + "fsync.cpp", + ], + LIBDEPS=[ + '$BUILD_DIR/mongo/db/commands', + '$BUILD_DIR/mongo/db/concurrency/write_conflict_exception', + '$BUILD_DIR/mongo/db/curop', + '$BUILD_DIR/mongo/db/storage/mmap_v1/storage_mmapv1', + ], +) + +env.Library( + target="dcommands_fcv", + source=[ + "feature_compatibility_version.cpp", + ], + LIBDEPS=[ + 'core', + '$BUILD_DIR/mongo/db/commands', + '$BUILD_DIR/mongo/db/db_raii', + '$BUILD_DIR/mongo/db/index_d', + ], +) + # Commands that should only be present in mongod env.Library( target="dcommands", @@ -106,10 +141,8 @@ env.Library( "drop_indexes.cpp", "eval.cpp", "explain_cmd.cpp", - "feature_compatibility_version.cpp", "find_and_modify.cpp", "find_cmd.cpp", - "fsync.cpp", "geo_near_cmd.cpp", "get_last_error.cpp", "getmore_cmd.cpp", @@ -144,6 +177,7 @@ env.Library( '$BUILD_DIR/mongo/client/clientdriver', '$BUILD_DIR/mongo/db/auth/authmongod', '$BUILD_DIR/mongo/db/background', + '$BUILD_DIR/mongo/db/catalog/catalog', '$BUILD_DIR/mongo/db/catalog/collection', '$BUILD_DIR/mongo/db/catalog/index_key_validate', '$BUILD_DIR/mongo/db/catalog/catalog_helpers', @@ -168,12 +202,9 @@ env.Library( '$BUILD_DIR/mongo/s/client/parallel', 'apply_ops_cmd_common', 'core', + 'dcommands_fcv', + 'dcommands_fsync', 'killcursors_common', - #'$BUILD_DIR/mongo/db/catalog/catalog', # CYCLE (CursorManager) - ], - LIBDEPS_TAGS=[ - # TODO(ADAM, 2017-05-16): See `CYCLE` tags above. - 'illegal_cyclic_or_unresolved_dependencies_whitelisted', ], ) diff --git a/src/mongo/db/ops/SConscript b/src/mongo/db/ops/SConscript index ec3ed3cd3ad..30272b19de9 100644 --- a/src/mongo/db/ops/SConscript +++ b/src/mongo/db/ops/SConscript @@ -207,10 +207,5 @@ env.Library( '$BUILD_DIR/mongo/db/update/update_driver', '$BUILD_DIR/mongo/db/introspect', '$BUILD_DIR/mongo/db/curop_metrics', - #'$BUILD_DIR/mongo/db/commands/dcommands', # CYCLE - ], - LIBDEPS_TAGS=[ - # TODO(ADAM, 2017-04-18): See `CYCLE` tags above. - 'illegal_cyclic_or_unresolved_dependencies_whitelisted', ], ) diff --git a/src/mongo/db/repl/SConscript b/src/mongo/db/repl/SConscript index 7b22561716e..115a960b98a 100644 --- a/src/mongo/db/repl/SConscript +++ b/src/mongo/db/repl/SConscript @@ -450,7 +450,7 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/db/auth/authorization_manager_global', - '$BUILD_DIR/mongo/db/commands/dcommands', + '$BUILD_DIR/mongo/db/commands/dcommands_fsync', '$BUILD_DIR/mongo/db/commands/server_status_core', '$BUILD_DIR/mongo/db/concurrency/lock_manager', '$BUILD_DIR/mongo/db/concurrency/write_conflict_exception', @@ -1353,7 +1353,8 @@ env.Library( '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/client/clientdriver', '$BUILD_DIR/mongo/db/auth/authcore', - '$BUILD_DIR/mongo/db/commands', + '$BUILD_DIR/mongo/db/commands/dcommands_fcv', + '$BUILD_DIR/mongo/db/commands/server_status', '$BUILD_DIR/mongo/db/logical_clock', '$BUILD_DIR/mongo/db/logical_time', '$BUILD_DIR/mongo/db/commands/list_collections_filter', @@ -1366,7 +1367,6 @@ env.Library( '$BUILD_DIR/mongo/db/service_context', '$BUILD_DIR/mongo/db/stats/counters', '$BUILD_DIR/mongo/db/repl/oplog_buffer_proxy', - '$BUILD_DIR/mongo/db/commands/core', '$BUILD_DIR/mongo/db/cloner', '$BUILD_DIR/mongo/db/index_d', '$BUILD_DIR/mongo/db/repair_database', diff --git a/src/mongo/db/s/SConscript b/src/mongo/db/s/SConscript index 07f64b9c48e..9603962e4ae 100644 --- a/src/mongo/db/s/SConscript +++ b/src/mongo/db/s/SConscript @@ -193,8 +193,8 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/db/bson/dotted_path_support', - '$BUILD_DIR/mongo/db/commands/dcommands', - '$BUILD_DIR/mongo/db/commands', + '$BUILD_DIR/mongo/db/commands/dcommands_fcv', + '$BUILD_DIR/mongo/db/commands/server_status', '$BUILD_DIR/mongo/db/db_raii', '$BUILD_DIR/mongo/db/dbhelpers', '$BUILD_DIR/mongo/db/index_d', diff --git a/src/mongo/db/stats/SConscript b/src/mongo/db/stats/SConscript index 2bc9b1c1775..d91a7df5322 100644 --- a/src/mongo/db/stats/SConscript +++ b/src/mongo/db/stats/SConscript @@ -97,7 +97,7 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/db/commands/core', + '$BUILD_DIR/mongo/db/commands/server_status', '$BUILD_DIR/mongo/db/index/index_access_methods', 'fill_locker_info', 'top', diff --git a/src/mongo/db/storage/SConscript b/src/mongo/db/storage/SConscript index 05da73b079b..46c00c785e5 100644 --- a/src/mongo/db/storage/SConscript +++ b/src/mongo/db/storage/SConscript @@ -179,7 +179,7 @@ env.Library( "storage_init.cpp", ], LIBDEPS=[ - "$BUILD_DIR/mongo/db/commands/core", + '$BUILD_DIR/mongo/db/commands/server_status', "storage_options", ], ) diff --git a/src/mongo/db/storage/mmap_v1/SConscript b/src/mongo/db/storage/mmap_v1/SConscript index a705b766764..dfea5c764da 100644 --- a/src/mongo/db/storage/mmap_v1/SConscript +++ b/src/mongo/db/storage/mmap_v1/SConscript @@ -58,7 +58,6 @@ env.Library( '$BUILD_DIR/mongo/db/catalog/index_catalog', '$BUILD_DIR/mongo/db/catalog/index_create', '$BUILD_DIR/mongo/db/commands', - '$BUILD_DIR/mongo/db/commands/core', '$BUILD_DIR/mongo/db/concurrency/lock_manager', '$BUILD_DIR/mongo/db/diag_log', '$BUILD_DIR/mongo/db/index_names', diff --git a/src/mongo/db/storage/wiredtiger/SConscript b/src/mongo/db/storage/wiredtiger/SConscript index 076910edf53..6d2684c8a57 100644 --- a/src/mongo/db/storage/wiredtiger/SConscript +++ b/src/mongo/db/storage/wiredtiger/SConscript @@ -85,7 +85,7 @@ if wiredtiger: '$BUILD_DIR/mongo/db/storage/kv/kv_engine', '$BUILD_DIR/mongo/db/storage/storage_engine_lock_file', '$BUILD_DIR/mongo/db/storage/storage_engine_metadata', - '$BUILD_DIR/mongo/db/commands/dcommands', + '$BUILD_DIR/mongo/db/commands/server_status', ], ) -- cgit v1.2.1