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

1 files changed, 2 insertions, 56 deletions

diff --git a/src/mongo/db/query/SConscript b/src/mongo/db/query/SConscript
index 6a0d30887b6..d665ccd9e28 100644
--- a/src/mongo/db/query/SConscript
+++ b/src/mongo/db/query/SConscript
@@ -57,43 +57,6 @@ env.CppUnitTest(
     ]
 )
 
-env.Library(
-    target='query',
-    source=[
-        "explain.cpp",
-        "get_executor.cpp",
-        "find.cpp",
-        "plan_executor.cpp",
-        "plan_ranker.cpp",
-        "plan_yield_policy.cpp",
-        "query_yield.cpp",
-        "stage_builder.cpp",
-    ],
-    LIBDEPS=[
-        "internal_plans",
-        "query_common",
-        "query_planner",
-        '$BUILD_DIR/mongo/db/catalog/collection',
-        '$BUILD_DIR/mongo/db/catalog/database',
-        '$BUILD_DIR/mongo/db/catalog/index_catalog',
-        '$BUILD_DIR/mongo/db/catalog/index_catalog_entry',
-        "$BUILD_DIR/mongo/db/curop",
-        "$BUILD_DIR/mongo/db/exec/exec",
-        "$BUILD_DIR/mongo/db/repl/repl_coordinator_interface",
-        "$BUILD_DIR/mongo/db/s/sharding",
-        "$BUILD_DIR/mongo/db/storage/oplog_hack",
-        "$BUILD_DIR/mongo/util/elapsed_tracker",
-        "$BUILD_DIR/mongo/db/matcher/expressions_mongod_only",
-        #'$BUILD_DIR/mongo/db/clientcursor', # CYCLE
-        #'$BUILD_DIR/mongo/db/write_ops', # CYCLE
-        #'$BUILD_DIR/mongo/db/catalog/catalog', # CYCLE
-    ],
-    LIBDEPS_TAGS=[
-        # TODO(ADAM, 2017-04-06): See `CYCLE` tags above.
-        'illegal_cyclic_or_unresolved_dependencies_whitelisted',
-    ],
-)
-
 # Shared mongod/mongos query code.
 env.Library(
     target="query_common",
@@ -152,8 +115,8 @@ env.CppUnitTest(
         "get_executor_test.cpp"
     ],
     LIBDEPS=[
-        "query",
         "query_test_service_context",
+        "$BUILD_DIR/mongo/db/query_exec",
         "$BUILD_DIR/mongo/db/serveronly",
         "$BUILD_DIR/mongo/dbtests/mocklib",
     ],
@@ -220,23 +183,6 @@ env.CppUnitTest(
 )
 
 env.Library(
-    target="internal_plans",
-    source=[
-        "internal_plans.cpp"
-    ],
-    LIBDEPS=[
-        '$BUILD_DIR/mongo/base',
-        '$BUILD_DIR/mongo/db/exec/exec',
-        '$BUILD_DIR/mongo/db/exec/working_set',
-        #'$BUILD_DIR/mongo/db/query/query', # CYCLE
-    ],
-    LIBDEPS_TAGS=[
-        # TODO(ADAM, 2017-01-09): See `CYCLE` tags above
-        'illegal_cyclic_or_unresolved_dependencies_whitelisted',
-    ],
-)
-
-env.Library(
     target="query_request",
     source=[
         "query_request.cpp",
@@ -449,8 +395,8 @@ env.CppUnitTest(
         "query_planner_text_test.cpp"
     ],
     LIBDEPS=[
-        "query",
         "query_planner_test_fixture",
+        "$BUILD_DIR/mongo/db/query_exec",
         "$BUILD_DIR/mongo/db/serveronly",
         "$BUILD_DIR/mongo/dbtests/mocklib",
     ],