integrated the new bson parser and mongodb-core 2.1.0

Author: christkv

lib/bulk/ordered.js

@@ -12,7 +12,9 @@ var common = require('./common')
   , Batch = common.Batch
   , mergeBatchResults = common.mergeBatchResults;
 
-var bson = new BSON.BSONPure();
+var bson = new BSON([BSON.Binary, BSON.Code, BSON.DBRef, BSON.Decimal128,
+	BSON.Double, BSON.Int32, BSON.Long, BSON.Map, BSON.MaxKey, BSON.MinKey,
+	BSON.ObjectId, BSON.BSONRegExp, BSON.Symbol, BSON.Timestamp]);
 
 /**
  * Create a FindOperatorsOrdered instance (INTERNAL TYPE, do not instantiate directly)
@@ -148,7 +150,9 @@ FindOperatorsOrdered.prototype.remove = FindOperatorsOrdered.prototype.delete;
 // Add to internal list of documents
 var addToOperationsList = function(_self, docType, document) {
   // Get the bsonSize
-  var bsonSize = bson.calculateObjectSize(document, false);
+  var bsonSize = bson.calculateObjectSize(document, {
+		checkKeys: false,
+	});
 
   // Throw error if the doc is bigger than the max BSON size
   if(bsonSize >= _self.s.maxBatchSizeBytes) {

lib/bulk/unordered.js

@@ -12,7 +12,9 @@ var common = require('./common')
   , Batch = common.Batch
   , mergeBatchResults = common.mergeBatchResults;
 
-var bson = new BSON.BSONPure();
+var bson = new BSON([BSON.Binary, BSON.Code, BSON.DBRef, BSON.Decimal128,
+	BSON.Double, BSON.Int32, BSON.Long, BSON.Map, BSON.MaxKey, BSON.MinKey,
+	BSON.ObjectId, BSON.BSONRegExp, BSON.Symbol, BSON.Timestamp]);
 
 /**
  * Create a FindOperatorsUnordered instance (INTERNAL TYPE, do not instantiate directly)
@@ -145,7 +147,9 @@ FindOperatorsUnordered.prototype.remove = function() {
 //
 var addToOperationsList = function(_self, docType, document) {
   // Get the bsonSize
-  var bsonSize = bson.calculateObjectSize(document, false);
+  var bsonSize = bson.calculateObjectSize(document, {
+		checkKeys: false,		
+	});
   // Throw error if the doc is bigger than the max BSON size
   if(bsonSize >= _self.s.maxBatchSizeBytes) throw toError("document is larger than the maximum size " + _self.s.maxBatchSizeBytes);
   // Holds the current batch

package.json

@@ -14,14 +14,14 @@
   ],
   "dependencies": {
     "es6-promise": "3.2.1",
-    "mongodb-core": "2.0.14",
+    "mongodb-core": "christkv/mongodb-core#1.0-bson-port",
     "readable-stream": "2.1.5"
   },
   "devDependencies": {
     "JSONStream": "^1.0.7",
     "betterbenchmarks": "^0.1.0",
     "bluebird": "3.4.6",
-    "bson": "^0.5.1",
+    "bson": "mongodb/js-bson#1.0-branch",
     "cli-table": "^0.3.1",
     "co": "4.6.0",
     "colors": "^1.1.2",

test/functional/raw_tests.js

@@ -1,5 +1,10 @@
 "use strict";
 
+var BSON = require('mongodb-core').BSON;
+var bson = new BSON([BSON.Binary, BSON.Code, BSON.DBRef, BSON.Decimal128,
+	BSON.Double, BSON.Int32, BSON.Long, BSON.Map, BSON.MaxKey, BSON.MinKey,
+	BSON.ObjectId, BSON.BSONRegExp, BSON.Symbol, BSON.Timestamp]);
+
 /**
  * @ignore
  */
@@ -8,9 +13,7 @@ exports.shouldCorrectlySaveDocumentsAndReturnAsRaw = {
 
   // The actual test we wish to run
   test: function(configuration, test) {
-    var Buffer = require('buffer').Buffer
-      , BSON = require('mongodb-core').BSON.pure().BSON;
-      // console.dir(BSON)
+    var Buffer = require('buffer').Buffer;
 
     var db = configuration.newDbInstance({w:1}, {poolSize:1});
     db.open(function(err, db) {
@@ -22,8 +25,8 @@ exports.shouldCorrectlySaveDocumentsAndReturnAsRaw = {
             var objects = [];
 
             for(var i = 0; i < items.length; i++) {
-              test.ok(Buffer.isBuffer(items[i])); 
-              objects.push(new BSON().deserialize(items[i]));
+              test.ok(Buffer.isBuffer(items[i]));
+              objects.push(bson.deserialize(items[i]));
             }
 
             test.equal(1, objects[0].a);
@@ -33,7 +36,7 @@ exports.shouldCorrectlySaveDocumentsAndReturnAsRaw = {
             // Execute findOne
             collection.findOne({a:1}, {raw:true}, function(err, item) {
               test.ok(Buffer.isBuffer(item));
-              var object = new BSON().deserialize(item);
+              var object = bson.deserialize(item);
               test.equal(1, object.a)
               db.close();
               test.done();
@@ -53,9 +56,7 @@ exports.shouldCorrectlySaveDocumentsAndReturnAsRawWithRawSetAtCollectionLevel =
 
   // The actual test we wish to run
   test: function(configuration, test) {
-    var Buffer = require('buffer').Buffer
-      , BSON = require('mongodb-core').BSON.pure().BSON;
-      // console.dir(BSON)
+    var Buffer = require('buffer').Buffer;
 
     var db = configuration.newDbInstance({w:1}, {poolSize:1});
     db.open(function(err, db) {
@@ -67,7 +68,7 @@ exports.shouldCorrectlySaveDocumentsAndReturnAsRawWithRawSetAtCollectionLevel =
             var objects = [];
             for(var i = 0; i < items.length; i++) {
               test.ok(Buffer.isBuffer(items[i]));
-              objects.push(new BSON().deserialize(items[i]));
+              objects.push(bson.deserialize(items[i]));
             }
 
             test.equal(1, objects[0].a);
@@ -77,7 +78,7 @@ exports.shouldCorrectlySaveDocumentsAndReturnAsRawWithRawSetAtCollectionLevel =
             // Execute findOne
             collection.findOne({a:1}, {raw:true}, function(err, item) {
               test.ok(Buffer.isBuffer(item));
-              var object = new BSON().deserialize(item);
+              var object = bson.deserialize(item);
               test.equal(1, object.a)
               db.close();
               test.done();

test/mock/lib/server.js

@@ -1,6 +1,6 @@
 var net = require('net'),
   Long = require('bson').Long,
-  BSON = require('bson').pure().BSON,
+  BSON = require('bson'),
   Request = require('./request'),
   Query = require('./protocol').Query,
   GetMore = require('./protocol').GetMore,