SERVER-68826 Move logical_time into server_base

7 files changed, 24 insertions, 79 deletions

diff --git a/src/mongo/db/commands/SConscript b/src/mongo/db/commands/SConscript
index 60d5609dd93..314821fc5b8 100644
--- a/src/mongo/db/commands/SConscript
+++ b/src/mongo/db/commands/SConscript
@@ -7,14 +7,13 @@ Import("get_option")
 env = env.Clone()
 
 env.Library(
-    target="test_commands_enabled",
+    target='test_commands_enabled',
     source=[
-        "test_commands_enabled.cpp",
+        'test_commands_enabled.cpp',
         'test_commands_enabled.idl',
     ],
     LIBDEPS_PRIVATE=[
-        '$BUILD_DIR/mongo/idl/server_parameter',
-        "server_status_core",
+        '$BUILD_DIR/mongo/db/server_base',
     ],
 )
 
@@ -24,27 +23,8 @@ env.Library(
         'server_status.cpp',
         'server_status_metric.cpp',
     ],
-    LIBDEPS=[
-        '$BUILD_DIR/mongo/base',
-    ],
-)
-
-env.Library(
-    target='server_status',
-    source=[
-        'server_status_command.cpp',
-    ],
-    LIBDEPS=[
-        '$BUILD_DIR/mongo/db/commands',
-    ],
     LIBDEPS_PRIVATE=[
-        '$BUILD_DIR/mongo/db/auth/auth',
-        '$BUILD_DIR/mongo/db/auth/authprivilege',
-        '$BUILD_DIR/mongo/db/server_options_core',
-        '$BUILD_DIR/mongo/db/stats/counters',
-        '$BUILD_DIR/mongo/util/net/http_client',
-        '$BUILD_DIR/mongo/util/processinfo',
-        'server_status_core',
+        '$BUILD_DIR/mongo/base',
     ],
 )
 
@@ -58,7 +38,6 @@ env.Library(
         '$BUILD_DIR/mongo/transport/message_compressor',
         '$BUILD_DIR/mongo/transport/service_executor',
         '$BUILD_DIR/mongo/util/net/ssl_manager',
-        'server_status',
         'server_status_core',
     ],
 )
@@ -71,7 +50,6 @@ env.Library(
     ],
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/db/server_base',
-        '$BUILD_DIR/mongo/idl/idl_parser',
     ],
 )
 
@@ -95,6 +73,7 @@ env.Library(
         'refresh_logical_session_cache_now.cpp',
         'refresh_sessions_command.cpp',
         'rename_collection_common.cpp',
+        'server_status_command.cpp',
         'sessions_commands.idl',
         'start_session_command.cpp',
         'update_metrics.cpp',
@@ -118,9 +97,9 @@ env.Library(
         '$BUILD_DIR/mongo/db/session/logical_session_cache_impl',
         '$BUILD_DIR/mongo/db/session/logical_session_id',
         '$BUILD_DIR/mongo/db/session/logical_session_id_helpers',
-        '$BUILD_DIR/mongo/idl/server_parameter',
         '$BUILD_DIR/mongo/logv2/logv2_options',
         '$BUILD_DIR/mongo/rpc/message',
+        '$BUILD_DIR/mongo/util/net/http_client',
         'test_commands_enabled',
     ],
 )
