KYLIN-1636 fix compile
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/c1ece6ab Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/c1ece6ab Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/c1ece6ab Branch: refs/heads/1.5.x-HBase1.x Commit: c1ece6ab5390d83544bc83b5763f59de5a00c37a Parents: dc1c2f6 Author: Yang Li <liy...@apache.org> Authored: Sun May 1 19:58:44 2016 +0800 Committer: Yang Li <liy...@apache.org> Committed: Sun May 1 19:58:44 2016 +0800 ---------------------------------------------------------------------- .../gridtable/benchmark/GTScannerBenchmark.java | 28 ++++++++++++------ .../benchmark/GTScannerBenchmark2.java | 30 +++++++++++++------- 2 files changed, 40 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/c1ece6ab/core-cube/src/main/java/org/apache/kylin/gridtable/benchmark/GTScannerBenchmark.java ---------------------------------------------------------------------- diff --git a/core-cube/src/main/java/org/apache/kylin/gridtable/benchmark/GTScannerBenchmark.java b/core-cube/src/main/java/org/apache/kylin/gridtable/benchmark/GTScannerBenchmark.java index 302258b..19c4bea 100644 --- a/core-cube/src/main/java/org/apache/kylin/gridtable/benchmark/GTScannerBenchmark.java +++ b/core-cube/src/main/java/org/apache/kylin/gridtable/benchmark/GTScannerBenchmark.java @@ -37,7 +37,6 @@ import org.apache.kylin.metadata.filter.ConstantTupleFilter; import org.apache.kylin.metadata.filter.LogicalTupleFilter; import org.apache.kylin.metadata.filter.TupleFilter; import org.apache.kylin.metadata.filter.TupleFilter.FilterOperatorEnum; -import org.junit.Test; import com.google.common.collect.Lists; @@ -88,22 +87,22 @@ public class GTScannerBenchmark { } } - @Test + //@Test public void testAggregate2() throws IOException { testAggregate(ImmutableBitSet.valueOf(0, 1)); } - @Test + //@Test public void testAggregate2_() throws IOException { testAggregate(ImmutableBitSet.valueOf(0, 2)); } - @Test + //@Test public void testAggregate4() throws IOException { testAggregate(ImmutableBitSet.valueOf(0, 1, 2, 3)); } - @Test + //@Test public void testAggregate5() throws IOException { testAggregate(ImmutableBitSet.valueOf(0, 1, 2, 3, 4)); } @@ -128,12 +127,12 @@ public class GTScannerBenchmark { return (int) (N / sec / 1000); } - @Test + //@Test public void testFilter1() throws IOException { testFilter(eq(col(1), 1, 5, 7)); } - @Test + //@Test public void testFilter2() throws IOException { testFilter( // and( // @@ -141,7 +140,7 @@ public class GTScannerBenchmark { eq(col(2), 2, 4))); } - @Test + //@Test public void testFilter3() throws IOException { testFilter( // and( // @@ -214,4 +213,17 @@ public class GTScannerBenchmark { private ColumnTupleFilter col(int i) { return new ColumnTupleFilter(info.colRef(i)); } + + public static void main(String[] args) throws IOException { + GTScannerBenchmark benchmark = new GTScannerBenchmark(); + + benchmark.testFilter1(); + benchmark.testFilter2(); + benchmark.testFilter3(); + + benchmark.testAggregate2(); + benchmark.testAggregate2_(); + benchmark.testAggregate4(); + benchmark.testAggregate5(); + } } http://git-wip-us.apache.org/repos/asf/kylin/blob/c1ece6ab/core-cube/src/main/java/org/apache/kylin/gridtable/benchmark/GTScannerBenchmark2.java ---------------------------------------------------------------------- diff --git a/core-cube/src/main/java/org/apache/kylin/gridtable/benchmark/GTScannerBenchmark2.java b/core-cube/src/main/java/org/apache/kylin/gridtable/benchmark/GTScannerBenchmark2.java index 1d4a2af..e1e3881 100644 --- a/core-cube/src/main/java/org/apache/kylin/gridtable/benchmark/GTScannerBenchmark2.java +++ b/core-cube/src/main/java/org/apache/kylin/gridtable/benchmark/GTScannerBenchmark2.java @@ -41,8 +41,6 @@ import org.apache.kylin.metadata.filter.ConstantTupleFilter; import org.apache.kylin.metadata.filter.LogicalTupleFilter; import org.apache.kylin.metadata.filter.TupleFilter; import org.apache.kylin.metadata.filter.TupleFilter.FilterOperatorEnum; -import org.junit.Ignore; -import org.junit.Test; import com.google.common.collect.Lists; @@ -51,7 +49,6 @@ import com.google.common.collect.Lists; * * All the same as GTScannerBenchmark except for the last measure is single-value HLLC */ -@Ignore public class GTScannerBenchmark2 { final GTInfo info; @@ -112,22 +109,22 @@ public class GTScannerBenchmark2 { } } - @Test + //@Test public void testAggregate2() throws IOException { testAggregate(ImmutableBitSet.valueOf(0, 1)); } - @Test + //@Test public void testAggregate2_() throws IOException { testAggregate(ImmutableBitSet.valueOf(0, 2)); } - @Test + //@Test public void testAggregate4() throws IOException { testAggregate(ImmutableBitSet.valueOf(0, 1, 2, 3)); } - @Test + //@Test public void testAggregate5() throws IOException { testAggregate(ImmutableBitSet.valueOf(0, 1, 2, 3, 4)); } @@ -152,12 +149,12 @@ public class GTScannerBenchmark2 { return (int) (N / sec / 1000); } - @Test + //@Test public void testFilter1() throws IOException { testFilter(eq(col(1), 1, 5, 7)); } - @Test + //@Test public void testFilter2() throws IOException { testFilter( // and( // @@ -165,7 +162,7 @@ public class GTScannerBenchmark2 { eq(col(2), 2, 4))); } - @Test + //@Test public void testFilter3() throws IOException { testFilter( // and( // @@ -238,4 +235,17 @@ public class GTScannerBenchmark2 { private ColumnTupleFilter col(int i) { return new ColumnTupleFilter(info.colRef(i)); } + + public static void main(String[] args) throws IOException { + GTScannerBenchmark2 benchmark = new GTScannerBenchmark2(); + + benchmark.testFilter1(); + benchmark.testFilter2(); + benchmark.testFilter3(); + + benchmark.testAggregate2(); + benchmark.testAggregate2_(); + benchmark.testAggregate4(); + //benchmark.testAggregate5(); // causes OOM in 4G heap + } }
