From 124e98d462c26475c8f2e4458b0ab90a795cbcab Mon Sep 17 00:00:00 2001
From: Ed Ceaser <eac@twitter.com>
Date: Thu, 11 Feb 2010 12:48:58 -0800
Subject: [PATCH] refactor connectionpools into 'databases'

---
 ivy/ivy.xml                                   |  2 +-
 .../MemoizingConnectionPoolFactory.scala      | 18 -----------
 .../StatsCollectingConnectionPool.scala       | 32 -------------------
 .../ApachePoolingDatabase.scala}              | 12 +++----
 .../Database.scala}                           |  8 ++---
 .../database/MemoizingDatabase.scala          | 18 +++++++++++
 .../database/StatsCollectingDatabase.scala    | 32 +++++++++++++++++++
 .../querulous/evaluator/QueryEvaluator.scala  |  6 ++--
 .../evaluator/StandardQueryEvaluator.scala    | 18 +++++------
 ...onnectionPool.scala => FakeDatabase.scala} |  4 +--
 .../querulous/integration/QuerySpec.scala     |  2 +-
 .../querulous/integration/TimeoutSpec.scala   |  8 ++---
 .../MemoizingConnectionPoolFactorySpec.scala  | 26 +++++++--------
 .../querulous/unit/QueryEvaluatorSpec.scala   | 18 +++++------
 .../StatsCollectingConnectionPoolSpec.scala   | 10 +++---
 15 files changed, 107 insertions(+), 107 deletions(-)
 delete mode 100644 src/main/scala/com/twitter/querulous/connectionpool/MemoizingConnectionPoolFactory.scala
 delete mode 100644 src/main/scala/com/twitter/querulous/connectionpool/StatsCollectingConnectionPool.scala
 rename src/main/scala/com/twitter/querulous/{connectionpool/ApacheConnectionPool.scala => database/ApachePoolingDatabase.scala} (89%)
 rename src/main/scala/com/twitter/querulous/{connectionpool/ConnectionPool.scala => database/Database.scala} (75%)
 create mode 100644 src/main/scala/com/twitter/querulous/database/MemoizingDatabase.scala
 create mode 100644 src/main/scala/com/twitter/querulous/database/StatsCollectingDatabase.scala
 rename src/test/scala/com/twitter/querulous/fake/{FakeConnectionPool.scala => FakeDatabase.scala} (68%)

diff --git a/ivy/ivy.xml b/ivy/ivy.xml
index eeabaa4..8c2fafe 100644
--- a/ivy/ivy.xml
+++ b/ivy/ivy.xml
@@ -1,7 +1,7 @@
 <ivy-module version="1.0" xmlns:e="http://ant.apache.org/ivy/extra">
   <info organisation="com.twitter"
     module="querulous"
-    revision="1.0.0"
+    revision="1.1.0"
     e:buildpackage="com.twitter.querulous"
     e:testclass="com.twitter.querulous.TestRunner"
     e:jarclassname="com.twitter.querulous.Main"
