diff options
Diffstat (limited to 'src/mongo/db/s')
| -rw-r--r-- | src/mongo/db/s/collection_metadata_filtering_test.cpp | 9 | ||||
| -rw-r--r-- | src/mongo/db/s/collection_metadata_test.cpp | 4 | ||||
| -rw-r--r-- | src/mongo/db/s/collection_sharding_runtime_test.cpp | 17 | ||||
| -rw-r--r-- | src/mongo/db/s/metadata_manager_test.cpp | 5 | ||||
| -rw-r--r-- | src/mongo/db/s/migration_chunk_cloner_source_legacy_test.cpp | 1 | ||||
| -rw-r--r-- | src/mongo/db/s/op_observer_sharding_test.cpp | 10 | ||||
| -rw-r--r-- | src/mongo/db/s/range_deletion_util_test.cpp | 1 | ||||
| -rw-r--r-- | src/mongo/db/s/shard_server_catalog_cache_loader.cpp | 1 |
8 files changed, 35 insertions, 13 deletions
diff --git a/src/mongo/db/s/collection_metadata_filtering_test.cpp b/src/mongo/db/s/collection_metadata_filtering_test.cpp index 7da06febea4..0aa4438b5a8 100644 --- a/src/mongo/db/s/collection_metadata_filtering_test.cpp +++ b/src/mongo/db/s/collection_metadata_filtering_test.cpp @@ -64,7 +64,14 @@ protected: const ShardKeyPattern shardKeyPattern(BSON("_id" << 1)); auto rt = RoutingTableHistory::makeNew( - kNss, UUID::gen(), shardKeyPattern.getKeyPattern(), nullptr, false, epoch, [&] { + kNss, + UUID::gen(), + shardKeyPattern.getKeyPattern(), + nullptr, + false, + epoch, + boost::none, + [&] { ChunkVersion version(1, 0, epoch); ChunkType chunk1(kNss, diff --git a/src/mongo/db/s/collection_metadata_test.cpp b/src/mongo/db/s/collection_metadata_test.cpp index 1cb96520d96..c26be5b2795 100644 --- a/src/mongo/db/s/collection_metadata_test.cpp +++ b/src/mongo/db/s/collection_metadata_test.cpp @@ -80,8 +80,8 @@ std::unique_ptr<CollectionMetadata> makeCollectionMetadataImpl( } UUID uuid(UUID::gen()); - auto rt = - RoutingTableHistory::makeNew(kNss, uuid, shardKeyPattern, nullptr, false, epoch, allChunks); + auto rt = RoutingTableHistory::makeNew( + kNss, uuid, shardKeyPattern, nullptr, false, epoch, boost::none, allChunks); return std::make_unique<CollectionMetadata>( ChunkManager(kThisShard, DatabaseVersion(UUID::gen(), 1), rt, kChunkManager), kThisShard); } diff --git a/src/mongo/db/s/collection_sharding_runtime_test.cpp b/src/mongo/db/s/collection_sharding_runtime_test.cpp index 77fc9616d93..0ea329db1b9 100644 --- a/src/mongo/db/s/collection_sharding_runtime_test.cpp +++ b/src/mongo/db/s/collection_sharding_runtime_test.cpp @@ -51,12 +51,17 @@ CollectionMetadata makeShardedMetadata(OperationContext* opCtx, UUID uuid = UUID const OID epoch = OID::gen(); auto range = ChunkRange(BSON(kShardKey << MINKEY), BSON(kShardKey << MAXKEY)); auto chunk = ChunkType(kTestNss, std::move(range), ChunkVersion(1, 0, epoch), ShardId("other")); - ChunkManager cm( - ShardId("0"), - DatabaseVersion(UUID::gen(), 1), - RoutingTableHistory::makeNew( - kTestNss, uuid, kShardKeyPattern, nullptr, false, epoch, {std::move(chunk)}), - boost::none); + ChunkManager cm(ShardId("0"), + DatabaseVersion(UUID::gen(), 1), + RoutingTableHistory::makeNew(kTestNss, + uuid, + kShardKeyPattern, + nullptr, + false, + epoch, + boost::none, + {std::move(chunk)}), + boost::none); if (!OperationShardingState::isOperationVersioned(opCtx)) { const auto version = cm.getVersion(ShardId("0")); diff --git a/src/mongo/db/s/metadata_manager_test.cpp b/src/mongo/db/s/metadata_manager_test.cpp index d0eb10912ae..cff36ce4269 100644 --- a/src/mongo/db/s/metadata_manager_test.cpp +++ b/src/mongo/db/s/metadata_manager_test.cpp @@ -85,6 +85,7 @@ protected: nullptr, false, epoch, + boost::none, {ChunkType{kNss, range, ChunkVersion(1, 0, epoch), kOtherShard}}); return CollectionMetadata( @@ -128,7 +129,7 @@ protected: splitChunks.emplace_back( kNss, ChunkRange(maxKey, chunkToSplit.getMax()), chunkVersion, kOtherShard); - auto rt = cm->getRoutingHistory()->makeUpdated(splitChunks); + auto rt = cm->getRoutingHistory()->makeUpdated(boost::none, splitChunks); return CollectionMetadata(ChunkManager(cm->dbPrimary(), cm->dbVersion(), rt, boost::none), kThisShard); @@ -150,7 +151,7 @@ protected: chunkVersion.incMajor(); auto rt = cm->getRoutingHistory()->makeUpdated( - {ChunkType(kNss, ChunkRange(minKey, maxKey), chunkVersion, kOtherShard)}); + boost::none, {ChunkType(kNss, ChunkRange(minKey, maxKey), chunkVersion, kOtherShard)}); return CollectionMetadata(ChunkManager(cm->dbPrimary(), cm->dbVersion(), rt, boost::none), kThisShard); diff --git a/src/mongo/db/s/migration_chunk_cloner_source_legacy_test.cpp b/src/mongo/db/s/migration_chunk_cloner_source_legacy_test.cpp index fe92a9dada3..82426d039a1 100644 --- a/src/mongo/db/s/migration_chunk_cloner_source_legacy_test.cpp +++ b/src/mongo/db/s/migration_chunk_cloner_source_legacy_test.cpp @@ -154,6 +154,7 @@ protected: nullptr, false, epoch, + boost::none, {ChunkType{kNss, ChunkRange{BSON(kShardKey << MINKEY), BSON(kShardKey << MAXKEY)}, ChunkVersion(1, 0, epoch), diff --git a/src/mongo/db/s/op_observer_sharding_test.cpp b/src/mongo/db/s/op_observer_sharding_test.cpp index a282455af15..fd32555ba66 100644 --- a/src/mongo/db/s/op_observer_sharding_test.cpp +++ b/src/mongo/db/s/op_observer_sharding_test.cpp @@ -63,8 +63,14 @@ CollectionMetadata makeAMetadata(BSONObj const& keyPattern) { const OID epoch = OID::gen(); auto range = ChunkRange(BSON("key" << MINKEY), BSON("key" << MAXKEY)); auto chunk = ChunkType(kTestNss, std::move(range), ChunkVersion(1, 0, epoch), ShardId("other")); - auto rt = RoutingTableHistory::makeNew( - kTestNss, UUID::gen(), KeyPattern(keyPattern), nullptr, false, epoch, {std::move(chunk)}); + auto rt = RoutingTableHistory::makeNew(kTestNss, + UUID::gen(), + KeyPattern(keyPattern), + nullptr, + false, + epoch, + boost::none, + {std::move(chunk)}); return CollectionMetadata( ChunkManager(ShardId("this"), DatabaseVersion(UUID::gen(), 1), rt, Timestamp(100, 0)), diff --git a/src/mongo/db/s/range_deletion_util_test.cpp b/src/mongo/db/s/range_deletion_util_test.cpp index 4af4b139430..d9874802768 100644 --- a/src/mongo/db/s/range_deletion_util_test.cpp +++ b/src/mongo/db/s/range_deletion_util_test.cpp @@ -96,6 +96,7 @@ public: nullptr, false, epoch, + boost::none, {ChunkType{kNss, ChunkRange{BSON(kShardKey << MINKEY), BSON(kShardKey << MAXKEY)}, ChunkVersion(1, 0, epoch), diff --git a/src/mongo/db/s/shard_server_catalog_cache_loader.cpp b/src/mongo/db/s/shard_server_catalog_cache_loader.cpp index dbd1f38f8e2..a4f9a02e009 100644 --- a/src/mongo/db/s/shard_server_catalog_cache_loader.cpp +++ b/src/mongo/db/s/shard_server_catalog_cache_loader.cpp @@ -234,6 +234,7 @@ CollectionAndChangedChunks getPersistedMetadataSinceVersion(OperationContext* op shardCollectionEntry.getKeyPattern().toBSON(), shardCollectionEntry.getDefaultCollation(), shardCollectionEntry.getUnique(), + boost::none, std::move(changedChunks)}; } |