Merge branch '3.5' into 3.6

Author: mbroadst

lib/collection.js

@@ -310,7 +310,7 @@ const DEPRECATED_FIND_OPTIONS = ['maxScan', 'fields', 'snapshot', 'oplogReplay']
  * @param {(ReadPreference|string)} [options.readPreference] The preferred read preference (ReadPreference.PRIMARY, ReadPreference.PRIMARY_PREFERRED, ReadPreference.SECONDARY, ReadPreference.SECONDARY_PREFERRED, ReadPreference.NEAREST).
  * @param {boolean} [options.partial=false] Specify if the cursor should return partial results when querying against a sharded system
  * @param {number} [options.maxTimeMS] Number of milliseconds to wait before aborting the query.
- * @param {number} [options.maxAwaitTimeMS] The maximum amount of time for the server to wait on new documents to satisfy a tailable cursor query. Requires `taiable` and `awaitData` to be true
+ * @param {number} [options.maxAwaitTimeMS] The maximum amount of time for the server to wait on new documents to satisfy a tailable cursor query. Requires `tailable` and `awaitData` to be true
  * @param {boolean} [options.noCursorTimeout] The server normally times out idle cursors after an inactivity period (10 minutes) to prevent excess memory use. Set this option to prevent that.
  * @param {object} [options.collation] Specify collation (MongoDB 3.4 or higher) settings for update operation (see 3.4 documentation for available fields).
  * @param {boolean} [options.allowDiskUse] Enables writing to temporary files on the server.

lib/core/sdam/server.js

