Changed store to prototype

Author: christkv

lib/topology_base.js

@@ -3,70 +3,78 @@ var MongoError = require('mongodb-core').MongoError
 
 // The store of ops
 var Store = function(topology, storeOptions) {
+ var self = this;
  var storedOps = [];
  storeOptions = storeOptions || {force:false, bufferMaxEntries: -1}
 
+ // Internal state
+ this.s = {
+ storedOps: storedOps
+ , storeOptions: storeOptions
+ , topology: topology
+ }
+
  Object.defineProperty(this, 'length', {
- enumerable:true, get: function() { return storedOps.length; }
+ enumerable:true, get: function() { return self.s.storedOps.length; }
  });
+}
 
- this.add = function(opType, ns, ops, options, callback) {
- if(storeOptions.force) return callback(new MongoError("db closed by application"));
- if(storeOptions.bufferMaxEntries == 0) return callback(new MongoError(f("no connection available for operation and number of stored operation > %s", storeOptions.bufferMaxEntries)));
- if(storeOptions.bufferMaxEntries > 0 && storedOps.length > storeOptions.bufferMaxEntries) {
- while(storedOps.length > 0) {
- var op = storedOps.shift();
- op.c(new MongoError(f("no connection available for operation and number of stored operation > %s", storeOptions.bufferMaxEntries)));
- }
-
- return;
+Store.prototype.add = function(opType, ns, ops, options, callback) {
+ if(this.s.storeOptions.force) return callback(new MongoError("db closed by application"));
+ if(this.s.storeOptions.bufferMaxEntries == 0) return callback(new MongoError(f("no connection available for operation and number of stored operation > %s", this.s.storeOptions.bufferMaxEntries)));
+ if(this.s.storeOptions.bufferMaxEntries > 0 && this.s.storedOps.length > this.s.storeOptions.bufferMaxEntries) {
+ while(this.s.storedOps.length > 0) {
+ var op = this.s.storedOps.shift();
+ op.c(new MongoError(f("no connection available for operation and number of stored operation > %s", this.s.storeOptions.bufferMaxEntries)));
  }
 
- storedOps.push({t: opType, n: ns, o: ops, op: options, c: callback})
+ return;
  }
 
- this.addObjectAndMethod = function(opType, object, method, params, callback) {
- if(storeOptions.force) return callback(new MongoError("db closed by application"));
- if(storeOptions.bufferMaxEntries == 0) return callback(new MongoError(f("no connection available for operation and number of stored operation > %s", storeOptions.bufferMaxEntries)));
- if(storeOptions.bufferMaxEntries > 0 && storedOps.length > storeOptions.bufferMaxEntries) {
- while(storedOps.length > 0) {
- var op = storedOps.shift();
- op.c(new MongoError(f("no connection available for operation and number of stored operation > %s", storeOptions.bufferMaxEntries)));
- }
+ this.s.storedOps.push({t: opType, n: ns, o: ops, op: options, c: callback})
+}
 
- return;
+Store.prototype.addObjectAndMethod = function(opType, object, method, params, callback) {
+ if(this.s.storeOptions.force) return callback(new MongoError("db closed by application"));
+ if(this.s.storeOptions.bufferMaxEntries == 0) return callback(new MongoError(f("no connection available for operation and number of stored operation > %s", this.s.storeOptions.bufferMaxEntries)));
+ if(this.s.storeOptions.bufferMaxEntries > 0 && this.s.storedOps.length > this.s.storeOptions.bufferMaxEntries) {
+ while(this.s.storedOps.length > 0) {
+ var op = this.s.storedOps.shift();
+ op.c(new MongoError(f("no connection available for operation and number of stored operation > %s", this.s.storeOptions.bufferMaxEntries)));
  }
 
- storedOps.push({t: opType, m: method, o: object, p: params, c: callback})
+ return;
  }
 
- this.flush = function() {
- while(storedOps.length > 0) {
- storedOps.shift().c(new MongoError(f("no connection available for operation")));
- }
- }
+ this.s.storedOps.push({t: opType, m: method, o: object, p: params, c: callback})
+}
 
- this.execute = function() {
- // Get current ops
- var ops = storedOps;
- // Reset the ops
- storedOps = [];
-
- // Execute all the stored ops
- while(ops.length > 0) {
- var op = ops.shift();
-
- if(op.t == 'cursor') {
- op.o[op.m].apply(op.o, op.p);
- } else {
- topology[op.t](op.n, op.o, op.op, op.c);
- }
- } 
+Store.prototype.flush = function() {
+ while(this.s.storedOps.length > 0) {
+ this.s.storedOps.shift().c(new MongoError(f("no connection available for operation")));
  }
+}
 
- this.all = function() {
- return storedOps;
- }
+Store.prototype.execute = function() {
+ // Get current ops
+ var ops = this.s.storedOps;
+ // Reset the ops
+ this.s.storedOps = [];
+
+ // Execute all the stored ops
+ while(ops.length > 0) {
+ var op = ops.shift();
+
+ if(op.t == 'cursor') {
+ op.o[op.m].apply(op.o, op.p);
+ } else {
+ this.s.topology[op.t](op.n, op.o, op.op, op.c);
+ }
+ } 
+}
+
+Store.prototype.all = function() {
+ return this.s.storedOps;
 }
 
 // Server capabilities