From a1f799838de90dfd8974ff772e1a862068392c14 Mon Sep 17 00:00:00 2001 From: Yiming Liu Date: Tue, 12 Jul 2016 10:50:02 +0800 Subject: [PATCH 1/2] KYLIN-1867: Upgrade small version for dependency libraries --- assembly/pom.xml | 13 - core-common/pom.xml | 4 + .../org/apache/kylin/common/util/RangeUtil.java | 35 +- .../org/apache/kylin/common/util/RangeTest.java | 185 +++++----- .../apache/kylin/common/util/RangeUtilTest.java | 19 +- core-cube/pom.xml | 3 - core-dictionary/pom.xml | 2 - core-job/pom.xml | 2 - core-metadata/pom.xml | 5 - core-storage/pom.xml | 2 - .../kylin/storage/cache/TsConditionExtractor.java | 21 +- engine-mr/pom.xml | 4 - engine-spark/pom.xml | 6 - engine-streaming/pom.xml | 3 - kylin-it/pom.xml | 21 +- pom.xml | 381 ++++++++++++++++++--- query/pom.xml | 8 - server-base/pom.xml | 79 +---- server/pom.xml | 22 -- source-hive/pom.xml | 3 - source-kafka/pom.xml | 3 - storage-hbase/pom.xml | 8 - .../cube/v2/filter/MassInValueProviderImpl.java | 8 +- tool/pom.xml | 3 - 24 files changed, 471 insertions(+), 369 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 4442e14..73c85d7 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -34,27 +34,22 @@ org.apache.kylin kylin-source-hive - ${project.parent.version} org.apache.kylin kylin-source-kafka - ${project.parent.version} org.apache.kylin kylin-storage-hbase - ${project.parent.version} org.apache.kylin kylin-engine-mr - ${project.parent.version} org.apache.kylin kylin-engine-streaming - ${project.parent.version} @@ -63,21 +58,18 @@ kylin-core-common test-jar test - ${project.parent.version} org.apache.kylin kylin-core-job test-jar test - ${project.parent.version} org.apache.kylin kylin-storage-hbase test-jar test - ${project.parent.version} org.apache.hadoop @@ -143,13 +135,11 @@ org.apache.hive.hcatalog hive-hcatalog-core - ${hive-hcatalog.version} provided org.apache.hbase hbase-testing-util - ${hbase-hadoop2.version} test @@ -165,7 +155,6 @@ org.apache.kafka kafka_2.10 - ${kafka.version} provided @@ -176,8 +165,6 @@ org.apache.maven.plugins maven-shade-plugin - 2.3 - package diff --git a/core-common/pom.xml b/core-common/pom.xml index 8f3fcbc..dd8ac13 100644 --- a/core-common/pom.xml +++ b/core-common/pom.xml @@ -74,6 +74,10 @@ guava + com.google.code.findbugs + jsr305 + + com.jcraft jsch diff --git a/core-common/src/main/java/org/apache/kylin/common/util/RangeUtil.java b/core-common/src/main/java/org/apache/kylin/common/util/RangeUtil.java index 1cd6282..6ef8c089 100644 --- a/core-common/src/main/java/org/apache/kylin/common/util/RangeUtil.java +++ b/core-common/src/main/java/org/apache/kylin/common/util/RangeUtil.java @@ -29,7 +29,6 @@ import com.google.common.collect.BoundType; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Range; -import com.google.common.collect.Ranges; /** */ @@ -41,7 +40,7 @@ public class RangeUtil { public static , V> NavigableMap filter(NavigableMap values, Range filterRange) { if (filterRange == null || filterRange.isEmpty()) { return Maps.newTreeMap(); - } else if (filterRange.equals(Ranges.all())) { + } else if (filterRange.equals(Range.all())) { return values; } @@ -106,29 +105,29 @@ public class RangeUtil { if (!self.hasLowerBound()) { if (share.hasLowerBound()) { if (share.lowerBoundType() == BoundType.CLOSED) { - ret.add(Ranges.lessThan(share.lowerEndpoint())); + ret.add(Range.lessThan(share.lowerEndpoint())); } else { - ret.add(Ranges.atMost(share.lowerEndpoint())); + ret.add(Range.atMost(share.lowerEndpoint())); } } } else { if (self.lowerEndpoint() != share.lowerEndpoint()) { if (self.lowerBoundType() == BoundType.CLOSED) { if (share.lowerBoundType() == BoundType.CLOSED) { - ret.add(Ranges.closedOpen(self.lowerEndpoint(), share.lowerEndpoint())); + ret.add(Range.closedOpen(self.lowerEndpoint(), share.lowerEndpoint())); } else { - ret.add(Ranges.closed(self.lowerEndpoint(), share.lowerEndpoint())); + ret.add(Range.closed(self.lowerEndpoint(), share.lowerEndpoint())); } } else { if (share.lowerBoundType() == BoundType.CLOSED) { - ret.add(Ranges.open(self.lowerEndpoint(), share.lowerEndpoint())); + ret.add(Range.open(self.lowerEndpoint(), share.lowerEndpoint())); } else { - ret.add(Ranges.openClosed(self.lowerEndpoint(), share.lowerEndpoint())); + ret.add(Range.openClosed(self.lowerEndpoint(), share.lowerEndpoint())); } } } else { if (self.lowerBoundType() == BoundType.CLOSED && share.lowerBoundType() == BoundType.OPEN) { - ret.add(Ranges.closed(self.lowerEndpoint(), share.lowerEndpoint())); + ret.add(Range.closed(self.lowerEndpoint(), share.lowerEndpoint())); } } } @@ -137,29 +136,29 @@ public class RangeUtil { if (!self.hasUpperBound()) { if (share.hasUpperBound()) { if (share.upperBoundType() == BoundType.CLOSED) { - ret.add(Ranges.greaterThan(share.upperEndpoint())); + ret.add(Range.greaterThan(share.upperEndpoint())); } else { - ret.add(Ranges.atLeast(share.upperEndpoint())); + ret.add(Range.atLeast(share.upperEndpoint())); } } } else { if (self.upperEndpoint() != share.upperEndpoint()) { if (self.upperBoundType() == BoundType.CLOSED) { if (share.upperBoundType() == BoundType.CLOSED) { - ret.add(Ranges.openClosed(share.upperEndpoint(), self.upperEndpoint())); + ret.add(Range.openClosed(share.upperEndpoint(), self.upperEndpoint())); } else { - ret.add(Ranges.closed(share.upperEndpoint(), self.upperEndpoint())); + ret.add(Range.closed(share.upperEndpoint(), self.upperEndpoint())); } } else { if (share.upperBoundType() == BoundType.CLOSED) { - ret.add(Ranges.open(share.upperEndpoint(), self.upperEndpoint())); + ret.add(Range.open(share.upperEndpoint(), self.upperEndpoint())); } else { - ret.add(Ranges.closedOpen(share.upperEndpoint(), self.upperEndpoint())); + ret.add(Range.closedOpen(share.upperEndpoint(), self.upperEndpoint())); } } } else { if (self.upperBoundType() == BoundType.CLOSED && share.upperBoundType() == BoundType.OPEN) { - ret.add(Ranges.closed(self.upperEndpoint(), share.upperEndpoint())); + ret.add(Range.closed(self.upperEndpoint(), share.upperEndpoint())); } } } @@ -212,12 +211,12 @@ public class RangeUtil { for (int index = 1; index < values.size(); index++) { temp = iter.next(); if (temp - lastEnd != 1) { - ranges.add(Ranges.closed(lastBegin, lastEnd)); + ranges.add(Range.closed(lastBegin, lastEnd)); lastBegin = temp; } lastEnd = temp; } - ranges.add(Ranges.closed(lastBegin, lastEnd)); + ranges.add(Range.closed(lastBegin, lastEnd)); return ranges; } } diff --git a/core-common/src/test/java/org/apache/kylin/common/util/RangeTest.java b/core-common/src/test/java/org/apache/kylin/common/util/RangeTest.java index f39c06b..d4e4cbf 100644 --- a/core-common/src/test/java/org/apache/kylin/common/util/RangeTest.java +++ b/core-common/src/test/java/org/apache/kylin/common/util/RangeTest.java @@ -23,7 +23,6 @@ import org.junit.Test; import com.google.common.collect.Lists; import com.google.common.collect.Range; -import com.google.common.collect.Ranges; /** */ @@ -32,145 +31,145 @@ public class RangeTest { @Test public void extremeCase() { - Range r1 = Ranges.all(); - Range r2 = Ranges.all(); + Range r1 = Range.all(); + Range r2 = Range.all(); - Range a = Ranges.closedOpen(2, 5); + Range a = Range.closedOpen(2, 5); Assert.assertTrue(RangeUtil.remove(r1, r2).equals(Lists.newArrayList())); - Assert.assertTrue(RangeUtil.remove(r1, a).equals(Lists.newArrayList(Ranges.lessThan(2), Ranges.atLeast(5)))); + Assert.assertTrue(RangeUtil.remove(r1, a).equals(Lists.newArrayList(Range.lessThan(2), Range.atLeast(5)))); } @Test public void testClosed() { - Range anull = Ranges.closedOpen(0, 0); - - Range r1 = Ranges.closed(2, 5); - - Range a1 = Ranges.open(1, 2); - Range a2 = Ranges.open(1, 3); - Range a3 = Ranges.open(1, 5); - Range a4 = Ranges.open(1, 6); - Range a5 = Ranges.open(6, 7); - Range a6 = Ranges.open(5, 7); - Range a7 = Ranges.open(4, 7); - Range a8 = Ranges.open(2, 7); - Range a9 = Ranges.open(1, 7); - - Range b1 = Ranges.closed(1, 2); - Range b2 = Ranges.closed(1, 3); - Range b3 = Ranges.closed(1, 5); - Range b4 = Ranges.closed(1, 6); - Range b5 = Ranges.closed(6, 7); - Range b6 = Ranges.closed(5, 7); - Range b7 = Ranges.closed(4, 7); - Range b8 = Ranges.closed(2, 7); - Range b9 = Ranges.closed(1, 7); - - Range c1 = Ranges.open(2, 3); - Range c2 = Ranges.open(3, 4); - Range c3 = Ranges.open(4, 5); - - Range d1 = Ranges.closed(2, 3); - Range d2 = Ranges.closed(3, 4); - Range d3 = Ranges.closed(4, 5); + Range anull = Range.closedOpen(0, 0); + + Range r1 = Range.closed(2, 5); + + Range a1 = Range.open(1, 2); + Range a2 = Range.open(1, 3); + Range a3 = Range.open(1, 5); + Range a4 = Range.open(1, 6); + Range a5 = Range.open(6, 7); + Range a6 = Range.open(5, 7); + Range a7 = Range.open(4, 7); + Range a8 = Range.open(2, 7); + Range a9 = Range.open(1, 7); + + Range b1 = Range.closed(1, 2); + Range b2 = Range.closed(1, 3); + Range b3 = Range.closed(1, 5); + Range b4 = Range.closed(1, 6); + Range b5 = Range.closed(6, 7); + Range b6 = Range.closed(5, 7); + Range b7 = Range.closed(4, 7); + Range b8 = Range.closed(2, 7); + Range b9 = Range.closed(1, 7); + + Range c1 = Range.open(2, 3); + Range c2 = Range.open(3, 4); + Range c3 = Range.open(4, 5); + + Range d1 = Range.closed(2, 3); + Range d2 = Range.closed(3, 4); + Range d3 = Range.closed(4, 5); Assert.assertTrue(RangeUtil.remove(r1, anull).equals(Lists.newArrayList(r1))); Assert.assertTrue(RangeUtil.remove(r1, a1).equals(Lists.newArrayList(r1))); - Assert.assertTrue(RangeUtil.remove(r1, a2).equals(Lists.newArrayList(Ranges.closed(3, 5)))); - Assert.assertTrue(RangeUtil.remove(r1, a3).equals(Lists.newArrayList(Ranges.closed(5, 5)))); + Assert.assertTrue(RangeUtil.remove(r1, a2).equals(Lists.newArrayList(Range.closed(3, 5)))); + Assert.assertTrue(RangeUtil.remove(r1, a3).equals(Lists.newArrayList(Range.closed(5, 5)))); Assert.assertTrue(RangeUtil.remove(r1, a4).equals(Lists.newArrayList())); Assert.assertTrue(RangeUtil.remove(r1, a5).equals(Lists.newArrayList(r1))); Assert.assertTrue(RangeUtil.remove(r1, a6).equals(Lists.newArrayList(r1))); - Assert.assertTrue(RangeUtil.remove(r1, a7).equals(Lists.newArrayList(Ranges.closed(2, 4)))); - Assert.assertTrue(RangeUtil.remove(r1, a8).equals(Lists.newArrayList(Ranges.closed(2, 2)))); + Assert.assertTrue(RangeUtil.remove(r1, a7).equals(Lists.newArrayList(Range.closed(2, 4)))); + Assert.assertTrue(RangeUtil.remove(r1, a8).equals(Lists.newArrayList(Range.closed(2, 2)))); Assert.assertTrue(RangeUtil.remove(r1, a9).equals(Lists.newArrayList())); - Assert.assertTrue(RangeUtil.remove(r1, b1).equals(Lists.newArrayList(Ranges.openClosed(2, 5)))); - Assert.assertTrue(RangeUtil.remove(r1, b2).equals(Lists.newArrayList(Ranges.openClosed(3, 5)))); + Assert.assertTrue(RangeUtil.remove(r1, b1).equals(Lists.newArrayList(Range.openClosed(2, 5)))); + Assert.assertTrue(RangeUtil.remove(r1, b2).equals(Lists.newArrayList(Range.openClosed(3, 5)))); Assert.assertTrue(RangeUtil.remove(r1, b3).equals(Lists.newArrayList())); Assert.assertTrue(RangeUtil.remove(r1, b4).equals(Lists.newArrayList())); Assert.assertTrue(RangeUtil.remove(r1, b5).equals(Lists.newArrayList(r1))); - Assert.assertTrue(RangeUtil.remove(r1, b6).equals(Lists.newArrayList(Ranges.closedOpen(2, 5)))); - Assert.assertTrue(RangeUtil.remove(r1, b7).equals(Lists.newArrayList(Ranges.closedOpen(2, 4)))); + Assert.assertTrue(RangeUtil.remove(r1, b6).equals(Lists.newArrayList(Range.closedOpen(2, 5)))); + Assert.assertTrue(RangeUtil.remove(r1, b7).equals(Lists.newArrayList(Range.closedOpen(2, 4)))); Assert.assertTrue(RangeUtil.remove(r1, b8).equals(Lists.newArrayList())); Assert.assertTrue(RangeUtil.remove(r1, b9).equals(Lists.newArrayList())); - Assert.assertTrue(RangeUtil.remove(r1, c1).equals(Lists.newArrayList(Ranges.closed(2, 2), Ranges.closed(3, 5)))); - Assert.assertTrue(RangeUtil.remove(r1, c2).equals(Lists.newArrayList(Ranges.closed(2, 3), Ranges.closed(4, 5)))); - Assert.assertTrue(RangeUtil.remove(r1, c3).equals(Lists.newArrayList(Ranges.closed(2, 4), Ranges.closed(5, 5)))); + Assert.assertTrue(RangeUtil.remove(r1, c1).equals(Lists.newArrayList(Range.closed(2, 2), Range.closed(3, 5)))); + Assert.assertTrue(RangeUtil.remove(r1, c2).equals(Lists.newArrayList(Range.closed(2, 3), Range.closed(4, 5)))); + Assert.assertTrue(RangeUtil.remove(r1, c3).equals(Lists.newArrayList(Range.closed(2, 4), Range.closed(5, 5)))); - Assert.assertTrue(RangeUtil.remove(r1, d1).equals(Lists.newArrayList(Ranges.openClosed(3, 5)))); - Assert.assertTrue(RangeUtil.remove(r1, d2).equals(Lists.newArrayList(Ranges.closedOpen(2, 3), Ranges.openClosed(4, 5)))); - Assert.assertTrue(RangeUtil.remove(r1, d3).equals(Lists.newArrayList(Ranges.closedOpen(2, 4)))); + Assert.assertTrue(RangeUtil.remove(r1, d1).equals(Lists.newArrayList(Range.openClosed(3, 5)))); + Assert.assertTrue(RangeUtil.remove(r1, d2).equals(Lists.newArrayList(Range.closedOpen(2, 3), Range.openClosed(4, 5)))); + Assert.assertTrue(RangeUtil.remove(r1, d3).equals(Lists.newArrayList(Range.closedOpen(2, 4)))); } @Test public void testOpen() { - Range anull = Ranges.closedOpen(0, 0); - - Range r1 = Ranges.open(2, 5); - - Range a1 = Ranges.open(1, 2); - Range a2 = Ranges.open(1, 3); - Range a3 = Ranges.open(1, 5); - Range a4 = Ranges.open(1, 6); - Range a5 = Ranges.open(6, 7); - Range a6 = Ranges.open(5, 7); - Range a7 = Ranges.open(4, 7); - Range a8 = Ranges.open(2, 7); - Range a9 = Ranges.open(1, 7); - - Range b1 = Ranges.closed(1, 2); - Range b2 = Ranges.closed(1, 3); - Range b3 = Ranges.closed(1, 5); - Range b4 = Ranges.closed(1, 6); - Range b5 = Ranges.closed(6, 7); - Range b6 = Ranges.closed(5, 7); - Range b7 = Ranges.closed(4, 7); - Range b8 = Ranges.closed(2, 7); - Range b9 = Ranges.closed(1, 7); - - Range c1 = Ranges.open(2, 3); - Range c2 = Ranges.open(3, 4); - Range c3 = Ranges.open(4, 5); - - Range d1 = Ranges.closed(2, 3); - Range d2 = Ranges.closed(3, 4); - Range d3 = Ranges.closed(4, 5); + Range anull = Range.closedOpen(0, 0); + + Range r1 = Range.open(2, 5); + + Range a1 = Range.open(1, 2); + Range a2 = Range.open(1, 3); + Range a3 = Range.open(1, 5); + Range a4 = Range.open(1, 6); + Range a5 = Range.open(6, 7); + Range a6 = Range.open(5, 7); + Range a7 = Range.open(4, 7); + Range a8 = Range.open(2, 7); + Range a9 = Range.open(1, 7); + + Range b1 = Range.closed(1, 2); + Range b2 = Range.closed(1, 3); + Range b3 = Range.closed(1, 5); + Range b4 = Range.closed(1, 6); + Range b5 = Range.closed(6, 7); + Range b6 = Range.closed(5, 7); + Range b7 = Range.closed(4, 7); + Range b8 = Range.closed(2, 7); + Range b9 = Range.closed(1, 7); + + Range c1 = Range.open(2, 3); + Range c2 = Range.open(3, 4); + Range c3 = Range.open(4, 5); + + Range d1 = Range.closed(2, 3); + Range d2 = Range.closed(3, 4); + Range d3 = Range.closed(4, 5); Assert.assertTrue(RangeUtil.remove(r1, anull).equals(Lists.newArrayList(r1))); Assert.assertTrue(RangeUtil.remove(r1, a1).equals(Lists.newArrayList(r1))); - Assert.assertTrue(RangeUtil.remove(r1, a2).equals(Lists.newArrayList(Ranges.closedOpen(3, 5)))); + Assert.assertTrue(RangeUtil.remove(r1, a2).equals(Lists.newArrayList(Range.closedOpen(3, 5)))); Assert.assertTrue(RangeUtil.remove(r1, a3).equals(Lists.newArrayList())); Assert.assertTrue(RangeUtil.remove(r1, a4).equals(Lists.newArrayList())); Assert.assertTrue(RangeUtil.remove(r1, a5).equals(Lists.newArrayList(r1))); Assert.assertTrue(RangeUtil.remove(r1, a6).equals(Lists.newArrayList(r1))); - Assert.assertTrue(RangeUtil.remove(r1, a7).equals(Lists.newArrayList(Ranges.openClosed(2, 4)))); + Assert.assertTrue(RangeUtil.remove(r1, a7).equals(Lists.newArrayList(Range.openClosed(2, 4)))); Assert.assertTrue(RangeUtil.remove(r1, a8).equals(Lists.newArrayList())); Assert.assertTrue(RangeUtil.remove(r1, a9).equals(Lists.newArrayList())); - Assert.assertTrue(RangeUtil.remove(r1, b1).equals(Lists.newArrayList(Ranges.open(2, 5)))); - Assert.assertTrue(RangeUtil.remove(r1, b2).equals(Lists.newArrayList(Ranges.open(3, 5)))); + Assert.assertTrue(RangeUtil.remove(r1, b1).equals(Lists.newArrayList(Range.open(2, 5)))); + Assert.assertTrue(RangeUtil.remove(r1, b2).equals(Lists.newArrayList(Range.open(3, 5)))); Assert.assertTrue(RangeUtil.remove(r1, b3).equals(Lists.newArrayList())); Assert.assertTrue(RangeUtil.remove(r1, b4).equals(Lists.newArrayList())); Assert.assertTrue(RangeUtil.remove(r1, b5).equals(Lists.newArrayList(r1))); - Assert.assertTrue(RangeUtil.remove(r1, b6).equals(Lists.newArrayList(Ranges.open(2, 5)))); - Assert.assertTrue(RangeUtil.remove(r1, b7).equals(Lists.newArrayList(Ranges.open(2, 4)))); + Assert.assertTrue(RangeUtil.remove(r1, b6).equals(Lists.newArrayList(Range.open(2, 5)))); + Assert.assertTrue(RangeUtil.remove(r1, b7).equals(Lists.newArrayList(Range.open(2, 4)))); Assert.assertTrue(RangeUtil.remove(r1, b8).equals(Lists.newArrayList())); Assert.assertTrue(RangeUtil.remove(r1, b9).equals(Lists.newArrayList())); - Assert.assertTrue(RangeUtil.remove(r1, c1).equals(Lists.newArrayList(Ranges.closedOpen(3, 5)))); - Assert.assertTrue(RangeUtil.remove(r1, c2).equals(Lists.newArrayList(Ranges.openClosed(2, 3), Ranges.closedOpen(4, 5)))); - Assert.assertTrue(RangeUtil.remove(r1, c3).equals(Lists.newArrayList(Ranges.openClosed(2, 4)))); + Assert.assertTrue(RangeUtil.remove(r1, c1).equals(Lists.newArrayList(Range.closedOpen(3, 5)))); + Assert.assertTrue(RangeUtil.remove(r1, c2).equals(Lists.newArrayList(Range.openClosed(2, 3), Range.closedOpen(4, 5)))); + Assert.assertTrue(RangeUtil.remove(r1, c3).equals(Lists.newArrayList(Range.openClosed(2, 4)))); - Assert.assertTrue(RangeUtil.remove(r1, d1).equals(Lists.newArrayList(Ranges.open(3, 5)))); - Assert.assertTrue(RangeUtil.remove(r1, d2).equals(Lists.newArrayList(Ranges.open(2, 3), Ranges.open(4, 5)))); - Assert.assertTrue(RangeUtil.remove(r1, d3).equals(Lists.newArrayList(Ranges.open(2, 4)))); + Assert.assertTrue(RangeUtil.remove(r1, d1).equals(Lists.newArrayList(Range.open(3, 5)))); + Assert.assertTrue(RangeUtil.remove(r1, d2).equals(Lists.newArrayList(Range.open(2, 3), Range.open(4, 5)))); + Assert.assertTrue(RangeUtil.remove(r1, d3).equals(Lists.newArrayList(Range.open(2, 4)))); } } diff --git a/core-common/src/test/java/org/apache/kylin/common/util/RangeUtilTest.java b/core-common/src/test/java/org/apache/kylin/common/util/RangeUtilTest.java index 0a5df77..5bfec36 100644 --- a/core-common/src/test/java/org/apache/kylin/common/util/RangeUtilTest.java +++ b/core-common/src/test/java/org/apache/kylin/common/util/RangeUtilTest.java @@ -28,7 +28,6 @@ import org.junit.Assert; import org.junit.Test; import com.google.common.collect.Range; -import com.google.common.collect.Ranges; import com.google.common.collect.Sets; /** @@ -40,31 +39,31 @@ public class RangeUtilTest { map.put(3, 3); map.put(1, 1); map.put(2, 2); - Map subMap = RangeUtil.filter(map, Ranges. all()); + Map subMap = RangeUtil.filter(map, Range. all()); Assert.assertEquals(subMap.size(), 3); - subMap = RangeUtil.filter(map, Ranges.atLeast(2)); + subMap = RangeUtil.filter(map, Range.atLeast(2)); Assert.assertEquals(subMap.size(), 2); - subMap = RangeUtil.filter(map, Ranges.greaterThan(2)); + subMap = RangeUtil.filter(map, Range.greaterThan(2)); Assert.assertEquals(subMap.size(), 1); - subMap = RangeUtil.filter(map, Ranges.greaterThan(0)); + subMap = RangeUtil.filter(map, Range.greaterThan(0)); Assert.assertEquals(subMap.size(), 3); - subMap = RangeUtil.filter(map, Ranges.greaterThan(5)); + subMap = RangeUtil.filter(map, Range.greaterThan(5)); Assert.assertEquals(subMap.size(), 0); - subMap = RangeUtil.filter(map, Ranges.atMost(2)); + subMap = RangeUtil.filter(map, Range.atMost(2)); Assert.assertEquals(subMap.size(), 2); - subMap = RangeUtil.filter(map, Ranges.lessThan(2)); + subMap = RangeUtil.filter(map, Range.lessThan(2)); Assert.assertEquals(subMap.size(), 1); - subMap = RangeUtil.filter(map, Ranges.lessThan(5)); + subMap = RangeUtil.filter(map, Range.lessThan(5)); Assert.assertEquals(subMap.size(), 3); - subMap = RangeUtil.filter(map, Ranges.lessThan(0)); + subMap = RangeUtil.filter(map, Range.lessThan(0)); Assert.assertEquals(subMap.size(), 0); } diff --git a/core-cube/pom.xml b/core-cube/pom.xml index cd65237..8bc41fe 100644 --- a/core-cube/pom.xml +++ b/core-cube/pom.xml @@ -38,12 +38,10 @@ org.apache.kylin kylin-core-metadata - ${project.parent.version} org.apache.kylin kylin-core-dictionary - ${project.parent.version} @@ -61,7 +59,6 @@ kylin-core-common test-jar test - ${project.parent.version} junit diff --git a/core-dictionary/pom.xml b/core-dictionary/pom.xml index 69209d0..9199787 100644 --- a/core-dictionary/pom.xml +++ b/core-dictionary/pom.xml @@ -40,7 +40,6 @@ org.apache.kylin kylin-core-metadata - ${project.parent.version} @@ -54,7 +53,6 @@ kylin-core-common test-jar test - ${project.parent.version} junit diff --git a/core-job/pom.xml b/core-job/pom.xml index a3c1d82..7210fd1 100644 --- a/core-job/pom.xml +++ b/core-job/pom.xml @@ -40,7 +40,6 @@ org.apache.kylin kylin-core-cube - ${project.parent.version} @@ -60,7 +59,6 @@ kylin-core-common test-jar test - ${project.parent.version} junit diff --git a/core-metadata/pom.xml b/core-metadata/pom.xml index 6f0d91e..1405ac7 100644 --- a/core-metadata/pom.xml +++ b/core-metadata/pom.xml @@ -40,19 +40,15 @@ org.apache.kylin kylin-core-common - ${project.parent.version} net.sf.ehcache ehcache - ${ehcache.version} - org.roaringbitmap RoaringBitmap - ${roaring.version} @@ -61,7 +57,6 @@ kylin-core-common test-jar test - ${project.parent.version} org.apache.commons diff --git a/core-storage/pom.xml b/core-storage/pom.xml index d8c1a29..7f6bb1e 100644 --- a/core-storage/pom.xml +++ b/core-storage/pom.xml @@ -40,7 +40,6 @@ org.apache.kylin kylin-core-cube - ${project.parent.version} @@ -49,7 +48,6 @@ kylin-core-common test-jar test - ${project.parent.version} junit diff --git a/core-storage/src/main/java/org/apache/kylin/storage/cache/TsConditionExtractor.java b/core-storage/src/main/java/org/apache/kylin/storage/cache/TsConditionExtractor.java index f972910..932bd44 100644 --- a/core-storage/src/main/java/org/apache/kylin/storage/cache/TsConditionExtractor.java +++ b/core-storage/src/main/java/org/apache/kylin/storage/cache/TsConditionExtractor.java @@ -25,7 +25,6 @@ import org.apache.kylin.metadata.filter.TupleFilter; import org.apache.kylin.metadata.model.TblColRef; import com.google.common.collect.Range; -import com.google.common.collect.Ranges; /** */ @@ -42,12 +41,12 @@ public class TsConditionExtractor { private static Range extractTsConditionInternal(TupleFilter filter, TblColRef colRef) { if (filter == null) { - return Ranges.all(); + return Range.all(); } if (filter instanceof LogicalTupleFilter) { if (filter.getOperator() == TupleFilter.FilterOperatorEnum.AND) { - Range ret = Ranges.all(); + Range ret = Range.all(); for (TupleFilter child : filter.getChildren()) { Range childRange = extractTsConditionInternal(child, colRef); if (childRange != null) { @@ -64,14 +63,14 @@ public class TsConditionExtractor { } else { //for conditions like date > DATE'2000-11-11' OR date < DATE '1999-01-01' //we will use Ranges.all() rather than two ranges to represent them - return Ranges.all(); + return Range.all(); } } if (filter instanceof CompareTupleFilter) { CompareTupleFilter compareTupleFilter = (CompareTupleFilter) filter; if (compareTupleFilter.getColumn() == null)// column will be null at filters like " 1<>1" - return Ranges.all(); + return Range.all(); if (compareTupleFilter.getColumn().equals(colRef)) { Object firstValue = compareTupleFilter.getFirstValue(); @@ -79,19 +78,19 @@ public class TsConditionExtractor { switch (compareTupleFilter.getOperator()) { case EQ: t = DateFormat.stringToMillis((String) firstValue); - return Ranges.closed(t, t); + return Range.closed(t, t); case LT: t = DateFormat.stringToMillis((String) firstValue); - return Ranges.lessThan(t); + return Range.lessThan(t); case LTE: t = DateFormat.stringToMillis((String) firstValue); - return Ranges.atMost(t); + return Range.atMost(t); case GT: t = DateFormat.stringToMillis((String) firstValue); - return Ranges.greaterThan(t); + return Range.greaterThan(t); case GTE: t = DateFormat.stringToMillis((String) firstValue); - return Ranges.atLeast(t); + return Range.atLeast(t); case NEQ: case IN://not handled for now break; @@ -99,6 +98,6 @@ public class TsConditionExtractor { } } } - return Ranges.all(); + return Range.all(); } } diff --git a/engine-mr/pom.xml b/engine-mr/pom.xml index 2f6ca79..49a4b4e 100644 --- a/engine-mr/pom.xml +++ b/engine-mr/pom.xml @@ -42,22 +42,18 @@ kylin-core-common test-jar test - ${project.parent.version} org.apache.kylin kylin-core-cube - ${project.parent.version} org.apache.kylin kylin-core-job - ${project.parent.version} org.apache.kylin kylin-core-storage - ${project.parent.version} diff --git a/engine-spark/pom.xml b/engine-spark/pom.xml index 004549d..fe7465a 100644 --- a/engine-spark/pom.xml +++ b/engine-spark/pom.xml @@ -40,13 +40,11 @@ org.apache.kylin kylin-storage-hbase - ${project.parent.version} org.apache.kylin kylin-core-job - ${project.parent.version} @@ -97,7 +95,6 @@ kylin-storage-hbase test-jar test - ${project.parent.version} @@ -105,7 +102,6 @@ kylin-core-common test-jar test - ${project.parent.version} @@ -128,8 +124,6 @@ org.apache.maven.plugins maven-shade-plugin - 2.3 - package diff --git a/engine-streaming/pom.xml b/engine-streaming/pom.xml index 85f2750..ce15027 100644 --- a/engine-streaming/pom.xml +++ b/engine-streaming/pom.xml @@ -40,12 +40,10 @@ org.apache.kylin kylin-core-cube - ${project.parent.version} org.apache.kylin kylin-core-storage - ${project.parent.version} @@ -54,7 +52,6 @@ kylin-core-common test-jar test - ${project.parent.version} org.apache.hadoop diff --git a/kylin-it/pom.xml b/kylin-it/pom.xml index a96dcd9..901f981 100644 --- a/kylin-it/pom.xml +++ b/kylin-it/pom.xml @@ -40,38 +40,32 @@ org.apache.kylin atopcalcite - ${project.parent.version} org.apache.kylin kylin-server - ${project.parent.version} classes + ${project.parent.version} org.apache.kylin kylin-core-storage - ${project.parent.version} org.apache.kylin kylin-source-hive - ${project.parent.version} org.apache.kylin kylin-jdbc - ${project.parent.version} org.apache.kylin kylin-storage-hbase - ${project.parent.version} org.apache.kylin kylin-query - ${project.parent.version} org.apache.calcite @@ -101,40 +95,34 @@ kylin-core-common test-jar test - ${project.parent.version} org.apache.kylin kylin-core-cube test-jar test - ${project.parent.version} org.apache.kylin kylin-core-storage test-jar test - ${project.parent.version} org.apache.kylin kylin-core-job test-jar test - ${project.parent.version} org.apache.kylin kylin-storage-hbase test-jar test - ${project.parent.version} org.apache.hive.hcatalog hive-hcatalog-core - ${hive-hcatalog.version} provided @@ -142,7 +130,6 @@ kylin-assembly test-jar test - ${project.parent.version} org.apache.maven @@ -241,7 +228,6 @@ org.apache.hbase hbase-testing-util - ${hbase-hadoop2.version} test @@ -257,7 +243,6 @@ org.apache.kafka kafka_2.10 - ${kafka.version} provided @@ -274,7 +259,6 @@ org.apache.maven.plugins maven-failsafe-plugin - 2.16 integration-tests @@ -305,7 +289,6 @@ org.codehaus.mojo exec-maven-plugin - 1.4.0 build_cube_with_engine @@ -388,7 +371,6 @@ org.apache.maven.doxia doxia-core - 1.6 xerces @@ -401,7 +383,6 @@ net.ju-n.maven.plugins checksum-maven-plugin - 1.2 diff --git a/pom.xml b/pom.xml index 1d09a90..a6f11f5 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,6 @@ 1.7 3.3.9 - 2.5.1 UTF-8 UTF-8 @@ -56,54 +55,60 @@ 0.98.8-hadoop2 0.8.1 - + 3.4 - 4.11 - 1.0.0 - 2.5.0 - 1.3.174 + 4.12 + 1.1.0 + 2.5.2 + 1.4.192 - 1.2 + 1.3.1 2.6 3.4 - 3.2.1 - 2.4 + 3.2.2 + 2.5 1.0.15 - 1.1 - 3.6 + 1.4 + 3.6.1 1.3.0 1.2.17 - 1.7.7 - 2.2.3 - 12.0 - 0.9.9-RC1 - 0.1.51 - 2.9.1 - 2.7.1 + 1.7.21 + 2.8.0 + 3.0.1 + 14.0 + 0.9.10 + 0.1.53 + 2.11.0 + 2.7.2 1.0.3 1.3.4 - 9.2.7.v20150116 - 3.0.3 - 2.8.1 - 4.5 + 9.3.10.v20160621 + 4.0.0 + 2.10.2.2.21 + 4.5.2 0.6.18 + 3.2.4 + 2.4.0 + 2.5 + 7.0.69 - 3.1.2.RELEASE - 1.0.1.RELEASE - 2.6.1 - 1.2.7.RELEASE + 3.2.17.RELEASE + 3.1.2.RELEASE + 1.0.2.RELEASE + 2.6.4 + 1.8.9 1.6.0 - 2.6.0 + 3.2.0 jacoco @@ -174,6 +179,150 @@ + + + org.apache.kylin + atopcalcite + ${project.version} + + + org.apache.kylin + kylin-core-common + ${project.version} + + + org.apache.kylin + kylin-core-metadata + ${project.version} + + + org.apache.kylin + kylin-core-dictionary + ${project.version} + + + org.apache.kylin + kylin-core-cube + ${project.version} + + + org.apache.kylin + kylin-core-job + ${project.version} + + + org.apache.kylin + kylin-core-storage + ${project.version} + + + org.apache.kylin + kylin-engine-mr + ${project.version} + + + org.apache.kylin + kylin-engine-streaming + ${project.version} + + + org.apache.kylin + kylin-engine-spark + ${project.version} + + + org.apache.kylin + kylin-source-hive + ${project.version} + + + org.apache.kylin + kylin-source-kafka + ${project.version} + + + org.apache.kylin + kylin-storage-hbase + ${project.version} + + + org.apache.kylin + kylin-query + ${project.version} + + + org.apache.kylin + kylin-server-base + ${project.version} + + + org.apache.kylin + kylin-server + ${project.version} + + + org.apache.kylin + kylin-jdbc + ${project.version} + + + org.apache.kylin + kylin-assembly + ${project.version} + + + org.apache.kylin + kylin-tool + ${project.version} + + + org.apache.kylin + kylin-it + ${project.version} + + + org.apache.kylin + kylin-core-common + ${project.version} + test-jar + + + org.apache.kylin + kylin-core-storage + ${project.version} + test-jar + + + org.apache.kylin + kylin-storage-hbase + ${project.version} + test-jar + + + org.apache.kylin + kylin-server-base + ${project.version} + test-jar + + + org.apache.kylin + kylin-core-job + ${project.version} + test-jar + + + org.apache.kylin + kylin-core-cube + ${project.version} + test-jar + + + org.apache.kylin + kylin-assembly + ${project.version} + test-jar + + org.apache.hadoop @@ -256,14 +405,23 @@ ${mrunit.version} hadoop2 - + + org.apache.hbase + hbase-testing-util + ${hbase-hadoop2.version} + test + org.apache.hive hive-jdbc ${hive.version} - + + org.apache.hive.hcatalog + hive-hcatalog-core + ${hive-hcatalog.version} + org.apache.hadoop @@ -294,18 +452,22 @@ spark-core_2.10 ${spark.version} - org.apache.spark spark-sql_2.10 ${spark.version} - org.apache.spark spark-hive_2.10 ${spark.version} + + org.apache.kafka + kafka_2.10 + ${kafka.version} + provided + @@ -390,6 +552,11 @@ ${commons-email.version} + com.google.code.findbugs + jsr305 + ${jsr305.version} + + com.google.guava guava ${guava.version} @@ -465,7 +632,113 @@ RoaringBitmap ${roaring.version} - + + cglib + cglib + ${cglib.version} + + + net.sf.supercsv + super-csv + ${supercsv.version} + + + org.aspectj + aspectjrt + ${aspectj.version} + + + org.aspectj + aspectjweaver + ${aspectj.version} + + + com.thetransactioncompany + cors-filter + ${cors.version} + + + net.sf.ehcache + ehcache + ${ehcache.version} + + + org.opensaml + opensaml + ${opensaml.version} + + + + org.springframework + spring-webmvc + ${spring.framework.version} + + + org.springframework + spring-jdbc + ${spring.framework.version} + + + org.springframework + spring-aop + ${spring.framework.version} + + + org.springframework + spring-context-support + ${spring.framework.version} + + + org.springframework + spring-test + ${spring.framework.version} + + + + org.springframework.security + spring-security-acl + ${spring.framework.security.version} + + + org.springframework.security + spring-security-ldap + ${spring.framework.security.version} + + + org.springframework.security.extensions + spring-security-saml2-core + ${spring.framework.security.extensions.version} + + + org.eclipse.jetty + jetty-server + ${jetty.version} + test + + + org.eclipse.jetty + jetty-webapp + ${jetty.version} + test + + + org.apache.tomcat + tomcat-catalina + ${tomcat.version} + provided + + + org.apache.tomcat + tomcat-jasper + ${tomcat.version} + provided + + + org.apache.tomcat.embed + tomcat-embed-core + ${tomcat.version} + provided + @@ -487,16 +760,12 @@ - - - - org.apache.maven.plugins maven-compiler-plugin - 3.1 + 3.5.1 ${javaVersion} ${javaVersion} @@ -505,17 +774,17 @@ org.apache.maven.plugins maven-site-plugin - 2.0 + 3.5.1 org.apache.maven.plugins maven-install-plugin - 2.2 + 2.5.2 org.apache.maven.plugins maven-resources-plugin - 2.4 + 3.0.1 UTF-8 @@ -523,7 +792,7 @@ org.apache.maven.plugins maven-jar-plugin - 2.4 + 3.0.2 @@ -559,7 +828,7 @@ org.apache.maven.plugins maven-source-plugin - 2.1.2 + 3.0.1 attach-sources @@ -589,12 +858,12 @@ org.apache.maven.plugins maven-release-plugin - ${maven-release.version} + 2.5.3 org.jacoco jacoco-maven-plugin - 0.7.0.201403182114 + 0.7.7.201606060606 ${sonar.jacoco.reportPath} true @@ -611,7 +880,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 2.13 + 2.17 validate @@ -629,7 +898,11 @@ - + + net.ju-n.maven.plugins + checksum-maven-plugin + 1.3 + org.eclipse.m2e @@ -661,6 +934,16 @@ + + org.codehaus.mojo + exec-maven-plugin + 1.5.0 + + + org.springframework.boot + spring-boot-maven-plugin + 1.3.6.RELEASE + @@ -699,7 +982,6 @@ org.apache.maven.plugins maven-compiler-plugin - 2.5.1 true 1024m @@ -710,7 +992,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.16 + 2.19.1 ${project.basedir}/../target/surefire-reports @@ -881,7 +1163,7 @@ org.apache.maven.doxia doxia-core - 1.6 + 1.7 xerces @@ -894,7 +1176,6 @@ net.ju-n.maven.plugins checksum-maven-plugin - 1.2 diff --git a/query/pom.xml b/query/pom.xml index 0dff0c3..4b76c1c 100644 --- a/query/pom.xml +++ b/query/pom.xml @@ -41,12 +41,10 @@ org.apache.kylin atopcalcite - ${project.parent.version} org.apache.kylin kylin-core-storage - ${project.parent.version} org.apache.calcite @@ -76,20 +74,17 @@ kylin-core-common test-jar test - ${project.parent.version} org.apache.kylin kylin-storage-hbase test - ${project.parent.version} org.apache.kylin kylin-storage-hbase test-jar test - ${project.parent.version} xerces @@ -163,7 +158,6 @@ org.apache.hbase hbase-testing-util - ${hbase-hadoop2.version} test @@ -213,7 +207,6 @@ org.apache.maven.doxia doxia-core - 1.6 xerces @@ -226,7 +219,6 @@ net.ju-n.maven.plugins checksum-maven-plugin - 1.2 diff --git a/server-base/pom.xml b/server-base/pom.xml index c0d48c9..e2750ea 100644 --- a/server-base/pom.xml +++ b/server-base/pom.xml @@ -39,7 +39,6 @@ org.apache.kylin kylin-query - ${project.parent.version} javax.servlet @@ -54,137 +53,73 @@ org.apache.kylin kylin-storage-hbase - ${project.parent.version} org.apache.kylin kylin-source-hive - ${project.parent.version} org.apache.kylin kylin-source-kafka - ${project.parent.version} net.sf.ehcache ehcache - ${ehcache.version} cglib cglib - 2.2.2 net.sf.supercsv super-csv - 2.1.0 - - - - org.springframework.boot - spring-boot-starter-web - ${spring.boot.version} - - - org.springframework.boot - spring-boot-starter-tomcat - - - org.slf4j - log4j-over-slf4j - - - ch.qos.logback - logback-classic - - org.springframework - spring-beans - ${spring.framework.version} - - - org.springframework spring-webmvc - ${spring.framework.version} org.springframework spring-jdbc - ${spring.framework.version} - - - org.springframework - spring-web - ${spring.framework.version} - jar org.springframework - spring-core - ${spring.framework.version} - jar + spring-aop org.springframework - spring-aop - ${spring.framework.version} - jar + spring-context-support org.springframework spring-test - ${spring.framework.version} org.springframework.security - spring-security-core - ${spring.framework.version} - - - org.springframework.security - spring-security-web - ${spring.framework.version} - - - org.springframework.security - spring-security-config - ${spring.framework.version} - - - org.springframework.security spring-security-acl - ${spring.framework.version} org.springframework.security spring-security-ldap - ${spring.framework.version} org.springframework.security.extensions spring-security-saml2-core - ${spring.framework.security.extensions.version} org.aspectj aspectjrt - 1.6.11 org.aspectj aspectjweaver - 1.6.11 @@ -193,13 +128,11 @@ kylin-core-common test-jar test - ${project.parent.version} org.apache.tomcat tomcat-catalina - 7.0.69 provided @@ -222,19 +155,11 @@ org.eclipse.jetty jetty-server - ${jetty.version} - test - - - org.eclipse.jetty - jetty-servlet - ${jetty.version} test org.eclipse.jetty jetty-webapp - ${jetty.version} test diff --git a/server/pom.xml b/server/pom.xml index 602dcad..1d87afd 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -41,7 +41,6 @@ org.apache.kylin kylin-server-base - ${project.parent.version} javax.servlet @@ -57,7 +56,6 @@ com.thetransactioncompany cors-filter - 1.3.2 javax.servlet @@ -69,7 +67,6 @@ org.opensaml opensaml - ${opensaml.version} xml-apis @@ -113,28 +110,24 @@ kylin-core-common test-jar test - ${project.parent.version} org.apache.kylin kylin-storage-hbase test-jar test - ${project.parent.version} org.apache.kylin kylin-server-base test-jar test - ${project.parent.version} org.apache.kylin kylin-jdbc - ${project.parent.version} test @@ -254,7 +247,6 @@ org.apache.hive.hcatalog hive-hcatalog-core - ${hive-hcatalog.version} provided @@ -272,26 +264,22 @@ org.apache.tomcat tomcat-catalina - 7.0.69 provided org.apache.tomcat tomcat-jasper - 7.0.69 provided org.apache.tomcat.embed tomcat-embed-core - 7.0.69 provided org.apache.hbase hbase-testing-util - ${hbase-hadoop2.version} test @@ -312,19 +300,11 @@ org.eclipse.jetty jetty-server - ${jetty.version} - test - - - org.eclipse.jetty - jetty-servlet - ${jetty.version} test org.eclipse.jetty jetty-webapp - ${jetty.version} test @@ -338,7 +318,6 @@ maven-war-plugin - 2.1.1 true classes @@ -350,7 +329,6 @@ org.springframework.boot spring-boot-maven-plugin - ${spring.boot.version} diff --git a/source-hive/pom.xml b/source-hive/pom.xml index 631e43e..c962ad7 100644 --- a/source-hive/pom.xml +++ b/source-hive/pom.xml @@ -40,7 +40,6 @@ org.apache.kylin kylin-engine-mr - ${project.parent.version} @@ -49,7 +48,6 @@ kylin-core-common test-jar test - ${project.parent.version} org.apache.hadoop @@ -64,7 +62,6 @@ org.apache.hive.hcatalog hive-hcatalog-core - ${hive-hcatalog.version} provided diff --git a/source-kafka/pom.xml b/source-kafka/pom.xml index 228b956..519b279 100644 --- a/source-kafka/pom.xml +++ b/source-kafka/pom.xml @@ -40,13 +40,11 @@ org.apache.kylin kylin-engine-streaming - ${project.parent.version} org.apache.kafka kafka_2.10 - ${kafka.version} provided @@ -64,7 +62,6 @@ org.apache.hive.hcatalog hive-hcatalog-core - ${hive-hcatalog.version} provided diff --git a/storage-hbase/pom.xml b/storage-hbase/pom.xml index 4c1cfdc..b8e8108 100644 --- a/storage-hbase/pom.xml +++ b/storage-hbase/pom.xml @@ -40,12 +40,10 @@ org.apache.kylin kylin-engine-mr - ${project.parent.version} org.apache.kylin kylin-engine-streaming - ${project.parent.version} @@ -54,14 +52,12 @@ kylin-core-common test-jar test - ${project.parent.version} org.apache.kylin kylin-core-storage test-jar test - ${project.parent.version} org.apache.hbase @@ -81,7 +77,6 @@ org.apache.hbase hbase-testing-util - ${hbase-hadoop2.version} test @@ -112,7 +107,6 @@ org.apache.maven.plugins maven-shade-plugin - 2.2 package @@ -198,7 +192,6 @@ org.apache.maven.doxia doxia-core - 1.6 xerces @@ -211,7 +204,6 @@ net.ju-n.maven.plugins checksum-maven-plugin - 1.2 diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/filter/MassInValueProviderImpl.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/filter/MassInValueProviderImpl.java index 2f8b0a0..1a9f4c6 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/filter/MassInValueProviderImpl.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/filter/MassInValueProviderImpl.java @@ -43,6 +43,8 @@ import com.google.common.cache.RemovalListener; import com.google.common.cache.RemovalNotification; import com.google.common.collect.Sets; +import static java.util.concurrent.TimeUnit.MILLISECONDS; + public class MassInValueProviderImpl implements MassInValueProvider { public static final Logger logger = LoggerFactory.getLogger(MassInValueProviderImpl.class); @@ -73,14 +75,14 @@ public class MassInValueProviderImpl implements MassInValueProvider { Pair> cached = hdfs_caches.getIfPresent(filterResourceIdentifier); if (cached != null && cached.getFirst().equals(modificationTime)) { ret = cached.getSecond(); - logger.info("Load HDFS from cache using " + stopwatch.elapsedMillis() + " millis"); + logger.info("Load HDFS from cache using " + stopwatch.elapsed(MILLISECONDS) + " millis"); return; } InputStream inputStream = fileSystem.open(new Path(filterResourceIdentifier)); List lines = IOUtils.readLines(inputStream); - logger.info("Load HDFS finished after " + stopwatch.elapsedMillis() + " millis"); + logger.info("Load HDFS finished after " + stopwatch.elapsed(MILLISECONDS) + " millis"); for (String line : lines) { if (StringUtils.isEmpty(line)) { @@ -98,7 +100,7 @@ public class MassInValueProviderImpl implements MassInValueProvider { hdfs_caches.put(filterResourceIdentifier, Pair.newPair(modificationTime, ret)); - logger.info("Mass In values constructed after " + stopwatch.elapsedMillis() + " millis, containing " + ret.size() + " entries"); + logger.info("Mass In values constructed after " + stopwatch.elapsed(MILLISECONDS) + " millis, containing " + ret.size() + " entries"); } } catch (IOException e) { diff --git a/tool/pom.xml b/tool/pom.xml index 171644a..70784ef 100644 --- a/tool/pom.xml +++ b/tool/pom.xml @@ -33,12 +33,10 @@ org.apache.kylin kylin-storage-hbase - ${project.parent.version} org.apache.kylin kylin-engine-mr - ${project.parent.version} @@ -55,7 +53,6 @@ org.apache.maven.plugins maven-shade-plugin - 2.3 package -- 2.7.4 (Apple Git-66) From f540a8146cccceb70c33b36be1c9ac35bc97c2c9 Mon Sep 17 00:00:00 2001 From: Yiming Liu Date: Tue, 12 Jul 2016 19:19:16 +0800 Subject: [PATCH 2/2] KYLIN-1867: Fix hadoop dependency version --- pom.xml | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index a6f11f5..2e8628a 100644 --- a/pom.xml +++ b/pom.xml @@ -54,6 +54,11 @@ 0.14.0 0.98.8-hadoop2 0.8.1 + + 2.6.0 + 2.2.4 + 3.0.1 + 14.0 3.4 @@ -61,6 +66,7 @@ 1.1.0 2.5.2 1.4.192 + 9.3.10.v20160621 1.3.1 @@ -78,16 +84,12 @@ 1.2.17 1.7.21 - 2.8.0 - 3.0.1 - 14.0 0.9.10 0.1.53 2.11.0 2.7.2 1.0.3 1.3.4 - 9.3.10.v20160621 4.0.0 2.10.2.2.21 4.5.2 @@ -107,9 +109,6 @@ 1.6.0 - - 3.2.0 - jacoco reuseReports @@ -542,11 +541,6 @@ ${jackson.version} - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - - org.apache.commons commons-email ${commons-email.version} -- 2.7.4 (Apple Git-66)