NODE-953 Made batchSize issue general at cursor level

Author: christkv

lib/collection.js

@@ -2669,7 +2669,6 @@ Collection.prototype.aggregate = function(pipeline, options, callback) {
     if(this.s.topology.capabilities().hasAggregationCursor) {
       options.cursor = options.cursor || { batchSize : 1000 };
       command.cursor = options.cursor;
-      mergeOptions(options, options.cursor);
     }
 
     // Allow disk usage command

lib/command_cursor.js

@@ -132,7 +132,7 @@ inherits(CommandCursor, Readable);
 
 // Set the methods to inherit from prototype
 var methodsToInherit = ['_next', 'next', 'each', 'forEach', 'toArray'
-  , 'rewind', 'bufferedCount', 'readBufferedDocuments', 'close', 'isClosed', 'kill'
+  , 'rewind', 'bufferedCount', 'readBufferedDocuments', 'close', 'isClosed', 'kill', 'setCursorBatchSize'
   , '_find', '_getmore', '_killcursor', 'isDead', 'explain', 'isNotified', 'isKilled'];
 
 // Only inherit the types we need

lib/cursor.js

@@ -155,6 +155,14 @@ var Cursor = function(bson, ns, cmd, options, topology, topologyOptions) {
 
   // Set the sort value
   this.sortValue = self.s.cmd.sort;
+
+  // Get the batchSize
+  var batchSize = cmd.cursor && cmd.cursor.batchSize
+    ? cmd.cursor && cmd.cursor.batchSize
+    : (options.cursor && options.cursor.batchSize ? options.cursor.batchSize : 1000);
+
+  // Set the batchSize
+  this.setCursorBatchSize(batchSize);
 }
 
 /**

test/functional/aggregation_tests.js

@@ -863,6 +863,8 @@ exports['should maintain batch size between calls to receive new batches'] = {
       test.equal(count, 6);
       db.close();
       test.done();
+    }).catch(err => {
+      console.log(err)
     });
   }
 }