Merge branch 'master' of github.com:nkallen/querulous

twitter-archive · Feb 23, 2010 · 46329d3 · 46329d3
2 parents f1b9493 + 3f3d6d0
commit 46329d3
Show file tree

Hide file tree

Showing 18 changed files with 21 additions and 83 deletions.
diff --git a/src/main/scala/com/twitter/querulous/Connection.scala b/src/main/scala/com/twitter/querulous/Connection.scala
diff --git a/src/main/scala/com/twitter/querulous/database/ApachePoolingDatabase.scala b/src/main/scala/com/twitter/querulous/database/ApachePoolingDatabase.scala
@@ -1,6 +1,6 @@
 package com.twitter.querulous.database
 
-import java.sql.SQLException
+import java.sql.{SQLException, Connection}
 import org.apache.commons.dbcp.{PoolableConnectionFactory, DriverManagerConnectionFactory, PoolingDataSource}
 import org.apache.commons.pool.impl.{GenericObjectPool, StackKeyedObjectPoolFactory}
 import com.twitter.xrayspecs.Duration
@@ -73,9 +73,7 @@ class ApachePoolingDatabase(
     }
   }
 
-  def open() = {
-    new Connection(poolingDataSource.getConnection(), dbhosts)
-  }
+  def open() = poolingDataSource.getConnection()
 
   override def toString = dbhosts.first + "_" + dbname
 }
diff --git a/src/main/scala/com/twitter/querulous/database/Database.scala b/src/main/scala/com/twitter/querulous/database/Database.scala
@@ -1,5 +1,7 @@
 package com.twitter.querulous.database
 
+import java.sql.Connection
+
 trait DatabaseFactory {
   def apply(dbhosts: List[String], dbname: String, username: String, password: String): Database
 }

diff --git a/src/main/scala/com/twitter/querulous/database/StatsCollectingDatabase.scala b/src/main/scala/com/twitter/querulous/database/StatsCollectingDatabase.scala
@@ -1,5 +1,7 @@
 package com.twitter.querulous.database
 
