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/db/matcher/matcher.cpp | |
| parent | 529d5de71344fda500802fa4a8671c5745ad62fa (diff) | |
| download | mongo-b19f95495d1df437722e6a0c85ea5ca6f91cdd8b.tar.gz | |
SERVER-29840 Add allowed features bitmask to MatchExpressionParser::parse
Diffstat (limited to 'src/mongo/db/matcher/matcher.cpp')
| -rw-r--r-- | src/mongo/db/matcher/matcher.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/mongo/db/matcher/matcher.cpp b/src/mongo/db/matcher/matcher.cpp index faf0f6f1170..5648a4f15d5 100644 --- a/src/mongo/db/matcher/matcher.cpp +++ b/src/mongo/db/matcher/matcher.cpp @@ -42,11 +42,13 @@ namespace mongo { Matcher::Matcher(const BSONObj& pattern, + const CollatorInterface* collator, + const boost::intrusive_ptr<ExpressionContext>& expCtx, const ExtensionsCallback& extensionsCallback, - const CollatorInterface* collator) + const MatchExpressionParser::AllowedFeatureSet allowedFeatures) : _pattern(pattern) { - StatusWithMatchExpression statusWithMatcher = - MatchExpressionParser::parse(pattern, extensionsCallback, collator); + StatusWithMatchExpression statusWithMatcher = MatchExpressionParser::parse( + pattern, collator, expCtx, extensionsCallback, allowedFeatures); uassert(16810, mongoutils::str::stream() << "bad query: " << statusWithMatcher.getStatus().toString(), statusWithMatcher.isOK()); |