diff --git a/src/main/scala/com/twitter/querulous/connectionpool/MemoizingConnectionPoolFactory.scala b/src/main/scala/com/twitter/querulous/connectionpool/MemoizingConnectionPoolFactory.scala
deleted file mode 100644
index de1588a..0000000
--- a/src/main/scala/com/twitter/querulous/connectionpool/MemoizingConnectionPoolFactory.scala
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.twitter.querulous.connectionpool
-
-import scala.collection.mutable
-
-class MemoizingConnectionPoolFactory(connectionPoolFactory: ConnectionPoolFactory) extends ConnectionPoolFactory {
-  private val connectionPools = new mutable.HashMap[String, ConnectionPool]
-
-  def apply(dbhosts: List[String], dbname: String, username: String, password: String) = synchronized {
-    connectionPools.getOrElseUpdate(
-      dbhosts.first + "/" + dbname,
-      connectionPoolFactory(dbhosts, dbname, username, password))
-  }
-
-  def close() {
-    for ((name, pool) <- connectionPools) pool.close()
-    connectionPools.clear()
-  }
-}
diff --git a/src/main/scala/com/twitter/querulous/connectionpool/StatsCollectingConnectionPool.scala b/src/main/scala/com/twitter/querulous/connectionpool/StatsCollectingConnectionPool.scala
deleted file mode 100644
index 6d3d1f7..0000000
--- a/src/main/scala/com/twitter/querulous/connectionpool/StatsCollectingConnectionPool.scala
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.twitter.querulous.connectionpool
-
-import java.sql.Connection
-
-class StatsCollectingConnectionPoolFactory(
-  connectionPoolFactory: ConnectionPoolFactory,
-  stats: StatsCollector) extends ConnectionPoolFactory {
-
-  def apply(dbhosts: List[String], dbname: String, username: String, password: String): ConnectionPool = {
-    new StatsCollectingConnectionPool(connectionPoolFactory(dbhosts, dbname, username, password), stats)
-  }
-}
-
-class StatsCollectingConnectionPool(pool: ConnectionPool, stats: StatsCollector)
-  extends ConnectionPool {
-
-  override def reserve(): Connection = {
-    stats.time("connection-pool-reserve-timing") {
-      pool.reserve()
-    }
-  }
-
-  override def release(connection: Connection) = {
-    stats.time("connection-pool-release-timing") {
-      pool.release(connection)
-    }
-  }
-
-  override def close() = {
-    pool.close()
-  }
-}
diff --git a/src/main/scala/com/twitter/querulous/connectionpool/ApacheConnectionPool.scala b/src/main/scala/com/twitter/querulous/database/ApachePoolingDatabase.scala
similarity index 89%
rename from src/main/scala/com/twitter/querulous/connectionpool/ApacheConnectionPool.scala
rename to src/main/scala/com/twitter/querulous/database/ApachePoolingDatabase.scala
index 9fa3ecb..e0f6e4c 100644
--- a/src/main/scala/com/twitter/querulous/connectionpool/ApacheConnectionPool.scala
+++ b/src/main/scala/com/twitter/querulous/database/ApachePoolingDatabase.scala
@@ -1,20 +1,20 @@
-package com.twitter.querulous.connectionpool
+package com.twitter.querulous.database
 
 import java.sql.{Connection, SQLException}
 import org.apache.commons.dbcp.{PoolableConnectionFactory, DriverManagerConnectionFactory, PoolingDataSource}
 import org.apache.commons.pool.impl.{GenericObjectPool, StackKeyedObjectPoolFactory}
 import com.twitter.xrayspecs.Duration
 
