diff options
| author | matt dannenberg <matt.dannenberg@10gen.com> | 2014-05-23 09:31:48 -0400 |
|---|---|---|
| committer | matt dannenberg <matt.dannenberg@10gen.com> | 2014-05-27 05:44:51 -0400 |
| commit | e4735eb2de26e12c8048fdd85340f086bd8ab447 (patch) | |
| tree | a1ed2cd67a705ad1acb72c562f2e942d250b4eec /src/mongo/dbtests/mock | |
| parent | c27f26b7b49714649800a7d602fead7d57ca3805 (diff) | |
| download | mongo-e4735eb2de26e12c8048fdd85340f086bd8ab447.tar.gz | |
SERVER-14043 s/namespace replset/namespace repl/
Diffstat (limited to 'src/mongo/dbtests/mock')
| -rw-r--r-- | src/mongo/dbtests/mock/mock_replica_set.cpp | 12 | ||||
| -rw-r--r-- | src/mongo/dbtests/mock/mock_replica_set.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/mongo/dbtests/mock/mock_replica_set.cpp b/src/mongo/dbtests/mock/mock_replica_set.cpp index 571a30129a7..ea9d12b928d 100644 --- a/src/mongo/dbtests/mock/mock_replica_set.cpp +++ b/src/mongo/dbtests/mock/mock_replica_set.cpp @@ -53,7 +53,7 @@ namespace mongo { MockConnRegistry::get()->addServer(mockServer); - replset::ReplSetConfig::MemberCfg config; + repl::ReplSetConfig::MemberCfg config; config.h = HostAndPort(hostName); replConfig.insert(std::make_pair(hostName, config)); } @@ -110,7 +110,7 @@ namespace mongo { ReplConfigMap::const_iterator iter = _replConfig.find(hostAndPort); fassert(16578, iter != _replConfig.end()); - const replset::ReplSetConfig::MemberCfg& config = iter->second; + const repl::ReplSetConfig::MemberCfg& config = iter->second; fassert(16579, !config.hidden && config.priority > 0 && !config.arbiterOnly); _primaryHost = hostAndPort; @@ -201,7 +201,7 @@ namespace mongo { builder.append("primary", getPrimary()); - const replset::ReplSetConfig::MemberCfg& replConfig = configIter->second; + const repl::ReplSetConfig::MemberCfg& replConfig = configIter->second; if (replConfig.arbiterOnly) { builder.append("arbiterOnly", true); } @@ -242,13 +242,13 @@ namespace mongo { int MockReplicaSet::getState(const std::string& hostAndPort) const { if (_replConfig.count(hostAndPort) < 1) { - return static_cast<int>(replset::MemberState::RS_SHUNNED); + return static_cast<int>(repl::MemberState::RS_SHUNNED); } else if (hostAndPort == getPrimary()) { - return static_cast<int>(replset::MemberState::RS_PRIMARY); + return static_cast<int>(repl::MemberState::RS_PRIMARY); } else { - return static_cast<int>(replset::MemberState::RS_SECONDARY); + return static_cast<int>(repl::MemberState::RS_SECONDARY); } } diff --git a/src/mongo/dbtests/mock/mock_replica_set.h b/src/mongo/dbtests/mock/mock_replica_set.h index fe29f791e88..92f238cd1b7 100644 --- a/src/mongo/dbtests/mock/mock_replica_set.h +++ b/src/mongo/dbtests/mock/mock_replica_set.h @@ -49,7 +49,7 @@ namespace mongo { */ class MockReplicaSet { public: - typedef std::map<std::string, replset::ReplSetConfig::MemberCfg> ReplConfigMap; + typedef std::map<std::string, repl::ReplSetConfig::MemberCfg> ReplConfigMap; /** * Creates a mock replica set and automatically mocks the isMaster |