Added support for correct mapreduce function on > 1.7.6 and higher

Author: christkv

integration/integration_tests.js

@@ -3481,7 +3481,7 @@ var all_tests = {
  });
  });
  },
- 
+
  test_custom_primary_key_generator : function() {
  // Custom factory (need to provide a 12 byte array);
  CustomPKFactory = function() {}
@@ -3538,7 +3538,7 @@ var all_tests = {
  test_map_reduce_functions_scope : function() {
  client.createCollection('test_map_reduce_functions_scope', function(err, collection) {
  collection.insert([{'user_id':1, 'timestamp':new Date()}, {'user_id':2, 'timestamp':new Date()}]);
-
+ 
  var map = function(){
  emit(test(this.timestamp.getYear()), 1);
  }

lib/mongodb/admin.js

@@ -6,6 +6,18 @@ var Admin = exports.Admin = function(db) {
  this.db = db;
 };
 
+Admin.prototype.serverInfo = function(callback) {
+ var self = this;
+ var command = {buildinfo:1};
+ var databaseName = self.db.databaseName;
+ self.db.databaseName = 'admin';
+ this.db.executeDbCommand(command, function(err, doc) {
+ self.db.databaseName = databaseName;
+ if(err != null) return callback(err, null);
+ return callback(null, doc.documents[0]);
+ });
+}
+
 Admin.prototype.profilingLevel = function(callback) {
  var command = {profile:-1};
  this.db.executeDbCommand(command, function(err, doc) {

lib/mongodb/collection.js

@@ -478,9 +478,15 @@ Collection.prototype.dropIndexes = function(callback) {
 Collection.prototype.mapReduce = function(map, reduce, options, callback) {
  var args = Array.prototype.slice.call(arguments, 2);
  callback = args.pop();
- options = args.length ? args.shift() : {};
-
  var self = this;
+ // Parse version of server if available
+ var version = this.db.version != null ? parseInt(this.db.version.replace(/\./g, '')) : 0;
+ 
+ // Set default to be inline if we are dealing with a v 1.7.6 > server
+ if(version > 0 && version > 176) {
+ options = args.length ? args.shift() : {out:'inline'};
+ if(options.out == null) options.out = 'inline';
+ }
 
  if(Object.prototype.toString.call(map) === '[object Function]') map = map.toString();
  if(Object.prototype.toString.call(reduce) === '[object Function]') reduce = reduce.toString();

lib/mongodb/db.js

@@ -49,7 +49,7 @@ Db.prototype.open = function(callback) {
 
  self.serverConfig.connection.addListener("connect", function() {
  // Create a callback function for a given connection
- var connectCallback = function(err, reply) {  
+ var connectCallback = function(err, reply) { 
  if(err != null) {
  return callback(err, null);
  } else if(reply.documents[0].ismaster == 1) {
@@ -61,7 +61,16 @@ Db.prototype.open = function(callback) {
  // emit a message saying we got a master and are ready to go and change state to reflect it
  if(self.state == 'notConnected') {
  self.state = 'connected';
- callback(null, self);
+ // 
+ // Call the server version function via admin to adapt to changes from 1.7.6 >
+ self.admin(function(err, admindb) {
+ admindb.serverInfo(function(err, doc) {
+ if(err != null) return callback(err, null);
+ // Store the db version
+ self.version = doc.version;
+ callback(null, self);
+ });
+ });
  } else {
  callback("connection already opened");
  }
@@ -78,8 +87,6 @@ Db.prototype.open = function(callback) {
  // Parse the data as a reply object
  var reply = new MongoReply(self, message);
  // Emit message
- 
- 
  self.emit(reply.responseTo.toString(), null, reply);
  // Remove the listener
  self.removeListener(reply.responseTo.toString(), self.listeners(reply.responseTo.toString())[0]);
@@ -166,7 +173,6 @@ Db.prototype.open = function(callback) {
 };
 
 Db.prototype.close = function() {
-
  this.connections.forEach(function(connection) {
  connection.close();
  });