SERVER-28281 Rotate deps, moving catalog to top.

Rotation of the dependency graph's "slices" to move
db/catalog/catalog to being fully resolved.  This will
facilitate breaking dependencies into this library.

12 files changed, 103 insertions, 26 deletions

diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript
index 09715e9a9d0..bbb8c5fa452 100644
--- a/src/mongo/db/SConscript
+++ b/src/mongo/db/SConscript
@@ -438,6 +438,7 @@ env.Library(
         "$BUILD_DIR/mongo/util/net/miniwebserver",
         "mongodandmongos",
         'repl/repl_coordinator_global',
+        'repl/serveronly',
     ],
 )
 
@@ -565,9 +566,13 @@ env.Library(
         'db_raii.cpp',
     ],
     LIBDEPS=[
-        'catalog/catalog',
         'stats/top',
         'views/views',
+        #'catalog/catalog', # CYCLE
+    ],
+    LIBDEPS_TAGS=[
+        # TODO(ADAM, 2017-03-10): See `CYCLE` tags above
+        'illegal_cyclic_or_unresolved_dependencies_whitelisted',
     ],
 )
 
@@ -608,6 +613,11 @@ env.Library(
         'db_raii',
         'index/index_access_methods',
         'ops/write_ops',
+        #'$BUILD_DIR/mongo/db/catalog/catalog', # CYCLE
+    ],
+    LIBDEPS_TAGS=[
+        # TODO(ADAM, 2017-03-10): See `CYCLE` tags above
+        'illegal_cyclic_or_unresolved_dependencies_whitelisted',
     ],
 )
 
@@ -658,8 +668,12 @@ env.Library(
     LIBDEPS=[
         "$BUILD_DIR/mongo/base",
         "$BUILD_DIR/mongo/util/background_job",
-        "catalog/catalog",
         "query/query",
+        #"catalog/catalog", # CYCLE
+    ],
+    LIBDEPS_TAGS=[
+        # TODO(ADAM, 2017-03-10): See `CYCLE` tags above
+        'illegal_cyclic_or_unresolved_dependencies_whitelisted',
     ],
 )
 
@@ -670,10 +684,14 @@ env.Library(
     ],
     LIBDEPS=[
         "$BUILD_DIR/mongo/base",
-        "catalog/catalog",
         "dbdirectclient",
         "ops/write_ops",
         "repl/isself",
+        #"catalog/catalog", # CYCLE
+    ],
+    LIBDEPS_TAGS=[
+        # TODO(ADAM, 2017-03-10): See `CYCLE` tags above.
+        'illegal_cyclic_or_unresolved_dependencies_whitelisted',
     ],
 )
 
@@ -696,9 +714,13 @@ env.Library(
         "index_rebuilder.cpp",
     ],
     LIBDEPS=[
-        "catalog/catalog",
         "db_raii",
         "index/index_access_methods",
+        #"catalog/catalog", # CYCYLE
+    ],
+    LIBDEPS_TAGS=[
+        # TODO(ADAM, 2017-03-10): See `CYCLE` tags above.
+        'illegal_cyclic_or_unresolved_dependencies_whitelisted',
     ],
 )
 
@@ -708,8 +730,12 @@ env.Library(
         "introspect.cpp",
     ],
     LIBDEPS=[
-        "catalog/catalog",
         "db_raii",
+        #"catalog/catalog", # CYCLE
+    ],
+    LIBDEPS_TAGS=[
+        # TODO(ADAM, 2017-03-10): See `CYCLE` tags above.
+        'illegal_cyclic_or_unresolved_dependencies_whitelisted',
     ],
 )
 
@@ -732,10 +758,14 @@ env.Library(
         "range_deleter_service.cpp",
     ],
     LIBDEPS=[
-        "catalog/catalog",
         "dbhelpers",
         "db_raii",
         "range_deleter",
+        #"catalog/catalog", # CYCLE
+    ],
+    LIBDEPS_TAGS=[
+        # TODO(ADAM, 2017-03-10): See `CYCLE` tags above.
+        'illegal_cyclic_or_unresolved_dependencies_whitelisted',
     ],
 )
 
@@ -763,8 +793,12 @@ env.Library(
     ],
     LIBDEPS=[
         "background",
-        "catalog/catalog",
         "catalog/index_key_validate",
+        #"catalog/catalog", # CYCLE
+    ],
+    LIBDEPS_TAGS=[
+        # TODO(ADAM, 2017-03-10): See `CYCLE` tags above.
+        'illegal_cyclic_or_unresolved_dependencies_whitelisted',
     ],
 )
 
@@ -807,6 +841,11 @@ env.Library(
         "ops/write_ops_parsers",
         "run_commands",
         "storage/storage_options",
+        #"catalog/catalog", # CYCLE
+    ],
+    LIBDEPS_TAGS=[
+        # TODO(ADAM, 2017-03-10): See `CYCLE` tags above
+        'illegal_cyclic_or_unresolved_dependencies_whitelisted',
     ],
 )
 
