remove custom pool code

Author: brianc

lib/client-pool.js

@@ -176,6 +176,4 @@ p.handleReadyForQuery = function() {
   this.emit('end');
 };
 
-var pool = require(__dirname + '/client-pool').init(ctor);
-
 module.exports = ctor;

lib/native.js

@@ -3,6 +3,7 @@ var defaults = require(__dirname + "/defaults");
 var events = require('events');
 var sys = require('sys');
 
+//compatibility for old nodes
 if(typeof events.EventEmitter.prototype.once !== 'function') {
   events.EventEmitter.prototype.once = function (type, listener) {
     var self = this;
@@ -13,69 +14,6 @@ if(typeof events.EventEmitter.prototype.once !== 'function') {
   };
 }
 
-var Pool = function(maxSize, createFn) {
-  events.EventEmitter.call(this);
-  this.maxSize = maxSize;
-  this.createFn = createFn;
-  this.items = [];
-  this.waits = [];
-}
-
-sys.inherits(Pool, events.EventEmitter);
-
-var p = Pool.prototype;
-
-p.checkOut = function(callback) {
-  if(!this.maxSize) {
-    return callback(null, this.createFn());
-  }
-  var len = 0;
-  for(var i = 0, len = this.items.length; i < len; i++) {
-    var item = this.items[i];
-    if(item.checkedIn) {
-      return this._pulse(item, callback);
-    }
-  }
-  //check if we can create a new item
-  if(this.items.length < this.maxSize && this.createFn) {
-    var result = this.createFn();
-    var item = {ref: result, checkedIn: true}
-    this.items.push(item);
-    if(item.checkedIn) {
-      return this._pulse(item, callback)
-    }
-  }
-  this.waits.push(callback);
-  return false; //did not execute sync
-}
-
-p.checkIn = function(item) {
-  //scan current items
-  for(var i = 0, len = this.items.length; i < len; i++) {
-    var currentItem = this.items[i];
-    if(currentItem.ref == item) {
-      currentItem.checkedIn = true;
-      this._pulse(currentItem);
-      return true;
-    }
-  }
-  //add new item
-  var newItem = {ref: item, checkedIn: true};
-  this.items.push(newItem);
-  this._pulse(newItem);
-  return false;
-}
-
-p._pulse = function(item, cb) {
-  cb = cb || this.waits.shift()
-  if(cb) {
-    item.checkedIn = false;
-    cb(null, item.ref)
-    return true;
-  }
-  return false;
-};
-
 var parseConnectionString = function(str) {
   //unix socket
   if(str.charAt(0) === '/') {
@@ -155,7 +93,6 @@ var getLibpgConString = function(config, callback) {
 }
 
 module.exports = {
-  Pool: Pool,
   normalizeConnectionInfo: normalizeConnectionInfo,
   //only exported here to make testing of this method possible
   //since it contains quite a bit of logic and testing for

lib/utils.js

@@ -1,6 +1,5 @@
 require(__dirname + '/test-helper');
 var utils = require(__dirname + "/../../lib/utils");
-var Pool = utils.Pool;
 var defaults = require(__dirname + "/../../lib").defaults;
 
 //this tests the monkey patching
@@ -21,101 +20,6 @@ test("EventEmitter.once", function() {
   assert.equal(callCount, 1);
 });
 
-test('an empty pool', function() {
-  test('with no creation method', function() {
-    var pool = new Pool(10);
-    var brian = {name:'brian'};
-
-    test('can set and get an item', function() {
-      pool.checkIn(brian);
-      var sync = pool.checkOut(assert.calls(function(err, item) {
-        assert.equal(brian, item)
-        assert.same(brian, item)
-      }))
-      assert.ok(sync, "should have fired sync")
-    })
-
-    test('checkout blocks until item checked back in', function() {
-      var called = false;
-      var sync = pool.checkOut(assert.calls(function(err, item) {
-        called = true;
-        assert.equal(brian, item)
-        assert.same(brian, item)
-      }))
-      assert.ok(sync === false, "Should not have fired sync")
-      assert.ok(called === false, "Should not have fired callback yet")
-      pool.checkIn(brian)
-    })
-
-  })
-
-  test('with a creation method', function() {
-    var customName = "first";
-    var callCount = 0;
-    var pool = new Pool(3, function() {
-      return {name: customName + (++callCount)};
-    });
-
-    test('creates if pool is not at max size', function() {
-      var sync = pool.checkOut(assert.calls(function(err, item) {
-        assert.equal(item.name, "first1");
-      }))
-      assert.ok(sync, "Should have generated item & called callback in sync")
-    })
-
-    test('creates again if item is checked out', function() {
-      var sync = pool.checkOut(assert.calls(function(err, item) {
-        assert.equal(item.name, "first2")
-      }))
-      assert.ok(sync, "Should have called in sync again")
-    })
-    var external = {name: 'boom'};
-    test('can add another item', function() {
-      pool.checkIn(external)
-      var sync = pool.checkOut(assert.calls(function(err, item) {
-        assert.equal(item.name, 'boom')
-      }))
-      assert.ok(sync, "Should have fired 3rd in sync")
-    })
-
-    test('after pool is full, create is not called again', function() {
-      var called = false;
-      var sync = pool.checkOut(assert.calls(function(err, item) {
-        called = true;
-        assert.equal(item.name, 'boom')
-      }))
-      assert.ok(sync === false, "should not be sync")
-      assert.ok(called === false, "should not have called callback")
-      pool.checkIn(external);
-    })
-  })
-})
-
-test('a pool with size of zero', function() {
-  var index = 0;
-  var pool = new Pool(0, function() {
-    return index++;
-  })
-  test('checkin does nothing', function() {
-    index = 0;
-    pool.checkIn(301813);
-    assert.equal(pool.checkOut(assert.calls(function(err, item) {
-      assert.equal(item, 0);
-    })));
-  })
-  test('always creates a new item', function() {
-    index = 0;
-    pool.checkOut(assert.calls(function(err, item) {
-      assert.equal(item, 0);
-    }))
-    pool.checkOut(assert.calls(function(err, item) {
-      assert.equal(item, 1);
-    }))
-    pool.checkOut(assert.calls(function(err, item) {
-      assert.equal(item, 2);
-    }))
-  })
-})
 
 test('normalizing connection info', function() {
   test('with objects', function() {