@@ -473,11 +473,13 @@ function markServerUnknown(server, error) {
 }
 
 function makeOperationHandler(server, options, callback) {
+  const session = options && options.session;
+
   return function handleOperationResult(err, result) {
     if (err) {
       if (err instanceof MongoNetworkError) {
-        if (options && options.session) {
-          options.session.serverSession.isDirty = true;
+        if (session && !session.hasEnded) {
+          session.serverSession.isDirty = true;
         }
 
         if (supportsRetryableWrites(server)) {

lib/core/sessions.js

@@ -123,14 +123,14 @@ class ClientSession extends EventEmitter {
       this.abortTransaction(); // pass in callback?
     }
 
-    // mark the session as ended, and emit a signal
-    this.hasEnded = true;
-    this.emit('ended', this);
-
     // release the server session back to the pool
     this.sessionPool.release(this.serverSession);
     this.serverSession = null;
 
+    // mark the session as ended, and emit a signal
+    this.hasEnded = true;
+    this.emit('ended', this);
+
     // spec indicates that we should ignore all errors for `endSessions`
     if (typeof callback === 'function') callback(null, null);
   }

lib/core/uri_parser.js

@@ -293,8 +293,8 @@ function applyConnectionStringOption(obj, key, value, options) {
     }
   }
 
-  if (key === 'readpreferencetags' && Array.isArray(value)) {
-    value = splitArrayOfMultipleReadPreferenceTags(value);
+  if (key === 'readpreferencetags') {
+    value = Array.isArray(value) ? splitArrayOfMultipleReadPreferenceTags(value) : [value];
   }
 
   // set the actual value

lib/operations/create_collection.js

@@ -4,11 +4,13 @@ const Aspect = require('./operation').Aspect;
 const defineAspects = require('./operation').defineAspects;
 const CommandOperation = require('./command');
 const applyWriteConcern = require('../utils').applyWriteConcern;
+const handleCallback = require('../utils').handleCallback;
 const loadCollection = require('../dynamic_loaders').loadCollection;
 const MongoError = require('../core').MongoError;
 const ReadPreference = require('../core').ReadPreference;
 
-const ILLEGAL_COMMAND_FIELDS = new Set([
+// Filter out any write concern options
+const illegalCommandFields = [
   'w',
   'wtimeout',
   'j',
@@ -22,24 +24,27 @@ const ILLEGAL_COMMAND_FIELDS = new Set([
   'session',
   'readConcern',
   'writeConcern'
-]);
+];
 
 class CreateCollectionOperation extends CommandOperation {
   constructor(db, name, options) {
     super(db, options);
+
     this.name = name;
   }
 
   _buildCommand() {
     const name = this.name;
     const options = this.options;
 
+    // Create collection command
     const cmd = { create: name };
+    // Add all optional parameters
     for (let n in options) {
       if (
         options[n] != null &&
         typeof options[n] !== 'function' &&
-        !ILLEGAL_COMMAND_FIELDS.has(n)
+        illegalCommandFields.indexOf(n) === -1
       ) {
         cmd[n] = options[n];
       }
@@ -52,51 +57,61 @@ class CreateCollectionOperation extends CommandOperation {
     const db = this.db;
     const name = this.name;
     const options = this.options;
-    const Collection = loadCollection();
-
-    let listCollectionOptions = Object.assign({ nameOnly: true, strict: false }, options);
-    listCollectionOptions = applyWriteConcern(listCollectionOptions, { db }, listCollectionOptions);
 
-    function done(err) {
-      if (err) {
-        return callback(err);
-      }
+    let Collection = loadCollection();
 
-      try {
-        callback(
-          null,
-          new Collection(db, db.s.topology, db.databaseName, name, db.s.pkFactory, options)
-        );
-      } catch (err) {
-        callback(err);
-      }
+    // Did the user destroy the topology
+    if (db.serverConfig && db.serverConfig.isDestroyed()) {
+      return callback(new MongoError('topology was destroyed'));
     }
 
-    const strictMode = listCollectionOptions.strict;
-    if (strictMode) {
-      db.listCollections({ name }, listCollectionOptions)
-        .setReadPreference(ReadPreference.PRIMARY)
-        .toArray((err, collections) => {
-          if (err) {
-            return callback(err);
-          }
+    let listCollectionOptions = Object.assign({}, options, { nameOnly: true });
+    listCollectionOptions = applyWriteConcern(listCollectionOptions, { db }, listCollectionOptions);
 
-          if (collections.length > 0) {
-            return callback(
-              new MongoError(`Collection ${name} already exists. Currently in strict mode.`)
+    // Check if we have the name
+    db.listCollections({ name }, listCollectionOptions)
+      .setReadPreference(ReadPreference.PRIMARY)
+      .toArray((err, collections) => {
+        if (err != null) return handleCallback(callback, err, null);
+        if (collections.length > 0 && listCollectionOptions.strict) {
+          return handleCallback(
+            callback,
+            MongoError.create({
+              message: `Collection ${name} already exists. Currently in strict mode.`,
+              driver: true
+            }),
+            null
+          );
+        } else if (collections.length > 0) {
+          try {
+            return handleCallback(
+              callback,
+              null,
+              new Collection(db, db.s.topology, db.databaseName, name, db.s.pkFactory, options)
             );
+          } catch (err) {
+            return handleCallback(callback, err);
           }
+        }
 
-          super.execute(done);
-        });
-
-      return;
-    }
+        // Execute command
+        super.execute(err => {
+          if (err) return handleCallback(callback, err);
 
-    // otherwise just execute the command
-    super.execute(done);
+          try {
+            return handleCallback(
+              callback,
+              null,
+              new Collection(db, db.s.topology, db.databaseName, name, db.s.pkFactory, options)
+            );
+          } catch (err) {
+            return handleCallback(callback, err);
+          }
+        });
+      });
   }
 }
 
 defineAspects(CreateCollectionOperation, Aspect.WRITE_OPERATION);
+
 module.exports = CreateCollectionOperation;

package.json

@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "bl": "^2.2.0",
-    "bson": "^1.1.1",
+    "bson": "^1.1.4",
     "denque": "^1.4.1",
     "require_optional": "^1.0.1",
     "safe-buffer": "^5.1.2"

test/examples/change_streams.js

@@ -16,11 +16,8 @@ describe('examples(change-stream):', function() {
     client = await this.configuration.newClient().connect();
     db = client.db(this.configuration.db);
 
-    // ensure database exists, we need this for 3.6
-    await db.collection('inventory').insertOne({});
-
-    // now clear the collection
-    await db.collection('inventory').deleteMany();
+    await db.createCollection('inventory');
+    await db.collection('inventory').deleteMany({});
   });
 
   afterEach(async function() {

test/functional/collection.test.js

@@ -10,7 +10,7 @@ describe('Collection', function() {
   let configuration;
   before(function() {
     configuration = this.configuration;
-    return setupDatabase(configuration, ['listCollectionsDb', 'listCollectionsDb2', 'test_db']);
+    return setupDatabase(configuration);
   });
 
   describe('standard collection tests', function() {
@@ -208,7 +208,12 @@ describe('Collection', function() {
             'Collection test_strict_create_collection already exists. Currently in strict mode.'
           );
 
-          done();
+          // Switch out of strict mode and try to re-create collection
+          db.createCollection('test_strict_create_collection', { strict: false }, err => {
+            expect(err).to.not.exist;
+            // Let's close the db
+            done();
+          });
         });
       });
     });
@@ -744,7 +749,7 @@ describe('Collection', function() {
         expect(coll).to.exist;
 
         db.createCollection('shouldFailDueToExistingCollection', { strict: true }, err => {
-          expect(err).to.exist;
+          expect(err).to.be.an.instanceof(Error);
           expect(err.message).to.equal(
             'Collection shouldFailDueToExistingCollection already exists. Currently in strict mode.'
           );

test/functional/cursor.test.js

@@ -2549,10 +2549,7 @@ describe('Cursor', function() {
 
         var db = client.db(configuration.db);
         var options = { capped: true, size: 8 };
-        db.createCollection('should_await_data_retry_tailable_cursor', options, function(
-          err,
-          collection
-        ) {
+        db.createCollection('should_await_data', options, function(err, collection) {
           test.equal(null, err);
 
           collection.insert({ a: 1 }, configuration.writeConcernMax(), function(err) {
@@ -4045,7 +4042,10 @@ describe('Cursor', function() {
         test.equal(null, err);
 
         var db = client.db(configuration.db);
-        db.createCollection('negative_batch_size_and_limit_set', function(err, collection) {
+        db.createCollection('Should_correctly_execute_count_on_cursor_1_', function(
+          err,
+          collection
+        ) {
           test.equal(null, err);
 
           // insert all docs

test/functional/find.test.js

@@ -1379,7 +1379,7 @@ describe('Find', function() {
       var client = configuration.newClient(configuration.writeConcernMax(), { poolSize: 1 });
       client.connect(function(err, client) {
         var db = client.db(configuration.db);
-        db.createCollection('execute_find_and_modify', function(err, collection) {
+        db.createCollection('shouldCorrectlyExecuteFindAndModify', function(err, collection) {
           var self = { _id: new ObjectID() };
           var _uuid = 'sddffdss';
 
@@ -1601,7 +1601,7 @@ describe('Find', function() {
           transactions: transactions
         };
 
-        db.createCollection('find_and_modify_generate_correct_bson', function(err, collection) {
+        db.createCollection('shouldCorrectlyExecuteFindAndModify', function(err, collection) {
           test.equal(null, err);
 
           collection.insert(wrapingObject, configuration.writeConcernMax(), function(err, r) {