diff --git a/src/mongo/db/auth/SConscript b/src/mongo/db/auth/SConscript
index 16d0303be7a..e8fb1d4b0b0 100644
--- a/src/mongo/db/auth/SConscript
+++ b/src/mongo/db/auth/SConscript
@@ -146,6 +146,12 @@ 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',
+                #'$BUILD_DIR/mongo/db/catalog/catalog', # CYCLE
+            ],
+            LIBDEPS_TAGS=[
+                # TODO(ADAM, 2017-03-10): See `CYCLE` tags above
+                'illegal_cyclic_or_unresolved_dependencies_whitelisted',
             ],
 )
 
diff --git a/src/mongo/db/catalog/SConscript b/src/mongo/db/catalog/SConscript
index df7d91124c2..cecb69862a9 100644
--- a/src/mongo/db/catalog/SConscript
+++ b/src/mongo/db/catalog/SConscript
@@ -80,6 +80,7 @@ env.Library(
     ],
     LIBDEPS=[
         'collection_options',
+        'index_key_validate',
         '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/db/concurrency/lock_manager',
         '$BUILD_DIR/mongo/db/curop',
@@ -92,15 +93,11 @@ env.Library(
         '$BUILD_DIR/mongo/db/ttl_collection_cache',
         '$BUILD_DIR/mongo/db/collection_index_usage_tracker',
         '$BUILD_DIR/mongo/db/background',
-        #'$BUILD_DIR/mongo/db/db_raii', # CYCLE
-        #'$BUILD_DIR/mongo/db/commands/dcommands', # CYCLE
-        #'$BUILD_DIR/mongo/db/index/index_access_methods', # CYCLE
-        #'$BUILD_DIR/mongo/db/views/views_mongod', # CYCLE
-        #'$BUILD_DIR/mongo/db/ops/write_ops', # CYCLE
-        #'$BUILD_DIR/mongo/db/clientcursor', # CYCLE
-    ],
-    LIBDEPS_TAGS=[
-        # TODO(ADAM, 2017-01-10): See `CYCLE` tags above.
-        'illegal_cyclic_or_unresolved_dependencies_whitelisted',
+        '$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',
     ],
 )
diff --git a/src/mongo/db/commands/SConscript b/src/mongo/db/commands/SConscript
index 0a3b1442caf..2525fe2db7f 100644
--- a/src/mongo/db/commands/SConscript
+++ b/src/mongo/db/commands/SConscript
@@ -164,6 +164,11 @@ env.Library(
         'apply_ops_cmd_common',
         'core',
         'killcursors_common',
+        #'$BUILD_DIR/mongo/db/catalog/catalog', # CYCLE
+    ],
+    LIBDEPS_TAGS=[
+        # TODO(ADAM, 2017-03-10): See `CYCLE` tags above.
+        'illegal_cyclic_or_unresolved_dependencies_whitelisted',
     ],
 )
 
diff --git a/src/mongo/db/index/SConscript b/src/mongo/db/index/SConscript
index ed19eb7a309..f651ec3f57f 100644
--- a/src/mongo/db/index/SConscript
+++ b/src/mongo/db/index/SConscript
@@ -93,7 +93,6 @@ serveronlyEnv.Library(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/base',
-        '$BUILD_DIR/mongo/db/catalog/catalog',
         '$BUILD_DIR/mongo/db/concurrency/write_conflict_exception',
         '$BUILD_DIR/mongo/db/storage/storage_options',
         '$BUILD_DIR/mongo/db/storage/mmap_v1/btree',
@@ -102,5 +101,10 @@ serveronlyEnv.Library(
         'expression_params',
         'index_descriptor',
         'key_generator',
+        #'$BUILD_DIR/mongo/db/catalog/catalog', # CYCLE
+    ],
+    LIBDEPS_TAGS=[
+        # TODO(ADAM, 2017-03-10): See `CYCLE` tags above
+        'illegal_cyclic_or_unresolved_dependencies_whitelisted',
     ],
 )
diff --git a/src/mongo/db/matcher/SConscript b/src/mongo/db/matcher/SConscript
index 7400ccc5726..57a4c786db0 100644
--- a/src/mongo/db/matcher/SConscript
+++ b/src/mongo/db/matcher/SConscript
@@ -139,12 +139,16 @@ env.Library(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/db/auth/authorization_manager_global',
-        '$BUILD_DIR/mongo/db/catalog/catalog',
         '$BUILD_DIR/mongo/db/concurrency/lock_manager',
         '$BUILD_DIR/mongo/db/db_raii',
         '$BUILD_DIR/mongo/db/fts/base',
         '$BUILD_DIR/mongo/scripting/scripting_server',
         'expressions',
+        #'$BUILD_DIR/mongo/db/catalog/catalog', # CYCLE
+    ],
+    LIBDEPS_TAGS=[
+        # TODO(ADAM, 2017-03-10): 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 7b5ddd1f629..157fa1ffd99 100644
--- a/src/mongo/db/ops/SConscript
+++ b/src/mongo/db/ops/SConscript
@@ -278,21 +278,20 @@ env.Library(
         "write_ops_exec.cpp",
     ],
     LIBDEPS=[
+        'update_driver',
         '$BUILD_DIR/mongo/base',
-        '$BUILD_DIR/mongo/db/catalog/catalog',
         '$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',
-        'update_driver',
-        #'$BUILD_DIR/mongo/db/commands/dcommands', # CYCLE
         '$BUILD_DIR/mongo/db/introspect',
         '$BUILD_DIR/mongo/db/curop_metrics',
+        #'$BUILD_DIR/mongo/db/catalog/catalog', # CYCLE
+        #'$BUILD_DIR/mongo/db/commands/dcommands', # CYCLE
     ],
     LIBDEPS_TAGS=[
         # TODO(ADAM, 2017-01-10): See `CYCLE` tags above.
-        # The only undefined symbol is `mongo::Command::run` from `dcommands`.
         'illegal_cyclic_or_unresolved_dependencies_whitelisted',
     ],
 )
