SERVER-23608 Make MatchExpressionParser take a CollatorInterface*

2 files changed, 5 insertions, 2 deletions

diff --git a/src/mongo/db/commands/current_op.cpp b/src/mongo/db/commands/current_op.cpp
index fed56b550ad..2f5798b410f 100644
--- a/src/mongo/db/commands/current_op.cpp
+++ b/src/mongo/db/commands/current_op.cpp
@@ -105,7 +105,8 @@ public:
         // collection, we pass in a fake collection name (and this is okay, because $where parsing
         // only relies on the database part of the namespace).
         const NamespaceString fakeNS(db, "$cmd");
-        const Matcher matcher(filter, ExtensionsCallbackReal(txn, &fakeNS));
+        CollatorInterface* collator = nullptr;
+        const Matcher matcher(filter, ExtensionsCallbackReal(txn, &fakeNS), collator);
 
         BSONArrayBuilder inprogBuilder(result.subarrayStart("inprog"));
 
diff --git a/src/mongo/db/commands/list_collections.cpp b/src/mongo/db/commands/list_collections.cpp
index 0f9876420de..a20179c2bae 100644
--- a/src/mongo/db/commands/list_collections.cpp
+++ b/src/mongo/db/commands/list_collections.cpp
@@ -191,8 +191,10 @@ public:
                 return appendCommandStatus(
                     result, Status(ErrorCodes::BadValue, "\"filter\" must be an object"));
             }
+            // The collator is null because collection objects are compared using binary comparison.
+            CollatorInterface* collator = nullptr;
             StatusWithMatchExpression statusWithMatcher = MatchExpressionParser::parse(
-                filterElt.Obj(), ExtensionsCallbackDisallowExtensions());
+                filterElt.Obj(), ExtensionsCallbackDisallowExtensions(), collator);
             if (!statusWithMatcher.isOK()) {
                 return appendCommandStatus(result, statusWithMatcher.getStatus());
             }