Added test to allow correct passing of maxstalenessms down

Author: christkv

lib/aggregation_cursor.js

@@ -13,8 +13,7 @@ var inherits = require('util').inherits
   , Readable = require('stream').Readable || require('readable-stream').Readable
   , Define = require('./metadata')
   , CoreCursor = require('./cursor')
-  , Query = require('mongodb-core').Query
-  , CoreReadPreference = require('mongodb-core').ReadPreference;
+  , Query = require('mongodb-core').Query;
 
 /**
  * @fileOverview The **AggregationCursor** class is an internal class that embodies an aggregation cursor on MongoDB

lib/collection.js

@@ -282,6 +282,7 @@ Collection.prototype.find = function() {
 
   // Add read preference if needed
   newOptions = getReadPreference(this, newOptions, this.s.db, this);
+
   // Set slave ok to true if read preference different from primary
   if(newOptions.readPreference != null
     && (newOptions.readPreference != 'primary' || newOptions.readPreference.mode != 'primary')) {
@@ -3272,18 +3273,18 @@ var getReadPreference = function(self, options, db, coll) {
     r = options.readPreference
   } else if(self.s.readPreference) {
     r = self.s.readPreference
-  } else if(db.readPreference) {
-    r = db.readPreference;
+  } else if(db.s.readPreference) {
+    r = db.s.readPreference;
   }
 
   if(r instanceof ReadPreference) {
-    options.readPreference = new CoreReadPreference(r.mode, r.tags);
+    options.readPreference = new CoreReadPreference(r.mode, r.tags, {maxStalenessMS: r.maxStalenessMS});
   } else if(typeof r == 'string') {
     options.readPreference = new CoreReadPreference(r);
   } else if(r && !(r instanceof ReadPreference) && typeof r == 'object') {
     var mode = r.mode || r.preference;
     if (mode && typeof mode == 'string') {
-      options.readPreference = new CoreReadPreference(mode, r.tags);
+      options.readPreference = new CoreReadPreference(mode, r.tags, {maxStalenessMS: r.maxStalenessMS});
     }
   }
 

lib/command_cursor.js

@@ -163,7 +163,7 @@ CommandCursor.prototype.setReadPreference = function(r) {
   if(this.s.state != CommandCursor.INIT) throw MongoError.create({message: 'cannot change cursor readPreference after cursor has been accessed', driver:true});
 
   if(r instanceof ReadPreference) {
-    this.s.options.readPreference = new CoreReadPreference(r.mode, r.tags);
+    this.s.options.readPreference = new CoreReadPreference(r.mode, r.tags, {maxStalenessMS: r.maxStalenessMS});
   } else if(typeof r == 'string') {
     this.s.options.readPreference = new CoreReadPreference(r);
   } else if(r instanceof CoreReadPreference) {

lib/cursor.js

@@ -793,7 +793,7 @@ define.classMethod('forEach', {callback: true, promise:false});
 Cursor.prototype.setReadPreference = function(r) {
   if(this.s.state != Cursor.INIT) throw MongoError.create({message: 'cannot change cursor readPreference after cursor has been accessed', driver:true});
   if(r instanceof ReadPreference) {
-    this.s.options.readPreference = new CoreReadPreference(r.mode, r.tags);
+    this.s.options.readPreference = new CoreReadPreference(r.mode, r.tags, {maxStalenessMS: r.maxStalenessMS});
   } else if(typeof r == 'string'){
     this.s.options.readPreference = new CoreReadPreference(r);
   } else if(r instanceof CoreReadPreference) {

lib/db.js

@@ -264,11 +264,11 @@ var convertReadPreference = function(readPreference) {
   if(readPreference && typeof readPreference == 'string') {
     return new CoreReadPreference(readPreference);
   } else if(readPreference instanceof ReadPreference) {
-    return new CoreReadPreference(readPreference.mode, readPreference.tags);
+    return new CoreReadPreference(readPreference.mode, readPreference.tags, {maxStalenessMS: readPreference.maxStalenessMS});
   } else if(readPreference && typeof readPreference == 'object') {
     var mode = readPreference.mode || readPreference.preference;
     if (mode && typeof mode == 'string') {
-      readPreference = new CoreReadPreference(mode, readPreference.tags);
+      readPreference = new CoreReadPreference(mode, readPreference.tags, {maxStalenessMS: readPreference.maxStalenessMS});
     }
   }
   return readPreference;
@@ -1162,29 +1162,28 @@ Db.prototype.addChild = function(db) {
  */
 Db.prototype.db = function(dbName, options) {
   options = options || {};
+
   // Copy the options and add out internal override of the not shared flag
-  for(var key in this.options) {
-    options[key] = this.options[key];
-  }
+  var finalOptions = assign({}, this.options, options);
 
   // Do we have the db in the cache already
-  if(this.s.dbCache[dbName] && options.returnNonCachedInstance !== true) {
+  if(this.s.dbCache[dbName] && finalOptions.returnNonCachedInstance !== true) {
     return this.s.dbCache[dbName];
   }
 
   // Add current db as parentDb
-  if(options.noListener == null || options.noListener == false) {
-    options.parentDb = this;
+  if(finalOptions.noListener == null || finalOptions.noListener == false) {
+    finalOptions.parentDb = this;
   }
 
   // Add promiseLibrary
-  options.promiseLibrary = this.s.promiseLibrary;
+  finalOptions.promiseLibrary = this.s.promiseLibrary;
 
   // Return the db object
-  var db = new Db(dbName, this.s.topology, options)
+  var db = new Db(dbName, this.s.topology, finalOptions)
 
   // Add as child
-  if(options.noListener == null || options.noListener == false) {
+  if(finalOptions.noListener == null || finalOptions.noListener == false) {
     this.addChild(db);
   }
 

lib/mongo_client.js

@@ -161,6 +161,11 @@ function translateOptions(options) {
     options.readPreference.tags = options.readPreferenceTags || options.read_preference_tags;
   }
 
+  // Do we have maxStalenessMS
+  if(options.maxStalenessMS) {
+    options.readPreference.maxStalenessMS = options.maxStalenessMS;
+  }
+
   // Set the socket and connection timeouts
   if(!options.socketTimeoutMS == null) options.socketTimeoutMS = 30000;
   if(!options.connectTimeoutMS == null) options.connectTimeoutMS = 30000;

lib/read_preference.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The **ReadPreference** class is a class that represents a MongoDB ReadPreference and is
  * used to construct connections.
- * 
+ *
  * @example
  * var Db = require('mongodb').Db,
  *   ReplSet = require('mongodb').ReplSet,
@@ -27,7 +27,7 @@
 
 /**
  * Creates a new ReadPreference instance
- * 
+ *
  * Read Preferences
  *  - **ReadPreference.PRIMARY**, Read from primary only. All operations produce an error (throw an exception where applicable) if primary is unavailable. Cannot be combined with tags (This is the default.).
  *  - **ReadPreference.PRIMARY_PREFERRED**, Read from primary if available, otherwise a secondary.
@@ -37,17 +37,34 @@
  *
  * @class
  * @param {string} mode The ReadPreference mode as listed above.
- * @param {object} tags An object representing read preference tags.
+ * @param {array} tags An object representing read preference tags.
+ * @param {object} [options] Additional read preference options
+ * @param {number} [options.maxStalenessMS] Max Secondary Read Stalleness in Miliseconds
  * @property {string} mode The ReadPreference mode.
- * @property {object} tags The ReadPreference tags.
+ * @property {array} tags The ReadPreference tags.
+ * @property {object} options Additional read preference options
+ * @property {number} maxStalenessMS MaxStalenessMS value for the read preference
  * @return {ReadPreference} a ReadPreference instance.
- */ 
-var ReadPreference = function(mode, tags) {
-  if(!(this instanceof ReadPreference))
-    return new ReadPreference(mode, tags);
+ */
+var ReadPreference = function(mode, tags, options) {
+  if(!(this instanceof ReadPreference)) {
+    return new ReadPreference(mode, tags, options);
+  }
+
   this._type = 'ReadPreference';
   this.mode = mode;
   this.tags = tags;
+  this.options =  options;
+
+  // If no tags were passed in
+  if(tags && typeof tags == 'object') {
+    this.options = tags, this.tags = null;
+  }
+
+  // Add the maxStalenessMS value to the read Preference
+  if(this.options && this.options.maxStalenessMS) {
+    this.maxStalenessMS = this.options.maxStalenessMS;
+  }
 }
 
 /**
@@ -56,7 +73,7 @@ var ReadPreference = function(mode, tags) {
  * @method
  * @param {string} mode The string representing the read preference mode.
  * @return {boolean}
- */  
+ */
 ReadPreference.isValid = function(_mode) {
   return (_mode == ReadPreference.PRIMARY || _mode == ReadPreference.PRIMARY_PREFERRED
     || _mode == ReadPreference.SECONDARY || _mode == ReadPreference.SECONDARY_PREFERRED
@@ -70,7 +87,7 @@ ReadPreference.isValid = function(_mode) {
  * @method
  * @param {string} mode The string representing the read preference mode.
  * @return {boolean}
- */  
+ */
 ReadPreference.prototype.isValid = function(mode) {
   var _mode = typeof mode == 'string' ? mode : this.mode;
   return ReadPreference.isValid(_mode);
@@ -86,9 +103,20 @@ ReadPreference.prototype.toObject = function() {
     object['tags'] = this.tags;
   }
 
+  if(this.maxStalenessMS) {
+    object['maxStalenessMS'] = this.maxStalenessMS;
+  }
+
   return object;
 }
 
+/**
+ * @ignore
+ */
+ReadPreference.prototype.toJSON = function() {
+  return this.toObject();
+}
+
 /**
  * @ignore
  */
@@ -101,4 +129,4 @@ ReadPreference.NEAREST = 'nearest'
 /**
  * @ignore
  */
-module.exports = ReadPreference;
+module.exports = ReadPreference;

lib/replset.js

@@ -237,7 +237,7 @@ var translateReadPreference = function(options) {
     options.readPreference = new CoreReadPreference(options.readPreference);
   } else if(options.readPreference instanceof ReadPreference) {
     options.readPreference = new CoreReadPreference(options.readPreference.mode
-      , options.readPreference.tags);
+      , options.readPreference.tags, {maxStalenessMS: options.readPreference.maxStalenessMS});
   }
 
   return options;

lib/url_parser.js

@@ -355,6 +355,9 @@ module.exports = function(url, options) {
         if(!ReadPreference.isValid(value)) throw new Error("readPreference must be either primary/primaryPreferred/secondary/secondaryPreferred/nearest");
         dbOptions.readPreference = value;
         break;
+      case 'maxStalenessMS':
+        dbOptions.maxStalenessMS = parseInt(value, 10);
+        break;
       case 'readPreferenceTags':
         // Decode the value
         value = decodeURIComponent(value);