From c95d6c25f5d6b2b6dd8cff5253821c1624cfa767 Mon Sep 17 00:00:00 2001 From: Jack Mulrow Date: Thu, 20 Jul 2017 10:32:53 -0400 Subject: SERVER-28918 Merge sessions and write_ops libraries --- src/mongo/db/SConscript | 38 ++++++++++++++++++++++++--------- src/mongo/db/catalog/SConscript | 2 +- src/mongo/db/commands/SConscript | 2 +- src/mongo/db/exec/SConscript | 2 +- src/mongo/db/ops/SConscript | 28 ------------------------ src/mongo/db/query/SConscript | 2 +- src/mongo/db/repl/SConscript | 12 +++++------ src/mongo/db/s/SConscript | 2 +- src/mongo/db/storage/mmap_v1/SConscript | 2 +- 9 files changed, 40 insertions(+), 50 deletions(-) (limited to 'src/mongo/db') diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript index 57c7cbf9af7..ce27aa72350 100644 --- a/src/mongo/db/SConscript +++ b/src/mongo/db/SConscript @@ -562,7 +562,7 @@ env.Library( LIBDEPS=[ 'db_raii', 'index/index_access_methods', - 'ops/write_ops', + 'write_ops', ], ) @@ -594,11 +594,10 @@ env.Library( 'curop_metrics', 'diag_log', 'lasterror', - 'ops/write_ops', + 'write_ops', 'ops/write_ops_parsers', 'rw_concern_d', 's/sharding', - 'sessions', 'storage/storage_options', ], ) @@ -648,7 +647,7 @@ env.Library( ], LIBDEPS=[ 'dbdirectclient', - 'ops/write_ops', + 'write_ops', 'repl/isself', '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/catalog/index_create', @@ -744,7 +743,7 @@ env.Library( LIBDEPS=[ "commands/dcommands_fsync", "db_raii", - "ops/write_ops", + "write_ops", "query/query", "ttl_collection_cache", ], @@ -823,7 +822,7 @@ env.Library( "introspect", "matcher/expressions_mongod_only", "op_observer_d", - "ops/write_ops", + "write_ops", "ops/write_ops_parsers", "pipeline/aggregation", "pipeline/serveronly", @@ -1416,19 +1415,38 @@ asioEnv.CppIntegrationTest( ) env.Library( - target='sessions', + target='write_ops', source=[ + 'ops/delete.cpp', + 'ops/insert.cpp', + 'ops/parsed_delete.cpp', + 'ops/parsed_update.cpp', + 'ops/update.cpp', + 'ops/update_lifecycle_impl.cpp', + 'ops/update_result.cpp', + 'ops/write_ops_exec.cpp', 'session.cpp', 'session_catalog.cpp', 'transaction_history_iterator.cpp', + env.Idlc('ops/single_write_result.idl')[0], env.Idlc('session_txn_record.idl')[0], ], LIBDEPS=[ + '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/db/catalog/collection_info_cache', + '$BUILD_DIR/mongo/db/concurrency/lock_manager', + '$BUILD_DIR/mongo/db/curop_metrics', '$BUILD_DIR/mongo/db/dbdirectclient', + '$BUILD_DIR/mongo/db/introspect', '$BUILD_DIR/mongo/db/logical_session_id', + '$BUILD_DIR/mongo/db/matcher/expressions_mongod_only', '$BUILD_DIR/mongo/db/namespace_string', - '$BUILD_DIR/mongo/db/ops/write_ops', + '$BUILD_DIR/mongo/db/query/query', '$BUILD_DIR/mongo/db/repl/oplog_entry', + '$BUILD_DIR/mongo/db/repl/repl_coordinator_impl', + '$BUILD_DIR/mongo/db/service_context', + '$BUILD_DIR/mongo/db/update/array_filter', + '$BUILD_DIR/mongo/db/update/update_driver', '$BUILD_DIR/mongo/idl/idl_parser', ], ) @@ -1442,7 +1460,7 @@ env.CppUnitTest( LIBDEPS=[ '$BUILD_DIR/mongo/db/repl/replmocks', 'service_context_d_test_fixture', - 'sessions', + 'write_ops', ], ) @@ -1454,7 +1472,7 @@ env.CppUnitTest( LIBDEPS=[ '$BUILD_DIR/mongo/db/repl/replmocks', 'service_context_d_test_fixture', - 'sessions', + 'write_ops', ], ) diff --git a/src/mongo/db/catalog/SConscript b/src/mongo/db/catalog/SConscript index 8e62bb4b74b..7a410ab6404 100644 --- a/src/mongo/db/catalog/SConscript +++ b/src/mongo/db/catalog/SConscript @@ -247,7 +247,7 @@ env.Library( '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/background', '$BUILD_DIR/mongo/db/db_raii', - '$BUILD_DIR/mongo/db/ops/write_ops', + '$BUILD_DIR/mongo/db/write_ops', '$BUILD_DIR/mongo/db/views/views', ], ) diff --git a/src/mongo/db/commands/SConscript b/src/mongo/db/commands/SConscript index 3d15d83e2ed..e39b3e4da43 100644 --- a/src/mongo/db/commands/SConscript +++ b/src/mongo/db/commands/SConscript @@ -204,7 +204,7 @@ env.Library( '$BUILD_DIR/mongo/db/index/index_access_methods', '$BUILD_DIR/mongo/db/index_d', '$BUILD_DIR/mongo/db/lasterror', - '$BUILD_DIR/mongo/db/ops/write_ops', + '$BUILD_DIR/mongo/db/write_ops', '$BUILD_DIR/mongo/db/ops/write_ops_parsers', '$BUILD_DIR/mongo/db/pipeline/serveronly', '$BUILD_DIR/mongo/db/repair_database', diff --git a/src/mongo/db/exec/SConscript b/src/mongo/db/exec/SConscript index 126226a130d..409ada6c1dd 100644 --- a/src/mongo/db/exec/SConscript +++ b/src/mongo/db/exec/SConscript @@ -104,7 +104,7 @@ env.Library( "$BUILD_DIR/mongo/s/common", '$BUILD_DIR/third_party/s2/s2', '$BUILD_DIR/mongo/db/query/query_common', - #'$BUILD_DIR/mongo/db/ops/write_ops', # CYCLE + #'$BUILD_DIR/mongo/db/write_ops', # CYCLE #'$BUILD_DIR/mongo/db/index/index_access_methods', # CYCLE #'$BUILD_DIR/mongo/db/matcher/expressions_mongod_only', # CYCLE #'$BUILD_DIR/mongo/db/s/sharding', # CYCLE diff --git a/src/mongo/db/ops/SConscript b/src/mongo/db/ops/SConscript index 69610c578f6..d83ace7958c 100644 --- a/src/mongo/db/ops/SConscript +++ b/src/mongo/db/ops/SConscript @@ -205,31 +205,3 @@ env.CppIntegrationTest( '$BUILD_DIR/mongo/util/version_impl', ], ) - -env.Library( - target="write_ops", - source=[ - "delete.cpp", - "insert.cpp", - "parsed_delete.cpp", - "parsed_update.cpp", - "update.cpp", - "update_lifecycle_impl.cpp", - "update_result.cpp", - "write_ops_exec.cpp", - env.Idlc('single_write_result.idl')[0], - ], - LIBDEPS=[ - '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/db/catalog/collection_info_cache', - '$BUILD_DIR/mongo/db/concurrency/lock_manager', - '$BUILD_DIR/mongo/db/matcher/expressions_mongod_only', - '$BUILD_DIR/mongo/db/query/query', - '$BUILD_DIR/mongo/db/repl/repl_coordinator_impl', - '$BUILD_DIR/mongo/db/service_context', - '$BUILD_DIR/mongo/db/update/array_filter', - '$BUILD_DIR/mongo/db/update/update_driver', - '$BUILD_DIR/mongo/db/introspect', - '$BUILD_DIR/mongo/db/curop_metrics', - ], -) diff --git a/src/mongo/db/query/SConscript b/src/mongo/db/query/SConscript index 60eab4d4f79..6b0eb9f99e0 100644 --- a/src/mongo/db/query/SConscript +++ b/src/mongo/db/query/SConscript @@ -87,7 +87,7 @@ env.Library( "$BUILD_DIR/mongo/util/elapsed_tracker", "$BUILD_DIR/mongo/db/matcher/expressions_mongod_only", #'$BUILD_DIR/mongo/db/clientcursor', # CYCLE - #'$BUILD_DIR/mongo/db/ops/write_ops', # CYCLE + #'$BUILD_DIR/mongo/db/write_ops', # CYCLE #'$BUILD_DIR/mongo/db/catalog/catalog', # CYCLE ], LIBDEPS_TAGS=[ diff --git a/src/mongo/db/repl/SConscript b/src/mongo/db/repl/SConscript index 3acdd25db3f..b7bb92c49f1 100644 --- a/src/mongo/db/repl/SConscript +++ b/src/mongo/db/repl/SConscript @@ -25,7 +25,7 @@ env.Library( '$BUILD_DIR/mongo/db/index_d', '$BUILD_DIR/mongo/db/index/index_descriptor', '$BUILD_DIR/mongo/util/fail_point', - '$BUILD_DIR/mongo/db/ops/write_ops', + '$BUILD_DIR/mongo/db/write_ops', '$BUILD_DIR/mongo/db/catalog/catalog_helpers', '$BUILD_DIR/mongo/db/namespace_string', ], @@ -51,7 +51,7 @@ env.Library( '$BUILD_DIR/mongo/db/index_d', '$BUILD_DIR/mongo/db/index/index_descriptor', '$BUILD_DIR/mongo/util/fail_point', - '$BUILD_DIR/mongo/db/ops/write_ops', + '$BUILD_DIR/mongo/db/write_ops', ], ) @@ -412,7 +412,7 @@ env.Library( 'roll_back_local_operations', '$BUILD_DIR/mongo/db/catalog/database_holder', '$BUILD_DIR/mongo/db/s/sharding', - '$BUILD_DIR/mongo/db/sessions', + '$BUILD_DIR/mongo/db/write_ops', '$BUILD_DIR/mongo/util/fail_point', '$BUILD_DIR/mongo/db/dbhelpers', ], @@ -455,7 +455,7 @@ env.Library( 'storage_interface_impl', '$BUILD_DIR/mongo/db/service_context', '$BUILD_DIR/mongo/db/service_context_d_test_fixture', - '$BUILD_DIR/mongo/db/sessions', + '$BUILD_DIR/mongo/db/write_ops', '$BUILD_DIR/mongo/executor/thread_pool_task_executor_test_fixture', ], ) @@ -500,7 +500,7 @@ env.Library( '$BUILD_DIR/mongo/db/concurrency/lock_manager', '$BUILD_DIR/mongo/db/s/sharding', '$BUILD_DIR/mongo/db/service_context', - '$BUILD_DIR/mongo/db/sessions', + '$BUILD_DIR/mongo/db/write_ops', '$BUILD_DIR/mongo/executor/task_executor_interface', '$BUILD_DIR/mongo/util/net/network', ], @@ -1496,7 +1496,7 @@ env.Library( '$BUILD_DIR/mongo/db/repl/oplog_buffer_proxy', '$BUILD_DIR/mongo/db/s/balancer', '$BUILD_DIR/mongo/db/service_context', - '$BUILD_DIR/mongo/db/sessions', + '$BUILD_DIR/mongo/db/write_ops', '$BUILD_DIR/mongo/db/stats/counters', '$BUILD_DIR/mongo/rpc/client_metadata', '$BUILD_DIR/mongo/s/catalog/sharding_catalog_manager', diff --git a/src/mongo/db/s/SConscript b/src/mongo/db/s/SConscript index 0fb3ed0112b..7b223072eae 100644 --- a/src/mongo/db/s/SConscript +++ b/src/mongo/db/s/SConscript @@ -116,7 +116,7 @@ env.Library( #'$BUILD_DIR/mongo/db/catalog/catalog', # CYCLE #'$BUILD_DIR/mongo/db/db_raii', # CYCLE #'$BUILD_DIR/mongo/db/dbhelpers', # CYCLE - #'$BUILD_DIR/mongo/db/ops/write_ops', # CYCLE + #'$BUILD_DIR/mongo/db/write_ops', # CYCLE #'$BUILD_DIR/mongo/db/query/query', # CYCLE #'$BUILD_DIR/mongo/s/catalog/sharding_catalog_manager', # CYCLE ], diff --git a/src/mongo/db/storage/mmap_v1/SConscript b/src/mongo/db/storage/mmap_v1/SConscript index e3eb4a43ba6..a1642bc578a 100644 --- a/src/mongo/db/storage/mmap_v1/SConscript +++ b/src/mongo/db/storage/mmap_v1/SConscript @@ -77,7 +77,7 @@ env.Library( '$BUILD_DIR/mongo/db/storage/storage_engine_lock_file', '$BUILD_DIR/mongo/db/storage/storage_engine_metadata', '$BUILD_DIR/mongo/db/index/index_access_methods', - '$BUILD_DIR/mongo/db/ops/write_ops', + '$BUILD_DIR/mongo/db/write_ops', ], ) -- cgit v1.2.1