Issue #272 and #265

Author: christkv

HISTORY

@@ -1,3 +1,8 @@
+0.9.6-5 2011-07-06
+* Rewritten BSON js parser now faster than the C parser on my core2duo laptop
+* Added option full to indexInformation to get all index info Issue #265
+* Passing in ObjectID for new Gridstore works correctly Issue #272
+
 0.9.6-4 2011-07-01
 * Added test and bug fix for insert/update/remove without callback supplied
 

lib/mongodb/collection.js

@@ -769,11 +769,17 @@ Collection.prototype.ensureIndex = function ensureIndex (fieldOrSpec, options, c
 /**
  * Retrieves this collections index info.
  *
+ * @param {Object} options -
+ * full: {Bool} set to true to remove raw index information
  * @param {Function} callback
  */
-
-Collection.prototype.indexInformation = function indexInformation (callback) {
- this.db.indexInformation(this.collectionName, callback);
+Collection.prototype.indexInformation = function indexInformation (options, callback) {
+ // Unpack calls
+ var args = Array.prototype.slice.call(arguments, 0);
+ callback = args.pop();
+ options = args.length ? args.shift() : {};
+ // Call the index information
+ this.db.indexInformation(this.collectionName, options, callback);
 };
 
 /**

lib/mongodb/db.js

@@ -526,24 +526,38 @@ Db.prototype.dropIndex = function(collectionName, indexName, callback) {
 /**
  Index Information
 **/
-Db.prototype.indexInformation = function(collectionName, callback) {
- if(typeof collectionName === "function") { callback = collectionName; collectionName = null;}
+Db.prototype.indexInformation = function(collectionName, options, callback) {
+ // Unpack calls
+ var args = Array.prototype.slice.call(arguments, 0);
+ callback = args.pop();
+ collectionName = args.length ? args.shift() : null;
+ options = args.length ? args.shift() : {};
+
+ // If we specified full information
+ var full = options['full'] == null ? false : options['full']; 
  // Build selector for the indexes
  var selector = collectionName != null ? {ns: (this.databaseName + "." + collectionName)} : {};
- var info = {};
  // Iterate through all the fields of the index
- new Cursor(this, new Collection(this, DbCommand.SYSTEM_INDEX_COLLECTION), selector).each(function(err, index) {
+ new Cursor(this, new Collection(this, DbCommand.SYSTEM_INDEX_COLLECTION), selector).toArray(function(err, indexes) {
  if(err != null) return callback(err, null);
+ // Contains all the information
+ var info = {};
 
- // Return the info when finished
- if(index == null) {
- callback(null, info);
- } else {
+ // if full defined just return all the indexes directly
+ if(full) return callback(null, indexes);
+ 
+ // Process all the indexes
+ for(var i = 0; i < indexes.length; i++) {
+ var index = indexes[i];
+ // Let's unpack the object
  info[index.name] = [];
  for(var name in index.key) {
  info[index.name].push([name, index.key[name]]);
  }
  }
+ 
+ // Return all the indexes
+ callback(null, info);
  });
 };
 

lib/mongodb/gridfs/gridstore.js

@@ -154,7 +154,7 @@ GridStore.prototype._open = function(callback) {
  self.metadata = doc.metadata;
  self.internalMd5 = doc.md5;
  } else {
- self.fileId = new self.db.bson_serializer.ObjectID();
+ self.fileId = self.fileId instanceof self.db.bson_serializer.ObjectID ? self.fileId : new self.db.bson_serializer.ObjectID();
  self.contentType = exports.GridStore.DEFAULT_CONTENT_TYPE;
  self.internalChunkSize = self.internalChunkSize == null ? Chunk.DEFAULT_CHUNK_SIZE : self.internalChunkSize;
  self.length = 0;

package.json

@@ -1,6 +1,6 @@
 { "name" : "mongodb"
 , "description" : "A node.js driver for MongoDB"
-, "version" : "0.9.6-4"
+, "version" : "0.9.6-5"
 , "author" : "Christian Amor Kvalheim <christkv@gmail.com>"
 , "contributors" : [ "Nathan White <nw@nwhite.net>",
  "Adam Wiggins <adam@heroku.com>",

test/gridstore/grid_store_test.js

@@ -619,19 +619,39 @@ var tests = testCase({
  // Write the file using writeBuffer
  gridStore.writeBuffer(data, function(err, doc) {
  gridStore.close(function(err, doc) {
-
+ 
  // Read the file using readBuffer
  GridStore.exist(client, doc._id, function(err, result) {
  test.equal(null, err);
  test.equal(true, result);
-
+ 
  client.close();
  test.done();
  }); 
  });
  }) 
  });
  }, 
+ 
+ shouldCorrectlySaveDataByObjectID : function(test) {
+ var id = new client.bson_serializer.ObjectID();
+ var gridStore = new GridStore(client, id, 'w');
+
+ gridStore.open(function(err, gridStore) {
+ gridStore.write('bar', function(err, gridStore) {
+ gridStore.close(function(err, result) {
+
+ GridStore.exist(client, id, function(err, result) {
+ test.equal(null, err);
+ test.equal(true, result);
+
+ client.close();
+ test.done();
+ });
+ });
+ });
+ }); 
+ }
 })
 
 // Stupid freaking workaround due to there being no way to run setup once for each suite

test/index_test.js

@@ -139,7 +139,7 @@ var tests = testCase({
  client.error(function(err, errors) {
  test.equal(1, errors.length);
  test.ok(errors[0].err == null);
-
+ 
  // Create a unique subfield index and test that insert fails
  client.createCollection('test_index_on_subfield2', function(err, collection) {
  client.createIndex(collection.collectionName, 'hello.a', true, function(err, indexName) {
@@ -232,7 +232,12 @@ var tests = testCase({
  test.equal(1, items.length);
  test.equal("Sarah", items[0].name);
 
- test.done();
+ // Fetch the info for the indexes
+ collection.indexInformation({full:true}, function(err, indexInfo) {
+ test.equal(null, err);
+ test.equal(2, indexInfo.length);
+ test.done();
+ })
  })
  }); 
  })