-class ApacheConnectionPoolFactory(
+class ApachePoolingDatabaseFactory(
   minOpenConnections: Int,
   maxOpenConnections: Int,
   checkConnectionHealthWhenIdleFor: Duration,
   maxWaitForConnectionReservation: Duration,
   checkConnectionHealthOnReservation: Boolean,
-  evictConnectionIfIdleFor: Duration) extends ConnectionPoolFactory {
+  evictConnectionIfIdleFor: Duration) extends DatabaseFactory {
 
   def apply(dbhosts: List[String], dbname: String, username: String, password: String) = {
-    val pool = new ApacheConnectionPool(
+    val pool = new ApachePoolingDatabase(
       dbhosts,
       dbname,
       username,
@@ -29,7 +29,7 @@ class ApacheConnectionPoolFactory(
   }
 }
 
-class ApacheConnectionPool(
+class ApachePoolingDatabase(
   dbhosts: List[String],
   dbname: String,
   username: String,
@@ -39,7 +39,7 @@ class ApacheConnectionPool(
   checkConnectionHealthWhenIdleFor: Duration,
   maxWaitForConnectionReservation: Duration,
   checkConnectionHealthOnReservation: Boolean,
-  evictConnectionIfIdleFor: Duration) extends ConnectionPool {
+  evictConnectionIfIdleFor: Duration) extends Database {
 
   Class.forName("com.mysql.jdbc.Driver")
 
diff --git a/src/main/scala/com/twitter/querulous/connectionpool/ConnectionPool.scala b/src/main/scala/com/twitter/querulous/database/Database.scala
similarity index 75%
rename from src/main/scala/com/twitter/querulous/connectionpool/ConnectionPool.scala
rename to src/main/scala/com/twitter/querulous/database/Database.scala
index 50cd4f2..8bf099f 100644
--- a/src/main/scala/com/twitter/querulous/connectionpool/ConnectionPool.scala
+++ b/src/main/scala/com/twitter/querulous/database/Database.scala
@@ -1,12 +1,12 @@
-package com.twitter.querulous.connectionpool
+package com.twitter.querulous.database
 
 import java.sql.Connection
 
-trait ConnectionPoolFactory {
-  def apply(dbhosts: List[String], dbname: String, username: String, password: String): ConnectionPool
+trait DatabaseFactory {
+  def apply(dbhosts: List[String], dbname: String, username: String, password: String): Database
 }
 
-trait ConnectionPool {
+trait Database {
   def reserve(): Connection
 
   def release(connection: Connection)
diff --git a/src/main/scala/com/twitter/querulous/database/MemoizingDatabase.scala b/src/main/scala/com/twitter/querulous/database/MemoizingDatabase.scala
new file mode 100644
index 0000000..6e54a62
--- /dev/null
+++ b/src/main/scala/com/twitter/querulous/database/MemoizingDatabase.scala
@@ -0,0 +1,18 @@
+package com.twitter.querulous.database
+
+import scala.collection.mutable
+
+class MemoizingDatabaseFactory(databaseFactory: DatabaseFactory) extends DatabaseFactory {
+  private val databases = new mutable.HashMap[String, Database]
+
+  def apply(dbhosts: List[String], dbname: String, username: String, password: String) = synchronized {
+    databases.getOrElseUpdate(
+      dbhosts.first + "/" + dbname,
+      databaseFactory(dbhosts, dbname, username, password))
+  }
+
+  def close() {
+    for ((name, pool) <- databases) pool.close()
+    databases.clear()
+  }
+}
diff --git a/src/main/scala/com/twitter/querulous/database/StatsCollectingDatabase.scala b/src/main/scala/com/twitter/querulous/database/StatsCollectingDatabase.scala
new file mode 100644
index 0000000..97a8731
--- /dev/null
+++ b/src/main/scala/com/twitter/querulous/database/StatsCollectingDatabase.scala
@@ -0,0 +1,32 @@
+package com.twitter.querulous.database
+
+import java.sql.Connection
+
+class StatsCollectingDatabaseFactory(
+  databaseFactory: DatabaseFactory,
+  stats: StatsCollector) extends DatabaseFactory {
+
+  def apply(dbhosts: List[String], dbname: String, username: String, password: String): Database = {
+    new StatsCollectingDatabase(databaseFactory(dbhosts, dbname, username, password), stats)
+  }
+}
+
+class StatsCollectingDatabase(pool: Database, stats: StatsCollector)
+  extends Database {
+
+  override def reserve(): Connection = {
+    stats.time("connection-pool-reserve-timing") {
+      pool.reserve()
+    }
+  }
+
+  override def release(connection: Connection) = {
+    stats.time("connection-pool-release-timing") {
+      pool.release(connection)
+    }
+  }
+
+  override def close() = {
+    pool.close()
+  }
+}
diff --git a/src/main/scala/com/twitter/querulous/evaluator/QueryEvaluator.scala b/src/main/scala/com/twitter/querulous/evaluator/QueryEvaluator.scala
index b802e67..434612f 100644
--- a/src/main/scala/com/twitter/querulous/evaluator/QueryEvaluator.scala
+++ b/src/main/scala/com/twitter/querulous/evaluator/QueryEvaluator.scala
@@ -2,14 +2,14 @@ package com.twitter.querulous.evaluator
 
 import java.sql.ResultSet
 import com.twitter.querulous.query.SqlQueryFactory
-import com.twitter.querulous.connectionpool.ApacheConnectionPoolFactory
+import com.twitter.querulous.database.ApachePoolingDatabaseFactory
 import com.twitter.xrayspecs.TimeConversions._
 
 object QueryEvaluator extends QueryEvaluatorFactory {
   def apply(dbhosts: List[String], dbname: String, username: String, password: String) = {
     val queryFactory = new SqlQueryFactory
-    val connectionPoolFactory = new ApacheConnectionPoolFactory(10, 10, 1.second, 10.millis, false, 0.seconds)
-    val queryEvaluatorFactory = new StandardQueryEvaluatorFactory(connectionPoolFactory, queryFactory)
+    val databaseFactory = new ApachePoolingDatabaseFactory(10, 10, 1.second, 10.millis, false, 0.seconds)
+    val queryEvaluatorFactory = new StandardQueryEvaluatorFactory(databaseFactory, queryFactory)
     queryEvaluatorFactory(dbhosts, dbname, username, password)
   }
 }
diff --git a/src/main/scala/com/twitter/querulous/evaluator/StandardQueryEvaluator.scala b/src/main/scala/com/twitter/querulous/evaluator/StandardQueryEvaluator.scala
index 816981d..fae5ad9 100644
--- a/src/main/scala/com/twitter/querulous/evaluator/StandardQueryEvaluator.scala
+++ b/src/main/scala/com/twitter/querulous/evaluator/StandardQueryEvaluator.scala
@@ -3,20 +3,20 @@ package com.twitter.querulous.evaluator
 import java.sql.{Connection, ResultSet}
 import org.apache.commons.dbcp.{DriverManagerConnectionFactory, PoolableConnectionFactory, PoolingDataSource}
 import org.apache.commons.pool.impl.GenericObjectPool
-import com.twitter.querulous.connectionpool.{ConnectionPool, ConnectionPoolFactory}
+import com.twitter.querulous.database.{Database, DatabaseFactory}
 import com.twitter.querulous.query.QueryFactory
 
 class StandardQueryEvaluatorFactory(
-  connectionPoolFactory: ConnectionPoolFactory,
+  databaseFactory: DatabaseFactory,
   queryFactory: QueryFactory) extends QueryEvaluatorFactory {
 
   def apply(dbhosts: List[String], dbname: String, username: String, password: String) = {
-    val connectionPool = connectionPoolFactory(dbhosts, dbname, username, password)
-    new StandardQueryEvaluator(connectionPool, queryFactory)
+    val database = databaseFactory(dbhosts, dbname, username, password)
+    new StandardQueryEvaluator(database, queryFactory)
   }
 }
 
-class StandardQueryEvaluator(protected val connectionPool: ConnectionPool, queryFactory: QueryFactory)
+class StandardQueryEvaluator(protected val database: Database, queryFactory: QueryFactory)
   extends QueryEvaluator {
 
   def select[A](query: String, params: Any*)(f: ResultSet => A) = withTransaction(_.select(query, params: _*)(f))
@@ -46,22 +46,22 @@ class StandardQueryEvaluator(protected val connectionPool: ConnectionPool, query
   }
 
   def withConnection[A](f: Connection => A): A = {
-    val connection = connectionPool.reserve()
+    val connection = database.reserve()
     try {
       f(connection)
     } finally {
-      connectionPool.release(connection)
+      database.release(connection)
     }
   }
 
   override def equals(other: Any) = {
     other match {
       case other: StandardQueryEvaluator =>
-        connectionPool eq other.connectionPool
+        database eq other.database
       case _ =>
         false
     }
   }
 
-  override def hashCode = connectionPool.hashCode
+  override def hashCode = database.hashCode
 }
diff --git a/src/test/scala/com/twitter/querulous/fake/FakeConnectionPool.scala b/src/test/scala/com/twitter/querulous/fake/FakeDatabase.scala
similarity index 68%
rename from src/test/scala/com/twitter/querulous/fake/FakeConnectionPool.scala
rename to src/test/scala/com/twitter/querulous/fake/FakeDatabase.scala
index 56f8cae..2510f79 100644
--- a/src/test/scala/com/twitter/querulous/fake/FakeConnectionPool.scala
+++ b/src/test/scala/com/twitter/querulous/fake/FakeDatabase.scala
@@ -3,9 +3,9 @@ package com.twitter.querulous.fake
 import java.sql.Connection
 import com.twitter.xrayspecs.{Duration, Time}
 import com.twitter.xrayspecs.TimeConversions._
-import com.twitter.querulous.connectionpool.ConnectionPool
+import com.twitter.querulous.database.Database
 
-class FakeConnectionPool(connection: Connection, latency: Duration) extends ConnectionPool {
+class FakeDatabase(connection: Connection, latency: Duration) extends Database {
   def reserve(): Connection = {
     Time.advance(latency)
     connection
diff --git a/src/test/scala/com/twitter/querulous/integration/QuerySpec.scala b/src/test/scala/com/twitter/querulous/integration/QuerySpec.scala
index 636fc22..b012e76 100644
--- a/src/test/scala/com/twitter/querulous/integration/QuerySpec.scala
+++ b/src/test/scala/com/twitter/querulous/integration/QuerySpec.scala
@@ -5,7 +5,7 @@ import org.specs.Specification
 import net.lag.configgy.Configgy
 import com.twitter.xrayspecs.Time
 import com.twitter.xrayspecs.TimeConversions._
-import com.twitter.querulous.connectionpool.ApacheConnectionPoolFactory
+import com.twitter.querulous.database.ApachePoolingDatabaseFactory
 import com.twitter.querulous.query._
 import com.twitter.querulous.evaluator.{StandardQueryEvaluatorFactory, QueryEvaluator}
 
diff --git a/src/test/scala/com/twitter/querulous/integration/TimeoutSpec.scala b/src/test/scala/com/twitter/querulous/integration/TimeoutSpec.scala
index 316ff3b..742987b 100644
--- a/src/test/scala/com/twitter/querulous/integration/TimeoutSpec.scala
+++ b/src/test/scala/com/twitter/querulous/integration/TimeoutSpec.scala
@@ -5,7 +5,7 @@ import org.specs.Specification
 import net.lag.configgy.Configgy
 import com.twitter.xrayspecs.Time
 import com.twitter.xrayspecs.TimeConversions._
-import com.twitter.querulous.connectionpool.ApacheConnectionPoolFactory
+import com.twitter.querulous.database.ApachePoolingDatabaseFactory
 import com.twitter.querulous.query.{SqlQueryFactory, TimingOutQueryFactory, SqlTimeoutException}
 import com.twitter.querulous.evaluator.{StandardQueryEvaluatorFactory, QueryEvaluator}
 
@@ -16,9 +16,9 @@ object TimeoutSpec extends Specification {
   val timeout = 1.second
   val queryFactory = new SqlQueryFactory
   val timingOutQueryFactory = new TimingOutQueryFactory(queryFactory, timeout)
-  val connectionPoolFactory = new ApacheConnectionPoolFactory(1, 1, 1.second, 20.millis, false, 0.seconds)
-  val queryEvaluatorFactory = new StandardQueryEvaluatorFactory(connectionPoolFactory, queryFactory)
-  val timingOutQueryEvaluatorFactory = new StandardQueryEvaluatorFactory(connectionPoolFactory, timingOutQueryFactory)
+  val databaseFactory = new ApachePoolingDatabaseFactory(1, 1, 1.second, 20.millis, false, 0.seconds)
+  val queryEvaluatorFactory = new StandardQueryEvaluatorFactory(databaseFactory, queryFactory)
+  val timingOutQueryEvaluatorFactory = new StandardQueryEvaluatorFactory(databaseFactory, timingOutQueryFactory)
 
   "Timeouts" should {
     doBefore {
diff --git a/src/test/scala/com/twitter/querulous/unit/MemoizingConnectionPoolFactorySpec.scala b/src/test/scala/com/twitter/querulous/unit/MemoizingConnectionPoolFactorySpec.scala
index 18316ca..82e185f 100644
--- a/src/test/scala/com/twitter/querulous/unit/MemoizingConnectionPoolFactorySpec.scala
+++ b/src/test/scala/com/twitter/querulous/unit/MemoizingConnectionPoolFactorySpec.scala
@@ -2,28 +2,28 @@ package com.twitter.querulous.unit
 
 import org.specs.mock.JMocker
 import org.specs.Specification
-import com.twitter.querulous.connectionpool.{ConnectionPool, ConnectionPoolFactory, MemoizingConnectionPoolFactory}
+import com.twitter.querulous.database.{Database, DatabaseFactory, MemoizingDatabaseFactory}
 
-object MemoizingConnectionPoolFactorySpec extends Specification with JMocker {
+object MemoizingDatabaseFactorySpec extends Specification with JMocker {
   val username = "username"
   val password = "password"
   val hosts = List("foo")
 
-  "MemoizingConnectionPoolFactory" should {
+  "MemoizingDatabaseFactory" should {
     "apply" in {
-      val connectionPool1 = mock[ConnectionPool]
-      val connectionPool2 = mock[ConnectionPool]
-      val connectionPoolFactory = mock[ConnectionPoolFactory]
-      val memoizingConnectionPool = new MemoizingConnectionPoolFactory(connectionPoolFactory)
+      val database1 = mock[Database]
+      val database2 = mock[Database]
+      val databaseFactory = mock[DatabaseFactory]
+      val memoizingDatabase = new MemoizingDatabaseFactory(databaseFactory)
 
       expect {
-        one(connectionPoolFactory).apply(hosts, "bar", username, password) willReturn connectionPool1
-        one(connectionPoolFactory).apply(hosts, "baz", username, password) willReturn connectionPool2
+        one(databaseFactory).apply(hosts, "bar", username, password) willReturn database1
+        one(databaseFactory).apply(hosts, "baz", username, password) willReturn database2
       }
-      memoizingConnectionPool(hosts, "bar", username, password) mustBe connectionPool1
-      memoizingConnectionPool(hosts, "bar", username, password) mustBe connectionPool1
-      memoizingConnectionPool(hosts, "baz", username, password) mustBe connectionPool2
-      memoizingConnectionPool(hosts, "baz", username, password) mustBe connectionPool2
+      memoizingDatabase(hosts, "bar", username, password) mustBe database1
+      memoizingDatabase(hosts, "bar", username, password) mustBe database1
+      memoizingDatabase(hosts, "baz", username, password) mustBe database2
+      memoizingDatabase(hosts, "baz", username, password) mustBe database2
     }
   }
 }
diff --git a/src/test/scala/com/twitter/querulous/unit/QueryEvaluatorSpec.scala b/src/test/scala/com/twitter/querulous/unit/QueryEvaluatorSpec.scala
index 5139a90..a94444a 100644
--- a/src/test/scala/com/twitter/querulous/unit/QueryEvaluatorSpec.scala
+++ b/src/test/scala/com/twitter/querulous/unit/QueryEvaluatorSpec.scala
@@ -4,7 +4,7 @@ import java.sql.{Connection, SQLException, DriverManager}
 import scala.collection.mutable
 import net.lag.configgy.Configgy
 import com.mysql.jdbc.exceptions.MySQLIntegrityConstraintViolationException
-import com.twitter.querulous.connectionpool.ConnectionPool
+import com.twitter.querulous.database.Database
 import com.twitter.querulous.evaluator.{StandardQueryEvaluator, QueryEvaluator}
 import com.twitter.querulous.query.{QueryFactory, SqlQueryFactory}
 import com.twitter.xrayspecs.Time
@@ -33,16 +33,16 @@ object QueryEvaluatorSpec extends Specification with JMocker {
     "connection pooling" in {
       "transactionally" >> {
         val connection = mock[Connection]
-        val connectionPool = mock[ConnectionPool]
-        val queryEvaluator = new StandardQueryEvaluator(connectionPool, queryFactory)
+        val database = mock[Database]
+        val queryEvaluator = new StandardQueryEvaluator(database, queryFactory)
 
         expect {
-          one(connectionPool).reserve() willReturn connection
+          one(database).reserve() willReturn connection
           one(connection).setAutoCommit(false)
           one(connection).prepareStatement("SELECT 1")
           one(connection).commit()
           one(connection).setAutoCommit(true)
-          one(connectionPool).release(connection)
+          one(database).release(connection)
         }
 
         queryEvaluator.transaction { transaction =>
@@ -52,13 +52,13 @@ object QueryEvaluatorSpec extends Specification with JMocker {
 
       "nontransactionally" >> {
         val connection = mock[Connection]
-        val connectionPool = mock[ConnectionPool]
-        val queryEvaluator = new StandardQueryEvaluator(connectionPool, queryFactory)
+        val database = mock[Database]
+        val queryEvaluator = new StandardQueryEvaluator(database, queryFactory)
 
         expect {
-          one(connectionPool).reserve() willReturn connection
+          one(database).reserve() willReturn connection
           one(connection).prepareStatement("SELECT 1")
-          one(connectionPool).release(connection)
+          one(database).release(connection)
         }
 
         var list = new mutable.ListBuffer[Int]
diff --git a/src/test/scala/com/twitter/querulous/unit/StatsCollectingConnectionPoolSpec.scala b/src/test/scala/com/twitter/querulous/unit/StatsCollectingConnectionPoolSpec.scala
index c64fba4..b317351 100644
--- a/src/test/scala/com/twitter/querulous/unit/StatsCollectingConnectionPoolSpec.scala
+++ b/src/test/scala/com/twitter/querulous/unit/StatsCollectingConnectionPoolSpec.scala
@@ -4,18 +4,18 @@ import java.sql.Connection
 import scala.collection.mutable.Map
 import org.specs.Specification
 import org.specs.mock.JMocker
-import com.twitter.querulous.connectionpool.StatsCollectingConnectionPool
-import com.twitter.querulous.fake.{FakeStatsCollector, FakeConnectionPool}
+import com.twitter.querulous.database.StatsCollectingDatabase
+import com.twitter.querulous.fake.{FakeStatsCollector, FakeDatabase}
 import com.twitter.xrayspecs.Time
 import com.twitter.xrayspecs.TimeConversions._
 
-object StatsCollectingConnectionPoolSpec extends Specification with JMocker {
-  "StatsCollectingConnectionPool" should {
+object StatsCollectingDatabaseSpec extends Specification with JMocker {
+  "StatsCollectingDatabase" should {
     Time.freeze()
     val latency = 1.second
     val connection = mock[Connection]
     val stats = new FakeStatsCollector
-    val pool = new StatsCollectingConnectionPool(new FakeConnectionPool(connection, latency), stats)
+    val pool = new StatsCollectingDatabase(new FakeDatabase(connection, latency), stats)
 
     "collect stats" in {
       "when releasing" >> {