Merge pull request #255 from twitter/alexlevenson/bump-deps

Use latest scalding, algebird, and bijection versions
twitter · Feb 4, 2015 · 05d9803 · 05d9803
2 parents 7c83fe8 + e3137ac
commit 05d9803
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/project/Build.scala b/project/Build.scala
@@ -119,10 +119,10 @@ object StorehausBuild extends Build {
       .filterNot(unreleasedModules.contains(_))
       .map { s => "com.twitter" % ("storehaus-" + s + "_2.10") % "0.10.0" }
 
-  val algebirdVersion = "0.8.2"
-  val bijectionVersion = "0.7.0"
+  val algebirdVersion = "0.9.0"
+  val bijectionVersion = "0.7.2"
   val utilVersion = "6.22.0"
-  val scaldingVersion = "0.11.1"
+  val scaldingVersion = "0.13.0"
   lazy val storehaus = Project(
 
     id = "storehaus",

diff --git a/storehaus-cache/src/main/scala/com/twitter/storehaus/cache/HHFilteredCache.scala b/storehaus-cache/src/main/scala/com/twitter/storehaus/cache/HHFilteredCache.scala
@@ -16,7 +16,7 @@
 
 package com.twitter.storehaus.cache
 
-import com.twitter.algebird.{ Semigroup, Monoid, Group, CMSHash  }
+import com.twitter.algebird.{ Semigroup, Monoid, Group, CMSHash, CMSHasherImplicits}
 import com.twitter.util.Future
 
 
@@ -41,6 +41,8 @@ object HeavyHittersPercent {
 }
 
 sealed class ApproxHHTracker[K](hhPct: HeavyHittersPercent, updateFreq: WriteOperationUpdateFrequency, roFreq: RollOverFrequencyMS) {
+  import CMSHasherImplicits._
+
   private[this] final val WIDTH = 1000
   private[this] final val DEPTH = 4
   private[this] final val hh = new java.util.HashMap[K, Long]()
@@ -53,9 +55,9 @@ sealed class ApproxHHTracker[K](hhPct: HeavyHittersPercent, updateFreq: WriteOpe
   private[this] var nextRollOver: Long = System.currentTimeMillis + roFreq.toLong
   private[this] final val updateOps = new java.util.concurrent.atomic.AtomicInteger(0)
 
-  private[this] final val hashes: IndexedSeq[CMSHash] = {
+  private[this] final val hashes: IndexedSeq[CMSHash[Long]] = {
     val r = new scala.util.Random(5)
-    (0 until DEPTH).map { _ => CMSHash(r.nextInt, 0, WIDTH) }
+    (0 until DEPTH).map { _ => CMSHash[Long](r.nextInt, 0, WIDTH) }
   }.toIndexedSeq
 
   @inline