Braid: Update mirror 'lib/node-mongodb-native' to 'cb074b6'

Author: Visnu Pitiyanuvath

.braids

@@ -79,7 +79,7 @@ lib/hoptoad-notifier:
 lib/node-mongodb-native: 
   branch: master
   remote: braid/lib/node-mongodb-native
-  revision: f7671cd0b5b3a849fc542723e9817a9fa2c1b31a
+  revision: cb074b6f14285f9b1b5dccc41e59b41205b3f6b4
   squashed: true
   type: git
   url: http://github.com/christkv/node-mongodb-native.git

lib/node-mongodb-native/.gitignore

@@ -1 +1,3 @@
-.DS_Store
+.DS_Store
+*.swp
+*.seed

lib/node-mongodb-native/HISTORY

@@ -1,4 +1,7 @@
+0.6.8
+* Removed multiple message concept from bson
+* Changed db.open(db) to be db.open(err, db)
 0.1 2010-01-30
 * Initial release support of driver using native node.js interface
-* Supports gridfs specification
+* Supports gridfs specificatio
 * Supports admin functionality

lib/node-mongodb-native/Makefile

@@ -2,12 +2,21 @@
 NODE = node
 name = all
 
+total: build_native test_all
+
+build_native:
+	$(MAKE) -C ./external-libs/bson
+	
 test:
 	@$(NODE) spec/spec.node.js
 
-test_all: test integrate_test
+test_all: test integrate_test_all
 
 integrate_test:
-	@$(NODE) integration/integration_tests.js $(name)
+	@$(NODE) integration/integration_tests.js pure $(name)
+	
+integrate_test_all:
+	@$(NODE) integration/integration_tests.js pure $(name)
+	@$(NODE) integration/integration_tests.js native $(name)
 
-.PHONY: test
+.PHONY: total

lib/node-mongodb-native/benchmark/streaming_benchmark.js

@@ -1,19 +1,28 @@
 require.paths.unshift('../lib');
+require.paths.unshift('../external-libs/bson');
 
 var Db = require('mongodb').Db,
   Server = require('mongodb').Server,
-  ObjectID = require('mongodb').ObjectID,
   Cursor = require('mongodb').Cursor,
   Collection = require('mongodb').Collection,
-  sys = require('sys');
+  sys = require('sys');  
+var BSON = require('bson');
 
-new Db('streaming_benchmark', new Server("127.0.0.1", 27017, {auto_reconnect: true}), {}).open(function(err, client) {
+var db = new Db('streaming_benchmark', new Server("127.0.0.1", 27017, {auto_reconnect: true}), {})
+// Set native deserializer
+db.bson_deserializer = BSON;
+db.bson_serializer = BSON;
+db.pkFactory = BSON.ObjectID;
+
+// Open the db
+db.open(function(err, client) {
   client.collection('streaming_benchmark', function(err, collection) {
     collection.remove({}, function(err, result) {
       // Benchmark
       var started_at = new Date().getTime(); 
       // Add documents
       for(var i = 0; i < 100000; i++) {
+      // for(var i = 0; i < 1000; i++) {
         collection.save({'i':i, 'a':i, 'c':i, 'd':{'i':i}}, function(err, result){});
       }    
       sys.puts("save recs: " + ((new Date().getTime() - started_at)/1000) + "seconds"); 
@@ -32,7 +41,7 @@ new Db('streaming_benchmark', new Server("127.0.0.1", 27017, {auto_reconnect: tr
           if ((count%10000)==0) sys.puts("recs:" + count + " :: " + 
             ((new Date().getTime() - started_at)/1000) + "seconds"); 
         }); 
-      });          
+      });                      
     })
   })
 });

lib/node-mongodb-native/examples/admin.js

@@ -1,7 +1,7 @@
 GLOBAL.DEBUG = true;
 
 sys = require("sys");
-test = require("mjsunit");
+test = require("assert");
 
 var mongo = require('../lib/mongodb');
 

