Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix left over stuff from the merge

  • Loading branch information...
commit 42d74a5a18fe1425bcf0a558c1563985c537cfc2 1 parent 17a14b9
Raghavendra Prabhu authored
View
10 src/main/scala/com/twitter/flockdb/FlockDB.scala
@@ -33,16 +33,6 @@ import com.twitter.flockdb.config.{FlockDB => FlockDBConfig}
class FlockDB(config: FlockDBConfig) extends GizzardServer(config) with Service {
val FILTER_SET_ZK_PATH = "/filters"
- object FlockExceptionWrappingProxyFactory extends ExceptionHandlingProxyFactory[thrift.FlockDB.Iface]({ (flock, e) =>
- e match {
- case _: thrift.FlockException =>
- throw e
- case _ =>
- exceptionLog.error(e, "Error in FlockDB.")
- throw new thrift.FlockException(e.toString)
- }
- })
-
val stats = new StatsCollector {
def incr(name: String, count: Int) = Stats.incr(name, count)
def time[A](name: String)(f: => A): A = {
View
3  src/test/scala/com/twitter/flockdb/unit/DifferenceQuerySpec.scala
@@ -34,7 +34,7 @@ class DifferenceQuerySpec extends ConfiguredSpecification with JMocker {
val differenceQuery = queryConfig.difference(query1, query2)
differenceQuery.selectWhereIn(List(1, 2, 3, 4, 5, 11, 12, 13))().toList mustEqual List(12,5,2,1)
}
-/*
+
"selectPage" in {
val differenceQuery = queryConfig.difference(query1, query2)
@@ -42,6 +42,5 @@ class DifferenceQuerySpec extends ConfiguredSpecification with JMocker {
differenceQuery.selectPage(10, Cursor(12L))().toTuple mustEqual (List(10,9,8,6,5,2,1), Cursor.End, Cursor(-10))
differenceQuery.selectPage(10, Cursor.Start)().toTuple mustEqual (List(12,10,9,8,6,5,2,1), Cursor.End, Cursor.End)
}
-*/
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.