diff options
Diffstat (limited to 'src/mongo/s/routing_table_history_test.cpp')
| -rw-r--r-- | src/mongo/s/routing_table_history_test.cpp | 62 |
1 files changed, 32 insertions, 30 deletions
diff --git a/src/mongo/s/routing_table_history_test.cpp b/src/mongo/s/routing_table_history_test.cpp index ee51cfc8a63..a067f030c82 100644 --- a/src/mongo/s/routing_table_history_test.cpp +++ b/src/mongo/s/routing_table_history_test.cpp @@ -71,7 +71,7 @@ RoutingTableHistory splitChunk(const RoutingTableHistory& rt, } return rt.makeUpdated( - boost::none /* timeseriesFields */, boost::none, boost::none, true, newChunks); + boost::none /* timeseriesFields */, boost::none /* reshardingFields */, true, newChunks); } /** @@ -132,8 +132,7 @@ public: epoch, timestamp, boost::none /* timeseriesFields */, - boost::none, - boost::none /* chunkSizeBytes */, + boost::none /* reshardingFields */, true, {initChunk})); ASSERT_EQ(_rt->numChunks(), 1ull); @@ -204,8 +203,7 @@ TEST_F(RoutingTableHistoryTest, TestSplits) { epoch, timestamp, boost::none /* timeseriesFields */, - boost::none, - boost::none /* chunkSizeBytes */, + boost::none /* reshardingFields */, true, {chunkAll}); @@ -219,8 +217,8 @@ TEST_F(RoutingTableHistoryTest, TestSplits) { ChunkVersion({epoch, timestamp}, {2, 2}), kThisShard}}; - auto rt1 = - rt.makeUpdated(boost::none /* timeseriesFields */, boost::none, boost::none, true, chunks1); + auto rt1 = rt.makeUpdated( + boost::none /* timeseriesFields */, boost::none /* reshardingFields */, true, chunks1); auto v1 = ChunkVersion({epoch, timestamp}, {2, 2}); ASSERT_EQ(v1, rt1.getVersion(kThisShard)); @@ -239,7 +237,7 @@ TEST_F(RoutingTableHistoryTest, TestSplits) { kThisShard}}; auto rt2 = rt1.makeUpdated( - boost::none /* timeseriesFields */, boost::none, boost::none, true, chunks2); + boost::none /* timeseriesFields */, boost::none /* reshardingFields */, true, chunks2); auto v2 = ChunkVersion({epoch, timestamp}, {3, 2}); ASSERT_EQ(v2, rt2.getVersion(kThisShard)); } @@ -263,8 +261,7 @@ TEST_F(RoutingTableHistoryTest, TestReplaceEmptyChunk) { epoch, timestamp, boost::none /* timeseriesFields */, - boost::none, - boost::none /* chunkSizeBytes */, + boost::none /* reshardingFields */, true, initialChunks); ASSERT_EQ(rt.numChunks(), 1); @@ -279,8 +276,10 @@ TEST_F(RoutingTableHistoryTest, TestReplaceEmptyChunk) { ChunkVersion({epoch, timestamp}, {2, 2}), kThisShard}}; - auto rt1 = rt.makeUpdated( - boost::none /* timeseriesFields */, boost::none, boost::none, true, changedChunks); + auto rt1 = rt.makeUpdated(boost::none /* timeseriesFields */, + boost::none /* reshardingFields */, + true, + changedChunks); auto v1 = ChunkVersion({epoch, timestamp}, {2, 2}); ASSERT_EQ(v1, rt1.getVersion(kThisShard)); ASSERT_EQ(rt1.numChunks(), 2); @@ -318,8 +317,7 @@ TEST_F(RoutingTableHistoryTest, TestUseLatestVersions) { epoch, timestamp, boost::none /* timeseriesFields */, - boost::none, - boost::none /* chunkSizeBytes */, + boost::none /* reshardingFields */, true, initialChunks); ASSERT_EQ(rt.numChunks(), 1); @@ -338,8 +336,10 @@ TEST_F(RoutingTableHistoryTest, TestUseLatestVersions) { ChunkVersion({epoch, timestamp}, {2, 2}), kThisShard}}; - auto rt1 = rt.makeUpdated( - boost::none /* timeseriesFields */, boost::none, boost::none, true, changedChunks); + auto rt1 = rt.makeUpdated(boost::none /* timeseriesFields */, + boost::none /* reshardingFields */, + true, + changedChunks); auto v1 = ChunkVersion({epoch, timestamp}, {2, 2}); ASSERT_EQ(v1, rt1.getVersion(kThisShard)); ASSERT_EQ(rt1.numChunks(), 2); @@ -368,8 +368,7 @@ TEST_F(RoutingTableHistoryTest, TestOutOfOrderVersion) { epoch, timestamp, boost::none /* timeseriesFields */, - boost::none, - boost::none /* chunkSizeBytes */, + boost::none /* reshardingFields */, true, initialChunks); ASSERT_EQ(rt.numChunks(), 2); @@ -384,8 +383,10 @@ TEST_F(RoutingTableHistoryTest, TestOutOfOrderVersion) { ChunkVersion({epoch, timestamp}, {3, 1}), kThisShard}}; - auto rt1 = rt.makeUpdated( - boost::none /* timeseriesFields */, boost::none, boost::none, true, changedChunks); + auto rt1 = rt.makeUpdated(boost::none /* timeseriesFields */, + boost::none /* reshardingFields */, + true, + changedChunks); auto v1 = ChunkVersion({epoch, timestamp}, {3, 1}); ASSERT_EQ(v1, rt1.getVersion(kThisShard)); ASSERT_EQ(rt1.numChunks(), 2); @@ -422,9 +423,8 @@ TEST_F(RoutingTableHistoryTest, TestMergeChunks) { false, epoch, timestamp, - boost::none, boost::none /* timeseriesFields */, - boost::none /* chunkSizeBytes */, + boost::none /* reshardingFields */, true, initialChunks); ASSERT_EQ(rt.numChunks(), 3); @@ -440,8 +440,10 @@ TEST_F(RoutingTableHistoryTest, TestMergeChunks) { ChunkVersion({epoch, timestamp}, {3, 1}), kThisShard}}; - auto rt1 = rt.makeUpdated( - boost::none /* timeseriesFields */, boost::none, boost::none, true, changedChunks); + auto rt1 = rt.makeUpdated(boost::none /* timeseriesFields */, + boost::none /* reshardingFields */, + true, + changedChunks); auto v1 = ChunkVersion({epoch, timestamp}, {3, 1}); ASSERT_EQ(v1, rt1.getVersion(kThisShard)); ASSERT_EQ(rt1.numChunks(), 2); @@ -474,8 +476,7 @@ TEST_F(RoutingTableHistoryTest, TestMergeChunksOrdering) { epoch, timestamp, boost::none /* timeseriesFields */, - boost::none, - boost::none /* chunkSizeBytes */, + boost::none /* reshardingFields */, true, initialChunks); ASSERT_EQ(rt.numChunks(), 3); @@ -491,8 +492,10 @@ TEST_F(RoutingTableHistoryTest, TestMergeChunksOrdering) { ChunkVersion({epoch, timestamp}, {3, 1}), kThisShard}}; - auto rt1 = rt.makeUpdated( - boost::none /* timeseriesFields */, boost::none, boost::none, true, changedChunks); + auto rt1 = rt.makeUpdated(boost::none /* timeseriesFields */, + boost::none /* reshardingFields */, + true, + changedChunks); auto v1 = ChunkVersion({epoch, timestamp}, {3, 1}); ASSERT_EQ(v1, rt1.getVersion(kThisShard)); ASSERT_EQ(rt1.numChunks(), 2); @@ -543,8 +546,7 @@ TEST_F(RoutingTableHistoryTest, TestFlatten) { epoch, timestamp, boost::none /* timeseriesFields */, - boost::none, - boost::none /* chunkSizeBytes */, + boost::none /* reshardingFields */, true, initialChunks); ASSERT_EQ(rt.numChunks(), 2); |