summaryrefslogtreecommitdiff
path: root/src/mongo/s/chunk_map_test.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/s/chunk_map_test.cpp')
-rw-r--r--src/mongo/s/chunk_map_test.cpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/mongo/s/chunk_map_test.cpp b/src/mongo/s/chunk_map_test.cpp
index 6514fc00745..88378ff53e1 100644
--- a/src/mongo/s/chunk_map_test.cpp
+++ b/src/mongo/s/chunk_map_test.cpp
@@ -27,13 +27,10 @@
* it in the license file.
*/
-#include "mongo/platform/basic.h"
-
#include "mongo/s/chunk_manager.h"
#include "mongo/unittest/unittest.h"
namespace mongo {
-
namespace {
const NamespaceString kNss("TestDB", "TestColl");
@@ -58,7 +55,7 @@ private:
TEST_F(ChunkMapTest, TestAddChunk) {
const OID epoch = OID::gen();
- ChunkVersion version{1, 0, epoch, Timestamp(1, 1)};
+ ChunkVersion version({epoch, Timestamp(1, 1)}, {1, 0});
auto chunk = std::make_shared<ChunkInfo>(
ChunkType{uuid(),
@@ -75,7 +72,7 @@ TEST_F(ChunkMapTest, TestAddChunk) {
TEST_F(ChunkMapTest, TestEnumerateAllChunks) {
const OID epoch = OID::gen();
ChunkMap chunkMap{epoch, Timestamp(1, 1)};
- ChunkVersion version{1, 0, epoch, Timestamp(1, 1)};
+ ChunkVersion version({epoch, Timestamp(1, 1)}, {1, 0});
auto newChunkMap = chunkMap.createMerged(
{std::make_shared<ChunkInfo>(
@@ -110,7 +107,7 @@ TEST_F(ChunkMapTest, TestEnumerateAllChunks) {
TEST_F(ChunkMapTest, TestIntersectingChunk) {
const OID epoch = OID::gen();
ChunkMap chunkMap{epoch, Timestamp(1, 1)};
- ChunkVersion version{1, 0, epoch, Timestamp(1, 1)};
+ ChunkVersion version({epoch, Timestamp(1, 1)}, {1, 0});
auto newChunkMap = chunkMap.createMerged(
{std::make_shared<ChunkInfo>(
@@ -140,7 +137,7 @@ TEST_F(ChunkMapTest, TestIntersectingChunk) {
TEST_F(ChunkMapTest, TestEnumerateOverlappingChunks) {
const OID epoch = OID::gen();
ChunkMap chunkMap{epoch, Timestamp(1, 1)};
- ChunkVersion version{1, 0, epoch, Timestamp(1, 1)};
+ ChunkVersion version({epoch, Timestamp(1, 1)}, {1, 0});
auto newChunkMap = chunkMap.createMerged(
{std::make_shared<ChunkInfo>(