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 index 1a7dc9a99..25b968cf3 100644 --- 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) } diff --git a/project/Build.scala b/project/Build.scala index 6939ba974..a09a39acb 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -124,6 +124,7 @@ object AlgebirdBuild extends Build { algebirdCore, algebirdUtil, algebirdBijection, + algebirdBenchmark, algebirdSpark ) @@ -131,8 +132,7 @@ object AlgebirdBuild extends Build { val id = "algebird-%s".format(name) Project(id = id, base = file(id), settings = sharedSettings ++ Seq( Keys.name := id, - previousArtifact := youngestForwardCompatible(name)) ++ - JmhPlugin.projectSettings + previousArtifact := youngestForwardCompatible(name)) ) } @@ -167,7 +167,7 @@ object AlgebirdBuild extends Build { }, addCompilerPlugin("org.scalamacros" % "paradise" % paradiseVersion cross CrossVersion.full) ).dependsOn(algebirdCore) - lazy val algebirdBenchmark = module("benchmark").settings( + lazy val algebirdBenchmark = module("benchmark").settings(JmhPlugin.projectSettings:_*).settings( libraryDependencies ++= Seq("com.twitter" %% "bijection-core" % "0.8.0") ).dependsOn(algebirdCore, algebirdUtil, algebirdTest % "test->compile").enablePlugins(JmhPlugin)