Merge branch '3.5'

Author: mbroadst

.evergreen/config.yml

@@ -1027,9 +1027,9 @@ buildvariants:
     expansions:
       NODE_LTS_NAME: argon
     tasks: *ref_0
-  - name: macos-1012-dubnium
-    display_name: macOS 10.12 Node Dubnium
-    run_on: macos-1012
+  - name: macos-1014-dubnium
+    display_name: macOS 10.14 Node Dubnium
+    run_on: macos-1014
     expansions:
       NODE_LTS_NAME: dubnium
     tasks: &ref_2
@@ -1082,21 +1082,21 @@ buildvariants:
       - test-2.6-replica_set-unified
       - test-2.6-sharded_cluster-unified
       - test-atlas-connectivity
-  - name: macos-1012-carbon
-    display_name: macOS 10.12 Node Carbon
-    run_on: macos-1012
+  - name: macos-1014-carbon
+    display_name: macOS 10.14 Node Carbon
+    run_on: macos-1014
     expansions:
       NODE_LTS_NAME: carbon
     tasks: *ref_2
-  - name: macos-1012-boron
-    display_name: macOS 10.12 Node Boron
-    run_on: macos-1012
+  - name: macos-1014-boron
+    display_name: macOS 10.14 Node Boron
+    run_on: macos-1014
     expansions:
       NODE_LTS_NAME: boron
     tasks: *ref_2
-  - name: macos-1012-argon
-    display_name: macOS 10.12 Node Argon
-    run_on: macos-1012
+  - name: macos-1014-argon
+    display_name: macOS 10.14 Node Argon
+    run_on: macos-1014
     expansions:
       NODE_LTS_NAME: argon
     tasks: *ref_2

.evergreen/generate_evergreen_tasks.js

@@ -45,9 +45,9 @@ const OPERATING_SYSTEMS = [
   },
   // macos
   {
-    name: 'macos-1012',
-    display_name: 'macOS 10.12',
-    run_on: 'macos-1012',
+    name: 'macos-1014',
+    display_name: 'macOS 10.14',
+    run_on: 'macos-1014',
     auth: false
   },
   // rhel

HISTORY.md

@@ -2,6 +2,41 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com./conventional-changelog/standard-version) for commit guidelines.
 
