diff options
| author | Charlie Swanson <charlie.swanson@mongodb.com> | 2018-11-01 17:35:26 -0400 |
|---|---|---|
| committer | Charlie Swanson <charlie.swanson@mongodb.com> | 2018-11-21 14:56:27 -0500 |
| commit | cce280f98a8badf8aef4ed960e82e61e61d3fe5e (patch) | |
| tree | 4ddfbd74d4acea1135c9ab15ecdd8803abb4ca6d /src/mongo/db/pipeline/mongo_process_common.cpp | |
| parent | 756f8e070b5fbf6728ecefbd625601f3dd7e75a0 (diff) | |
| download | mongo-cce280f98a8badf8aef4ed960e82e61e61d3fe5e.tar.gz | |
SERVER-37871 Enforce agreement on shard key across cluster for $out
Diffstat (limited to 'src/mongo/db/pipeline/mongo_process_common.cpp')
| -rw-r--r-- | src/mongo/db/pipeline/mongo_process_common.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mongo/db/pipeline/mongo_process_common.cpp b/src/mongo/db/pipeline/mongo_process_common.cpp index 3ab1d1a2bfc..4348baf3940 100644 --- a/src/mongo/db/pipeline/mongo_process_common.cpp +++ b/src/mongo/db/pipeline/mongo_process_common.cpp @@ -149,7 +149,7 @@ bool MongoProcessCommon::keyPatternNamesExactPaths(const BSONObj& keyPattern, return nFieldsMatched == uniqueKeyPaths.size(); } -boost::optional<OID> MongoProcessCommon::refreshAndGetEpoch( +boost::optional<ChunkVersion> MongoProcessCommon::refreshAndGetCollectionVersion( const boost::intrusive_ptr<ExpressionContext>& expCtx, const NamespaceString& nss) const { const bool forceRefreshFromThisThread = false; auto routingInfo = uassertStatusOK( @@ -157,7 +157,7 @@ boost::optional<OID> MongoProcessCommon::refreshAndGetEpoch( ->catalogCache() ->getCollectionRoutingInfoWithRefresh(expCtx->opCtx, nss, forceRefreshFromThisThread)); if (auto chunkManager = routingInfo.cm()) { - return chunkManager->getVersion().epoch(); + return chunkManager->getVersion(); } return boost::none; } @@ -175,4 +175,5 @@ std::vector<FieldPath> MongoProcessCommon::_shardKeyToDocumentKeyFields( } return result; } + } // namespace mongo |