@@ -134,7 +113,7 @@ env.Library(
         'connection_status.cpp',
         'connection_status.idl',
         'drop_connections_command.cpp',
-        'rotate_certificates_command.cpp',
+        'drop_connections.idl',
         'generic_servers.cpp',
         'generic_servers.idl',
         'internal_transactions_test_command.idl',
@@ -142,17 +121,14 @@ env.Library(
         'logical_session_server_status_section.cpp',
         'mr_common.cpp',
         'reap_logical_session_cache_now.cpp',
+        'rotate_certificates_command.cpp',
+        'rotate_certificates.idl',
         'test_api_version_2_commands.cpp',
         'test_deprecation_command.cpp',
         'traffic_recording_cmds.cpp',
         'user_management_commands_common.cpp',
-        'drop_connections.idl',
-        'rotate_certificates.idl',
         'user_management_commands.idl',
     ],
-    LIBDEPS=[
-        '$BUILD_DIR/mongo/db/read_write_concern_defaults',
-    ],
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/client/clientdriver_minimal',
         '$BUILD_DIR/mongo/db/auth/address_restriction',
@@ -163,9 +139,11 @@ env.Library(
         '$BUILD_DIR/mongo/db/pipeline/change_stream_pipeline',
         '$BUILD_DIR/mongo/db/pipeline/document_source_internal_apply_oplog_update',
         '$BUILD_DIR/mongo/db/pipeline/pipeline',
+        '$BUILD_DIR/mongo/db/read_write_concern_defaults',
         '$BUILD_DIR/mongo/db/repl/isself',
         '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface',
         '$BUILD_DIR/mongo/db/server_base',
+        '$BUILD_DIR/mongo/db/server_options_core',
         '$BUILD_DIR/mongo/db/session/logical_session_cache',
         '$BUILD_DIR/mongo/db/session/logical_session_cache_impl',
         '$BUILD_DIR/mongo/db/session/logical_session_id',
@@ -183,7 +161,6 @@ env.Library(
         'authentication_commands',
         'core',
         'feature_compatibility_parsers',
-        'server_status',
         'test_commands_enabled',
     ],
 )
@@ -200,7 +177,7 @@ env.Library(
 )
 
 env.Library(
-    target="authentication_commands",
+    target='authentication_commands',
     source=[
         'authentication_commands.cpp',
         'authentication_commands.idl',
@@ -220,9 +197,9 @@ env.Library(
 )
 
 env.Library(
-    target="mongod_fsync",
+    target='mongod_fsync',
     source=[
-        "fsync.cpp",
+        'fsync.cpp',
     ],
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/db/auth/auth',
@@ -236,9 +213,9 @@ env.Library(
 )
 
 env.Library(
-    target="mongod_fcv",
+    target='mongod_fcv',
     source=[
-        "feature_compatibility_version.cpp",
+        'feature_compatibility_version.cpp',
         'feature_compatibility_version.idl',
     ],
     LIBDEPS=[
@@ -251,7 +228,7 @@ env.Library(
         '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface',
         '$BUILD_DIR/mongo/db/repl/repl_server_parameters',
         '$BUILD_DIR/mongo/db/repl/repl_settings',
-        '$BUILD_DIR/mongo/idl/server_parameter',
+        '$BUILD_DIR/mongo/db/server_base',
     ],
 )
 
@@ -271,7 +248,6 @@ env.Library(
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/db/auth/authprivilege',
         '$BUILD_DIR/mongo/db/server_base',
-        '$BUILD_DIR/mongo/idl/idl_parser',
     ],
 )
 
@@ -283,7 +259,6 @@ env.Library(
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/db/auth/authprivilege',
         '$BUILD_DIR/mongo/db/server_base',
-        '$BUILD_DIR/mongo/idl/idl_parser',
     ],
 )
 
@@ -477,7 +452,6 @@ env.Library(
     ],
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/db/server_base',
-        '$BUILD_DIR/mongo/idl/idl_parser',
     ],
 )
 
@@ -488,7 +462,6 @@ env.Library(
     ],
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/db/server_base',
-        '$BUILD_DIR/mongo/idl/idl_parser',
     ],
 )
 
