1 files changed, 18 insertions, 10 deletions
diff --git a/src/mongo/db/s/sharding_ddl_util_test.cpp b/src/mongo/db/s/sharding_ddl_util_test.cpp
index 7eb847f789d..9b9fdc950ca 100644
--- a/src/mongo/db/s/sharding_ddl_util_test.cpp
+++ b/src/mongo/db/s/sharding_ddl_util_test.cpp
@@ -83,12 +83,14 @@ const NamespaceString kToNss("test.to");
 // Query 'limit' objects from the database into an array.
 void findN(DBClientBase& client,
            const std::string& ns,
-           Query query,
+           const BSONObj& filter,
+           const Query& querySettings,
            int limit,
            std::vector<BSONObj>& out) {
     out.reserve(limit);
     std::unique_ptr<DBClientCursor> c = client.query(NamespaceString(ns),
-                                                     std::move(query),
+                                                     filter,
+                                                     querySettings,
                                                      limit,
                                                      0 /*nToSkip*/,
                                                      nullptr /*fieldsToReturn*/,
@@ -109,9 +111,9 @@ TEST_F(ShardingDDLUtilTest, ShardedRenameMetadata) {
     DBDirectClient client(opCtx);
 
     const NamespaceString fromNss("test.from");
-    const auto fromCollQuery = Query(BSON(CollectionType::kNssFieldName << fromNss.ns()));
+    const auto fromCollQuery = BSON(CollectionType::kNssFieldName << fromNss.ns());
 
-    const auto toCollQuery = Query(BSON(CollectionType::kNssFieldName << kToNss.ns()));
+    const auto toCollQuery = BSON(CollectionType::kNssFieldName << kToNss.ns());
 
     const Timestamp collTimestamp(1);
     const auto collUUID = UUID::gen();
@@ -156,10 +158,13 @@ TEST_F(ShardingDDLUtilTest, ShardedRenameMetadata) {
     // Get FROM collection document and chunks
     auto fromDoc = client.findOne(CollectionType::ConfigNS.ns(), fromCollQuery);
     CollectionType fromCollection(fromDoc);
-    auto fromChunksQuery =
-        Query(BSON(ChunkType::collectionUUID << collUUID)).sort(BSON("_id" << 1));
     std::vector<BSONObj> fromChunks;
-    findN(client, ChunkType::ConfigNS.ns(), fromChunksQuery, nChunks, fromChunks);
+    findN(client,
+          ChunkType::ConfigNS.ns(),
+          BSON(ChunkType::collectionUUID << collUUID) /*filter*/,
+          Query().sort(BSON("_id" << 1)),
+          nChunks,
+          fromChunks);
 
     auto fromCollType = Grid::get(opCtx)->catalogClient()->getCollection(opCtx, fromNss);
     // Perform the metadata rename
@@ -171,11 +176,14 @@ TEST_F(ShardingDDLUtilTest, ShardedRenameMetadata) {
 
     // Get TO collection document and chunks
     auto toDoc = client.findOne(CollectionType::ConfigNS.ns(), toCollQuery);
-    const auto toChunksQuery =
-        Query(BSON(ChunkType::collectionUUID << collUUID)).sort(BSON("_id" << 1));
     CollectionType toCollection(toDoc);
     std::vector<BSONObj> toChunks;
-    findN(client, ChunkType::ConfigNS.ns(), toChunksQuery, nChunks, toChunks);
+    findN(client,
+          ChunkType::ConfigNS.ns(),
+          BSON(ChunkType::collectionUUID << collUUID) /*filter*/,
+          Query().sort(BSON("_id" << 1)),
+          nChunks,
+          toChunks);
 
     // Check that original epoch/timestamp are changed in config.collections entry
     ASSERT(fromCollection.getEpoch() != toCollection.getEpoch());