merged in 2.0 branch

Author: christkv

HISTORY.md

@@ -175,7 +175,7 @@ Collection.prototype.find = function() {
     options = args[0];
   }
 
-  if(len === 2 && !Array.isArray(fields)) {
+  if(len === 2 && fields !== undefined && !Array.isArray(fields)) {
     var fieldKeys = Object.keys(fields);
     var is_option = false;
 

lib/collection.js

@@ -57,7 +57,7 @@ var debugFields = ['authSource', 'w', 'wtimeout', 'j', 'native_parser', 'forceSe
  * @param {boolean} [options.raw=false] Return document results as raw BSON buffers.
  * @param {boolean} [options.promoteLongs=true] Promotes Long values to number if they fit inside the 53 bits resolution.
  * @param {number} [options.bufferMaxEntries=-1] Sets a cap on how many operations the driver will buffer up before giving up on getting a working connection, default is -1 which is unlimited.
- * @param {number} [options.numberOfRetries=5] Number of retries off connection.
+ * @param {number} [options.numberOfRetries=5] Number of times a tailable cursor will re-poll when it gets nothing back.
  * @param {number} [options.retryMiliSeconds=500] Number of milliseconds between retries.
  * @param {(ReadPreference|string)} [options.readPreference=null] The preferred read preference (ReadPreference.PRIMARY, ReadPreference.PRIMARY_PREFERRED, ReadPreference.SECONDARY, ReadPreference.SECONDARY_PREFERRED, ReadPreference.NEAREST).
  * @param {object} [options.pkFactory=null] A primary key factory object for generation of custom _id keys.
@@ -758,7 +758,6 @@ define.classMethod('dropCollection', {callback: true, promise:true});
  */
 Db.prototype.dropDatabase = function(callback) {
   var self = this;
-  if(typeof options == 'function') callback = options, options = {};
   // Drop database command
   var cmd = {'dropDatabase':1};
 

lib/db.js

@@ -247,16 +247,19 @@ var connect = function(url, options, callback) {
       new Db(object.dbName, __server, {w:1, native_parser:false}).open(function(err, db) {
         // Update number of servers
         totalNumberOfServers = totalNumberOfServers - 1;
+        
         // If no error do the correct checks
         if(!err) {
           // Close the connection
           db.close();
           var isMasterDoc = db.serverConfig.isMasterDoc;
+          
           // Check what type of server we have
           if(isMasterDoc.setName) {
             totalNumberOfMongodServers++;
             setName = isMasterDoc.setName;
           }
+
           if(isMasterDoc.msg && isMasterDoc.msg == "isdbgrid") totalNumberOfMongosServers++;
         } else {
           error = err;

lib/mongo_client.js

@@ -1,6 +1,6 @@
 {
   "name": "mongodb",
-  "version": "2.0.39",
+  "version": "2.0.41",
   "description": "MongoDB legacy driver emulation layer on top of mongodb-core",
   "main": "index.js",
   "repository": {
@@ -13,7 +13,7 @@
     "legacy"
   ],
   "dependencies": {
-      "mongodb-core": "1.2.8"
+      "mongodb-core": "1.2.10"
     , "readable-stream": "1.0.31"
     , "es6-promise": "2.1.1"
   },

package.json

@@ -71,7 +71,7 @@ exports.shouldCorrectlyRetrieveReplSetGetStatusWithPromises = {
  * @ignore
  */
 exports.shouldCorrectlyCallValidateCollectionUsingAuthenticatedMode = {
-  metadata: { requires: { topology: ['single', 'replicaset', 'sharded', 'ssl', 'heap', 'wiredtiger'] } },
+  metadata: { requires: { topology: ['single', 'ssl', 'heap', 'wiredtiger'] } },
 
   // The actual test we wish to run
   test: function(configure, test) {

test/functional/authentication_tests.js

@@ -2256,3 +2256,48 @@ exports['Should correctly execute parallelCollectionScan with single cursor emit
     });
   }
 }
+
+exports['Should simulate closed cursor'] = {
+  // Add a tag that our runner can trigger on
+  // in this case we are setting that node needs to be higher than 0.10.X to run
+  metadata: { requires: { mongodb: ">2.5.5", topology: ["single", "replicaset"] } },
+
+  // The actual test we wish to run
+  test: function(configuration, test) {
+    var db = configuration.newDbInstance(configuration.writeConcernMax(), {poolSize:1, auto_reconnect:false});
+    // Establish connection to db
+    db.open(function(err, db) {
+      var docs = [];
+
+      // Insert some documents
+      for(var i = 0; i < 1000; i++) {
+        docs.push({a:i});
+      }
+
+      // Get the collection
+      var collection = db.collection('parallelCollectionScan_4');
+      // Insert 1000 documents in a batch
+      collection.insert(docs, function(err, result) {
+        var results = [];
+        var numCursors = 1;
+
+        // Get the cursor
+        var cursor = collection.find({}).batchSize(2);
+        // Get next document
+        cursor.next(function(err, doc) {
+          test.equal(null, err);
+          test.ok(doc != null);
+
+          // Mess with state forcing a call to isDead on the cursor
+          cursor.s.state = 2;
+
+          cursor.next(function(err, doc) {
+            test.ok(err != null);
+            db.close();
+            test.done();
+          })
+        });
+      });
+    });
+  }
+}

test/functional/find_tests.js

@@ -246,20 +246,37 @@ exports.shouldCorrectlyHandleMultipleChunkGridStore = {
     var fs_client = configuration.newDbInstance(configuration.writeConcernMax(), {poolSize:1});
 
     fs_client.open(function(err, fs_client) {
+      test.equal(null, err);
+
       fs_client.dropDatabase(function(err, done) {
+        test.equal(null, err);
+
         var gridStore = new GridStore(fs_client, "test_gs_multi_chunk", "w");
         gridStore.open(function(err, gridStore) {
+          test.equal(null, err);
+
           gridStore.chunkSize = 512;
           var file1 = ''; var file2 = ''; var file3 = '';
           for(var i = 0; i < gridStore.chunkSize; i++) { file1 = file1 + 'x'; }
           for(var i = 0; i < gridStore.chunkSize; i++) { file2 = file2 + 'y'; }
           for(var i = 0; i < gridStore.chunkSize; i++) { file3 = file3 + 'z'; }
 
           gridStore.write(file1, function(err, gridStore) {
+            console.dir(err)
+            test.equal(null, err);
+
             gridStore.write(file2, function(err, gridStore) {
+              test.equal(null, err);
+  
               gridStore.write(file3, function(err, gridStore) {
+                test.equal(null, err);
+    
                 gridStore.close(function(err, result) {
+                  test.equal(null, err);
+      
                   fs_client.collection('fs.chunks', function(err, collection) {
+                    test.equal(null, err);
+
                     collection.count(function(err, count) {
                       test.equal(3, count);
 
@@ -3042,3 +3059,47 @@ exports['should correctly seek on file where size of file is a multiple of the c
     });
   }
 }
+
+/**
+ * @ignore
+ */
+exports['should correctly write fake png to gridstore'] = {
+  metadata: { requires: { topology: ['single', 'replicaset', 'sharded', 'ssl', 'heap', 'wiredtiger'] } },
+
+  // The actual test we wish to run
+  test: function(configuration, test) {
+    var MongoClient = configuration.require.MongoClient
+      , GridStore = configuration.require.GridStore
+      , ObjectID = configuration.require.ObjectID
+      , fs = require('fs')
+      , assert = require('assert');
+
+    // Connection URL
+    var url = 'mongodb://localhost:27017/myproject';
+    var id = new ObjectID();
+
+    // Create a test buffer
+    var buffer = new Buffer(200033);
+
+    // Use connect method to connect to the Server
+    MongoClient.connect(configuration.url(), function(err, db) {
+      assert.equal(null, err);
+
+      var gridStore = new GridStore(db, new ObjectID(), 'w', { "content_type": "image/png", "chunk_size": 1024*4 });
+      gridStore.open(function(err, gridStore) {
+        test.equal(null, err);
+
+        gridStore.write(buffer, function(err, result) {
+          test.equal(null, err);
+  
+          gridStore.close(function(err, result) { 
+            test.equal(null, err);
+
+            db.close();
+            test.done();
+          });
+        });
+      });
+    });
+  }
+}

test/functional/gridfs_tests.js

@@ -352,3 +352,26 @@ exports['Should fail due to wrong uri user:password@localhost'] = {
     }
   }
 }
+
+/**
+ * @ignore
+ */
+exports["correctly timeout MongoClient connect using custom connectTimeoutMS"] = {
+  metadata: { requires: { topology: ['single', 'replicaset', 'sharded', 'ssl', 'heap', 'wiredtiger'] } },
+
+  // The actual test we wish to run
+  test: function(configuration, test) {
+    var MongoClient = configuration.require.MongoClient;
+
+    var start = new Date();
+
+    MongoClient.connect('mongodb://example.com/test?connectTimeoutMS=1000&maxPoolSize=1', function(err, db) {
+      // db.close();
+
+      var end = new Date();
+      console.dir(end.getTime() - start.getTime())
+
+      test.done();
+    });
+  }
+}

test/functional/mongo_client_tests.js

@@ -529,7 +529,7 @@ exports.shouldCreateComplexIndexOnTwoFields = {
         test.equal(null, err);
 
         // Create an index on the a field
-        db.createIndex('createIndexExample1', {a:1, b:1}
+        collection.createIndex({a:1, b:1}
           , {unique:true, background:true, w:1}, function(err, indexName) {
 
           // Show that duplicate records got dropped