SERVER-14503 move replHasDatabases to heartbeat.* from instance.*

Author: matt dannenberg

src/mongo/db/instance.cpp

@@ -903,29 +903,6 @@ namespace mongo {
         wunit.commit();
     }
 
-    /* returns true if there is data on this server.  useful when starting replication.
-       local database does NOT count except for rsoplog collection.
-       used to set the hasData field on replset heartbeat command response
-    */
-    bool replHasDatabases(OperationContext* txn) {
-        vector<string> names;
-        globalStorageEngine->listDatabases( &names );
-
-        if( names.size() >= 2 ) return true;
-        if( names.size() == 1 ) {
-            if( names[0] != "local" )
-                return true;
-            // we have a local database.  return true if oplog isn't empty
-            {
-                Lock::DBRead lk(txn->lockState(), repl::rsoplog);
-                BSONObj o;
-                if( Helpers::getFirst(txn, repl::rsoplog, o) )
-                    return true;
-            }
-        }
-        return false;
-    }
-
     DBDirectClient::DBDirectClient() 
         : _txnOwned(new OperationContextImpl),
           _txn(_txnOwned.get())

src/mongo/db/instance.h

@@ -73,11 +73,6 @@ namespace mongo {
                            DbResponse& dbresponse,
                            const HostAndPort &client );
 
-    /* returns true if there is no data on this server.  useful when starting replication.
-       local database does NOT count.
-    */
-    bool replHasDatabases(OperationContext* txn);
-
     /**
      * Embedded calls to the local server using the DBClientBase API without going over the network.
      *

src/mongo/db/repl/heartbeat.cpp

@@ -31,15 +31,17 @@
 #include <boost/thread/thread.hpp>
 
 #include "mongo/db/commands.h"
-#include "mongo/db/instance.h"
+#include "mongo/db/dbhelpers.h"
 #include "mongo/db/repl/bgsync.h"
 #include "mongo/db/repl/connections.h"
 #include "mongo/db/repl/heartbeat_info.h"
+#include "mongo/db/repl/oplog.h"
 #include "mongo/db/repl/repl_coordinator_global.h"
 #include "mongo/db/repl/repl_set_health_poll_task.h"
 #include "mongo/db/repl/replset_commands.h"
 #include "mongo/db/repl/rs.h"
 #include "mongo/db/repl/server.h"
+#include "mongo/db/storage/storage_engine.h"
 #include "mongo/util/background.h"
 #include "mongo/util/concurrency/task.h"
 #include "mongo/util/fail_point_service.h"
@@ -53,6 +55,32 @@ namespace repl {
 
     using namespace bson;
 
+namespace {
+    /**
+     * Returns true if there is no data on this server. Useful when starting replication.
+     * The "local" database does NOT count except for "rs.oplog" collection.
+     * Used to set the hasData field on replset heartbeat command response.
+     */
+    bool replHasDatabases(OperationContext* txn) {
+        vector<string> names;
+        globalStorageEngine->listDatabases( &names );
+
+        if( names.size() >= 2 ) return true;
+        if( names.size() == 1 ) {
+            if( names[0] != "local" )
+                return true;
+            // we have a local database.  return true if oplog isn't empty
+            {
+                Lock::DBRead lk(txn->lockState(), repl::rsoplog);
+                BSONObj o;
+                if( Helpers::getFirst(txn, repl::rsoplog, o) )
+                    return true;
+            }
+        }
+        return false;
+    }
+} // namespace
+
     /* { replSetHeartbeat : <setname> } */
     class CmdReplSetHeartbeat : public ReplSetCommand {
     public: