diff options
author | Maria van Keulen <maria@mongodb.com> | 2017-03-07 12:00:08 -0500 |
---|---|---|
committer | Maria van Keulen <maria@mongodb.com> | 2017-03-07 12:00:08 -0500 |
commit | 589a5c169ced8f6e9ddcd3d182ae1b75db6b7d79 (patch) | |
tree | c7a090ffdd56a91ae677e2492c61b820af44f964 /src/mongo/db/matcher/expression_text.cpp | |
parent | 3cba97198638df3750e3b455e2ad57af7ee536ae (diff) | |
download | mongo-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/matcher/expression_text.cpp')
-rw-r--r-- | src/mongo/db/matcher/expression_text.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mongo/db/matcher/expression_text.cpp b/src/mongo/db/matcher/expression_text.cpp index 8c8bd979cf8..9dcf093e591 100644 --- a/src/mongo/db/matcher/expression_text.cpp +++ b/src/mongo/db/matcher/expression_text.cpp @@ -41,7 +41,7 @@ namespace mongo { -Status TextMatchExpression::init(OperationContext* txn, +Status TextMatchExpression::init(OperationContext* opCtx, const NamespaceString& nss, TextParams params) { _ftsQuery.setQuery(std::move(params.query)); @@ -52,9 +52,9 @@ Status TextMatchExpression::init(OperationContext* txn, fts::TextIndexVersion version; { // Find text index. - ScopedTransaction transaction(txn, MODE_IS); - AutoGetDb autoDb(txn, nss.db(), MODE_IS); - Lock::CollectionLock collLock(txn->lockState(), nss.ns(), MODE_IS); + ScopedTransaction transaction(opCtx, MODE_IS); + AutoGetDb autoDb(opCtx, nss.db(), MODE_IS); + Lock::CollectionLock collLock(opCtx->lockState(), nss.ns(), MODE_IS); Database* db = autoDb.getDb(); if (!db) { return {ErrorCodes::IndexNotFound, @@ -70,7 +70,7 @@ Status TextMatchExpression::init(OperationContext* txn, << "')"}; } std::vector<IndexDescriptor*> idxMatches; - collection->getIndexCatalog()->findIndexByType(txn, IndexNames::TEXT, idxMatches); + collection->getIndexCatalog()->findIndexByType(opCtx, IndexNames::TEXT, idxMatches); if (idxMatches.empty()) { return {ErrorCodes::IndexNotFound, "text index required for $text query"}; } |