diff options
author | Hari Khalsa <hkhalsa@10gen.com> | 2014-05-15 13:26:48 -0400 |
---|---|---|
committer | Hari Khalsa <hkhalsa@10gen.com> | 2014-05-15 13:56:05 -0400 |
commit | 4de88387eec6c0bb08b10d0ba1574a656f56232d (patch) | |
tree | 7fdc9a0acd251b5b8b0a8f3de45ce1c2ecf7e94c /src/mongo/db/ops | |
parent | 71cbb04eb8262b0bdf255056f26101466c11b43d (diff) | |
download | mongo-4de88387eec6c0bb08b10d0ba1574a656f56232d.tar.gz |
SERVER-13641 rename TransactionExperiment to OperationContext
Diffstat (limited to 'src/mongo/db/ops')
-rw-r--r-- | src/mongo/db/ops/delete.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/ops/delete.h | 4 | ||||
-rw-r--r-- | src/mongo/db/ops/delete_executor.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/ops/delete_executor.h | 4 | ||||
-rw-r--r-- | src/mongo/db/ops/update.cpp | 6 | ||||
-rw-r--r-- | src/mongo/db/ops/update.h | 6 | ||||
-rw-r--r-- | src/mongo/db/ops/update_executor.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/ops/update_executor.h | 4 |
8 files changed, 15 insertions, 15 deletions
diff --git a/src/mongo/db/ops/delete.cpp b/src/mongo/db/ops/delete.cpp index 1e28a895855..c78ca1692f1 100644 --- a/src/mongo/db/ops/delete.cpp +++ b/src/mongo/db/ops/delete.cpp @@ -38,7 +38,7 @@ namespace mongo { justOne: stop after 1 match god: allow access to system namespaces, and don't yield */ - long long deleteObjects(TransactionExperiment* txn, + long long deleteObjects(OperationContext* txn, Database* db, const StringData& ns, BSONObj pattern, diff --git a/src/mongo/db/ops/delete.h b/src/mongo/db/ops/delete.h index 28327c42c06..f0536b63dd2 100644 --- a/src/mongo/db/ops/delete.h +++ b/src/mongo/db/ops/delete.h @@ -36,10 +36,10 @@ namespace mongo { class Database; - class TransactionExperiment; + class OperationContext; // If justOne is true, deletedId is set to the id of the deleted object. - long long deleteObjects(TransactionExperiment* txn, + long long deleteObjects(OperationContext* txn, Database* db, const StringData& ns, BSONObj pattern, diff --git a/src/mongo/db/ops/delete_executor.cpp b/src/mongo/db/ops/delete_executor.cpp index 7c16d203756..9c14c772bdc 100644 --- a/src/mongo/db/ops/delete_executor.cpp +++ b/src/mongo/db/ops/delete_executor.cpp @@ -79,7 +79,7 @@ namespace mongo { return status; } - long long DeleteExecutor::execute(TransactionExperiment* txn, Database* db) { + long long DeleteExecutor::execute(OperationContext* txn, Database* db) { uassertStatusOK(prepare()); uassert(17417, mongoutils::str::stream() << diff --git a/src/mongo/db/ops/delete_executor.h b/src/mongo/db/ops/delete_executor.h index ee072d957ad..475df92a105 100644 --- a/src/mongo/db/ops/delete_executor.h +++ b/src/mongo/db/ops/delete_executor.h @@ -39,7 +39,7 @@ namespace mongo { class CanonicalQuery; class Database; class DeleteRequest; - class TransactionExperiment; + class OperationContext; /** * Implementation of the processing of a delete operation in a mongod. @@ -92,7 +92,7 @@ namespace mongo { * * Returns the number of documents deleted. */ - long long execute(TransactionExperiment* txn, Database* db); + long long execute(OperationContext* txn, Database* db); private: /// Unowned pointer to the request object that this executor will process. diff --git a/src/mongo/db/ops/update.cpp b/src/mongo/db/ops/update.cpp index 6559c2203a0..07e292f6320 100644 --- a/src/mongo/db/ops/update.cpp +++ b/src/mongo/db/ops/update.cpp @@ -49,7 +49,7 @@ #include "mongo/db/query/query_planner_common.h" #include "mongo/db/repl/is_master.h" #include "mongo/db/repl/oplog.h" -#include "mongo/db/storage/mmap_v1/dur_transaction.h" +#include "mongo/db/operation_context_impl.h" #include "mongo/db/catalog/collection.h" #include "mongo/platform/unordered_set.h" @@ -416,7 +416,7 @@ namespace mongo { } } // namespace - UpdateResult update(TransactionExperiment* txn, + UpdateResult update(OperationContext* txn, Database* db, const UpdateRequest& request, OpDebug* opDebug) { @@ -426,7 +426,7 @@ namespace mongo { } UpdateResult update( - TransactionExperiment* txn, + OperationContext* txn, Database* db, const UpdateRequest& request, OpDebug* opDebug, diff --git a/src/mongo/db/ops/update.h b/src/mongo/db/ops/update.h index cdb76718f3e..f950fbaf08c 100644 --- a/src/mongo/db/ops/update.h +++ b/src/mongo/db/ops/update.h @@ -38,7 +38,7 @@ namespace mongo { class CanonicalQuery; - class TransactionExperiment; + class OperationContext; class UpdateDriver; /** @@ -46,7 +46,7 @@ namespace mongo { * * Caller must hold the appropriate database locks. */ - UpdateResult update(TransactionExperiment* txn, + UpdateResult update(OperationContext* txn, Database* db, const UpdateRequest& request, OpDebug* opDebug); @@ -59,7 +59,7 @@ namespace mongo { * * TODO: Move this into a private method of UpdateExecutor. */ - UpdateResult update(TransactionExperiment* txn, + UpdateResult update(OperationContext* txn, Database* db, const UpdateRequest& request, OpDebug* opDebug, diff --git a/src/mongo/db/ops/update_executor.cpp b/src/mongo/db/ops/update_executor.cpp index 109a11ebed9..fd2f11701a7 100644 --- a/src/mongo/db/ops/update_executor.cpp +++ b/src/mongo/db/ops/update_executor.cpp @@ -62,7 +62,7 @@ namespace mongo { return Status::OK(); } - UpdateResult UpdateExecutor::execute(TransactionExperiment* txn, Database* db) { + UpdateResult UpdateExecutor::execute(OperationContext* txn, Database* db) { uassertStatusOK(prepare()); return update(txn, db, diff --git a/src/mongo/db/ops/update_executor.h b/src/mongo/db/ops/update_executor.h index ef2ca7ba503..881c0cc0d36 100644 --- a/src/mongo/db/ops/update_executor.h +++ b/src/mongo/db/ops/update_executor.h @@ -39,7 +39,7 @@ namespace mongo { class CanonicalQuery; class OpDebug; - class TransactionExperiment; + class OperationContext; class UpdateRequest; /** @@ -91,7 +91,7 @@ namespace mongo { * Execute an update. Requires the caller to hold the database lock on the * appropriate resources for the request. */ - UpdateResult execute(TransactionExperiment* txn, Database* db); + UpdateResult execute(OperationContext* txn, Database* db); private: /** |