summaryrefslogtreecommitdiff
path: root/src/mongo/db/ops
diff options
context:
space:
mode:
authorAndrew Morrow <acm@mongodb.com>2018-01-09 14:39:34 -0500
committerAndrew Morrow <acm@mongodb.com>2018-01-10 21:26:25 -0500
commit9d1f323a131ba5e3e1af79973ae79910de10a957 (patch)
treef5d7f5463069ce3462adbf819450e68a64c8c2a1 /src/mongo/db/ops
parent37cb7ea09393e88662e3139bd20fa29e59f2a1a3 (diff)
downloadmongo-9d1f323a131ba5e3e1af79973ae79910de10a957.tar.gz
SERVER-30815 Refactor libraries to reduce cycles
- Merge db/s/split_vector and db/s/split_chunk into db/s/sharding, since they were directly mutually cyclic with it. - Split db/index/index_access_method out of db/index/index_access_methods, so that libquery_exec can use the abstract class without needing to know about the detailed implementations - Combine db/clientcursor, db/query/{query,internal_plans}, db/exec/exec, parts of db/write_ops, and db/pipeline/serveronly_pipeline, into a new db/libquery_exec library. - Split a new library s/grid out of s/coreshard, and fold the parts of s/client/sharding_client into s/grid that were cyclic with coreshard, solving this cycle. - Adds/removes a few stray LIBDEPS here or there as needed to make the above transformations work. After making this transformation, we will be left with one important cycle: the new db/libquery_exec is still cyclic with db/s/sharding
Diffstat (limited to 'src/mongo/db/ops')
-rw-r--r--src/mongo/db/ops/SConscript4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/db/ops/SConscript b/src/mongo/db/ops/SConscript
index aeb6b0d5980..7755be679ee 100644
--- a/src/mongo/db/ops/SConscript
+++ b/src/mongo/db/ops/SConscript
@@ -14,9 +14,9 @@ env.Library(
'$BUILD_DIR/mongo/db/repl/oplog',
'$BUILD_DIR/mongo/db/repl/repl_coordinator_interface',
'$BUILD_DIR/mongo/util/fail_point',
- '$BUILD_DIR/mongo/db/write_ops',
'$BUILD_DIR/mongo/db/curop',
'$BUILD_DIR/mongo/db/db_raii',
+ '$BUILD_DIR/mongo/db/write_ops',
],
)
@@ -66,8 +66,8 @@ env.CppUnitTest(
target='write_ops_retryability_test',
source='write_ops_retryability_test.cpp',
LIBDEPS=[
+ '$BUILD_DIR/mongo/db/query_exec',
'$BUILD_DIR/mongo/db/repl/mock_repl_coord_server_fixture',
'$BUILD_DIR/mongo/db/repl/oplog_entry',
- '$BUILD_DIR/mongo/db/write_ops',
],
)