diff options
| author | Allison Easton <allison.easton@mongodb.com> | 2021-09-21 13:39:28 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-09-21 14:39:04 +0000 |
| commit | 9e1d37df7bf5bb4c8312f155bd671214f75ea296 (patch) | |
| tree | c0895615554be30d482ec9923af19ea75b9745ae /src/mongo/s/catalog_cache.cpp | |
| parent | bfef41e47abf95ec8f8114552d44df6c58409c9c (diff) | |
| download | mongo-9e1d37df7bf5bb4c8312f155bd671214f75ea296.tar.gz | |
SERVER-52847 Make timestamp required in CollectionType and ShardCollectionType IDL
Diffstat (limited to 'src/mongo/s/catalog_cache.cpp')
| -rw-r--r-- | src/mongo/s/catalog_cache.cpp | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/src/mongo/s/catalog_cache.cpp b/src/mongo/s/catalog_cache.cpp index bc5acaa48fc..d786da676f9 100644 --- a/src/mongo/s/catalog_cache.cpp +++ b/src/mongo/s/catalog_cache.cpp @@ -659,20 +659,10 @@ CatalogCache::CollectionCache::LookupResult CatalogCache::CollectionCache::_look // updating. Otherwise, we're making a whole new routing table. if (isIncremental && existingHistory->optRt->getVersion().epoch() == collectionAndChunks.epoch) { - if (existingHistory->optRt->getVersion().getTimestamp().is_initialized() != - collectionAndChunks.creationTime.is_initialized()) { - return existingHistory->optRt - ->makeUpdatedReplacingTimestamp(collectionAndChunks.creationTime) - .makeUpdated(collectionAndChunks.reshardingFields, - maxChunkSize, - collectionAndChunks.allowMigrations, - collectionAndChunks.changedChunks); - } else { - return existingHistory->optRt->makeUpdated(collectionAndChunks.reshardingFields, - maxChunkSize, - collectionAndChunks.allowMigrations, - collectionAndChunks.changedChunks); - } + return existingHistory->optRt->makeUpdated(collectionAndChunks.reshardingFields, + maxChunkSize, + collectionAndChunks.allowMigrations, + collectionAndChunks.changedChunks); } auto defaultCollator = [&]() -> std::unique_ptr<CollatorInterface> { |