+import java.sql.Connection
+
 class StatsCollectingDatabaseFactory(
   databaseFactory: DatabaseFactory,
   stats: StatsCollector) extends DatabaseFactory {

diff --git a/src/main/scala/com/twitter/querulous/database/TimingOutDatabase.scala b/src/main/scala/com/twitter/querulous/database/TimingOutDatabase.scala
@@ -2,6 +2,7 @@ package com.twitter.querulous.database
 
 import java.util.concurrent.{TimeoutException => JTimeoutException, _}
 import com.twitter.xrayspecs.Duration
+import java.sql.Connection
 
 class TimingOutDatabaseFactory(databaseFactory: DatabaseFactory, poolSize: Int, queueSize: Int, openTimeout: Duration, initialTimeout: Duration) extends DatabaseFactory {
   def apply(dbhosts: List[String], dbname: String, username: String, password: String): Database = {

diff --git a/src/main/scala/com/twitter/querulous/evaluator/Transaction.scala b/src/main/scala/com/twitter/querulous/evaluator/Transaction.scala
@@ -1,6 +1,6 @@
 package com.twitter.querulous.evaluator
 
-import java.sql.{ResultSet, SQLException, SQLIntegrityConstraintViolationException}
+import java.sql.{ResultSet, SQLException, SQLIntegrityConstraintViolationException, Connection}
 import com.twitter.querulous.query.QueryFactory
 
 class Transaction(queryFactory: QueryFactory, connection: Connection) extends QueryEvaluator {

diff --git a/src/main/scala/com/twitter/querulous/query/DebuggingQuery.scala b/src/main/scala/com/twitter/querulous/query/DebuggingQuery.scala
@@ -1,6 +1,6 @@
 package com.twitter.querulous.query
 
-import java.sql.{Timestamp}
+import java.sql.{Timestamp, Connection}
 
 class DebuggingQueryFactory(queryFactory: QueryFactory, log: String => Unit) extends QueryFactory {
   def apply(connection: Connection, query: String, params: Any*) = {

diff --git a/src/main/scala/com/twitter/querulous/query/Query.scala b/src/main/scala/com/twitter/querulous/query/Query.scala
@@ -1,6 +1,6 @@
 package com.twitter.querulous.query
 
-import java.sql.ResultSet
+import java.sql.{ResultSet, Connection}
 
 trait QueryFactory {
   def apply(connection: Connection, queryString: String, params: Any*): Query

diff --git a/src/main/scala/com/twitter/querulous/query/RetryingQuery.scala b/src/main/scala/com/twitter/querulous/query/RetryingQuery.scala
@@ -1,6 +1,6 @@
 package com.twitter.querulous.query
 
-import java.sql.SQLException
+import java.sql.{SQLException, Connection}
 import com.twitter.xrayspecs.Duration
 
 class RetryingQueryFactory(queryFactory: QueryFactory, retries: Int) extends QueryFactory {

diff --git a/src/main/scala/com/twitter/querulous/query/SqlQuery.scala b/src/main/scala/com/twitter/querulous/query/SqlQuery.scala
@@ -1,6 +1,6 @@
 package com.twitter.querulous.query
 
-import java.sql.{PreparedStatement, ResultSet, SQLException, Timestamp}
+import java.sql.{PreparedStatement, ResultSet, SQLException, Timestamp, Connection}
 import java.util.regex.Pattern
 import scala.collection.mutable
 

diff --git a/src/main/scala/com/twitter/querulous/query/StatsCollectingQuery.scala b/src/main/scala/com/twitter/querulous/query/StatsCollectingQuery.scala
@@ -1,6 +1,6 @@
 package com.twitter.querulous.query
 
-import java.sql.ResultSet
+import java.sql.{ResultSet, Connection}
 
 class StatsCollectingQueryFactory(queryFactory: QueryFactory, stats: StatsCollector)
   extends QueryFactory {

diff --git a/src/main/scala/com/twitter/querulous/query/TimingOutQuery.scala b/src/main/scala/com/twitter/querulous/query/TimingOutQuery.scala
@@ -1,8 +1,9 @@
 package com.twitter.querulous.query
 
-import java.sql.SQLException
+import java.sql.{SQLException, Connection}
 import com.twitter.xrayspecs.Duration
 
+
 class SqlTimeoutException extends SQLException("Query timeout")
 
 class TimingOutQueryFactory(queryFactory: QueryFactory, timeout: Duration) extends QueryFactory {
@@ -28,7 +29,7 @@ class TimingOutQuery(query: Query, timeout: Duration) extends QueryProxy(query)
         cancel()
       }
     } catch {
-      case e: TimeoutException => 
+      case e: TimeoutException =>
         throw new SqlTimeoutException
     }
   }

diff --git a/src/main/scala/com/twitter/querulous/test/FakeDatabase.scala b/src/main/scala/com/twitter/querulous/test/FakeDatabase.scala
@@ -1,5 +1,6 @@
 package com.twitter.querulous.test
 
+import java.sql.Connection
 import com.twitter.xrayspecs.{Duration, Time}
 import com.twitter.xrayspecs.TimeConversions._
 import com.twitter.querulous.database.Database

diff --git a/src/test/scala/com/twitter/querulous/unit/ConnectionSpec.scala b/src/test/scala/com/twitter/querulous/unit/ConnectionSpec.scala
diff --git a/src/test/scala/com/twitter/querulous/unit/QueryEvaluatorSpec.scala b/src/test/scala/com/twitter/querulous/unit/QueryEvaluatorSpec.scala
@@ -1,6 +1,6 @@
 package com.twitter.querulous.unit
 
-import java.sql.{SQLException, DriverManager}
+import java.sql.{SQLException, DriverManager, Connection}
 import scala.collection.mutable
 import net.lag.configgy.Configgy
 import com.mysql.jdbc.exceptions.MySQLIntegrityConstraintViolationException

diff --git a/src/test/scala/com/twitter/querulous/unit/SqlQuerySpec.scala b/src/test/scala/com/twitter/querulous/unit/SqlQuerySpec.scala
@@ -1,6 +1,6 @@
 package com.twitter.querulous.unit
 
-import java.sql.PreparedStatement
+import java.sql.{PreparedStatement, Connection}
 import org.specs.Specification
 import org.specs.mock.{ClassMocker, JMocker}
 import com.twitter.querulous.query.SqlQuery

diff --git a/src/test/scala/com/twitter/querulous/unit/StatsCollectingDatabaseSpec.scala b/src/test/scala/com/twitter/querulous/unit/StatsCollectingDatabaseSpec.scala
@@ -1,6 +1,7 @@
 package com.twitter.querulous.unit
 
 import scala.collection.mutable.Map
+import java.sql.Connection
 import org.specs.Specification
 import org.specs.mock.{ClassMocker, JMocker}
 import com.twitter.querulous.database.StatsCollectingDatabase

diff --git a/src/test/scala/com/twitter/querulous/unit/TimingOutDatabaseSpec.scala b/src/test/scala/com/twitter/querulous/unit/TimingOutDatabaseSpec.scala
@@ -1,6 +1,7 @@
 package com.twitter.querulous.unit
 
 import java.util.concurrent.{CountDownLatch, TimeUnit}
+import java.sql.Connection
 import com.twitter.querulous.TimeoutException
 import com.twitter.querulous.database.{Database, TimingOutDatabase}
 import com.twitter.xrayspecs.Time