NODE-486 .limit return more than limited value

Author: christkv

lib/aggregation_cursor.js

@@ -18,9 +18,9 @@ var inherits = require('util').inherits
 /**
  * @fileOverview The **AggregationCursor** class is an internal class that embodies an aggregation cursor on MongoDB
  * allowing for iteration over the results returned from the underlying query. It supports
- * one by one document iteration, conversion to an array or can be iterated as a Node 0.10.X 
+ * one by one document iteration, conversion to an array or can be iterated as a Node 0.10.X
  * or higher stream
- * 
+ *
  * **AGGREGATIONCURSOR Cannot directly be instantiated**
  * @example
  * var MongoClient = require('mongodb').MongoClient,
@@ -36,7 +36,7 @@ var inherits = require('util').inherits
  *     , {a:2, b:2}, {a:3, b:3}
  *     , {a:4, b:4}], {w:1}, function(err, result) {
  *     test.equal(null, err);
- * 
+ *
  *     // Show that duplicate records got dropped
  *     col.aggregation({}, {cursor: {}}).toArray(function(err, items) {
  *       test.equal(null, err);
@@ -126,7 +126,7 @@ var AggregationCursor = function(bson, ns, cmd, options, topology, topologyOptio
  */
 
 // Inherit from Readable
-inherits(AggregationCursor, Readable);  
+inherits(AggregationCursor, Readable);
 
 // Extend the Cursor
 for(var name in CoreCursor.prototype) {
@@ -338,13 +338,13 @@ AggregationCursor.prototype.get = AggregationCursor.prototype.toArray;
  * @method AggregationCursor.prototype.close
  * @param {AggregationCursor~resultCallback} [callback] The result callback.
  * @return {null}
- */   
+ */
 
 /**
  * Is the cursor closed
  * @method AggregationCursor.prototype.isClosed
  * @return {boolean}
- */   
+ */
 
 /**
  * Execute the explain for the cursor
@@ -357,13 +357,13 @@ AggregationCursor.prototype.get = AggregationCursor.prototype.toArray;
  * Clone the cursor
  * @function AggregationCursor.prototype.clone
  * @return {AggregationCursor}
- */     
+ */
 
 /**
  * Resets the cursor
  * @function AggregationCursor.prototype.rewind
  * @return {AggregationCursor}
- */  
+ */
 
 /**
  * The callback format for the forEach iterator method
@@ -390,4 +390,4 @@ AggregationCursor.INIT = 0;
 AggregationCursor.OPEN = 1;
 AggregationCursor.CLOSED = 2;
 
-module.exports = AggregationCursor;
+module.exports = AggregationCursor;

lib/command_cursor.js

@@ -17,11 +17,11 @@ var inherits = require('util').inherits
   , CoreReadPreference = require('mongodb-core').ReadPreference;
 
 /**
- * @fileOverview The **CommandCursor** class is an internal class that embodies a 
- * generalized cursor based on a MongoDB command allowing for iteration over the 
- * results returned. It supports one by one document iteration, conversion to an 
+ * @fileOverview The **CommandCursor** class is an internal class that embodies a
+ * generalized cursor based on a MongoDB command allowing for iteration over the
+ * results returned. It supports one by one document iteration, conversion to an
  * array or can be iterated as a Node 0.10.X or higher stream
- * 
+ *
  * **CommandCursor Cannot directly be instantiated**
  * @example
  * var MongoClient = require('mongodb').MongoClient,
@@ -37,7 +37,7 @@ var inherits = require('util').inherits
  *     , {a:2, b:2}, {a:3, b:3}
  *     , {a:4, b:4}], {w:1}, function(err, result) {
  *     test.equal(null, err);
- * 
+ *
  *     // List the database collections available
  *     db.listCollections().toArray(function(err, items) {
  *       test.equal(null, err);
@@ -126,11 +126,11 @@ var CommandCursor = function(bson, ns, cmd, options, topology, topologyOptions)
  */
 
 // Inherit from Readable
-inherits(CommandCursor, Readable);  
+inherits(CommandCursor, Readable);
 
 // Set the methods to inherit from prototype
 var methodsToInherit = ['_next', 'next', 'each', 'forEach', 'toArray'
-  , 'rewind', 'bufferedCount', 'readBufferedDocuments', 'close', 'isClosed'];
+  , 'rewind', 'bufferedCount', 'readBufferedDocuments', 'close', 'isClosed', 'kill'];
 
 // Only inherit the types we need
 for(var i = 0; i < methodsToInherit.length; i++) {
@@ -231,25 +231,25 @@ CommandCursor.prototype.get = CommandCursor.prototype.toArray;
  * @method CommandCursor.prototype.close
  * @param {CommandCursor~resultCallback} [callback] The result callback.
  * @return {null}
- */   
+ */
 
 /**
  * Is the cursor closed
  * @method CommandCursor.prototype.isClosed
  * @return {boolean}
- */   
+ */
 
 /**
  * Clone the cursor
  * @function CommandCursor.prototype.clone
  * @return {CommandCursor}
- */     
+ */
 
 /**
  * Resets the cursor
  * @function CommandCursor.prototype.rewind
  * @return {CommandCursor}
- */  
+ */
 
 /**
  * The callback format for the forEach iterator method
@@ -276,4 +276,4 @@ CommandCursor.INIT = 0;
 CommandCursor.OPEN = 1;
 CommandCursor.CLOSED = 2;
 
-module.exports = CommandCursor;
+module.exports = CommandCursor;

lib/cursor.js

@@ -179,7 +179,7 @@ Cursor.prototype.setCursorOption = function(field, value) {
   if(this.s.state == Cursor.CLOSED || this.s.state == Cursor.OPEN || this.isDead()) throw new MongoError("Cursor is closed");
   if(fields.indexOf(field) == -1) throw new MongoError(f("option %s not a supported option %s", field, fields));
   this.s[field] = value;
-  if(field == 'numberOfRetries') 
+  if(field == 'numberOfRetries')
     this.s.currentNumberOfRetries = value;
   return this;
 }
@@ -592,6 +592,7 @@ Cursor.prototype.toArray = function(callback) {
 
       // Add doc to items
       items.push(doc)
+
       // Get all buffered objects
       if(self.bufferedCount() > 0) {
         var docs = self.readBufferedDocuments(self.bufferedCount())

lib/gridfs/chunk.js

@@ -32,27 +32,27 @@ var Chunk = function(file, mongoObject, writeConcern) {
   if(mongoObjectFinal.data == null) {
   } else if(typeof mongoObjectFinal.data == "string") {
     var buffer = new Buffer(mongoObjectFinal.data.length);
-    buffer.write(mongoObjectFinal.data, 'binary', 0);
+    buffer.write(mongoObjectFinal.data, 0, 'binary');
     this.data = new Binary(buffer);
   } else if(Array.isArray(mongoObjectFinal.data)) {
     var buffer = new Buffer(mongoObjectFinal.data.length);
-    buffer.write(mongoObjectFinal.data.join(''), 'binary', 0);
+    buffer.write(mongoObjectFinal.data.join(''), 0, 'binary');
     this.data = new Binary(buffer);
   } else if(mongoObjectFinal.data._bsontype === 'Binary') {
     this.data = mongoObjectFinal.data;
   } else if(Buffer.isBuffer(mongoObjectFinal.data)) {
   } else {
     throw Error("Illegal chunk format");
   }
-  
+
   // Update position
   this.internalPosition = 0;
 };
 
 /**
  * Writes a data to this object and advance the read/write head.
  *
- * @param data {string} the data to write 
+ * @param data {string} the data to write
  * @param callback {function(*, GridStore)} This will be called after executing
  *     this method. The first parameter will contain null and the second one
  *     will contain a reference to this object.
@@ -152,7 +152,7 @@ Chunk.prototype.save = function(options, callback) {
     // Merge the options
     var writeOptions = {};
     for(var name in options) writeOptions[name] = options[name];
-    for(var name in self.writeConcern) writeOptions[name] = self.writeConcern[name];    
+    for(var name in self.writeConcern) writeOptions[name] = self.writeConcern[name];
 
     // collection.remove({'_id':self.objectId}, self.writeConcern, function(err, result) {
     collection.remove({'_id':self.objectId}, writeOptions, function(err, result) {
@@ -179,10 +179,10 @@ Chunk.prototype.save = function(options, callback) {
 /**
  * Creates a mongoDB object representation of this chunk.
  *
- * @param callback {function(Object)} This will be called after executing this 
+ * @param callback {function(Object)} This will be called after executing this
  *     method. The object will be passed to the first parameter and will have
  *     the structure:
- *        
+ *
  *        <pre><code>
  *        {
  *          '_id' : , // {number} id for this chunk
@@ -233,4 +233,4 @@ Object.defineProperty(Chunk.prototype, "position", { enumerable: true
  */
 Chunk.DEFAULT_CHUNK_SIZE = 1024 * 255;
 
-module.exports = Chunk;
+module.exports = Chunk;