summaryrefslogtreecommitdiff
path: root/src/mongo/db/s/config/sharding_catalog_manager_split_chunk_test.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/db/s/config/sharding_catalog_manager_split_chunk_test.cpp')
-rw-r--r--src/mongo/db/s/config/sharding_catalog_manager_split_chunk_test.cpp35
1 files changed, 7 insertions, 28 deletions
diff --git a/src/mongo/db/s/config/sharding_catalog_manager_split_chunk_test.cpp b/src/mongo/db/s/config/sharding_catalog_manager_split_chunk_test.cpp
index e735c1291e4..525011fd0ee 100644
--- a/src/mongo/db/s/config/sharding_catalog_manager_split_chunk_test.cpp
+++ b/src/mongo/db/s/config/sharding_catalog_manager_split_chunk_test.cpp
@@ -63,7 +63,6 @@ TEST_F(SplitChunkTest, SplitExistingChunkCorrectlyShouldSucceed) {
ChunkType chunk;
chunk.setName(OID::gen());
- chunk.setNS(nss);
chunk.setCollectionUUID(collUuid);
auto origVersion = ChunkVersion(1, 0, collEpoch, collTimestamp);
@@ -106,7 +105,7 @@ TEST_F(SplitChunkTest, SplitExistingChunkCorrectlyShouldSucceed) {
// First chunkDoc should have range [chunkMin, chunkSplitPoint]
auto chunkDocStatus =
- getChunkDoc(operationContext(), nssOrUuid, chunkMin, collEpoch, collTimestamp);
+ getChunkDoc(operationContext(), collUuid, chunkMin, collEpoch, collTimestamp);
ASSERT_OK(chunkDocStatus.getStatus());
auto chunkDoc = chunkDocStatus.getValue();
@@ -121,7 +120,7 @@ TEST_F(SplitChunkTest, SplitExistingChunkCorrectlyShouldSucceed) {
// Second chunkDoc should have range [chunkSplitPoint, chunkMax]
auto otherChunkDocStatus =
- getChunkDoc(operationContext(), nssOrUuid, chunkSplitPoint, collEpoch, collTimestamp);
+ getChunkDoc(operationContext(), collUuid, chunkSplitPoint, collEpoch, collTimestamp);
ASSERT_OK(otherChunkDocStatus.getStatus());
auto otherChunkDoc = otherChunkDocStatus.getValue();
@@ -138,7 +137,6 @@ TEST_F(SplitChunkTest, SplitExistingChunkCorrectlyShouldSucceed) {
ASSERT(chunkDoc.getHistory() == otherChunkDoc.getHistory());
};
- test(_nss1, boost::none /* timestamp */);
test(_nss2, Timestamp(42));
}
@@ -149,7 +147,6 @@ TEST_F(SplitChunkTest, MultipleSplitsOnExistingChunkShouldSucceed) {
ChunkType chunk;
chunk.setName(OID::gen());
- chunk.setNS(nss);
chunk.setCollectionUUID(collUuid);
auto origVersion = ChunkVersion(1, 0, collEpoch, collTimestamp);
@@ -182,7 +179,7 @@ TEST_F(SplitChunkTest, MultipleSplitsOnExistingChunkShouldSucceed) {
// First chunkDoc should have range [chunkMin, chunkSplitPoint]
auto chunkDocStatus =
- getChunkDoc(operationContext(), nssOrUuid, chunkMin, collEpoch, collTimestamp);
+ getChunkDoc(operationContext(), collUuid, chunkMin, collEpoch, collTimestamp);
ASSERT_OK(chunkDocStatus.getStatus());
auto chunkDoc = chunkDocStatus.getValue();
@@ -197,7 +194,7 @@ TEST_F(SplitChunkTest, MultipleSplitsOnExistingChunkShouldSucceed) {
// Second chunkDoc should have range [chunkSplitPoint, chunkSplitPoint2]
auto midChunkDocStatus =
- getChunkDoc(operationContext(), nssOrUuid, chunkSplitPoint, collEpoch, collTimestamp);
+ getChunkDoc(operationContext(), collUuid, chunkSplitPoint, collEpoch, collTimestamp);
ASSERT_OK(midChunkDocStatus.getStatus());
auto midChunkDoc = midChunkDocStatus.getValue();
@@ -212,7 +209,7 @@ TEST_F(SplitChunkTest, MultipleSplitsOnExistingChunkShouldSucceed) {
// Third chunkDoc should have range [chunkSplitPoint2, chunkMax]
auto lastChunkDocStatus =
- getChunkDoc(operationContext(), nssOrUuid, chunkSplitPoint2, collEpoch, collTimestamp);
+ getChunkDoc(operationContext(), collUuid, chunkSplitPoint2, collEpoch, collTimestamp);
ASSERT_OK(lastChunkDocStatus.getStatus());
auto lastChunkDoc = lastChunkDocStatus.getValue();
@@ -230,7 +227,6 @@ TEST_F(SplitChunkTest, MultipleSplitsOnExistingChunkShouldSucceed) {
ASSERT(midChunkDoc.getHistory() == lastChunkDoc.getHistory());
};
- test(_nss1, boost::none /* timestamp */);
test(_nss2, Timestamp(42));
}
@@ -241,10 +237,8 @@ TEST_F(SplitChunkTest, NewSplitShouldClaimHighestVersion) {
ChunkType chunk, chunk2;
chunk.setName(OID::gen());
- chunk.setNS(nss);
chunk.setCollectionUUID(collUuid);
chunk2.setName(OID::gen());
- chunk2.setNS(nss);
chunk2.setCollectionUUID(collUuid);
// set up first chunk
@@ -283,7 +277,7 @@ TEST_F(SplitChunkTest, NewSplitShouldClaimHighestVersion) {
// First chunkDoc should have range [chunkMin, chunkSplitPoint]
auto chunkDocStatus =
- getChunkDoc(operationContext(), nssOrUuid, chunkMin, collEpoch, collTimestamp);
+ getChunkDoc(operationContext(), collUuid, chunkMin, collEpoch, collTimestamp);
ASSERT_OK(chunkDocStatus.getStatus());
auto chunkDoc = chunkDocStatus.getValue();
@@ -295,7 +289,7 @@ TEST_F(SplitChunkTest, NewSplitShouldClaimHighestVersion) {
// Second chunkDoc should have range [chunkSplitPoint, chunkMax]
auto otherChunkDocStatus =
- getChunkDoc(operationContext(), nssOrUuid, chunkSplitPoint, collEpoch, collTimestamp);
+ getChunkDoc(operationContext(), collUuid, chunkSplitPoint, collEpoch, collTimestamp);
ASSERT_OK(otherChunkDocStatus.getStatus());
auto otherChunkDoc = otherChunkDocStatus.getValue();
@@ -306,7 +300,6 @@ TEST_F(SplitChunkTest, NewSplitShouldClaimHighestVersion) {
ASSERT_EQ(competingVersion.minorVersion() + 2, otherChunkDoc.getVersion().minorVersion());
};
- test(_nss1, boost::none /* timestamp */);
test(_nss2, Timestamp(42));
}
@@ -316,7 +309,6 @@ TEST_F(SplitChunkTest, PreConditionFailErrors) {
ChunkType chunk;
chunk.setName(OID::gen());
- chunk.setNS(nss);
chunk.setCollectionUUID(UUID::gen());
auto origVersion = ChunkVersion(1, 0, collEpoch, collTimestamp);
@@ -344,7 +336,6 @@ TEST_F(SplitChunkTest, PreConditionFailErrors) {
ASSERT_EQ(ErrorCodes::BadValue, splitStatus);
};
- test(_nss1, boost::none /* timestamp */);
test(_nss2, Timestamp(42));
}
@@ -353,7 +344,6 @@ TEST_F(SplitChunkTest, NonExisingNamespaceErrors) {
const auto collEpoch = OID::gen();
ChunkType chunk;
- chunk.setNS(nss);
chunk.setCollectionUUID(UUID::gen());
auto origVersion = ChunkVersion(1, 0, collEpoch, collTimestamp);
@@ -379,7 +369,6 @@ TEST_F(SplitChunkTest, NonExisingNamespaceErrors) {
ASSERT_NOT_OK(splitStatus);
};
- test(_nss1, boost::none /* timestamp */);
test(_nss2, Timestamp(42));
}
@@ -388,7 +377,6 @@ TEST_F(SplitChunkTest, NonMatchingEpochsOfChunkAndRequestErrors) {
const auto collEpoch = OID::gen();
ChunkType chunk;
- chunk.setNS(nss);
chunk.setCollectionUUID(UUID::gen());
auto origVersion = ChunkVersion(1, 0, collEpoch, collTimestamp);
@@ -414,7 +402,6 @@ TEST_F(SplitChunkTest, NonMatchingEpochsOfChunkAndRequestErrors) {
ASSERT_EQ(ErrorCodes::StaleEpoch, splitStatus);
};
- test(_nss1, boost::none /* timestamp */);
test(_nss2, Timestamp(42));
}
@@ -424,7 +411,6 @@ TEST_F(SplitChunkTest, SplitPointsOutOfOrderShouldFail) {
ChunkType chunk;
chunk.setName(OID::gen());
- chunk.setNS(nss);
chunk.setCollectionUUID(UUID::gen());
auto origVersion = ChunkVersion(1, 0, collEpoch, collTimestamp);
@@ -450,7 +436,6 @@ TEST_F(SplitChunkTest, SplitPointsOutOfOrderShouldFail) {
ASSERT_EQ(ErrorCodes::InvalidOptions, splitStatus);
};
- test(_nss1, boost::none /* timestamp */);
test(_nss2, Timestamp(42));
}
@@ -459,7 +444,6 @@ TEST_F(SplitChunkTest, SplitPointsOutOfRangeAtMinShouldFail) {
const auto collEpoch = OID::gen();
ChunkType chunk;
- chunk.setNS(nss);
chunk.setCollectionUUID(UUID::gen());
auto origVersion = ChunkVersion(1, 0, collEpoch, collTimestamp);
@@ -485,7 +469,6 @@ TEST_F(SplitChunkTest, SplitPointsOutOfRangeAtMinShouldFail) {
ASSERT_EQ(ErrorCodes::InvalidOptions, splitStatus);
};
- test(_nss1, boost::none /* timestamp */);
test(_nss2, Timestamp(42));
}
@@ -495,7 +478,6 @@ TEST_F(SplitChunkTest, SplitPointsOutOfRangeAtMaxShouldFail) {
ChunkType chunk;
chunk.setName(OID::gen());
- chunk.setNS(nss);
chunk.setCollectionUUID(UUID::gen());
auto origVersion = ChunkVersion(1, 0, collEpoch, collTimestamp);
@@ -521,7 +503,6 @@ TEST_F(SplitChunkTest, SplitPointsOutOfRangeAtMaxShouldFail) {
ASSERT_EQ(ErrorCodes::InvalidOptions, splitStatus);
};
- test(_nss1, boost::none /* timestamp */);
test(_nss2, Timestamp(42));
}
@@ -530,7 +511,6 @@ TEST_F(SplitChunkTest, SplitPointsWithDollarPrefixShouldFail) {
const auto collEpoch = OID::gen();
ChunkType chunk;
- chunk.setNS(nss);
chunk.setCollectionUUID(UUID::gen());
auto origVersion = ChunkVersion(1, 0, collEpoch, collTimestamp);
@@ -559,7 +539,6 @@ TEST_F(SplitChunkTest, SplitPointsWithDollarPrefixShouldFail) {
"shard0000"));
};
- test(_nss1, boost::none /* timestamp */);
test(_nss2, Timestamp(42));
}
View Lorry Controller Status