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/s/shard_key_pattern.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/s/shard_key_pattern.cpp')
| -rw-r--r-- | src/mongo/s/shard_key_pattern.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mongo/s/shard_key_pattern.cpp b/src/mongo/s/shard_key_pattern.cpp index 1a8e77658e1..ef0009bd8d6 100644 --- a/src/mongo/s/shard_key_pattern.cpp +++ b/src/mongo/s/shard_key_pattern.cpp @@ -265,7 +265,7 @@ static BSONElement findEqualityElement(const EqualityMatches& equalities, const return extractKeyElementFromMatchable(matchable, suffixStr); } -StatusWith<BSONObj> ShardKeyPattern::extractShardKeyFromQuery(OperationContext* txn, +StatusWith<BSONObj> ShardKeyPattern::extractShardKeyFromQuery(OperationContext* opCtx, const BSONObj& basicQuery) const { if (!isValid()) return StatusWith<BSONObj>(BSONObj()); @@ -273,7 +273,8 @@ StatusWith<BSONObj> ShardKeyPattern::extractShardKeyFromQuery(OperationContext* auto qr = stdx::make_unique<QueryRequest>(NamespaceString("")); qr->setFilter(basicQuery); - auto statusWithCQ = CanonicalQuery::canonicalize(txn, std::move(qr), ExtensionsCallbackNoop()); + auto statusWithCQ = + CanonicalQuery::canonicalize(opCtx, std::move(qr), ExtensionsCallbackNoop()); if (!statusWithCQ.isOK()) { return StatusWith<BSONObj>(statusWithCQ.getStatus()); } |