mongodb 2.1.0-alpha → 2.1.2

package/lib/bulk/ordered.js

@@ -9,6 +9,7 @@ var common = require('./common')
   , BulkWriteResult = common.BulkWriteResult
   , LegacyOp = common.LegacyOp
   , ObjectID = require('mongodb-core').BSON.ObjectID
+  , Define = require('../metadata')
   , Batch = common.Batch
   , mergeBatchResults = common.mergeBatchResults;
 
@@ -211,11 +212,10 @@ function OrderedBulkOperation(topology, collection, options) {
   var namespace = collection.collectionName;
 
   // Set max byte size
-	var maxBatchSizeBytes = topology.isMasterDoc.maxBsonObjectSize;
-	var maxWriteBatchSize = topology.isMasterDoc.maxWriteBatchSize || 1000;
-
-	// Get the capabilities
-	var capabilities = topology.capabilities();
+	var maxBatchSizeBytes = topology.isMasterDoc && topology.isMasterDoc.maxBsonObjectSize
+    ? topology.isMasterDoc.maxBsonObjectSize : (1024*1025*16);
+	var maxWriteBatchSize = topology.isMasterDoc && topology.isMasterDoc.maxWriteBatchSize 
+    ? topology.isMasterDoc.maxWriteBatchSize : 1000;
 
   // Get the write concern
   var writeConcern = common.writeConcern(shallowClone(options), collection, options);
@@ -262,8 +262,6 @@ function OrderedBulkOperation(topology, collection, options) {
     , batches: []
     // Write concern
     , writeConcern: writeConcern
-    // Capabilities
-    , capabilities: capabilities
     // Max batch size options
     , maxBatchSizeBytes: maxBatchSizeBytes
     , maxWriteBatchSize: maxWriteBatchSize
@@ -283,12 +281,22 @@ function OrderedBulkOperation(topology, collection, options) {
     , collection: collection
     // Promise Library
     , promiseLibrary: promiseLibrary
+		// Fundamental error
+		, err: null
+    // Bypass validation
+    , bypassDocumentValidation: typeof options.bypassDocumentValidation == 'boolean' ? options.bypassDocumentValidation : false
   }
 }
 
+var define = OrderedBulkOperation.define = new Define('OrderedBulkOperation', OrderedBulkOperation, false);
+
 OrderedBulkOperation.prototype.raw = function(op) {
   var key = Object.keys(op)[0];
 
+  // Set up the force server object id
+  var forceServerObjectId = typeof this.s.options.forceServerObjectId == 'boolean'
+    ? this.s.options.forceServerObjectId : this.s.collection.s.db.options.forceServerObjectId;
+
   // Update operations
   if((op.updateOne && op.updateOne.q)
     || (op.updateMany && op.updateMany.q)
@@ -301,7 +309,7 @@ OrderedBulkOperation.prototype.raw = function(op) {
   if(op.updateOne || op.updateMany || op.replaceOne) {
     var multi = op.updateOne || op.replaceOne ? false : true;
     var operation = {q: op[key].filter, u: op[key].update || op[key].replacement, multi: multi}
-    if(op[key].upsert) operation.upsert = true;
+    operation.upsert = op[key].upsert ? true: false;
     return addToOperationsList(this, common.UPDATE, operation);
   }
 
@@ -320,16 +328,16 @@ OrderedBulkOperation.prototype.raw = function(op) {
 
   // Insert operations
   if(op.insertOne && op.insertOne.document == null) {
-    if(op.insertOne._id == null) op.insertOne._id = new ObjectID();
+    if(forceServerObjectId !== true && op.insertOne._id == null) op.insertOne._id = new ObjectID();
     return addToOperationsList(this, common.INSERT, op.insertOne);
   } else if(op.insertOne && op.insertOne.document) {
-    if(op.insertOne.document._id == null) op.insertOne.document._id = new ObjectID();
+    if(forceServerObjectId !== true && op.insertOne.document._id == null) op.insertOne.document._id = new ObjectID();
     return addToOperationsList(this, common.INSERT, op.insertOne.document);
   }
 
   if(op.insertMany) {
     for(var i = 0; i < op.insertMany.length; i++) {
-      if(op.insertMany[i]._id == null) op.insertMany[i]._id = new ObjectID();
+      if(forceServerObjectId !== true && op.insertMany[i]._id == null) op.insertMany[i]._id = new ObjectID();
       addToOperationsList(this, common.INSERT, op.insertMany[i]);
     }
 
@@ -348,7 +356,7 @@ OrderedBulkOperation.prototype.raw = function(op) {
  * @return {OrderedBulkOperation}
  */
 OrderedBulkOperation.prototype.insert = function(document) {
-  if(document._id == null) document._id = new ObjectID();
+  if(this.s.collection.s.db.options.forceServerObjectId !== true && document._id == null) document._id = new ObjectID();
   return addToOperationsList(this, common.INSERT, document);
 }
 
@@ -391,6 +399,11 @@ var executeCommands = function(self, callback) {
   var batch = self.s.batches.shift();
 
   var resultHandler = function(err, result) {
+		// Error is a driver related error not a bulk op error, terminate
+		if(err && err.driver || err && err.message) {
+			return callback(err);
+		}
+
     // If we have and error
     if(err) err.ok = 0;
     // Merge the results together
@@ -402,7 +415,7 @@ var executeCommands = function(self, callback) {
     // If we are ordered and have errors and they are
     // not all replication errors terminate the operation
     if(self.s.bulkResult.writeErrors.length > 0) {
-      return callback(self.s.bulkResult.writeErrors[0], new BulkWriteResult(self.s.bulkResult));
+      return callback(toError(self.s.bulkResult.writeErrors[0]), new BulkWriteResult(self.s.bulkResult));
     }
 
     // Execute the next command in line
@@ -414,6 +427,26 @@ var executeCommands = function(self, callback) {
     finalOptions.writeConcern = self.s.writeConcern;
   }
 
+	// Set an operationIf if provided
+	if(self.operationId) {
+		resultHandler.operationId = self.operationId;
+	}
+
+	// Serialize functions
+	if(self.s.options.serializeFunctions) {
+		finalOptions.serializeFunctions = true
+	}
+
+  // Serialize functions
+  if(self.s.options.ignoreUndefined) {
+    finalOptions.ignoreUndefined = true
+  }
+
+  // Is the bypassDocumentValidation options specific
+  if(self.s.bypassDocumentValidation == true) {
+    finalOptions.bypassDocumentValidation = true;
+  }
+
   try {
     if(batch.batchType == common.INSERT) {
       self.s.topology.insert(self.s.collection.namespace, batch.operations, finalOptions, resultHandler);
@@ -425,7 +458,7 @@ var executeCommands = function(self, callback) {
   } catch(err) {
     // Force top level error
     err.ok = 0;
-    // Merge top level error and return 
+    // Merge top level error and return
     callback(null, mergeBatchResults(false, batch, self.s.bulkResult, err, null));
   }
 }
@@ -446,7 +479,7 @@ var executeCommands = function(self, callback) {
  * @param {number} [options.wtimeout=null] The write concern timeout.
  * @param {boolean} [options.j=false] Specify a journal write concern.
  * @param {boolean} [options.fsync=false] Specify a file sync write concern.
- * @param {OrderedBulkOperation~resultCallback} callback The result callback
+ * @param {OrderedBulkOperation~resultCallback} [callback] The result callback
  * @throws {MongoError}
  * @return {Promise} returns Promise if no callback passed
  */
@@ -468,17 +501,21 @@ OrderedBulkOperation.prototype.execute = function(_writeConcern, callback) {
   }
 
   // Execute using callback
-  if(typeof callback == 'function') return executeCommands(this, callback);
+  if(typeof callback == 'function') {
+		return executeCommands(this, callback);
+	}
 
   // Return a Promise
   return new this.s.promiseLibrary(function(resolve, reject) {
     executeCommands(self, function(err, r) {
       if(err) return reject(err);
-      resolve(r); 
+      resolve(r);
     });
   });
 }
 
+define.classMethod('execute', {callback: true, promise:false});
+
 /**
  * Returns an unordered batch object
  * @ignore
@@ -487,4 +524,6 @@ var initializeOrderedBulkOp = function(topology, collection, options) {
 	return new OrderedBulkOperation(topology, collection, options);
 }
 
+initializeOrderedBulkOp.OrderedBulkOperation = OrderedBulkOperation;
 module.exports = initializeOrderedBulkOp;
+module.exports.Bulk = OrderedBulkOperation;

package/lib/bulk/unordered.js

@@ -9,6 +9,7 @@ var common = require('./common')
   , BulkWriteResult = common.BulkWriteResult
   , LegacyOp = common.LegacyOp
   , ObjectID = require('mongodb-core').BSON.ObjectID
+  , Define = require('../metadata')
   , Batch = common.Batch
   , mergeBatchResults = common.mergeBatchResults;
 
@@ -227,12 +228,11 @@ var UnorderedBulkOperation = function(topology, collection, options) {
 	// Handle to the bson serializer, used to calculate running sizes
 	var bson = topology.bson;
 
-  // Get the capabilities
-  var capabilities = topology.capabilities();
-
   // Set max byte size
-	var maxBatchSizeBytes = topology.isMasterDoc.maxBsonObjectSize;
-	var maxWriteBatchSize = topology.isMasterDoc.maxWriteBatchSize || 1000;
+  var maxBatchSizeBytes = topology.isMasterDoc && topology.isMasterDoc.maxBsonObjectSize
+    ? topology.isMasterDoc.maxBsonObjectSize : (1024*1025*16);
+  var maxWriteBatchSize = topology.isMasterDoc && topology.isMasterDoc.maxWriteBatchSize 
+    ? topology.isMasterDoc.maxWriteBatchSize : 1000;
 
   // Get the write concern
   var writeConcern = common.writeConcern(shallowClone(options), collection, options);
@@ -273,8 +273,6 @@ var UnorderedBulkOperation = function(topology, collection, options) {
     , batches: []
     // Write concern
     , writeConcern: writeConcern
-    // Capabilities
-    , capabilities: capabilities
     // Max batch size options
     , maxBatchSizeBytes: maxBatchSizeBytes
     , maxWriteBatchSize: maxWriteBatchSize
@@ -294,9 +292,13 @@ var UnorderedBulkOperation = function(topology, collection, options) {
     , collection: collection
     // Promise Library
     , promiseLibrary: promiseLibrary
+    // Bypass validation
+    , bypassDocumentValidation: typeof options.bypassDocumentValidation == 'boolean' ? options.bypassDocumentValidation : false
   }
 }
 
+var define = UnorderedBulkOperation.define = new Define('UnorderedBulkOperation', UnorderedBulkOperation, false);
+
 /**
  * Add a single insert document to the bulk operation
  *
@@ -305,7 +307,7 @@ var UnorderedBulkOperation = function(topology, collection, options) {
  * @return {UnorderedBulkOperation}
  */
 UnorderedBulkOperation.prototype.insert = function(document) {
-  if(document._id == null) document._id = new ObjectID();
+  if(this.s.collection.s.db.options.forceServerObjectId !== true && document._id == null) document._id = new ObjectID();
   return addToOperationsList(this, common.INSERT, document);
 }
 
@@ -340,6 +342,10 @@ Object.defineProperty(UnorderedBulkOperation.prototype, 'length', {
 UnorderedBulkOperation.prototype.raw = function(op) {
   var key = Object.keys(op)[0];
 
+  // Set up the force server object id
+  var forceServerObjectId = typeof this.s.options.forceServerObjectId == 'boolean'
+    ? this.s.options.forceServerObjectId : this.s.collection.s.db.options.forceServerObjectId;
+
   // Update operations
   if((op.updateOne && op.updateOne.q)
     || (op.updateMany && op.updateMany.q)
@@ -371,15 +377,16 @@ UnorderedBulkOperation.prototype.raw = function(op) {
 
   // Insert operations
   if(op.insertOne && op.insertOne.document == null) {
-    if(op.insertOne._id == null) op.insertOne._id = new ObjectID();
+    if(forceServerObjectId !== true && op.insertOne._id == null) op.insertOne._id = new ObjectID();
     return addToOperationsList(this, common.INSERT, op.insertOne);
   } else if(op.insertOne && op.insertOne.document) {
-    if(op.insertOne.document._id == null) op.insertOne.document._id = new ObjectID();
+    if(forceServerObjectId !== true && op.insertOne.document._id == null) op.insertOne.document._id = new ObjectID();
     return addToOperationsList(this, common.INSERT, op.insertOne.document);
   }
 
   if(op.insertMany) {
     for(var i = 0; i < op.insertMany.length; i++) {
+      if(forceServerObjectId !== true && op.insertMany[i]._id == null) op.insertMany[i]._id = new ObjectID();
       addToOperationsList(this, common.INSERT, op.insertMany[i]);
     }
 
@@ -399,11 +406,31 @@ var executeBatch = function(self, batch, callback) {
   }
 
   var resultHandler = function(err, result) {
+		// Error is a driver related error not a bulk op error, terminate
+		if(err && err.driver || err && err.message) {
+			return callback(err);
+		}
+
     // If we have and error
     if(err) err.ok = 0;
     callback(null, mergeBatchResults(false, batch, self.s.bulkResult, err, result));
   }
 
+	// Set an operationIf if provided
+	if(self.operationId) {
+		resultHandler.operationId = self.operationId;
+	}
+
+	// Serialize functions
+	if(self.s.options.serializeFunctions) {
+		finalOptions.serializeFunctions = true
+	}
+
+  // Is the bypassDocumentValidation options specific
+  if(self.s.bypassDocumentValidation == true) {
+    finalOptions.bypassDocumentValidation = true;
+  }
+
   try {
     if(batch.batchType == common.INSERT) {
       self.s.topology.insert(self.s.collection.namespace, batch.operations, finalOptions, resultHandler);
@@ -415,7 +442,7 @@ var executeBatch = function(self, batch, callback) {
   } catch(err) {
     // Force top level error
     err.ok = 0;
-    // Merge top level error and return 
+    // Merge top level error and return
     callback(null, mergeBatchResults(false, batch, self.s.bulkResult, err, null));
   }
 }
@@ -424,14 +451,21 @@ var executeBatch = function(self, batch, callback) {
 // Execute all the commands
 var executeBatches = function(self, callback) {
   var numberOfCommandsToExecute = self.s.batches.length;
+	var error = null;
   // Execute over all the batches
   for(var i = 0; i < self.s.batches.length; i++) {
     executeBatch(self, self.s.batches[i], function(err, result) {
+			// Driver layer error capture it
+			if(err) error = err;
+			// Count down the number of commands left to execute
       numberOfCommandsToExecute = numberOfCommandsToExecute - 1;
 
       // Execute
       if(numberOfCommandsToExecute == 0) {
-        var error = self.s.bulkResult.writeErrors.length > 0 ? self.s.bulkResult.writeErrors[0] : null;
+				// Driver level error
+				if(error) return callback(error);
+				// Treat write errors
+        var error = self.s.bulkResult.writeErrors.length > 0 ? toError(self.s.bulkResult.writeErrors[0]) : null;
         callback(error, new BulkWriteResult(self.s.bulkResult));
       }
     });
@@ -454,7 +488,7 @@ var executeBatches = function(self, callback) {
  * @param {number} [options.wtimeout=null] The write concern timeout.
  * @param {boolean} [options.j=false] Specify a journal write concern.
  * @param {boolean} [options.fsync=false] Specify a file sync write concern.
- * @param {UnorderedBulkOperation~resultCallback} callback The result callback
+ * @param {UnorderedBulkOperation~resultCallback} [callback] The result callback
  * @throws {MongoError}
  * @return {Promise} returns Promise if no callback passed
  */
@@ -484,11 +518,13 @@ UnorderedBulkOperation.prototype.execute = function(_writeConcern, callback) {
   return new this.s.promiseLibrary(function(resolve, reject) {
     executeBatches(self, function(err, r) {
       if(err) return reject(err);
-      resolve(r); 
+      resolve(r);
     });
   });
 }
 
+define.classMethod('execute', {callback: true, promise:false});
+
 /**
  * Returns an unordered batch object
  * @ignore
@@ -497,4 +533,6 @@ var initializeUnorderedBulkOp = function(topology, collection, options) {
 	return new UnorderedBulkOperation(topology, collection, options);
 }
 
+initializeUnorderedBulkOp.UnorderedBulkOperation = UnorderedBulkOperation;
 module.exports = initializeUnorderedBulkOp;
+module.exports.Bulk = UnorderedBulkOperation;