diff --git a/src/mongo/db/pipeline/SConscript b/src/mongo/db/pipeline/SConscript
index ee26ddc62fd..79ac52d8d45 100644
--- a/src/mongo/db/pipeline/SConscript
+++ b/src/mongo/db/pipeline/SConscript
@@ -474,5 +474,10 @@ env.Library(
         '$BUILD_DIR/mongo/db/matcher/expressions_mongod_only',
         '$BUILD_DIR/mongo/db/stats/serveronly',
         '$BUILD_DIR/mongo/db/clientcursor',
+        #'$BUILD_DIR/mongo/db/catalog/catalog', # CYCLE
+    ],
+    LIBDEPS_TAGS=[
+        # TODO(ADAM, 2017-03-10): See `CYCLE` tags above
+        'illegal_cyclic_or_unresolved_dependencies_whitelisted',
     ],
 )
diff --git a/src/mongo/db/s/SConscript b/src/mongo/db/s/SConscript
index b47c1383029..386bbd73d5b 100644
--- a/src/mongo/db/s/SConscript
+++ b/src/mongo/db/s/SConscript
@@ -188,6 +188,11 @@ env.Library(
         'balancer',
         'metadata',
         'sharding',
+        #'$BUILD_DIR/mongo/db/catalog/catalog', # CYCLE
+    ],
+    LIBDEPS_TAGS=[
+        # TODO(ADAM, 2017-03-10): See `CYCLE` tags above
+        'illegal_cyclic_or_unresolved_dependencies_whitelisted',
     ],
 )
 
diff --git a/src/mongo/db/stats/SConscript b/src/mongo/db/stats/SConscript
index 3020659a95b..bcba2b0eefe 100644
--- a/src/mongo/db/stats/SConscript
+++ b/src/mongo/db/stats/SConscript
@@ -100,11 +100,15 @@ env.Library(
     LIBDEPS=[
         '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/db/commands/core',
-        '$BUILD_DIR/mongo/db/catalog/catalog',
         '$BUILD_DIR/mongo/db/index/index_access_methods',
         '$BUILD_DIR/mongo/db/range_deleter',
         '$BUILD_DIR/mongo/db/range_deleter_d',
         'fill_locker_info',
         'top',
+        #'$BUILD_DIR/mongo/db/catalog/catalog', # CYCLE
+    ],
+    LIBDEPS_TAGS=[
+        # TODO(ADAM, 2017-03-10): See `CYCLE` tags above.
+        'illegal_cyclic_or_unresolved_dependencies_whitelisted',
     ],
 )
diff --git a/src/mongo/db/storage/wiredtiger/SConscript b/src/mongo/db/storage/wiredtiger/SConscript
index cc95490afea..be65a2008ea 100644
--- a/src/mongo/db/storage/wiredtiger/SConscript
+++ b/src/mongo/db/storage/wiredtiger/SConscript
@@ -83,7 +83,12 @@ 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/catalog/catalog', # CYCLE
                  ],
+        LIBDEPS_TAGS=[
+            # TODO(ADAM, 2017-03-10): See `CYCLE` tags above
+            'illegal_cyclic_or_unresolved_dependencies_whitelisted',
+        ],
         )
 
     wtEnv.Library(
diff --git a/src/mongo/db/views/SConscript b/src/mongo/db/views/SConscript
index a5a2512a2c6..c0a35f834fa 100644
--- a/src/mongo/db/views/SConscript
+++ b/src/mongo/db/views/SConscript
@@ -13,9 +13,13 @@ env.Library(
     LIBDEPS=[
         '$BUILD_DIR/mongo/db/dbhelpers',
         '$BUILD_DIR/mongo/db/views/views',
-        '$BUILD_DIR/mongo/db/catalog/catalog',
         '$BUILD_DIR/mongo/db/s/sharding',
-    ]
+        #'$BUILD_DIR/mongo/db/catalog/catalog', # CYCLE
+    ],
+    LIBDEPS_TAGS=[
+        # TODO(ADAM, 2017-03-10): See `CYCLE` tags above.
+        'illegal_cyclic_or_unresolved_dependencies_whitelisted',
+    ],
 )
 
 env.Library(