Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' into fix_difference_query

  • Loading branch information...
commit e1fb576d0b6da9b066b97990d4b3e48d86fc8d89 2 parents 0c19c96 + be69af8
hyungoo hyungoo authored
6 config/development.scala
View
@@ -18,9 +18,10 @@ trait Credentials extends Connection {
}
class ProductionQueryEvaluator extends AsyncQueryEvaluator {
+ override var workPoolSize = 40
database.memoize = true
database.pool = new ThrottledPoolingDatabase {
- size = 40
+ size = workPoolSize
openTimeout = 100.millis
}
@@ -72,8 +73,9 @@ new FlockDB {
val lowLatencyQueryEvaluator = edgesQueryEvaluator
val materializingQueryEvaluator = new ProductionQueryEvaluator {
+ workPoolSize = 1
database.pool = new ThrottledPoolingDatabase {
- size = 1
+ size = workPoolSize
openTimeout = 1.second
}
}
6 config/production.scala
View
@@ -16,9 +16,10 @@ trait Credentials extends Connection {
}
class ProductionQueryEvaluator extends AsyncQueryEvaluator {
+ override var workPoolSize = 40
database.memoize = true
database.pool = new ThrottledPoolingDatabase {
- size = 40
+ size = workPoolSize
openTimeout = 100.millis
}
@@ -72,8 +73,9 @@ new FlockDB {
val lowLatencyQueryEvaluator = new ProductionQueryEvaluator
val materializingQueryEvaluator = new ProductionQueryEvaluator {
+ workPoolSize = 1
database.pool = new ThrottledPoolingDatabase {
- size = 1
+ size = workPoolSize
openTimeout = 1.second
}
}
3  config/test.scala
View
@@ -24,10 +24,11 @@ trait Credentials extends Connection {
class TestQueryEvaluator(label: String) extends AsyncQueryEvaluator {
query.debug = { s => Logger.get("query").debug(s) }
+ override var workPoolSize = 2
singletonFactory = true
database.memoize = true
database.pool = new ThrottledPoolingDatabase {
- size = 2
+ size = workPoolSize
openTimeout = 5.seconds
}
4 project/build.properties
View
@@ -1,8 +1,8 @@
#Project properties
-#Sun Mar 11 15:27:38 PDT 2012
+#Fri Mar 30 14:53:10 PDT 2012
project.organization=com.twitter
project.name=flockdb
sbt.version=0.7.4
-project.version=1.8.7-SNAPSHOT
+project.version=1.8.15-SNAPSHOT
build.scala.versions=2.8.1
project.initialize=false
2  project/build/FlockDBProject.scala
View
@@ -10,7 +10,7 @@ with SubversionPublisher {
override def filterScalaJars = false
val scalaTools = "org.scala-lang" % "scala-compiler" % "2.8.1"
- val gizzard = "com.twitter" % "gizzard" % "3.0.6" withSources()
+ val gizzard = "com.twitter" % "gizzard" % "3.0.13" withSources()
val scrooge = "com.twitter" % "scrooge-runtime" % "1.0.3" withSources()
val asm = "asm" % "asm" % "1.5.3" % "test"
6 project/release.properties
View
@@ -1,4 +1,4 @@
#Automatically generated by ReleaseManagement
-#Sun Mar 11 15:27:38 PDT 2012
-version=1.8.6
-sha1=2d771314f18a7a28edc8df57c7bedd56cc3b0811
+#Fri Mar 30 14:53:10 PDT 2012
+version=1.8.14
+sha1=51950ad077e6ed323f8d77fa80799b7c9be5f646
Please sign in to comment.
Something went wrong with that request. Please try again.