summaryrefslogtreecommitdiff
path: root/src/mongo/db/repl/oplog_buffer_collection.cpp
diff options
context:
space:
mode:
authorRandolph Tan <randolph@10gen.com>2017-07-03 17:49:48 -0400
committerRandolph Tan <randolph@10gen.com>2017-07-12 13:20:42 -0400
commit1550eb477fcf883e861f63ffc988a6060a2fbfb1 (patch)
tree2ae92c69ae385f2788ec7ab2fad3aa77e7495ee9 /src/mongo/db/repl/oplog_buffer_collection.cpp
parent1d6008b049e65615b13404f0b877034cfa980220 (diff)
downloadmongo-1550eb477fcf883e861f63ffc988a6060a2fbfb1.tar.gz
SERVER-28912 Thread statement id from batched insert command oplog entry
Diffstat (limited to 'src/mongo/db/repl/oplog_buffer_collection.cpp')
-rw-r--r--src/mongo/db/repl/oplog_buffer_collection.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/db/repl/oplog_buffer_collection.cpp b/src/mongo/db/repl/oplog_buffer_collection.cpp
index 4adefe18d65..2e0ccc8278c 100644
--- a/src/mongo/db/repl/oplog_buffer_collection.cpp
+++ b/src/mongo/db/repl/oplog_buffer_collection.cpp
@@ -175,7 +175,7 @@ void OplogBufferCollection::pushAllNonBlocking(OperationContext* opCtx,
return;
}
size_t numDocs = std::distance(begin, end);
- Batch docsToInsert(numDocs);
+ std::vector<InsertStatement> docsToInsert(numDocs);
stdx::lock_guard<stdx::mutex> lk(_mutex);
auto ts = _lastPushedTimestamp;
auto sentinelCount = _sentinelCount;
@@ -184,7 +184,7 @@ void OplogBufferCollection::pushAllNonBlocking(OperationContext* opCtx,
auto previousTimestamp = ts;
std::tie(doc, ts, sentinelCount) = addIdToDocument(value, ts, sentinelCount);
invariant(value.isEmpty() ? ts == previousTimestamp : ts > previousTimestamp);
- return doc;
+ return InsertStatement(doc);
});
auto status = _storageInterface->insertDocuments(opCtx, _nss, docsToInsert);