lib/node-mongodb-native/examples/blog.js

@@ -1,7 +1,7 @@
 GLOBAL.DEBUG = true;
 
 sys = require("sys");
-test = require("mjsunit");
+test = require("assert");
 
 var mongo = require('../lib/mongodb');
 

lib/node-mongodb-native/examples/capped.js

@@ -1,7 +1,7 @@
 GLOBAL.DEBUG = true;
 
 sys = require("sys");
-test = require("mjsunit");
+test = require("assert");
 
 var mongo = require('../lib/mongodb');
 

lib/node-mongodb-native/examples/cursor.js

@@ -1,7 +1,7 @@
 GLOBAL.DEBUG = true;
 
 sys = require("sys");
-test = require("mjsunit");
+test = require("assert");
 
 var mongo = require('../lib/mongodb');
 

lib/node-mongodb-native/examples/gridfs.js

@@ -1,7 +1,7 @@
 GLOBAL.DEBUG = true;
 
 sys = require("sys");
-test = require("mjsunit");
+test = require("assert");
 
 var mongo = require('../lib/mongodb');
 

lib/node-mongodb-native/examples/index_test.js

@@ -1,7 +1,7 @@
 GLOBAL.DEBUG = true;
 
 sys = require("sys");
-test = require("mjsunit");
+test = require("assert");
 
 var mongo = require('../lib/mongodb'),
   Integer = require('../lib/mongodb/goog/math/integer').Integer;

lib/node-mongodb-native/examples/info.js

@@ -1,7 +1,7 @@
 GLOBAL.DEBUG = true;
 
 sys = require("sys");
-test = require("mjsunit");
+test = require("assert");
 
 var mongo = require('../lib/mongodb');
 

lib/node-mongodb-native/examples/queries.js

@@ -1,7 +1,7 @@
 GLOBAL.DEBUG = true;
 
 sys = require("sys");
-test = require("mjsunit");
+test = require("assert");
 
 var mongo = require('../lib/mongodb');
 

lib/node-mongodb-native/examples/simple.js

@@ -1,7 +1,7 @@
 GLOBAL.DEBUG = true;
 
 sys = require("sys");
-test = require("mjsunit");
+test = require("assert");
 
 var mongo = require('../lib/mongodb');
 

lib/node-mongodb-native/examples/strict.js

@@ -1,7 +1,7 @@
 GLOBAL.DEBUG = true;
 
 sys = require("sys");
-test = require("mjsunit");
+test = require("assert");
 
 var mongo = require('../lib/mongodb');
 

lib/node-mongodb-native/examples/types.js

@@ -1,7 +1,7 @@
 GLOBAL.DEBUG = true;
 
 sys = require("sys");
-test = require("mjsunit");
+test = require("assert");
 
 var mongo = require('../lib/mongodb');
 

lib/node-mongodb-native/examples/url.js

@@ -0,0 +1,16 @@
+GLOBAL.DEBUG = true;
+
+sys = require("sys");
+test = require("assert");
+
+var mongo = require('../lib/mongodb');
+
+sys.puts('Connecting to ' + (process.env.MONGO_URL || mongo.Db.DEFAULT_URL));
+mongo.connect(process.env.MONGO_URL, function(err, db) {
+  db.dropDatabase(function(err, result) {
+    db.collection('test', function(err, collection) {
+      collection.insert({'a':1});
+      db.close();
+    });
+  });
+});

lib/node-mongodb-native/external-libs/bson/.gitignore

@@ -0,0 +1,3 @@
+build/
+bson.node
+.lock-wscript

lib/node-mongodb-native/external-libs/bson/Makefile

@@ -0,0 +1,15 @@
+
+NODE = node
+name = all
+
+all:
+	rm -rf build .lock-wscript bson.node
+	node-waf configure build
+	@$(NODE) test_bson.js
+	@$(NODE) test_full_bson.js
+
+test:
+	@$(NODE) test_bson.js
+	@$(NODE) test_full_bson.js
+	
+.PHONY: all