SERVER-61385 Migrate callers of 'DBClientBase::query()' legacy API to the modern 'find()' API

There are a handful of remaining callers of the legacy API,
either using the exhaust option or which are involved in a
code path which still relies on the OP_QUERY-inspired BSON
format. These should be cleaned up as follow-up work.

1 files changed, 6 insertions, 4 deletions

diff --git a/src/mongo/dbtests/clienttests.cpp b/src/mongo/dbtests/clienttests.cpp
index c595aa018c7..9bebe9f636e 100644
--- a/src/mongo/dbtests/clienttests.cpp
+++ b/src/mongo/dbtests/clienttests.cpp
@@ -158,8 +158,9 @@ public:
 
         ASSERT_OK(dbtests::createIndex(&opCtx, ns(), BSON("a" << 1 << "b" << 1)));
 
-        unique_ptr<DBClientCursor> c =
-            db.query(NamespaceString(ns()), BSONObj{}, Query().sort(BSON("a" << 1 << "b" << 1)));
+        FindCommandRequest findRequest{NamespaceString{ns()}};
+        findRequest.setSort(BSON("a" << 1 << "b" << 1));
+        unique_ptr<DBClientCursor> c = db.find(std::move(findRequest));
         ASSERT_EQUALS(1111, c->itcount());
     }
 };
@@ -176,8 +177,9 @@ public:
             db.insert(ns(), BSON("i" << i));
         }
 
-        unique_ptr<DBClientCursor> c =
-            db.query(NamespaceString(ns()), BSONObj{}, Query().sort(BSON("i" << 1)));
+        FindCommandRequest findRequest{NamespaceString{ns()}};
+        findRequest.setSort(BSON("i" << 1));
+        std::unique_ptr<DBClientCursor> c = db.find(std::move(findRequest));
 
         BSONObj o = c->next();
         ASSERT(c->more());