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, 5 insertions, 12 deletions

diff --git a/src/mongo/db/dbdirectclient.cpp b/src/mongo/db/dbdirectclient.cpp
index 580104f1c48..479557afc7e 100644
--- a/src/mongo/db/dbdirectclient.cpp
+++ b/src/mongo/db/dbdirectclient.cpp
@@ -145,18 +145,11 @@ void DBDirectClient::say(Message& toSend, bool isRetry, string* actualServer) {
     invariant(dbResponse.response.empty());
 }
 
-unique_ptr<DBClientCursor> DBDirectClient::query(const NamespaceStringOrUUID& nsOrUuid,
-                                                 const BSONObj& filter,
-                                                 const Query& querySettings,
-                                                 int limit,
-                                                 int nToSkip,
-                                                 const BSONObj* fieldsToReturn,
-                                                 int queryOptions,
-                                                 int batchSize,
-                                                 boost::optional<BSONObj> readConcernObj) {
-    invariant(!readConcernObj, "passing readConcern to DBDirectClient functions is not supported");
-    return DBClientBase::query(
-        nsOrUuid, filter, querySettings, limit, nToSkip, fieldsToReturn, queryOptions, batchSize);
+std::unique_ptr<DBClientCursor> DBDirectClient::find(FindCommandRequest findRequest,
+                                                     const ReadPreferenceSetting& readPref) {
+    invariant(!findRequest.getReadConcern(),
+              "passing readConcern to DBDirectClient::find() is not supported");
+    return DBClientBase::find(std::move(findRequest), readPref);
 }
 
 write_ops::FindAndModifyCommandReply DBDirectClient::findAndModify(