diff options
| author | Amirsaman Memaripour <amirsaman.memaripour@10gen.com> | 2020-02-06 21:20:39 +0000 |
|---|---|---|
| committer | evergreen <evergreen@mongodb.com> | 2020-02-06 21:20:39 +0000 |
| commit | 3ab78432e0621ee541c96316a018d81c937d20b2 (patch) | |
| tree | ed64cd8f9152e9019c04c5c8f9225e41c96d6e16 | |
| parent | e9fadb78003810c3985edf33e60c618f4a2c2b3e (diff) | |
| download | mongo-3ab78432e0621ee541c96316a018d81c937d20b2.tar.gz | |
SERVER-42985 Replace 4.4 placeholder value in WireVersion enum
| -rw-r--r-- | src/mongo/client/sdam/topology_description.cpp | 2 | ||||
| -rw-r--r-- | src/mongo/db/repl/collection_cloner.cpp | 2 | ||||
| -rw-r--r-- | src/mongo/db/repl/collection_cloner_test.cpp | 4 | ||||
| -rw-r--r-- | src/mongo/db/wire_version.h | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/mongo/client/sdam/topology_description.cpp b/src/mongo/client/sdam/topology_description.cpp index 167133f1d58..960c0b21057 100644 --- a/src/mongo/client/sdam/topology_description.cpp +++ b/src/mongo/client/sdam/topology_description.cpp @@ -181,7 +181,7 @@ void TopologyDescription::checkWireCompatibilityVersions() { const std::string TopologyDescription::minimumRequiredMongoVersionString(int version) { switch (version) { - case PLACEHOLDER_FOR_44: + case RESUMABLE_INITIAL_SYNC: return "4.4"; case SHARDED_TRANSACTIONS: return "4.2"; diff --git a/src/mongo/db/repl/collection_cloner.cpp b/src/mongo/db/repl/collection_cloner.cpp index 4d73098c787..119239e1acf 100644 --- a/src/mongo/db/repl/collection_cloner.cpp +++ b/src/mongo/db/repl/collection_cloner.cpp @@ -94,7 +94,7 @@ CollectionCloner::CollectionCloner(const NamespaceString& sourceNss, _stats.ns = _sourceNss.ns(); // Find out whether the sync source supports resumable queries. - _resumeSupported = (getClient()->getMaxWireVersion() == WireVersion::PLACEHOLDER_FOR_44); + _resumeSupported = (getClient()->getMaxWireVersion() == WireVersion::RESUMABLE_INITIAL_SYNC); } BaseCloner::ClonerStages CollectionCloner::getStages() { diff --git a/src/mongo/db/repl/collection_cloner_test.cpp b/src/mongo/db/repl/collection_cloner_test.cpp index 5f00b44bc30..09c6642d2f5 100644 --- a/src/mongo/db/repl/collection_cloner_test.cpp +++ b/src/mongo/db/repl/collection_cloner_test.cpp @@ -78,8 +78,8 @@ protected: }; _storageInterface.createCollectionForBulkFn = _standardCreateCollectionFn; - _mockClient->setWireVersions(WireVersion::PLACEHOLDER_FOR_44, - WireVersion::PLACEHOLDER_FOR_44); + _mockClient->setWireVersions(WireVersion::RESUMABLE_INITIAL_SYNC, + WireVersion::RESUMABLE_INITIAL_SYNC); _mockServer->assignCollectionUuid(_nss.ns(), _collUuid); _mockServer->setCommandReply("replSetGetRBID", BSON("ok" << 1 << "rbid" << _sharedData->getRollBackId())); diff --git a/src/mongo/db/wire_version.h b/src/mongo/db/wire_version.h index 561070f2a1c..6857b983b6b 100644 --- a/src/mongo/db/wire_version.h +++ b/src/mongo/db/wire_version.h @@ -76,12 +76,12 @@ enum WireVersion { // Supports sharded transactions (4.2+). SHARDED_TRANSACTIONS = 8, - // TODO SERVER-42985: Supports some upcoming feature (4.4+). - PLACEHOLDER_FOR_44 = 9, + // Supports resumable initial sync (4.4+). + RESUMABLE_INITIAL_SYNC = 9, // Set this to the highest value in this enum - it will be the default maxWireVersion for // the WireSpec values. - LATEST_WIRE_VERSION = PLACEHOLDER_FOR_44, + LATEST_WIRE_VERSION = RESUMABLE_INITIAL_SYNC, }; /** |