diff options
| author | Tess Avitabile <tess.avitabile@mongodb.com> | 2017-08-21 15:31:06 -0400 |
|---|---|---|
| committer | Tess Avitabile <tess.avitabile@mongodb.com> | 2017-08-25 14:16:10 -0400 |
| commit | b19f95495d1df437722e6a0c85ea5ca6f91cdd8b (patch) | |
| tree | bbc5dd0a3b5868240cd6c5c97c48408e3170046f /src/mongo/s/shard_key_pattern.cpp | |
| parent | 529d5de71344fda500802fa4a8671c5745ad62fa (diff) | |
| download | mongo-b19f95495d1df437722e6a0c85ea5ca6f91cdd8b.tar.gz | |
SERVER-29840 Add allowed features bitmask to MatchExpressionParser::parse
Diffstat (limited to 'src/mongo/s/shard_key_pattern.cpp')
| -rw-r--r-- | src/mongo/s/shard_key_pattern.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/mongo/s/shard_key_pattern.cpp b/src/mongo/s/shard_key_pattern.cpp index cb9b0883ff9..baefac56f4f 100644 --- a/src/mongo/s/shard_key_pattern.cpp +++ b/src/mongo/s/shard_key_pattern.cpp @@ -283,8 +283,14 @@ StatusWith<BSONObj> ShardKeyPattern::extractShardKeyFromQuery(OperationContext* auto qr = stdx::make_unique<QueryRequest>(NamespaceString("")); qr->setFilter(basicQuery); + const boost::intrusive_ptr<ExpressionContext> expCtx; auto statusWithCQ = - CanonicalQuery::canonicalize(opCtx, std::move(qr), ExtensionsCallbackNoop()); + CanonicalQuery::canonicalize(opCtx, + std::move(qr), + expCtx, + ExtensionsCallbackNoop(), + MatchExpressionParser::kAllowAllSpecialFeatures & + ~MatchExpressionParser::AllowedFeatures::kExpr); if (!statusWithCQ.isOK()) { return StatusWith<BSONObj>(statusWithCQ.getStatus()); } |