chore(NODE-4177): remove unused Server.query method (mongodb#3196)

Author: baileympearson

src/cmap/connection.ts

@@ -21,7 +21,7 @@ import {
 } from '../error';
 import type { ServerApi, SupportedNodeConnectionOptions } from '../mongo_client';
 import { CancellationToken, TypedEventEmitter } from '../mongo_types';
-import { ReadPreference, ReadPreferenceLike } from '../read_preference';
+import type { ReadPreference, ReadPreferenceLike } from '../read_preference';
 import { applySession, ClientSession, updateSessionFromResponse } from '../sessions';
 import {
   calculateDurationInMs,
@@ -45,7 +45,6 @@ import {
   GetMore,
   KillCursor,
   Msg,
-  OpQueryOptions,
   Query,
   Response,
   WriteProtocolMessageType
@@ -565,78 +564,6 @@ export class Connection extends TypedEventEmitter<ConnectionEvents> {
     }
   }
 
-  query(ns: MongoDBNamespace, cmd: Document, options: QueryOptions, callback: Callback): void {
-    const isExplain = cmd.$explain != null;
-    const readPreference = options.readPreference ?? ReadPreference.primary;
-    const batchSize = options.batchSize || 0;
-    const limit = options.limit;
-    const numberToSkip = options.skip || 0;
-    let numberToReturn = 0;
-    if (
-      limit &&
-      (limit < 0 || (limit !== 0 && limit < batchSize) || (limit > 0 && batchSize === 0))
-    ) {
-      numberToReturn = limit;
-    } else {
-      numberToReturn = batchSize;
-    }
-
-    if (isExplain) {
-      // nToReturn must be 0 (match all) or negative (match N and close cursor)
-      // nToReturn > 0 will give explain results equivalent to limit(0)
-      numberToReturn = -Math.abs(limit || 0);
-    }
-
-    const queryOptions: OpQueryOptions = {
-      numberToSkip,
-      numberToReturn,
-      pre32Limit: typeof limit === 'number' ? limit : undefined,
-      checkKeys: false,
-      secondaryOk: readPreference.secondaryOk()
-    };
-
-    if (options.projection) {
-      queryOptions.returnFieldSelector = options.projection;
-    }
-
-    const query = new Query(ns.toString(), cmd, queryOptions);
-    if (typeof options.tailable === 'boolean') {
-      query.tailable = options.tailable;
-    }
-
-    if (typeof options.oplogReplay === 'boolean') {
-      query.oplogReplay = options.oplogReplay;
-    }
-
-    if (typeof options.timeout === 'boolean') {
-      query.noCursorTimeout = !options.timeout;
-    } else if (typeof options.noCursorTimeout === 'boolean') {
-      query.noCursorTimeout = options.noCursorTimeout;
-    }
-
-    if (typeof options.awaitData === 'boolean') {
-      query.awaitData = options.awaitData;
-    }
-
-    if (typeof options.partial === 'boolean') {
-      query.partial = options.partial;
-    }
-
-    write(
-      this,
-      query,
-      { [kFullResult]: true, ...pluckBSONSerializeOptions(options) },
-      (err, result) => {
-        if (err || !result) return callback(err, result);
-        if (isExplain && result.documents && result.documents[0]) {
-          return callback(undefined, result.documents[0]);
-        }
-
-        callback(undefined, result);
-      }
-    );
-  }
-
   getMore(
     ns: MongoDBNamespace,
     cursorId: Long,

src/operations/find.ts

@@ -1,5 +1,4 @@
 import type { Document } from '../bson';
-import { isSharded } from '../cmap/wire_protocol/shared';
 import type { Collection } from '../collection';
 import { MongoCompatibilityError, MongoInvalidArgumentError } from '../error';
 import { ReadConcern } from '../read_concern';
@@ -128,37 +127,6 @@ export class FindOperation extends CommandOperation<Document> {
       return;
     }
 
-    if (serverWireVersion < 4) {
-      if (this.readConcern && this.readConcern.level !== 'local') {
-        callback(
-          new MongoCompatibilityError(
-            `Server find command does not support a readConcern level of ${this.readConcern.level}`
-          )
-        );
-
-        return;
-      }
-
-      const findCommand = makeLegacyFindCommand(this.ns, this.filter, options);
-      if (isSharded(server) && this.readPreference) {
-        findCommand.$readPreference = this.readPreference.toJSON();
-      }
-
-      server.query(
-        this.ns,
-        findCommand,
-        {
-          ...this.options,
-          ...this.bsonOptions,
-          documentsReturnedIn: 'firstBatch',
-          readPreference: this.readPreference
-        },
-        callback
-      );
-
-      return;
-    }
-
     let findCommand = makeFindCommand(this.ns, this.filter, options);
     if (this.explain) {
       findCommand = decorateWithExplain(findCommand, this.explain);
@@ -303,54 +271,6 @@ function makeFindCommand(ns: MongoDBNamespace, filter: Document, options: FindOp
   return findCommand;
 }
 
-function makeLegacyFindCommand(
-  ns: MongoDBNamespace,
-  filter: Document,
-  options: FindOptions
-): Document {
-  const findCommand: Document = {
-    $query: filter
-  };
-
-  if (options.sort) {
-    findCommand.$orderby = formatSort(options.sort);
-  }
-
-  if (options.hint) {
-    findCommand.$hint = normalizeHintField(options.hint);
-  }
-
-  if (typeof options.returnKey === 'boolean') {
-    findCommand.$returnKey = options.returnKey;
-  }
-
-  if (options.max) {
-    findCommand.$max = options.max;
-  }
-
-  if (options.min) {
-    findCommand.$min = options.min;
-  }
-
-  if (typeof options.showRecordId === 'boolean') {
-    findCommand.$showDiskLoc = options.showRecordId;
-  }
-
-  if (options.comment) {
-    findCommand.$comment = options.comment;
-  }
-
-  if (typeof options.maxTimeMS === 'number') {
-    findCommand.$maxTimeMS = options.maxTimeMS;
-  }
-
-  if (options.explain != null) {
-    findCommand.$explain = true;
-  }
-
-  return findCommand;
-}
-
 defineAspects(FindOperation, [
   Aspect.READ_OPERATION,
   Aspect.RETRYABLE,

src/sdam/server.ts

@@ -1,11 +1,5 @@
 import type { Document, Long } from '../bson';
-import {
-  CommandOptions,
-  Connection,
-  DestroyOptions,
-  GetMoreOptions,
-  QueryOptions
-} from '../cmap/connection';
+import { CommandOptions, Connection, DestroyOptions, GetMoreOptions } from '../cmap/connection';
 import {
   ConnectionPool,
   ConnectionPoolEvents,
@@ -364,30 +358,6 @@ export class Server extends TypedEventEmitter<ServerEvents> {
     );
   }
 
-  /**
-   * Execute a query against the server
-   * @internal
-   */
-  query(ns: MongoDBNamespace, cmd: Document, options: QueryOptions, callback: Callback): void {
-    if (this.s.state === STATE_CLOSING || this.s.state === STATE_CLOSED) {
-      callback(new MongoServerClosedError());
-      return;
-    }
-
-    this.s.pool.withConnection(
-      undefined,
-      (err, conn, cb) => {
-        if (err || !conn) {
-          markServerUnknown(this, err);
-          return cb(err);
-        }
-
-        conn.query(ns, cmd, options, makeOperationHandler(this, conn, cmd, options, cb));
-      },
-      callback
-    );
-  }
-
   /**
    * Execute a `getMore` against the server
    * @internal