SERVER-18101 Remove usage of default_version.cpp

Author: kaloianm

src/mongo/SConscript

@@ -871,57 +871,67 @@ quick_exit_env.Library(target='quick_exit',
                 'util/quick_exit.cpp',
             ])
 
-env.Library('coreshard',
-            [
-                # This is only here temporarily for auto-split logic in chunk.cpp.
-                's/balancer_policy.cpp',
-                's/distlock.cpp',
-                's/config.cpp',
-                's/grid.cpp',
-                's/chunk.cpp',
-                's/chunk_manager.cpp',
-                's/config_server_checker_service.cpp',
-                's/shard_key_pattern.cpp'
-            ],
-            LIBDEPS=[
-                '$BUILD_DIR/mongo/s/base',
-                '$BUILD_DIR/mongo/s/client/sharding_client',
-                '$BUILD_DIR/mongo/s/cluster_ops_impl',
-            ])
-
-env.Library('mongoscore',
-            [
-                's/balance.cpp',
-                's/cluster_last_error_info.cpp',
-                's/cursors.cpp',
-                's/request.cpp',
-                's/s_only.cpp',
-                's/strategy.cpp',
-                's/version_manager.cpp',
-                's/version_mongos.cpp',
-            ],
-            LIBDEPS=[
-                'db/auth/authmongos',
-                'db/fts/ftsmongos',
-                'db/query/explain_common',
-                'db/query/lite_parsed_query',
-                's/cluster_ops',
-                's/cluster_write_op_conversion',
-            ])
+# This library contains sharding functionality used by both mongod and mongos. Certain tests,
+# which exercise this functionality also link against it.
+env.Library(
+    target='coreshard',
+    source=[
+        # This is only here temporarily for auto-split logic in chunk.cpp.
+        's/balancer_policy.cpp',
+        's/distlock.cpp',
+        's/config.cpp',
+        's/grid.cpp',
+        's/chunk.cpp',
+        's/chunk_manager.cpp',
+        's/config_server_checker_service.cpp',
+        's/shard_key_pattern.cpp',
+        's/version_manager.cpp',
+    ],
+    LIBDEPS=[
+        's/base',
+        's/client/sharding_client',
+        's/cluster_ops_impl',
+    ]
+)
 
-env.CppUnitTest("mongoscore_test",
-                ["s/shard_key_pattern_test.cpp",
-                 "s/balancing_window_test.cpp",
-                 "s/balancer_policy_tests.cpp",
-                ],
-                LIBDEPS=["mongoscore",
-                         "coreshard",
-                         "mongocommon",
-                         "coreserver",
-                         "coredb"])
+# This library is only used by the mongos execuable and any tests which require mongos runtime
+# objects, such as the request processing pipeline or the balancer.
+env.Library(
+    target='mongoscore',
+    source=[
+        's/balance.cpp',
+        's/cluster_last_error_info.cpp',
+        's/cursors.cpp',
+        's/request.cpp',
+        's/s_only.cpp',
+        's/strategy.cpp',
+        's/version_mongos.cpp',
+    ],
+    LIBDEPS=[
+        'db/auth/authmongos',
+        'db/fts/ftsmongos',
+        'db/query/explain_common',
+        'db/query/lite_parsed_query',
+        's/cluster_ops',
+        's/cluster_write_op_conversion',
+    ]
+)
 
