diff options
| author | Jason Rassi <rassi@10gen.com> | 2014-10-20 17:08:55 -0400 |
|---|---|---|
| committer | Jason Rassi <rassi@10gen.com> | 2014-11-20 12:52:25 -0500 |
| commit | 429dc5819eb37e21d9e5c4573aae8421efd50ed7 (patch) | |
| tree | e64019b8d4fd795cac5a778df79a0983bb34bcf7 /src/mongo/db/instance.cpp | |
| parent | 1b204eba0dc80f4007cb88b995b761a8bc0987fc (diff) | |
| download | mongo-429dc5819eb37e21d9e5c4573aae8421efd50ed7.tar.gz | |
SERVER-15675 Remove OperationContext from UpdateRequest/DeleteRequest
The write execution machinery should have a handle to the operation
context, not the write request structs.
Diffstat (limited to 'src/mongo/db/instance.cpp')
| -rw-r--r-- | src/mongo/db/instance.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mongo/db/instance.cpp b/src/mongo/db/instance.cpp index 64d55a656e0..9c97fccecdb 100644 --- a/src/mongo/db/instance.cpp +++ b/src/mongo/db/instance.cpp @@ -554,7 +554,7 @@ namespace { op.debug().query = query; op.setQuery(query); - UpdateRequest request(txn, ns); + UpdateRequest request(ns); request.setUpsert(upsert); request.setMulti(multi); @@ -569,7 +569,7 @@ namespace { int attempt = 1; while ( 1 ) { try { - UpdateExecutor executor(&request, &op.debug()); + UpdateExecutor executor(txn, &request, &op.debug()); uassertStatusOK(executor.prepare()); // Tentatively take an intent lock, fix up if we need to create the collection @@ -603,7 +603,7 @@ namespace { // This is an upsert into a non-existing database, so need an exclusive lock // to avoid deadlock { - UpdateExecutor executor(&request, &op.debug()); + UpdateExecutor executor(txn, &request, &op.debug()); uassertStatusOK(executor.prepare()); Lock::DBLock dbLock(txn->lockState(), ns.db(), MODE_X); @@ -645,7 +645,7 @@ namespace { op.debug().query = pattern; op.setQuery(pattern); - DeleteRequest request(txn, ns); + DeleteRequest request(ns); request.setQuery(pattern); request.setMulti(!justOne); request.setUpdateOpLog(true); @@ -655,7 +655,7 @@ namespace { int attempt = 1; while ( 1 ) { try { - DeleteExecutor executor(&request); + DeleteExecutor executor(txn, &request); uassertStatusOK(executor.prepare()); AutoGetDb autoDb(txn, ns.db(), MODE_IX); |