@@ -606,7 +579,6 @@ env.Library(
         '$BUILD_DIR/mongo/db/set_change_stream_state_coordinator',
         '$BUILD_DIR/mongo/db/timeseries/timeseries_conversion_util',
         '$BUILD_DIR/mongo/db/transaction/transaction_api',
-        '$BUILD_DIR/mongo/idl/idl_parser',
         '$BUILD_DIR/mongo/util/net/ssl_manager',
         'cluster_server_parameter_commands_invocation',
         'core',
@@ -617,7 +589,6 @@ env.Library(
         'mongod_fsync',
         'profile_common',
         'rwc_defaults_commands',
-        'server_status',
         'servers',
         'set_feature_compatibility_version_idl',
         'set_index_commit_quorum_idl',
@@ -786,7 +757,7 @@ env.CppUnitTest(
 )
 
 env.CppUnitTest(
-    target="command_mirroring_test",
+    target='command_mirroring_test',
     source=[
         'command_mirroring_test.cpp',
     ],
diff --git a/src/mongo/db/commands/get_cluster_parameter_invocation.h b/src/mongo/db/commands/get_cluster_parameter_invocation.h
index 66b63737c27..a122cd6be94 100644
--- a/src/mongo/db/commands/get_cluster_parameter_invocation.h
+++ b/src/mongo/db/commands/get_cluster_parameter_invocation.h
@@ -30,7 +30,7 @@
 #pragma once
 
 #include "mongo/db/commands/cluster_server_parameter_cmds_gen.h"
-#include "mongo/idl/server_parameter.h"
+#include "mongo/db/server_parameter.h"
 
 namespace mongo {
 
diff --git a/src/mongo/db/commands/parameters.cpp b/src/mongo/db/commands/parameters.cpp
index c498273f107..834002ff9b6 100644
--- a/src/mongo/db/commands/parameters.cpp
+++ b/src/mongo/db/commands/parameters.cpp
@@ -27,9 +27,6 @@
  *    it in the license file.
  */
 
-
-#include "mongo/platform/basic.h"
-
 #include <set>
 
 #include "mongo/bson/bsontypes.h"
@@ -41,22 +38,18 @@
 #include "mongo/db/commands.h"
 #include "mongo/db/commands/parameters_gen.h"
 #include "mongo/db/commands/parse_log_component_settings.h"
+#include "mongo/db/server_parameter_gen.h"
 #include "mongo/db/storage/kv/kv_engine.h"
 #include "mongo/db/storage/storage_options.h"
 #include "mongo/idl/command_generic_argument.h"
-#include "mongo/idl/server_parameter_gen.h"
 #include "mongo/logv2/log.h"
 #include "mongo/util/str.h"
 
 #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kCommand
 
-
-using std::string;
-using std::stringstream;
-
 namespace mongo {
-
 namespace {
+
 using logv2::LogComponent;
 using logv2::LogSeverity;
 
@@ -93,7 +86,7 @@ static mutablebson::Element getParentForLogComponent(mutablebson::Document& doc,
  * The "default" log component is an implementation detail. Don't expose this to users.
  */
 void getLogComponentVerbosity(BSONObj* output) {
-    static const string defaultLogComponentName =
+    static const std::string defaultLogComponentName =
         LogComponent(LogComponent::kDefault).getShortName();
 
     mutablebson::Document doc;
@@ -190,7 +183,6 @@ Status setLogComponentVerbosity(const BSONObj& bsonSettings) {
     return Status::OK();
 }
 
-
 GetParameterOptions parseGetParameterOptions(BSONElement elem) {
     if (elem.type() == BSONType::Object) {
         return GetParameterOptions::parse(IDLParserContext{"getParameter"}, elem.Obj());
diff --git a/src/mongo/db/commands/server_status.cpp b/src/mongo/db/commands/server_status.cpp
index 584726a56e0..1fab501c0a5 100644
--- a/src/mongo/db/commands/server_status.cpp
+++ b/src/mongo/db/commands/server_status.cpp
@@ -27,8 +27,6 @@
  *    it in the license file.
  */
 
-#include "mongo/platform/basic.h"
-
 #include "mongo/db/commands/server_status.h"
 
 #include "mongo/db/service_context.h"
diff --git a/src/mongo/db/commands/server_status.h b/src/mongo/db/commands/server_status.h
index d4b8b59e025..d5f08eef962 100644
--- a/src/mongo/db/commands/server_status.h
+++ b/src/mongo/db/commands/server_status.h
@@ -145,4 +145,5 @@ public:
 private:
     const OpCounters* _counters;
 };
+
 }  // namespace mongo
diff --git a/src/mongo/db/commands/server_status_command.cpp b/src/mongo/db/commands/server_status_command.cpp
index b98e6fc4cd2..cd5ed9cad25 100644
--- a/src/mongo/db/commands/server_status_command.cpp
+++ b/src/mongo/db/commands/server_status_command.cpp
@@ -184,15 +184,6 @@ MONGO_INITIALIZER(CreateCmdServerStatus)(InitializerContext* context) {
 
 }  // namespace
 
-OpCounterServerStatusSection::OpCounterServerStatusSection(const std::string& sectionName,
-                                                           OpCounters* counters)
-    : ServerStatusSection(sectionName), _counters(counters) {}
-
-BSONObj OpCounterServerStatusSection::generateSection(OperationContext* opCtx,
-                                                      const BSONElement& configElement) const {
-    return _counters->getObj();
-}
-
 OpCounterServerStatusSection globalOpCounterServerStatusSection("opcounters", &globalOpCounters);
 
 namespace {
diff --git a/src/mongo/db/commands/server_status_servers.cpp b/src/mongo/db/commands/server_status_servers.cpp
index 80cdd8ec25d..6e6a265c9e0 100644
--- a/src/mongo/db/commands/server_status_servers.cpp
+++ b/src/mongo/db/commands/server_status_servers.cpp
@@ -27,8 +27,6 @@
  *    it in the license file.
  */
 
-#include "mongo/platform/basic.h"
-
 #include "mongo/config.h"
 #include "mongo/db/commands/server_status.h"
 #include "mongo/transport/message_compressor_registry.h"
@@ -41,12 +39,6 @@
 #include "mongo/util/net/ssl_manager.h"
 
 namespace mongo {
-
-using std::endl;
-using std::map;
-using std::string;
-using std::stringstream;
-
 namespace {
 
 // some universal sections
@@ -187,6 +179,6 @@ public:
         }
     }
 } advisoryHostFQDNs;
-}  // namespace
 
+}  // namespace
 }  // namespace mongo