-env.CppUnitTest("dbclient_rs_test", [ "client/dbclient_rs_test.cpp" ],
-                 LIBDEPS=['$BUILD_DIR/mongo/client/clientdriver', 'mocklib'])
+env.CppUnitTest(
+    target='mongoscore_test',
+    source=[
+        's/shard_key_pattern_test.cpp',
+        's/balancing_window_test.cpp',
+        's/balancer_policy_tests.cpp',
+    ],
+    LIBDEPS=[
+        'mongoscore',
+        'coreshard',
+        'mongocommon',
+        'coreserver',
+        'coredb',
+    ]
+)
 
 env.CppUnitTest("scoped_db_conn_test", [ "client/scoped_db_conn_test.cpp" ],
                  LIBDEPS=[
@@ -934,15 +944,6 @@ env.CppUnitTest("scoped_db_conn_test", [ "client/scoped_db_conn_test.cpp" ],
                     "ntservice_mock"],
                  NO_CRUTCH=True)
 
-env.CppUnitTest("shard_test", [ "s/shard_test.cpp" ],
-                LIBDEPS=[ "mongoscore",
-                          "coreshard",
-                          "mongocommon",
-                          "coreserver",
-                          "coredb",
-                          "message_server_port",
-                          "mocklib"])
-
 env.CppUnitTest('config_server_tests', [ 's/config_server_tests.cpp' ],
                 LIBDEPS=[ "mongoscore",
                           "coreshard",
@@ -969,8 +970,6 @@ if has_option( 'use-cpu-profiler' ):
     # just to this file.
     env.InjectThirdPartyIncludePaths('tcmalloc')
 
-env.Library("defaultversion", "s/default_version.cpp")
-
 env.CppUnitTest(
     target="index_filter_commands_test",
     source=[
@@ -1043,7 +1042,6 @@ serveronlyLibdeps = ["coreshard",
                      "db/concurrency/lock_manager",
                      "db/concurrency/write_conflict_exception",
                      "db/ops/update_driver",
-                     "defaultversion",
                      "global_timestamp",
                      "index_key_validate",
                      'range_deleter',

src/mongo/client/SConscript

@@ -35,4 +35,8 @@ env.Library('clientdriver', [
 
 env.CppUnitTest("replica_set_monitor_test",
                 ["replica_set_monitor_test.cpp"],
-                LIBDEPS=["clientdriver"])
+                LIBDEPS=["clientdriver"])
+
+env.CppUnitTest("dbclient_rs_test",
+                ["dbclient_rs_test.cpp"],
+                LIBDEPS=['clientdriver', '$BUILD_DIR/mongo/mocklib'])

src/mongo/db/server_options_helpers.cpp

@@ -953,7 +953,4 @@ namespace {
         return Status::OK();
     }
 
-    // FIXME: This function will not return the correct value if someone renames the mongos binary
-    bool isMongos() { return serverGlobalParams.binaryName == "mongos"; }
-
 } // namespace mongo

src/mongo/db/server_options_helpers.h

@@ -67,8 +67,4 @@ namespace mongo {
 
     void printCommandLineOpts();
 
-    // This function should eventually go away, but needs to be here now because we have a lot of
-    // code that is shared between mongod and mongos that must know at runtime which binary it is in
-    bool isMongos();
-
 } // namespace mongo

src/mongo/db/sorter/sorter.cpp

@@ -57,6 +57,7 @@
 #include "mongo/db/jsobj.h"
 #include "mongo/db/storage_options.h"
 #include "mongo/platform/atomic_word.h"
+#include "mongo/s/mongos_options.h"
 #include "mongo/util/assert_util.h"
 #include "mongo/util/bufreader.h"
 #include "mongo/util/mongoutils/str.h"

src/mongo/db/storage_options.h

@@ -106,8 +106,4 @@ namespace mongo {
 
     extern StorageGlobalParams storageGlobalParams;
 
-    // This is not really related to persistence, but mongos and the other executables share code
-    // and we use this function to determine at runtime which executable we are in.
-    bool isMongos();
-
 } // namespace mongo

src/mongo/s/SConscript

@@ -198,8 +198,7 @@ env.CppUnitTest(
         'cluster_ops',
         'cluster_write_op_conversion',
         '$BUILD_DIR/mongo/db/common',
-        '$BUILD_DIR/mongo/server_options', # DbMessage needs server options
-        "$BUILD_DIR/mongo/client/clientdriver",
+        '$BUILD_DIR/mongo/client/clientdriver',
     ]
 )
 

src/mongo/s/client/SConscript

@@ -32,7 +32,8 @@ env.CppUnitTest(
     target='sharding_client_test',
     source=[
         'multi_host_query_test.cpp',
-        'shard_connection_test.cpp'
+        'shard_connection_test.cpp',
+        'shard_test.cpp',
     ],
     LIBDEPS=[
         'sharding_client',

src/mongo/s/client/shard_connection.cpp

@@ -491,7 +491,9 @@ namespace {
 
     void ShardConnection::kill() {
         if ( _conn ) {
-            if( versionManager.isVersionableCB( _conn ) ) versionManager.resetShardVersionCB( _conn );
+            if (versionManager.isVersionableCB(_conn)) {
+                versionManager.resetShardVersionCB(_conn);
+            }
 
             if (_conn->isFailed()) {
                 // Let the pool know about the bad connection and also delegate disposal to it.