mongodb 3.3.0-beta1 → 3.3.0-beta2

package/lib/operations/execute_operation.js

@@ -3,6 +3,10 @@
 const MongoError = require('../core').MongoError;
 const Aspect = require('./operation').Aspect;
 const OperationBase = require('./operation').OperationBase;
+const ReadPreference = require('../core').ReadPreference;
+const isRetryableError = require('../core/error').isRetryableError;
+const maxWireVersion = require('../core/utils').maxWireVersion;
+const isUnifiedTopology = require('../core/utils').isUnifiedTopology;
 
 /**
  * Executes the given operation with provided arguments.
@@ -26,6 +30,25 @@ function executeOperation(topology, operation, callback) {
     throw new TypeError('This method requires a valid operation instance');
   }
 
+  if (
+    isUnifiedTopology(topology) &&
+    !operation.hasAspect(Aspect.SKIP_SESSION) &&
+    topology.shouldCheckForSessionSupport()
+  ) {
+    // TODO: this is only supported for unified topology, the first part of this check
+    //       should go away when we drop legacy topology types.
+    topology.selectServer(ReadPreference.primaryPreferred, err => {
+      if (err) {
+        callback(err);
+        return;
+      }
+
+      executeOperation(topology, operation, callback);
+    });
+
+    return;
+  }
+
   const Promise = topology.s.promiseLibrary;
 
   // The driver sessions spec mandates that we implicitly create sessions for operations
@@ -65,7 +88,11 @@ function executeOperation(topology, operation, callback) {
     );
 
     try {
-      return operation.execute(handler);
+      if (operation.hasAspect(Aspect.EXECUTE_WITH_SELECTION)) {
+        return executeWithServerSelection(topology, operation, handler);
+      } else {
+        return operation.execute(handler);
+      }
     } catch (e) {
       handler(e);
       throw e;
@@ -76,11 +103,63 @@ function executeOperation(topology, operation, callback) {
     const handler = makeExecuteCallback(resolve, reject);
 
     try {
-      return operation.execute(handler);
+      if (operation.hasAspect(Aspect.EXECUTE_WITH_SELECTION)) {
+        return executeWithServerSelection(topology, operation, handler);
+      } else {
+        return operation.execute(handler);
+      }
     } catch (e) {
       handler(e);
     }
   });
 }
 
+function supportsRetryableReads(server) {
+  return maxWireVersion(server) >= 6;
+}
+
+function executeWithServerSelection(topology, operation, callback) {
+  const readPreference = operation.readPreference || ReadPreference.primary;
+
+  function callbackWithRetry(err, result) {
+    if (err == null) {
+      return callback(null, result);
+    }
+
+    if (!isRetryableError(err)) {
+      return callback(err);
+    }
+
+    // select a new server, and attempt to retry the operation
+    topology.selectServer(readPreference, (err, server) => {
+      if (err || !supportsRetryableReads(server)) {
+        callback(err, null);
+        return;
+      }
+
+      operation.execute(server, callback);
+    });
+  }
+
+  // select a server, and execute the operation against it
+  topology.selectServer(readPreference, (err, server) => {
+    if (err) {
+      callback(err, null);
+      return;
+    }
+
+    const shouldRetryReads =
+      topology.s.options.retryReads !== false &&
+      (operation.session && !operation.session.inTransaction()) &&
+      supportsRetryableReads(server);
+
+    if (operation.hasAspect(Aspect.RETRYABLE) && shouldRetryReads) {
+      operation.execute(server, callbackWithRetry);
+      return;
+    }
+
+    operation.execute(server, callback);
+  });
+}
+
 module.exports = executeOperation;

package/lib/operations/explain.js

@@ -14,10 +14,6 @@ class ExplainOperation extends OperationBase {
 
   execute() {
     const cursor = this.cursor;
-
-    if (cursor._initImplicitSession) {
-      cursor._initImplicitSession();
-    }
     return CoreCursor.prototype.next.apply(cursor, arguments);
   }
 }

package/lib/operations/operation.js

@@ -3,7 +3,9 @@
 const Aspect = {
   READ_OPERATION: Symbol('READ_OPERATION'),
   SKIP_SESSION: Symbol('SKIP_SESSION'),
-  WRITE_OPERATION: Symbol('WRITE_OPERATION')
+  WRITE_OPERATION: Symbol('WRITE_OPERATION'),
+  RETRYABLE: Symbol('RETRYABLE'),
+  EXECUTE_WITH_SELECTION: Symbol('EXECUTE_WITH_SELECTION')
 };
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mongodb",
-  "version": "3.3.0-beta1",
+  "version": "3.3.0-beta2",
   "description": "The official MongoDB driver for Node.js",
   "main": "index.js",
   "files": [