remove cursor default batch size of 1000

Author: baileympearson

src/cursor/abstract_cursor.ts

@@ -893,7 +893,7 @@ export abstract class AbstractCursor<
   ): Promise<InitialCursorResponse>;
 
   /** @internal */
-  async getMore(batchSize: number): Promise<CursorResponse> {
+  async getMore(): Promise<CursorResponse> {
     if (this.cursorId == null) {
       throw new MongoRuntimeError(
         'Unexpected null cursor id. A cursor creating command should have set this'
@@ -910,11 +910,10 @@ export abstract class AbstractCursor<
         'Unexpected null session. A cursor creating command should have set this'
       );
     }
-
     const getMoreOptions = {
       ...this.cursorOptions,
       session: this.cursorSession,
-      batchSize
+      batchSize: this.cursorOptions.batchSize
     };
 
     const getMoreOperation = new GetMoreOperation(
@@ -987,14 +986,11 @@ export abstract class AbstractCursor<
       await this.cursorInit();
       // If the cursor died or returned documents, return
       if ((this.documents?.length ?? 0) !== 0 || this.isDead) return;
-      // Otherwise, run a getMore
     }
 
-    // otherwise need to call getMore
-    const batchSize = this.cursorOptions.batchSize || 1000;
-
+    // Otherwise, run a getMore
     try {
-      const response = await this.getMore(batchSize);
+      const response = await this.getMore();
       this.cursorId = response.id;
       this.documents = response;
     } catch (error) {

src/cursor/change_stream_cursor.ts

@@ -158,8 +158,8 @@ export class ChangeStreamCursor<
     return { server, session, response };
   }
 
-  override async getMore(batchSize: number): Promise<CursorResponse> {
-    const response = await super.getMore(batchSize);
+  override async getMore(): Promise<CursorResponse> {
+    const response = await super.getMore();
 
     this.maxWireVersion = maxWireVersion(this.server);
     this._processBatch(response);

src/cursor/find_cursor.ts

@@ -98,34 +98,29 @@ export class FindCursor<TSchema = any> extends ExplainableCursor<TSchema> {
   }
 
   /** @internal */
-  override async getMore(batchSize: number): Promise<CursorResponse> {
+  override async getMore(): Promise<CursorResponse> {
     const numReturned = this.numReturned;
-    if (numReturned) {
-      // TODO(DRIVERS-1448): Remove logic to enforce `limit` in the driver
-      const limit = this.findOptions.limit;
-      batchSize =
-        limit && limit > 0 && numReturned + batchSize > limit ? limit - numReturned : batchSize;
-
-      if (batchSize <= 0) {
-        try {
-          await this.close();
-        } catch (error) {
-          squashError(error);
-          // this is an optimization for the special case of a limit for a find command to avoid an
-          // extra getMore when the limit has been reached and the limit is a multiple of the batchSize.
-          // This is a consequence of the new query engine in 5.0 having no knowledge of the limit as it
-          // produces results for the find command.  Once a batch is filled up, it is returned and only
-          // on the subsequent getMore will the query framework consider the limit, determine the cursor
-          // is exhausted and return a cursorId of zero.
-          // instead, if we determine there are no more documents to request from the server, we preemptively
-          // close the cursor
-        }
-        return CursorResponse.emptyGetMore;
+    const limit = this.findOptions.limit;
+
+    if (numReturned && limit && numReturned >= limit) {
+      try {
+        await this.close();
+      } catch (error) {
+        squashError(error);
+        // this is an optimization for the special case of a limit for a find command to avoid an
+        // extra getMore when the limit has been reached and the limit is a multiple of the batchSize.
+        // This is a consequence of the new query engine in 5.0 having no knowledge of the limit as it
+        // produces results for the find command.  Once a batch is filled up, it is returned and only
+        // on the subsequent getMore will the query framework consider the limit, determine the cursor
+        // is exhausted and return a cursorId of zero.
+        // instead, if we determine there are no more documents to request from the server, we preemptively
+        // close the cursor
       }
+      return CursorResponse.emptyGetMore;
     }
 
-    const response = await super.getMore(batchSize);
-    // TODO: wrap this in some logic to prevent it from happening if we don't need this support
+    const response = await super.getMore();
+
     this.numReturned = this.numReturned + response.batchSize;
 
     return response;

src/cursor/run_command_cursor.ts

@@ -159,7 +159,7 @@ export class RunCommandCursor extends AbstractCursor {
   }
 
   /** @internal */
-  override async getMore(_batchSize: number): Promise<CursorResponse> {
+  override async getMore(): Promise<CursorResponse> {
     if (!this.session) {
       throw new MongoRuntimeError(
         'Unexpected null session. A cursor creating command should have set this'