Skip to content
This repository
Browse code

Fix left over stuff from the merge

  • Loading branch information...
commit 42d74a5a18fe1425bcf0a558c1563985c537cfc2 1 parent 17a14b9
authored March 29, 2012
10  src/main/scala/com/twitter/flockdb/FlockDB.scala
@@ -33,16 +33,6 @@ import com.twitter.flockdb.config.{FlockDB => FlockDBConfig}
33 33
 class FlockDB(config: FlockDBConfig) extends GizzardServer(config) with Service {
34 34
   val FILTER_SET_ZK_PATH = "/filters"
35 35
 
36  
-  object FlockExceptionWrappingProxyFactory extends ExceptionHandlingProxyFactory[thrift.FlockDB.Iface]({ (flock, e) =>
37  
-    e match {
38  
-      case _: thrift.FlockException =>
39  
-        throw e
40  
-      case _ =>
41  
-        exceptionLog.error(e, "Error in FlockDB.")
42  
-        throw new thrift.FlockException(e.toString)
43  
-    }
44  
-  })
45  
-
46 36
   val stats = new StatsCollector {
47 37
     def incr(name: String, count: Int) = Stats.incr(name, count)
48 38
     def time[A](name: String)(f: => A): A = {
3  src/test/scala/com/twitter/flockdb/unit/DifferenceQuerySpec.scala
@@ -34,7 +34,7 @@ class DifferenceQuerySpec extends ConfiguredSpecification with JMocker {
34 34
       val differenceQuery = queryConfig.difference(query1, query2)
35 35
       differenceQuery.selectWhereIn(List(1, 2, 3, 4, 5, 11, 12, 13))().toList mustEqual List(12,5,2,1)
36 36
     }
37  
-/*
  37
+
38 38
     "selectPage" in {
39 39
       val differenceQuery = queryConfig.difference(query1, query2)
40 40
 
@@ -42,6 +42,5 @@ class DifferenceQuerySpec extends ConfiguredSpecification with JMocker {
42 42
       differenceQuery.selectPage(10, Cursor(12L))().toTuple  mustEqual (List(10,9,8,6,5,2,1), Cursor.End, Cursor(-10))
43 43
       differenceQuery.selectPage(10, Cursor.Start)().toTuple mustEqual (List(12,10,9,8,6,5,2,1), Cursor.End, Cursor.End)
44 44
     }
45  
-*/
46 45
   }
47 46
 }

0 notes on commit 42d74a5

Please sign in to comment.
Something went wrong with that request. Please try again.