summaryrefslogtreecommitdiff
path: root/src/mongo/db/exec/collection_scan.cpp
diff options
context:
space:
mode:
authorMaria van Keulen <maria@mongodb.com>2017-03-07 12:00:08 -0500
committerMaria van Keulen <maria@mongodb.com>2017-03-07 12:00:08 -0500
commit589a5c169ced8f6e9ddcd3d182ae1b75db6b7d79 (patch)
treec7a090ffdd56a91ae677e2492c61b820af44f964 /src/mongo/db/exec/collection_scan.cpp
parent3cba97198638df3750e3b455e2ad57af7ee536ae (diff)
downloadmongo-589a5c169ced8f6e9ddcd3d182ae1b75db6b7d79.tar.gz
SERVER-27938 Rename all OperationContext variables to opCtx
This commit is an automated rename of all whole word instances of txn, _txn, and txnPtr to opCtx, _opCtx, and opCtxPtr, respectively in all .cpp and .h files in src/mongo.
Diffstat (limited to 'src/mongo/db/exec/collection_scan.cpp')
-rw-r--r--src/mongo/db/exec/collection_scan.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mongo/db/exec/collection_scan.cpp b/src/mongo/db/exec/collection_scan.cpp
index a102eee8bda..987f7c28513 100644
--- a/src/mongo/db/exec/collection_scan.cpp
+++ b/src/mongo/db/exec/collection_scan.cpp
@@ -54,11 +54,11 @@ using stdx::make_unique;
// static
const char* CollectionScan::kStageType = "COLLSCAN";
-CollectionScan::CollectionScan(OperationContext* txn,
+CollectionScan::CollectionScan(OperationContext* opCtx,
const CollectionScanParams& params,
WorkingSet* workingSet,
const MatchExpression* filter)
- : PlanStage(kStageType, txn),
+ : PlanStage(kStageType, opCtx),
_workingSet(workingSet),
_filter(filter),
_params(params),
@@ -200,7 +200,7 @@ bool CollectionScan::isEOF() {
return _commonStats.isEOF || _isDead;
}
-void CollectionScan::doInvalidate(OperationContext* txn,
+void CollectionScan::doInvalidate(OperationContext* opCtx,
const RecordId& id,
InvalidationType type) {
// We don't care about mutations since we apply any filters to the result when we (possibly)
@@ -213,7 +213,7 @@ void CollectionScan::doInvalidate(OperationContext* txn,
// Deletions can harm the underlying RecordCursor so we must pass them down.
if (_cursor) {
- _cursor->invalidate(txn, id);
+ _cursor->invalidate(opCtx, id);
}
if (_params.tailable && id == _lastSeenId) {