refactor: use new command base for estimatedDocumentCount

Author: mbroadst

lib/operations/estimated_document_count.js

@@ -2,32 +2,44 @@
 
 const Aspect = require('./operation').Aspect;
 const defineAspects = require('./operation').defineAspects;
-const CommandOperation = require('./command');
-const buildCountCommand = require('./common_functions').buildCountCommand;
-const handleCallback = require('../utils').handleCallback;
+const CommandOperationV2 = require('./command_v2');
 
-class EstimatedDocumentCountOperation extends CommandOperation {
+class EstimatedDocumentCountOperation extends CommandOperationV2 {
   constructor(collection, options) {
-    super(collection.s.db, options, collection);
+    super(collection, options);
+    this.collectionName = collection.s.namespace.collection;
   }
 
-  _buildCommand() {
-    const coll = this.collection;
-    let options = this.options;
+  execute(server, callback) {
+    const options = this.options;
+    const cmd = { count: this.collectionName };
+    if (typeof options.skip === 'number') {
+      cmd.skip = options.skip;
+    }
 
-    options.collectionName = coll.collectionName;
+    if (typeof options.limit === 'number') {
+      cmd.limit = options.limit;
+    }
 
-    return buildCountCommand(coll, null, options);
-  }
+    if (options.hint) {
+      cmd.hint = options.hint;
+    }
+
+    super.executeCommand(server, cmd, (err, response) => {
+      if (err) {
+        callback(err);
+        return;
+      }
 
-  execute(callback) {
-    super.execute((err, result) => {
-      if (err) return handleCallback(callback, err);
-      handleCallback(callback, null, result.n);
+      callback(null, response.n);
     });
   }
 }
 
-defineAspects(EstimatedDocumentCountOperation, Aspect.READ_OPERATION);
+defineAspects(EstimatedDocumentCountOperation, [
+  Aspect.READ_OPERATION,
+  Aspect.RETRYABLE,
+  Aspect.EXECUTE_WITH_SELECTION
+]);
 
 module.exports = EstimatedDocumentCountOperation;

test/functional/retryable_reads_tests.js

@@ -23,7 +23,8 @@ describe('Retryable Reads', function() {
       spec.description.match(/listDatabases/i) ||
       spec.description.match(/listDatabaseNames/i) ||
       spec.description.match(/listCollections/i) ||
-      spec.description.match(/listCollectionNames/i)
+      spec.description.match(/listCollectionNames/i) ||
+      spec.description.match(/estimatedDocumentCount/i)
     );
   });
 });