diff options
| author | Ian Boros <ian.boros@mongodb.com> | 2020-01-30 13:10:55 -0500 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-02-28 22:16:41 +0000 |
| commit | cfa5c05fa1855fb1a04cb3a6e2eb10a7e82bf726 (patch) | |
| tree | 7ab1e1ce8e2edd6837952c131fe14d43a0633235 /src/mongo/db/commands/list_databases.cpp | |
| parent | 793ae32c597f197b6445750aa9bfdaabc206132d (diff) | |
| download | mongo-cfa5c05fa1855fb1a04cb3a6e2eb10a7e82bf726.tar.gz | |
SERVER-45406 Plumb ExpressionContext through PlanStage
This patch includes also moves ownership of the collator to the ExpressionContext.
Diffstat (limited to 'src/mongo/db/commands/list_databases.cpp')
| -rw-r--r-- | src/mongo/db/commands/list_databases.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mongo/db/commands/list_databases.cpp b/src/mongo/db/commands/list_databases.cpp index 9a383f85522..c656355ec06 100644 --- a/src/mongo/db/commands/list_databases.cpp +++ b/src/mongo/db/commands/list_databases.cpp @@ -126,9 +126,8 @@ public: if (auto filterObj = cmd.getFilter()) { // The collator is null because database metadata objects are compared using simple // binary comparison. - const CollatorInterface* collator = nullptr; - boost::intrusive_ptr<ExpressionContext> expCtx( - new ExpressionContext(opCtx, collator, NamespaceString(dbname))); + auto expCtx = make_intrusive<ExpressionContext>( + opCtx, std::unique_ptr<CollatorInterface>(nullptr), NamespaceString(dbname)); auto matcher = uassertStatusOK(MatchExpressionParser::parse(filterObj.get(), std::move(expCtx))); filter = std::move(matcher); |