diff options
| author | Jack Mulrow <jack.mulrow@mongodb.com> | 2017-07-20 10:32:53 -0400 |
|---|---|---|
| committer | Jack Mulrow <jack.mulrow@mongodb.com> | 2017-07-20 13:43:58 -0400 |
| commit | c95d6c25f5d6b2b6dd8cff5253821c1624cfa767 (patch) | |
| tree | 9a65472ccdd609d87221f5384b048a150efaf3bf /src/mongo/db/SConscript | |
| parent | 0688e2f813345855d62d65729447ace2dec75142 (diff) | |
| download | mongo-c95d6c25f5d6b2b6dd8cff5253821c1624cfa767.tar.gz | |
SERVER-28918 Merge sessions and write_ops libraries
Diffstat (limited to 'src/mongo/db/SConscript')
| -rw-r--r-- | src/mongo/db/SConscript | 38 |
1 files changed, 28 insertions, 10 deletions
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', ], ) |