Added support for maxMessageSizeBytes if available (DRIVERS-1)

Author: christkv

HISTORY

@@ -7,6 +7,7 @@
 - Uses setImmediate if on 0.10 otherwise nextTick for cursor stream
 - Fixed race condition in Cursor stream (NODE-31)
 - Fixed issues related to node 0.10 and process.nextTick now correctly using setImmediate where needed on node 0.10
+- Added support for maxMessageSizeBytes if available (DRIVERS-1)
 
 1.2.13 2013-02-22
 -----------------

lib/mongodb/connection/connection.js

@@ -24,6 +24,7 @@ var Connection = exports.Connection = function(id, socketOptions) {
  // Connection parsing state
  //
  this.maxBsonSize = socketOptions.maxBsonSize ? socketOptions.maxBsonSize : Connection.DEFAULT_MAX_BSON_SIZE;
+ this.maxMessageSizeBytes = socketOptions.maxMessageSizeBytes ? socketOptions.maxMessageSizeBytes : Connection.DEFAULT_MAX_MESSAGE_SIZE;
  // Contains the current message bytes
  this.buffer = null;
  // Contains the current message size
@@ -42,6 +43,8 @@ var Connection = exports.Connection = function(id, socketOptions) {
 
 // Set max bson size
 Connection.DEFAULT_MAX_BSON_SIZE = 1024 * 1024 * 4;
+// Set default to max bson to avoid overflow or bad guesses
+Connection.DEFAULT_MAX_MESSAGE_SIZE = Connection.DEFAULT_MAX_BSON_SIZE;
 
 // Inherit event emitter so we can emit stuff wohoo
 inherits(Connection, EventEmitter);
@@ -183,17 +186,28 @@ Connection.prototype.write = function(command, callback) {
  if(Array.isArray(command)) {
  for(var i = 0; i < command.length; i++) {
  var binaryCommand = command[i].toBinary()
+ 
  if(!this.socketOptions['disableDriverBSONSizeCheck'] && binaryCommand.length > this.maxBsonSize) 
- return callback(new Error("Document exceeds maximal allowed bson size of " + this.maxBsonSize + " bytes"));
+ return callback(new Error("Document exceeds maximum allowed bson size of " + this.maxBsonSize + " bytes"));
+ 
+ if(this.socketOptions['disableDriverBSONSizeCheck'] && binaryCommand.length > this.maxMessageSizeBytes) {
+ return callback(new Error("Command exceeds maximum message size of " + this.maxMessageSizeBytes + " bytes"));
+ }
+
  if(this.logger != null && this.logger.doDebug) 
  this.logger.debug("writing command to mongodb", {binary: binaryCommand, json: command[i]});
 
  var r = this.writeSteam.write(binaryCommand);
  }
  } else {
  var binaryCommand = command.toBinary()
+
  if(!this.socketOptions['disableDriverBSONSizeCheck'] && binaryCommand.length > this.maxBsonSize) 
- return callback(new Error("Document exceeds maximal allowed bson size of " + this.maxBsonSize + " bytes"));
+ return callback(new Error("Document exceeds maximum allowed bson size of " + this.maxBsonSize + " bytes"));
+
+ if(this.socketOptions['disableDriverBSONSizeCheck'] && binaryCommand.length > this.maxMessageSizeBytes) {
+ return callback(new Error("Command exceeds maximum message size of " + this.maxMessageSizeBytes + " bytes"));
+ }
 
  if(this.logger != null && this.logger.doDebug) 
  this.logger.debug("writing command to mongodb", {binary: binaryCommand, json: command});

lib/mongodb/connection/connection_pool.js

@@ -81,6 +81,16 @@ ConnectionPool.prototype.setMaxBsonSize = function(maxBsonSize) {
  }
 }
 
+ConnectionPool.prototype.setMaxMessageSizeBytes = function(maxMessageSizeBytes) {
+ if(maxMessageSizeBytes == null){
+ maxMessageSizeBytes = Connection.DEFAULT_MAX_MESSAGE_SIZE;
+ }
+
+ for(var i = 0; i < this.openConnections.length; i++) {
+ this.openConnections[i].maxMessageSizeBytes = maxMessageSizeBytes;
+ }
+}
+
 // Start a function
 var _connect = function(_self) {
  // return new function() {

lib/mongodb/connection/server.js

@@ -322,6 +322,7 @@ Server.prototype.connect = function(dbInstance, options, callback) {
  if(err != null) return internalCallback(err, null, server);
  server.master = reply.documents[0].ismaster == 1 ? true : false;
  server.connectionPool.setMaxBsonSize(reply.documents[0].maxBsonObjectSize);
+ server.connectionPool.setMaxMessageSizeBytes(reply.documents[0].maxMessageSizeBytes);
  // Set server as connected
  server.connected = true;
  // Save document returned so we can query it

test/tests/functional/db_tests.js

@@ -527,7 +527,7 @@ exports.shouldCorrectlyAccessACollection = function(configuration, test) {
  var col1 = db.collection('test_correctly_access_collections');
 
  // Grab a collection with a callback but no safe operation
- var db.collection('test_correctly_access_collections', function(err, col2) {
+ db.collection('test_correctly_access_collections', function(err, col2) {
  test.equal(null, err);
 
  // Grab a collection with a callback in safe mode, ensuring it exists (should fail as it's not created)

test/tests/functional/insert_tests.js

@@ -1086,6 +1086,27 @@ exports.shouldFailDueToInsertBeingBiggerThanMaxDocumentSizeAllowed = function(co
  });
 }
 
+/**
+ * @ignore
+ */
+exports.shouldFailDueToMessageBeingBiggerThanMaxMessageSize = function(configuration, test) {
+ var Binary = configuration.getMongoPackage().Binary;
+
+ var db = configuration.newDbInstance({w:1}, {disableDriverBSONSizeCheck:true})
+ db.open(function(err, db) {
+ var binary = new Binary(new Buffer(db.serverConfig.checkoutWriter().maxBsonSize));
+ var collection = db.collection('shouldFailDueToInsertBeingBiggerThanMaxDocumentSizeAllowed');
+
+ collection.insert([{doc:binary}, {doc:binary}, {doc:binary}, {doc:binary}], {w:1}, function(err, result) {
+ test.ok(err != null);
+ test.ok(err.message.match('Command exceeds maximum'))
+
+ db.close();
+ test.done();
+ }); 
+ })
+}
+
 /**
  * @ignore
  */