refactor: use aspects instead of isCursorCreating

Author: durran

src/operations/aggregate.ts

@@ -79,10 +79,6 @@ export class AggregateOperation<T = Document> extends CommandOperation<T> {
     }
   }
 
-  get isCursorCreating(): boolean {
-    return true;
-  }
-
   get canRetryRead(): boolean {
     return !this.hasWriteStage;
   }
@@ -131,4 +127,9 @@ export class AggregateOperation<T = Document> extends CommandOperation<T> {
   }
 }
 
-defineAspects(AggregateOperation, [Aspect.READ_OPERATION, Aspect.RETRYABLE, Aspect.EXPLAINABLE]);
+defineAspects(AggregateOperation, [
+  Aspect.READ_OPERATION,
+  Aspect.RETRYABLE,
+  Aspect.EXPLAINABLE,
+  Aspect.CURSOR_CREATING
+]);

src/operations/estimated_document_count.ts

@@ -28,10 +28,6 @@ export class EstimatedDocumentCountOperation extends CommandOperation<number> {
     this.collectionName = collection.collectionName;
   }
 
-  get isCursorCreating(): boolean {
-    return true;
-  }
-
   execute(server: Server, session: ClientSession, callback: Callback<number>): void {
     if (maxWireVersion(server) < 12) {
       return this.executeLegacy(server, session, callback);
@@ -72,4 +68,8 @@ export class EstimatedDocumentCountOperation extends CommandOperation<number> {
   }
 }
 
-defineAspects(EstimatedDocumentCountOperation, [Aspect.READ_OPERATION, Aspect.RETRYABLE]);
+defineAspects(EstimatedDocumentCountOperation, [
+  Aspect.READ_OPERATION,
+  Aspect.RETRYABLE,
+  Aspect.CURSOR_CREATING
+]);

src/operations/execute_operation.ts

@@ -202,7 +202,7 @@ function executeWithServerSelection(
         session &&
         session.isPinned &&
         !session.inTransaction() &&
-        operation.isCursorCreating
+        operation.hasAspect(Aspect.CURSOR_CREATING)
       ) {
         session.unpin({ force: true, forceClear: true });
       }

src/operations/find.ts

@@ -101,10 +101,6 @@ export class FindOperation extends CommandOperation<Document> {
     this.filter = filter != null && filter._bsontype === 'ObjectID' ? { _id: filter } : filter;
   }
 
-  get isCursorCreating(): boolean {
-    return true;
-  }
-
   execute(server: Server, session: ClientSession, callback: Callback<Document>): void {
     this.server = server;
 
@@ -349,4 +345,9 @@ function makeLegacyFindCommand(
   return findCommand;
 }
 
-defineAspects(FindOperation, [Aspect.READ_OPERATION, Aspect.RETRYABLE, Aspect.EXPLAINABLE]);
+defineAspects(FindOperation, [
+  Aspect.READ_OPERATION,
+  Aspect.RETRYABLE,
+  Aspect.EXPLAINABLE,
+  Aspect.CURSOR_CREATING
+]);

src/operations/find_one.ts

@@ -21,10 +21,6 @@ export class FindOneOperation extends CommandOperation<Document> {
     this.query = query;
   }
 
-  get isCursorCreating(): boolean {
-    return true;
-  }
-
   execute(server: Server, session: ClientSession, callback: Callback<Document>): void {
     const coll = this.collection;
     const query = this.query;
@@ -44,4 +40,4 @@ export class FindOneOperation extends CommandOperation<Document> {
   }
 }
 
-defineAspects(FindOneOperation, [Aspect.EXPLAINABLE]);
+defineAspects(FindOneOperation, [Aspect.EXPLAINABLE, Aspect.CURSOR_CREATING]);

src/operations/indexes.ts

@@ -383,10 +383,6 @@ export class ListIndexesOperation extends CommandOperation<Document> {
     this.collectionNamespace = collection.s.namespace;
   }
 
-  get isCursorCreating(): boolean {
-    return true;
-  }
-
   execute(server: Server, session: ClientSession, callback: Callback<Document>): void {
     const serverWireVersion = maxWireVersion(server);
     if (serverWireVersion < LIST_INDEXES_WIRE_VERSION) {
@@ -517,7 +513,11 @@ export class IndexInformationOperation extends AbstractOperation<Document> {
   }
 }
 
-defineAspects(ListIndexesOperation, [Aspect.READ_OPERATION, Aspect.RETRYABLE]);
+defineAspects(ListIndexesOperation, [
+  Aspect.READ_OPERATION,
+  Aspect.RETRYABLE,
+  Aspect.CURSOR_CREATING
+]);
 defineAspects(CreateIndexesOperation, [Aspect.WRITE_OPERATION]);
 defineAspects(CreateIndexOperation, [Aspect.WRITE_OPERATION]);
 defineAspects(EnsureIndexOperation, [Aspect.WRITE_OPERATION]);

src/operations/list_collections.ts

@@ -40,10 +40,6 @@ export class ListCollectionsOperation extends CommandOperation<string[]> {
     }
   }
 
-  get isCursorCreating(): boolean {
-    return true;
-  }
-
   execute(server: Server, session: ClientSession, callback: Callback<string[]>): void {
     if (maxWireVersion(server) < LIST_COLLECTIONS_WIRE_VERSION) {
       let filter = this.filter;
@@ -156,4 +152,8 @@ export class ListCollectionsCursor<
   }
 }
 
-defineAspects(ListCollectionsOperation, [Aspect.READ_OPERATION, Aspect.RETRYABLE]);
+defineAspects(ListCollectionsOperation, [
+  Aspect.READ_OPERATION,
+  Aspect.RETRYABLE,
+  Aspect.CURSOR_CREATING
+]);

src/operations/operation.ts

@@ -9,7 +9,8 @@ export const Aspect = {
   WRITE_OPERATION: Symbol('WRITE_OPERATION'),
   RETRYABLE: Symbol('RETRYABLE'),
   EXPLAINABLE: Symbol('EXPLAINABLE'),
-  SKIP_COLLATION: Symbol('SKIP_COLLATION')
+  SKIP_COLLATION: Symbol('SKIP_COLLATION'),
+  CURSOR_CREATING: Symbol('CURSOR_CREATING')
 } as const;
 
 /** @public */
@@ -89,10 +90,6 @@ export abstract class AbstractOperation<TResult = any> {
     return this[kSession];
   }
 
-  get isCursorCreating(): boolean {
-    return false;
-  }
-
   get canRetryRead(): boolean {
     return true;
   }