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/exec/projection_exec_test.cpp | |
| parent | 529d5de71344fda500802fa4a8671c5745ad62fa (diff) | |
| download | mongo-b19f95495d1df437722e6a0c85ea5ca6f91cdd8b.tar.gz | |
SERVER-29840 Add allowed features bitmask to MatchExpressionParser::parse
Diffstat (limited to 'src/mongo/db/exec/projection_exec_test.cpp')
| -rw-r--r-- | src/mongo/db/exec/projection_exec_test.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/mongo/db/exec/projection_exec_test.cpp b/src/mongo/db/exec/projection_exec_test.cpp index 673ad7c3c48..41c40c2b287 100644 --- a/src/mongo/db/exec/projection_exec_test.cpp +++ b/src/mongo/db/exec/projection_exec_test.cpp @@ -35,7 +35,6 @@ #include "mongo/db/exec/working_set_computed_data.h" #include "mongo/db/json.h" #include "mongo/db/matcher/expression_parser.h" -#include "mongo/db/matcher/extensions_callback_disallow_extensions.h" #include "mongo/db/query/collation/collator_interface_mock.h" #include "mongo/unittest/unittest.h" #include <memory> @@ -51,8 +50,7 @@ using std::unique_ptr; */ unique_ptr<MatchExpression> parseMatchExpression(const BSONObj& obj) { const CollatorInterface* collator = nullptr; - StatusWithMatchExpression status = - MatchExpressionParser::parse(obj, ExtensionsCallbackDisallowExtensions(), collator); + StatusWithMatchExpression status = MatchExpressionParser::parse(obj, collator); ASSERT_TRUE(status.isOK()); return std::move(status.getValue()); } @@ -85,8 +83,7 @@ void testTransform(const char* specStr, BSONObj spec = fromjson(specStr); BSONObj query = fromjson(queryStr); unique_ptr<MatchExpression> queryExpression = parseMatchExpression(query); - ProjectionExec exec( - spec, queryExpression.get(), collator, ExtensionsCallbackDisallowExtensions()); + ProjectionExec exec(spec, queryExpression.get(), collator); // Create working set member. WorkingSetMember wsm; @@ -169,8 +166,7 @@ BSONObj transformMetaSortKeyCovered(const BSONObj& sortKey, wsm->addComputed(new SortKeyComputedData(sortKey)); ws.transitionToRecordIdAndIdx(wsid); - ProjectionExec projExec( - fromjson(projSpec), nullptr, nullptr, ExtensionsCallbackDisallowExtensions()); + ProjectionExec projExec(fromjson(projSpec), nullptr, nullptr); ASSERT_OK(projExec.transform(wsm)); return wsm->obj.value(); @@ -183,7 +179,7 @@ BSONObj transformCovered(BSONObj projSpec, const IndexKeyDatum& ikd) { wsm->keyData.push_back(ikd); ws.transitionToRecordIdAndIdx(wsid); - ProjectionExec projExec(projSpec, nullptr, nullptr, ExtensionsCallbackDisallowExtensions()); + ProjectionExec projExec(projSpec, nullptr, nullptr); ASSERT_OK(projExec.transform(wsm)); return wsm->obj.value(); |