summaryrefslogtreecommitdiff
path: root/src/mongo/db/s/collection_sharding_state.cpp
diff options
context:
space:
mode:
authorNathan Myers <nathan.myers@10gen.com>2017-09-25 16:20:23 -0400
committerNathan Myers <nathan.myers@10gen.com>2017-09-25 16:20:23 -0400
commit0939e1447aa5b4291c09c1fab2344a66098213dd (patch)
tree53675734d2c5d1378088beb3b35c77cce8ed7a15 /src/mongo/db/s/collection_sharding_state.cpp
parentd7aca6435e8ccc89005a97dc585dfbe429a17dec (diff)
downloadmongo-0939e1447aa5b4291c09c1fab2344a66098213dd.tar.gz
SERVER-29136 Plumb update document key through to op log
Diffstat (limited to 'src/mongo/db/s/collection_sharding_state.cpp')
-rw-r--r--src/mongo/db/s/collection_sharding_state.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/mongo/db/s/collection_sharding_state.cpp b/src/mongo/db/s/collection_sharding_state.cpp
index a5b6073205d..787b59e73bd 100644
--- a/src/mongo/db/s/collection_sharding_state.cpp
+++ b/src/mongo/db/s/collection_sharding_state.cpp
@@ -320,14 +320,11 @@ void CollectionShardingState::onUpdateOp(OperationContext* opCtx,
}
auto CollectionShardingState::makeDeleteState(BSONObj const& doc) -> DeleteState {
- BSONObj documentKey = getMetadata().extractDocumentKey(doc).getOwned();
- invariant(documentKey.hasField("_id"_sd));
- return {std::move(documentKey),
+ return {getMetadata().extractDocumentKey(doc).getOwned(),
_sourceMgr && _sourceMgr->getCloner()->isDocumentInMigratingChunk(doc)};
}
-void CollectionShardingState::onDeleteOp(OperationContext* opCtx,
- const CollectionShardingState::DeleteState& deleteState) {
+void CollectionShardingState::onDeleteOp(OperationContext* opCtx, DeleteState const& deleteState) {
dassert(opCtx->lockState()->isCollectionLockedForMode(_nss.ns(), MODE_IX));
if (serverGlobalParams.clusterRole == ClusterRole::ShardServer) {