mongodb 3.0.4 → 3.0.8

package/lib/utils.js

@@ -1,7 +1,7 @@
 'use strict';
 
-var MongoError = require('mongodb-core').MongoError,
-  ReadPreference = require('mongodb-core').ReadPreference;
+const MongoError = require('mongodb-core').MongoError;
+const ReadPreference = require('mongodb-core').ReadPreference;
 
 var shallowClone = function(obj) {
   var copy = {};
@@ -378,11 +378,12 @@ const executeOperation = (topology, operation, args, options) => {
 
   // The driver sessions spec mandates that we implicitly create sessions for operations
   // that are not explicitly provided with a session.
-  let session, opOptions;
+  let session, opOptions, owner;
   if (!options.skipSessions && topology.hasSessionSupport()) {
     opOptions = args[args.length - 2];
     if (opOptions == null || opOptions.session == null) {
-      session = topology.startSession();
+      owner = Symbol();
+      session = topology.startSession({ owner });
       const optionsIndex = args.length - 2;
       args[optionsIndex] = Object.assign({}, args[optionsIndex], { session: session });
     } else if (opOptions.session && opOptions.session.hasEnded) {
@@ -392,7 +393,7 @@ const executeOperation = (topology, operation, args, options) => {
 
   const makeExecuteCallback = (resolve, reject) =>
     function executeCallback(err, result) {
-      if (session && !options.returnsCursor) {
+      if (session && session.owner === owner && !options.returnsCursor) {
         session.endSession(() => {
           delete opOptions.session;
           if (err) return reject(err);
@@ -440,6 +441,51 @@ const executeOperation = (topology, operation, args, options) => {
   });
 };
 
+/**
+ * Applies a write concern to a command based on well defined inheritance rules, optionally
+ * detecting support for the write concern in the first place.
+ *
+ * @param {Object} target the target command we will be applying the write concern to
+ * @param {Object} sources sources where we can inherit default write concerns from
+ * @param {Object} [options] optional settings passed into a command for write concern overrides
+ * @returns {Object} the (now) decorated target
+ */
+function applyWriteConcern(target, sources, options) {
+  options = options || {};
+  const db = sources.db;
+  const coll = sources.collection;
+
+  // NOTE: there is probably a much better place for this
+  if (db && db.s.options.retryWrites) {
+    target.retryWrites = true;
+  }
+
+  if (options.w != null || options.j != null || options.fsync != null) {
+    const writeConcern = {};
+    if (options.w != null) writeConcern.w = options.w;
+    if (options.wtimeout != null) writeConcern.wtimeout = options.wtimeout;
+    if (options.j != null) writeConcern.j = options.j;
+    if (options.fsync != null) writeConcern.fsync = options.fsync;
+    return Object.assign(target, { writeConcern });
+  }
+
+  if (
+    coll &&
+    (coll.writeConcern.w != null || coll.writeConcern.j != null || coll.writeConcern.fsync != null)
+  ) {
+    return Object.assign(target, { writeConcern: Object.assign({}, coll.writeConcern) });
+  }
+
+  if (
+    db &&
+    (db.writeConcern.w != null || db.writeConcern.j != null || db.writeConcern.fsync != null)
+  ) {
+    return Object.assign(target, { writeConcern: Object.assign({}, db.writeConcern) });
+  }
+
+  return target;
+}
+
 exports.filterOptions = filterOptions;
 exports.mergeOptions = mergeOptions;
 exports.translateOptions = translateOptions;
@@ -458,3 +504,4 @@ exports.MAX_JS_INT = 0x20000000000000;
 exports.mergeOptionsAndWriteConcern = mergeOptionsAndWriteConcern;
 exports.translateReadPreference = translateReadPreference;
 exports.executeOperation = executeOperation;
+exports.applyWriteConcern = applyWriteConcern;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mongodb",
-  "version": "3.0.4",
+  "version": "3.0.8",
   "description": "The official MongoDB driver for Node.js",
   "main": "index.js",
   "repository": {
@@ -13,10 +13,9 @@
     "official"
   ],
   "dependencies": {
-    "mongodb-core": "3.0.4"
+    "mongodb-core": "3.0.8"
   },
   "devDependencies": {
-    "betterbenchmarks": "^0.1.0",
     "bluebird": "3.5.0",
     "bson": "^1.0.4",
     "chai": "^4.1.1",
@@ -27,7 +26,7 @@
     "eslint-plugin-prettier": "^2.2.0",
     "istanbul": "^0.4.5",
     "jsdoc": "3.5.4",
-    "mongodb-extended-json": "^1.10.0",
+    "mongodb-extjson": "^2.1.1",
     "mongodb-mock-server": "^1.0.0",
     "mongodb-test-runner": "^1.1.18",
     "prettier": "^1.5.3",
@@ -48,7 +47,8 @@
     "coverage": "istanbul cover mongodb-test-runner -- -t 60000  test/unit test/functional",
     "lint": "eslint lib test",
     "format": "prettier --print-width 100 --tab-width 2 --single-quote --write 'test/**/*.js' 'lib/**/*.js'",
-    "changelog": "conventional-changelog -p angular -i HISTORY.md -s"
+    "changelog": "conventional-changelog -p angular -i HISTORY.md -s",
+    "bench": "node test/driverBench/"
   },
   "homepage": "https://github.com/mongodb/node-mongodb-native"
 }

package/lib/metadata.js

@@ -1,70 +0,0 @@
-'use strict';
-
-var f = require('util').format;
-
-var Define = function(name, object, stream) {
-  this.name = name;
-  this.object = object;
-  this.stream = typeof stream === 'boolean' ? stream : false;
-  this.instrumentations = {};
-};
-
-Define.prototype.classMethod = function(name, options) {
-  var keys = Object.keys(options).sort();
-  var key = generateKey(keys, options);
-
-  // Add a list of instrumentations
-  if (this.instrumentations[key] == null) {
-    this.instrumentations[key] = {
-      methods: [],
-      options: options
-    };
-  }
-
-  // Push to list of method for this instrumentation
-  this.instrumentations[key].methods.push(name);
-};
-
-var generateKey = function(keys, options) {
-  var parts = [];
-  for (var i = 0; i < keys.length; i++) {
-    parts.push(f('%s=%s', keys[i], options[keys[i]]));
-  }
-
-  return parts.join();
-};
-
-Define.prototype.staticMethod = function(name, options) {
-  options.static = true;
-  var keys = Object.keys(options).sort();
-  var key = generateKey(keys, options);
-
-  // Add a list of instrumentations
-  if (this.instrumentations[key] == null) {
-    this.instrumentations[key] = {
-      methods: [],
-      options: options
-    };
-  }
-
-  // Push to list of method for this instrumentation
-  this.instrumentations[key].methods.push(name);
-};
-
-Define.prototype.generate = function() {
-  // Generate the return object
-  var object = {
-    name: this.name,
-    obj: this.object,
-    stream: this.stream,
-    instrumentations: []
-  };
-
-  for (var name in this.instrumentations) {
-    object.instrumentations.push(this.instrumentations[name]);
-  }
-
-  return object;
-};
-
-module.exports = Define;