Merge pull request twitter#475 from twitter/ianoc/optimizeQTree

Optimize QTree a bunch
snoble · Aug 3, 2015 · 2c419f2 · 2c419f2
2 parents 0e52dbc + fadaf2e
commit 2c419f2
Show file tree

Hide file tree

Showing 3 changed files with 184 additions and 99 deletions.
diff --git a/algebird-benchmark/src/main/scala/com/twitter/algebird/benchmark/QTreeMicroBenchmark.scala b/algebird-benchmark/src/main/scala/com/twitter/algebird/benchmark/QTreeMicroBenchmark.scala
@@ -40,7 +40,7 @@ object QTreeMicroBenchmark {
       val r = if (q.offset % 2 == 0) null else q
 
       val parent =
-        new QTree[A](nextOffset, nextLevel, q.count, monoid.zero, l, r)
+        new QTree[A](monoid.zero, nextOffset, nextLevel, q.count, l, r)
 
       extendToLevelDoubleBranch(parent, n)
     }
@@ -56,9 +56,9 @@ object QTreeMicroBenchmark {
 
       val parent =
         if (q.offset % 2 == 0)
-          new QTree[A](nextOffset, nextLevel, q.count, monoid.zero, q, null)
+          new QTree[A](monoid.zero, nextOffset, nextLevel, q.count, q, null)
         else
-          new QTree[A](nextOffset, nextLevel, q.count, monoid.zero, null, q)
+          new QTree[A](monoid.zero, nextOffset, nextLevel, q.count, null, q)
 
       extendToLevelSingleBranch(parent, n)
     }