diff options
Diffstat (limited to 'src/mongo/db/repl/oplog.cpp')
-rw-r--r-- | src/mongo/db/repl/oplog.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/mongo/db/repl/oplog.cpp b/src/mongo/db/repl/oplog.cpp index 87a748833e3..a8e14fc6470 100644 --- a/src/mongo/db/repl/oplog.cpp +++ b/src/mongo/db/repl/oplog.cpp @@ -423,8 +423,8 @@ void _logOp(OperationContext* txn, void logOps(OperationContext* txn, const char* opstr, const NamespaceString& nss, - std::vector<BSONObj>::iterator begin, - std::vector<BSONObj>::iterator end, + std::vector<BSONObj>::const_iterator begin, + std::vector<BSONObj>::const_iterator end, bool fromMigrate) { ReplicationCoordinator::Mode replMode = ReplicationCoordinator::get(txn)->getReplicationMode(); @@ -459,7 +459,7 @@ void logOp(OperationContext* txn, _logOp(txn, opstr, ns, obj, o2, fromMigrate, _oplogCollectionName, replMode, true); } -OpTime writeOpsToOplog(OperationContext* txn, const std::deque<BSONObj>& ops) { +OpTime writeOpsToOplog(OperationContext* txn, const std::vector<BSONObj>& ops) { ReplicationCoordinator* replCoord = getGlobalReplicationCoordinator(); OpTime lastOptime; @@ -483,11 +483,10 @@ OpTime writeOpsToOplog(OperationContext* txn, const std::deque<BSONObj>& ops) { OldClientContext ctx(txn, rsOplogName, _localDB); WriteUnitOfWork wunit(txn); - std::vector<BSONObj> opsVect(ops.begin(), ops.end()); checkOplogInsert( - _localOplogCollection->insertDocuments(txn, opsVect.begin(), opsVect.end(), false)); + _localOplogCollection->insertDocuments(txn, ops.begin(), ops.end(), false)); lastOptime = - fassertStatusOK(ErrorCodes::InvalidBSON, OpTime::parseFromOplogEntry(opsVect.back())); + fassertStatusOK(ErrorCodes::InvalidBSON, OpTime::parseFromOplogEntry(ops.back())); wunit.commit(); } MONGO_WRITE_CONFLICT_RETRY_LOOP_END(txn, "writeOps", _localOplogCollection->ns().ns()); |