use a cancel-specific timer thread for SqlQuery cancelAsynchronously

twitter-archive · Sep 7, 2010 · 9c2f37c · 9c2f37c
1 parent 79a6911
commit 9c2f37c
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/main/scala/com/twitter/querulous/query/SqlQuery.scala b/src/main/scala/com/twitter/querulous/query/SqlQuery.scala
@@ -42,7 +42,12 @@ object NullValues {
   def apply(typeVal: Int) = nullTypes(typeVal)
 }
 
+private object QueryCancellation {
+  val cancelTimer = new java.util.Timer("Query cancellation timer", true)
+}
+
 class SqlQuery(connection: Connection, query: String, params: Any*) extends Query {
+  import QueryCancellation._
 
   val statement = buildStatement(connection, query, params: _*)
 
@@ -78,9 +83,7 @@ class SqlQuery(connection: Connection, query: String, params: Any*) extends Quer
       override def run() {
         try {
           // FIXME make duration configurable
-          // FIXME use cancel specific timer, so that blocks in
-          //   the global timeout thread do not affect cancel timeouts
-          Timeout(new com.twitter.xrayspecs.Duration(200)) {
+          Timeout(cancelTimer, new com.twitter.xrayspecs.Duration(200)) {
             try {
               // start by trying the nice way
               statement.cancel()