+<a name="3.5.4"></a>
+## [3.5.4](https://github.com./mongodb/node-mongodb-native/compare/v3.5.3...v3.5.4) (2020-02-25)
+
+
+### Bug Fixes
+
+* **cmap:** don't run min connection thread if no minimum specified ([2d1b713](https://github.com./mongodb/node-mongodb-native/commit/2d1b713))
+* **sdam:** use ObjectId comparison to track maxElectionId ([a1e0849](https://github.com./mongodb/node-mongodb-native/commit/a1e0849))
+* **topology:** ensure selection wait queue is always processed ([bf701d6](https://github.com./mongodb/node-mongodb-native/commit/bf701d6))
+* **topology:** enter `STATE_CLOSING` before draining waitQueue ([494dffb](https://github.com./mongodb/node-mongodb-native/commit/494dffb))
+* don't consume first document when calling `hasNext` on cursor ([bb359a1](https://github.com./mongodb/node-mongodb-native/commit/bb359a1))
+
+
+### Features
+
+* add utility helper for returning promises or using callbacks ([ac9e4c9](https://github.com./mongodb/node-mongodb-native/commit/ac9e4c9))
+
+
+
+<a name="3.5.3"></a>
+## [3.5.3](https://github.com./mongodb/node-mongodb-native/compare/v3.5.2...v3.5.3) (2020-02-12)
+
+
+### Bug Fixes
+
+* **message-stream:** support multiple inbound message packets ([8388443](https://github.com./mongodb/node-mongodb-native/commit/8388443))
+* **server:** non-timeout network errors transition to Unknown state ([fa4b01b](https://github.com./mongodb/node-mongodb-native/commit/fa4b01b))
+
+
+### Features
+
+* **connection:** support exhaust behavior at the transport level ([9ccf268](https://github.com./mongodb/node-mongodb-native/commit/9ccf268))
+
+
+
 <a name="3.5.2"></a>
 ## [3.5.2](https://github.com./mongodb/node-mongodb-native/compare/v3.5.1...v3.5.2) (2020-01-20)
 

lib/cmap/connection_pool.js

@@ -362,7 +362,7 @@ class ConnectionPool extends EventEmitter {
 }
 
 function ensureMinPoolSize(pool) {
-  if (pool.closed) {
+  if (pool.closed || pool.options.minPoolSize === 0) {
     return;
   }
 

lib/core/sdam/topology.js

@@ -319,14 +319,16 @@ class Topology extends EventEmitter {
     }
 
     options = options || {};
-    if (this.s.state === STATE_CLOSED) {
+    if (this.s.state === STATE_CLOSED || this.s.state === STATE_CLOSING) {
       if (typeof callback === 'function') {
         callback();
       }
 
       return;
     }
 
+    stateTransition(this, STATE_CLOSING);
+
     drainWaitQueue(this[kWaitQueue], new MongoError('Topology closed'));
     drainTimerQueue(this.s.connectionTimers);
 
@@ -343,8 +345,6 @@ class Topology extends EventEmitter {
       delete this.s.detectTopologyDescriptionChange;
     }
 
-    stateTransition(this, STATE_CLOSING);
-
     this.s.sessions.forEach(session => session.endSession());
     this.s.sessionPool.endAllPooledSessions(() => {
       eachAsync(
@@ -441,8 +441,7 @@ class Topology extends EventEmitter {
       }, serverSelectionTimeoutMS);
     }
 
-    // place the member at the front of the wait queue
-    this[kWaitQueue].unshift(waitQueueMember);
+    this[kWaitQueue].push(waitQueueMember);
     processWaitQueue(this);
   }
 
@@ -991,7 +990,7 @@ function srvPollingHandler(topology) {
 
 function drainWaitQueue(queue, err) {
   while (queue.length) {
-    const waitQueueMember = queue.pop();
+    const waitQueueMember = queue.shift();
     clearTimeout(waitQueueMember.timer);
     if (!waitQueueMember[kCancelled]) {
       waitQueueMember.callback(err);
@@ -1007,7 +1006,8 @@ function processWaitQueue(topology) {
 
   const isSharded = topology.description.type === TopologyType.Sharded;
   const serverDescriptions = Array.from(topology.description.servers.values());
-  for (let i = 0; i < topology[kWaitQueue].length; ++i) {
+  const membersToProcess = topology[kWaitQueue].length;
+  for (let i = 0; i < membersToProcess; ++i) {
     const waitQueueMember = topology[kWaitQueue].shift();
     if (waitQueueMember[kCancelled]) {
       continue;
@@ -1022,12 +1022,12 @@ function processWaitQueue(topology) {
     } catch (e) {
       clearTimeout(waitQueueMember.timer);
       waitQueueMember.callback(e);
-      break;
+      continue;
     }
 
     if (selectedDescriptions.length === 0) {
       topology[kWaitQueue].push(waitQueueMember);
-      break;
+      continue;
     }
 
     const selectedServerDescription = randomSelection(selectedDescriptions);

lib/core/utils.js

@@ -255,6 +255,8 @@ function makeClientMetadata(options) {
   return metadata;
 }
 
+const noop = () => {};
+
 module.exports = {
   uuidV4,
   calculateDurationInMs,
@@ -270,5 +272,6 @@ module.exports = {
   tagsStrictEqual,
   errorStrictEqual,
   makeStateMachine,
-  makeClientMetadata
+  makeClientMetadata,
+  noop
 };

lib/cursor.js

@@ -9,16 +9,12 @@ const MongoError = require('./core').MongoError;
 const CoreCursor = require('./core/cursor').CoreCursor;
 const CursorState = require('./core/cursor').CursorState;
 const Map = require('./core').BSON.Map;
+const maybePromise = require('./utils').maybePromise;
+const executeOperation = require('./operations/execute_operation');
+const formattedOrderClause = require('./utils').formattedOrderClause;
 
 const each = require('./operations/cursor_ops').each;
-
 const CountOperation = require('./operations/count');
-const ExplainOperation = require('./operations/explain');
-const HasNextOperation = require('./operations/has_next');
-const NextOperation = require('./operations/next');
-const ToArrayOperation = require('./operations/to_array');
-
-const executeOperation = require('./operations/execute_operation');
 
 /**
  * @fileOverview The **Cursor** class is an internal class that embodies a cursor on MongoDB
@@ -127,8 +123,6 @@ class Cursor extends CoreCursor {
       state: CursorState.INIT,
       // Promise library
       promiseLibrary,
-      // Current doc
-      currentDoc: null,
       // explicitlyIgnoreSession
       explicitlyIgnoreSession: !!options.explicitlyIgnoreSession
     };
@@ -198,9 +192,27 @@ class Cursor extends CoreCursor {
    * @return {Promise} returns Promise if no callback passed
    */
   hasNext(callback) {
-    const hasNextOperation = new HasNextOperation(this);
+    if (this.s.state === CursorState.CLOSED || (this.isDead && this.isDead())) {
+      throw MongoError.create({ message: 'Cursor is closed', driver: true });
+    }
+
+    return maybePromise(callback, cb => {
+      const cursor = this;
+      if (cursor.isNotified()) {
+        return cb(null, false);
+      }
 
-    return executeOperation(this.topology, hasNextOperation, callback);
+      cursor._next((err, doc) => {
+        if (err) return cb(err);
+        if (doc == null || cursor.s.state === Cursor.CLOSED || cursor.isDead()) {
+          return cb(null, false);
+        }
+
+        cursor.s.state = CursorState.OPEN;
+        cursor.cursorState.cursorIndex--;
+        cb(null, true);
+      });
+    });
   }
 
   /**
@@ -211,9 +223,27 @@ class Cursor extends CoreCursor {
    * @return {Promise} returns Promise if no callback passed
    */
   next(callback) {
-    const nextOperation = new NextOperation(this);
+    return maybePromise(callback, cb => {
+      const cursor = this;
+      if (cursor.s.state === CursorState.CLOSED || (cursor.isDead && cursor.isDead())) {
+        cb(MongoError.create({ message: 'Cursor is closed', driver: true }));
+        return;
+      }
 
-    return executeOperation(this.topology, nextOperation, callback);
+      if (cursor.s.state === CursorState.INIT && cursor.cmd.sort) {
+        try {
+          cursor.cmd.sort = formattedOrderClause(cursor.cmd.sort);
+        } catch (err) {
+          return cb(err);
+        }
+      }
+
+      cursor._next((err, doc) => {
+        if (err) return cb(err);
+        cursor.s.state = CursorState.OPEN;
+        cb(null, doc);
+      });
+    });
   }
 
   /**
@@ -783,9 +813,49 @@ class Cursor extends CoreCursor {
       });
     }
 
-    const toArrayOperation = new ToArrayOperation(this);
+    return maybePromise(callback, cb => {
+      const cursor = this;
+      const items = [];
 
-    return executeOperation(this.topology, toArrayOperation, callback);
+      // Reset cursor
+      cursor.rewind();
+      cursor.s.state = CursorState.INIT;
+
+      // Fetch all the documents
+      const fetchDocs = () => {
+        cursor._next((err, doc) => {
+          if (err) {
+            return cursor._endSession
+              ? cursor._endSession(() => handleCallback(cb, err))
+              : handleCallback(cb, err);
+          }
+
+          if (doc == null) {
+            return cursor.close({ skipKillCursors: true }, () => handleCallback(cb, null, items));
+          }
+
+          // Add doc to items
+          items.push(doc);
+
+          // Get all buffered objects
+          if (cursor.bufferedCount() > 0) {
+            let docs = cursor.readBufferedDocuments(cursor.bufferedCount());
+
+            // Transform the doc if transform method added
+            if (cursor.s.transforms && typeof cursor.s.transforms.doc === 'function') {
+              docs = docs.map(cursor.s.transforms.doc);
+            }
+
+            Array.prototype.push.apply(items, docs);
+          }
+
+          // Attempt a fetch
+          fetchDocs();
+        });
+      };
+
+      fetchDocs();
+    });
   }
 
   /**
@@ -971,9 +1041,9 @@ class Cursor extends CoreCursor {
       delete this.cmd['readConcern'];
     }
 
-    const explainOperation = new ExplainOperation(this);
-
-    return executeOperation(this.topology, explainOperation, callback);
+    return maybePromise(callback, cb => {
+      CoreCursor.prototype._next.apply(this, [cb]);
+    });
   }
 
   /**