Repository: kylin Updated Branches: refs/heads/2.0-rc 2b222043d -> 6d7d2d71a
KYLIN-1266 Drop some unused dependencies Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/6d7d2d71 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/6d7d2d71 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/6d7d2d71 Branch: refs/heads/2.0-rc Commit: 6d7d2d71ac749d79fceb7158b7e714843fab5263 Parents: 2b22204 Author: Li, Yang <yang...@ebay.com> Authored: Wed Dec 30 16:36:43 2015 +0800 Committer: Li, Yang <yang...@ebay.com> Committed: Wed Dec 30 16:37:29 2015 +0800 ---------------------------------------------------------------------- assembly/pom.xml | 24 ++- core-common/pom.xml | 18 +- .../kylin/common/util/CollectionUtils.java | 29 +++ .../org/apache/kylin/common/util/Primes.java | 184 +++++++++++++++++++ .../org/apache/kylin/common/util/BasicTest.java | 4 +- .../cube/upgrade/v2/CubeMetadataUpgradeV2.java | 2 +- core-storage/pom.xml | 2 - cube/pom.xml | 4 - metadata/pom.xml | 4 - pom.xml | 12 -- server/pom.xml | 10 +- .../rest/security/MockAclHBaseStorage.java | 2 +- .../rest/security/RealAclHBaseStorage.java | 2 +- .../apache/kylin/rest/service/QueryService.java | 4 +- source-kafka/pom.xml | 1 + storage-hbase/pom.xml | 5 - .../storage/hbase/steps/CreateHTableJob.java | 2 +- 17 files changed, 243 insertions(+), 66 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/6d7d2d71/assembly/pom.xml ---------------------------------------------------------------------- diff --git a/assembly/pom.xml b/assembly/pom.xml index df4a07f..cd7fc2b 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -84,11 +84,6 @@ </dependency> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minicluster</artifactId> <scope>test</scope> </dependency> @@ -110,11 +105,6 @@ </dependency> <dependency> <groupId>org.apache.hbase</groupId> - <artifactId>hbase-client</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> <artifactId>hbase-server</artifactId> <scope>provided</scope> </dependency> @@ -165,6 +155,13 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.apache.kafka</groupId> + <artifactId>kafka_2.10</artifactId> + <version>${kafka.version}</version> + <!-- FIXME: Should be provided just like hive and hbase, inflates job jar from 9 MB to 21 MB --> + </dependency> + </dependencies> <build> @@ -184,6 +181,13 @@ <minimizeJar>false</minimizeJar> <shadedArtifactAttached>true</shadedArtifactAttached> <shadedClassifierName>job</shadedClassifierName> + <artifactSet> + <excludes> + <exclude>io.netty:*</exclude> + <exclude>org.apache.zookeeper:*</exclude> + <exclude>net.sf.ehcache:*</exclude> + </excludes> + </artifactSet> <filters> <filter> <artifact>*:*</artifact> http://git-wip-us.apache.org/repos/asf/kylin/blob/6d7d2d71/core-common/pom.xml ---------------------------------------------------------------------- diff --git a/core-common/pom.xml b/core-common/pom.xml index d02ddd3..72d8808 100644 --- a/core-common/pom.xml +++ b/core-common/pom.xml @@ -49,18 +49,10 @@ <artifactId>commons-lang3</artifactId> </dependency> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-math3</artifactId> - </dependency> - <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> <dependency> - <groupId>commons-configuration</groupId> - <artifactId>commons-configuration</artifactId> - </dependency> - <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> </dependency> @@ -69,11 +61,6 @@ <artifactId>commons-email</artifactId> </dependency> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-collections4</artifactId> - <version>${commons-collections4.version}</version> - </dependency> - <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> </dependency> @@ -114,6 +101,11 @@ <!-- Env & Test --> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-math3</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/kylin/blob/6d7d2d71/core-common/src/main/java/org/apache/kylin/common/util/CollectionUtils.java ---------------------------------------------------------------------- diff --git a/core-common/src/main/java/org/apache/kylin/common/util/CollectionUtils.java b/core-common/src/main/java/org/apache/kylin/common/util/CollectionUtils.java new file mode 100644 index 0000000..c4b7d1d --- /dev/null +++ b/core-common/src/main/java/org/apache/kylin/common/util/CollectionUtils.java @@ -0,0 +1,29 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. +*/ + +package org.apache.kylin.common.util; + +import java.util.Collection; + +public class CollectionUtils { + + public static boolean isEmpty(final Collection<?> coll) { + return coll == null || coll.isEmpty(); + } + +} http://git-wip-us.apache.org/repos/asf/kylin/blob/6d7d2d71/core-common/src/main/java/org/apache/kylin/common/util/Primes.java ---------------------------------------------------------------------- diff --git a/core-common/src/main/java/org/apache/kylin/common/util/Primes.java b/core-common/src/main/java/org/apache/kylin/common/util/Primes.java new file mode 100644 index 0000000..9509802 --- /dev/null +++ b/core-common/src/main/java/org/apache/kylin/common/util/Primes.java @@ -0,0 +1,184 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. +*/ +package org.apache.kylin.common.util; + +import java.math.BigInteger; + +/** + * Copied from commons-math3 to avoid big dependency. + */ +public class Primes { + + /** + * The first 512 prime numbers. + * <p> + * It contains all primes smaller or equal to the cubic square of Integer.MAX_VALUE. + * As a result, <code>int</code> numbers which are not reduced by those primes are guaranteed + * to be either prime or semi prime. + */ + public static final int[] PRIMES = {2, + 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, + 79, 83, 89, 97, 101, 103, 107, 109, 113, 127, 131, 137, 139, 149, 151, 157, 163, 167, 173, 179, + 181, 191, 193, 197, 199, 211, 223, 227, 229, 233, 239, 241, 251, 257, 263, 269, 271, 277, 281, 283, + 293, 307, 311, 313, 317, 331, 337, 347, 349, 353, 359, 367, 373, 379, 383, 389, 397, 401, 409, 419, + 421, 431, 433, 439, 443, 449, 457, 461, 463, 467, 479, 487, 491, 499, 503, 509, 521, 523, 541, 547, + 557, 563, 569, 571, 577, 587, 593, 599, 601, 607, 613, 617, 619, 631, 641, 643, 647, 653, 659, 661, + 673, 677, 683, 691, 701, 709, 719, 727, 733, 739, 743, 751, 757, 761, 769, 773, 787, 797, 809, 811, + 821, 823, 827, 829, 839, 853, 857, 859, 863, 877, 881, 883, 887, 907, 911, 919, 929, 937, 941, 947, + 953, 967, 971, 977, 983, 991, 997, 1009, 1013, 1019, 1021, 1031, 1033, 1039, 1049, 1051, 1061, 1063, 1069, 1087, + 1091, 1093, 1097, 1103, 1109, 1117, 1123, 1129, 1151, 1153, 1163, 1171, 1181, 1187, 1193, 1201, 1213, 1217, 1223, 1229, + 1231, 1237, 1249, 1259, 1277, 1279, 1283, 1289, 1291, 1297, 1301, 1303, 1307, 1319, 1321, 1327, 1361, 1367, 1373, 1381, + 1399, 1409, 1423, 1427, 1429, 1433, 1439, 1447, 1451, 1453, 1459, 1471, 1481, 1483, 1487, 1489, 1493, 1499, 1511, 1523, + 1531, 1543, 1549, 1553, 1559, 1567, 1571, 1579, 1583, 1597, 1601, 1607, 1609, 1613, 1619, 1621, 1627, 1637, 1657, 1663, + 1667, 1669, 1693, 1697, 1699, 1709, 1721, 1723, 1733, 1741, 1747, 1753, 1759, 1777, 1783, 1787, 1789, 1801, 1811, 1823, + 1831, 1847, 1861, 1867, 1871, 1873, 1877, 1879, 1889, 1901, 1907, 1913, 1931, 1933, 1949, 1951, 1973, 1979, 1987, 1993, + 1997, 1999, 2003, 2011, 2017, 2027, 2029, 2039, 2053, 2063, 2069, 2081, 2083, 2087, 2089, 2099, 2111, 2113, 2129, 2131, + 2137, 2141, 2143, 2153, 2161, 2179, 2203, 2207, 2213, 2221, 2237, 2239, 2243, 2251, 2267, 2269, 2273, 2281, 2287, 2293, + 2297, 2309, 2311, 2333, 2339, 2341, 2347, 2351, 2357, 2371, 2377, 2381, 2383, 2389, 2393, 2399, 2411, 2417, 2423, 2437, + 2441, 2447, 2459, 2467, 2473, 2477, 2503, 2521, 2531, 2539, 2543, 2549, 2551, 2557, 2579, 2591, 2593, 2609, 2617, 2621, + 2633, 2647, 2657, 2659, 2663, 2671, 2677, 2683, 2687, 2689, 2693, 2699, 2707, 2711, 2713, 2719, 2729, 2731, 2741, 2749, + 2753, 2767, 2777, 2789, 2791, 2797, 2801, 2803, 2819, 2833, 2837, 2843, 2851, 2857, 2861, 2879, 2887, 2897, 2903, 2909, + 2917, 2927, 2939, 2953, 2957, 2963, 2969, 2971, 2999, 3001, 3011, 3019, 3023, 3037, 3041, 3049, 3061, 3067, 3079, 3083, + 3089, 3109, 3119, 3121, 3137, 3163, 3167, 3169, 3181, 3187, 3191, 3203, 3209, 3217, 3221, 3229, 3251, 3253, 3257, 3259, + 3271, 3299, 3301, 3307, 3313, 3319, 3323, 3329, 3331, 3343, 3347, 3359, 3361, 3371, 3373, 3389, 3391, 3407, 3413, 3433, + 3449, 3457, 3461, 3463, 3467, 3469, 3491, 3499, 3511, 3517, 3527, 3529, 3533, 3539, 3541, 3547, 3557, 3559, 3571, 3581, + 3583, 3593, 3607, 3613, 3617, 3623, 3631, 3637, 3643, 3659, 3671}; + + /** + * Hide utility class. + */ + private Primes() { + } + + /** + * Primality test: tells if the argument is a (provable) prime or not. + * <p> + * It uses the Miller-Rabin probabilistic test in such a way that a result is guaranteed: + * it uses the firsts prime numbers as successive base (see Handbook of applied cryptography + * by Menezes, table 4.1). + * + * @param n number to test. + * @return true if n is prime. (All numbers < 2 return false). + */ + public static boolean isPrime(int n) { + if (n < 2) { + return false; + } + + for (int p : PRIMES) { + if (0 == (n % p)) { + return n == p; + } + } + return millerRabinPrimeTest(n); + } + + /** + * Return the smallest prime greater than or equal to n. + * + * @param n a positive number. + * @return the smallest prime greater than or equal to n. + * @throws IllegalArgumentException if n < 0. + */ + public static int nextPrime(int n) { + if (n < 0) { + throw new IllegalArgumentException(); + } + if (n == 2) { + return 2; + } + n |= 1;//make sure n is odd + if (n == 1) { + return 2; + } + + if (isPrime(n)) { + return n; + } + + // prepare entry in the +2, +4 loop: + // n should not be a multiple of 3 + final int rem = n % 3; + if (0 == rem) { // if n % 3 == 0 + n += 2; // n % 3 == 2 + } else if (1 == rem) { // if n % 3 == 1 + // if (isPrime(n)) return n; + n += 4; // n % 3 == 2 + } + while (true) { // this loop skips all multiple of 3 + if (isPrime(n)) { + return n; + } + n += 2; // n % 3 == 1 + if (isPrime(n)) { + return n; + } + n += 4; // n % 3 == 2 + } + } + + /** + * Miller-Rabin probabilistic primality test for int type, used in such a way that a result is always guaranteed. + * <p> + * It uses the prime numbers as successive base therefore it is guaranteed to be always correct. + * (see Handbook of applied cryptography by Menezes, table 4.1) + * + * @param n number to test: an odd integer ≥ 3 + * @return true if n is prime. false if n is definitely composite. + */ + public static boolean millerRabinPrimeTest(final int n) { + final int nMinus1 = n - 1; + final int s = Integer.numberOfTrailingZeros(nMinus1); + final int r = nMinus1 >> s; + //r must be odd, it is not checked here + int t = 1; + if (n >= 2047) { + t = 2; + } + if (n >= 1373653) { + t = 3; + } + if (n >= 25326001) { + t = 4; + } // works up to 3.2 billion, int range stops at 2.7 so we are safe :-) + BigInteger br = BigInteger.valueOf(r); + BigInteger bn = BigInteger.valueOf(n); + + for (int i = 0; i < t; i++) { + BigInteger a = BigInteger.valueOf(PRIMES[i]); + BigInteger bPow = a.modPow(br, bn); + int y = bPow.intValue(); + if ((1 != y) && (y != nMinus1)) { + int j = 1; + while ((j <= s - 1) && (nMinus1 != y)) { + long square = ((long) y) * y; + y = (int) (square % n); + if (1 == y) { + return false; + } // definitely composite + j++; + } + if (nMinus1 != y) { + return false; + } // definitely composite + } + } + return true; // definitely prime + } +} + http://git-wip-us.apache.org/repos/asf/kylin/blob/6d7d2d71/core-common/src/test/java/org/apache/kylin/common/util/BasicTest.java ---------------------------------------------------------------------- diff --git a/core-common/src/test/java/org/apache/kylin/common/util/BasicTest.java b/core-common/src/test/java/org/apache/kylin/common/util/BasicTest.java index d753a20..25a8d44 100644 --- a/core-common/src/test/java/org/apache/kylin/common/util/BasicTest.java +++ b/core-common/src/test/java/org/apache/kylin/common/util/BasicTest.java @@ -30,11 +30,9 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; -import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.apache.commons.configuration.ConfigurationException; import org.junit.Ignore; import org.junit.Test; import org.slf4j.LoggerFactory; @@ -220,7 +218,7 @@ public class BasicTest { @Test @Ignore("fix it later") - public void test2() throws IOException, ConfigurationException { + public void test2() throws IOException { ArrayList<String> x = Lists.newArrayListWithCapacity(10); x.set(2, "dd"); for (String y : x) { http://git-wip-us.apache.org/repos/asf/kylin/blob/6d7d2d71/core-cube/src/main/java/org/apache/kylin/cube/upgrade/v2/CubeMetadataUpgradeV2.java ---------------------------------------------------------------------- diff --git a/core-cube/src/main/java/org/apache/kylin/cube/upgrade/v2/CubeMetadataUpgradeV2.java b/core-cube/src/main/java/org/apache/kylin/cube/upgrade/v2/CubeMetadataUpgradeV2.java index 77cb28d..4b823e6 100644 --- a/core-cube/src/main/java/org/apache/kylin/cube/upgrade/v2/CubeMetadataUpgradeV2.java +++ b/core-cube/src/main/java/org/apache/kylin/cube/upgrade/v2/CubeMetadataUpgradeV2.java @@ -23,12 +23,12 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.ArrayUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.kylin.common.KylinConfig; import org.apache.kylin.common.persistence.ResourceStore; +import org.apache.kylin.common.util.CollectionUtils; import org.apache.kylin.cube.CubeDescManager; import org.apache.kylin.cube.CubeInstance; import org.apache.kylin.cube.CubeManager; http://git-wip-us.apache.org/repos/asf/kylin/blob/6d7d2d71/core-storage/pom.xml ---------------------------------------------------------------------- diff --git a/core-storage/pom.xml b/core-storage/pom.xml index e17d13f..d5d971a 100644 --- a/core-storage/pom.xml +++ b/core-storage/pom.xml @@ -40,14 +40,12 @@ <artifactId>kylin-core-cube</artifactId> <version>${project.parent.version}</version> </dependency> - <dependency> <groupId>net.sf.ehcache</groupId> <artifactId>ehcache</artifactId> <version>2.8.1</version> </dependency> - <!-- Env & Test --> <dependency> <groupId>org.apache.kylin</groupId> http://git-wip-us.apache.org/repos/asf/kylin/blob/6d7d2d71/cube/pom.xml ---------------------------------------------------------------------- diff --git a/cube/pom.xml b/cube/pom.xml index e5964c4..7e23dea 100644 --- a/cube/pom.xml +++ b/cube/pom.xml @@ -65,10 +65,6 @@ <artifactId>commons-io</artifactId> </dependency> <dependency> - <groupId>commons-configuration</groupId> - <artifactId>commons-configuration</artifactId> - </dependency> - <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/kylin/blob/6d7d2d71/metadata/pom.xml ---------------------------------------------------------------------- diff --git a/metadata/pom.xml b/metadata/pom.xml index 52feb4b..49db6b9 100644 --- a/metadata/pom.xml +++ b/metadata/pom.xml @@ -61,10 +61,6 @@ <artifactId>commons-io</artifactId> </dependency> <dependency> - <groupId>commons-configuration</groupId> - <artifactId>commons-configuration</artifactId> - </dependency> - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/kylin/blob/6d7d2d71/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index c3c43f4..c936774 100644 --- a/pom.xml +++ b/pom.xml @@ -65,10 +65,8 @@ <commons-lang.version>2.6</commons-lang.version> <commons-lang3.version>3.1</commons-lang3.version> <commons-io.version>2.4</commons-io.version> - <commons-configuration.version>1.9</commons-configuration.version> <commons-daemon.version>1.0.15</commons-daemon.version> <commons-httpclient.version>3.1</commons-httpclient.version> - <commons-collections4.version>4.0</commons-collections4.version> <commons-email.version>1.1</commons-email.version> <commons-math3.version>3.5</commons-math3.version> @@ -342,11 +340,6 @@ <version>${commons-io.version}</version> </dependency> <dependency> - <groupId>commons-configuration</groupId> - <artifactId>commons-configuration</artifactId> - <version>${commons-configuration.version}</version> - </dependency> - <dependency> <groupId>commons-daemon</groupId> <artifactId>commons-daemon</artifactId> <version>${commons-daemon.version}</version> @@ -388,11 +381,6 @@ </dependency> <dependency> <groupId>org.apache.commons</groupId> - <artifactId>commons-collections4</artifactId> - <version>${commons-collections4.version}</version> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> <artifactId>commons-email</artifactId> <version>${commons-email.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/kylin/blob/6d7d2d71/server/pom.xml ---------------------------------------------------------------------- diff --git a/server/pom.xml b/server/pom.xml index 515305d..3990dc1 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -246,10 +246,6 @@ <artifactId>super-csv</artifactId> <version>2.1.0</version> </dependency> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - </dependency> <!-- spring aop --> <dependency> @@ -434,9 +430,9 @@ </exclusions> </dependency> <dependency> - <groupId>com.thetransactioncompany</groupId> - <artifactId>cors-filter</artifactId> - <version>1.3.2</version> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> http://git-wip-us.apache.org/repos/asf/kylin/blob/6d7d2d71/server/src/main/java/org/apache/kylin/rest/security/MockAclHBaseStorage.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/kylin/rest/security/MockAclHBaseStorage.java b/server/src/main/java/org/apache/kylin/rest/security/MockAclHBaseStorage.java index eb870cf..b98191f 100644 --- a/server/src/main/java/org/apache/kylin/rest/security/MockAclHBaseStorage.java +++ b/server/src/main/java/org/apache/kylin/rest/security/MockAclHBaseStorage.java @@ -2,10 +2,10 @@ package org.apache.kylin.rest.security; import java.io.IOException; +import org.apache.commons.lang.StringUtils; import org.apache.hadoop.hbase.client.HTableInterface; import org.apache.kylin.rest.service.AclService; import org.apache.kylin.rest.service.UserService; -import org.h2.util.StringUtils; /** */ http://git-wip-us.apache.org/repos/asf/kylin/blob/6d7d2d71/server/src/main/java/org/apache/kylin/rest/security/RealAclHBaseStorage.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/kylin/rest/security/RealAclHBaseStorage.java b/server/src/main/java/org/apache/kylin/rest/security/RealAclHBaseStorage.java index 0cf3822..f02a361 100644 --- a/server/src/main/java/org/apache/kylin/rest/security/RealAclHBaseStorage.java +++ b/server/src/main/java/org/apache/kylin/rest/security/RealAclHBaseStorage.java @@ -2,12 +2,12 @@ package org.apache.kylin.rest.security; import java.io.IOException; +import org.apache.commons.lang.StringUtils; import org.apache.hadoop.hbase.client.HTableInterface; import org.apache.kylin.common.KylinConfig; import org.apache.kylin.rest.service.AclService; import org.apache.kylin.rest.service.UserService; import org.apache.kylin.storage.hbase.HBaseConnection; -import org.h2.util.StringUtils; /** */ http://git-wip-us.apache.org/repos/asf/kylin/blob/6d7d2d71/server/src/main/java/org/apache/kylin/rest/service/QueryService.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/kylin/rest/service/QueryService.java b/server/src/main/java/org/apache/kylin/rest/service/QueryService.java index 669616b..d248b72 100644 --- a/server/src/main/java/org/apache/kylin/rest/service/QueryService.java +++ b/server/src/main/java/org/apache/kylin/rest/service/QueryService.java @@ -43,6 +43,7 @@ import javax.sql.DataSource; import org.apache.calcite.avatica.ColumnMetaData.Rep; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang.StringUtils; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.HTableInterface; import org.apache.hadoop.hbase.client.Put; @@ -64,7 +65,6 @@ import org.apache.kylin.rest.response.SQLResponse; import org.apache.kylin.rest.util.QueryUtil; import org.apache.kylin.rest.util.Serializer; import org.apache.kylin.storage.hbase.HBaseConnection; -import org.h2.util.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -282,7 +282,7 @@ public class QueryService extends BasicService { Connection conn = null; ResultSet columnMeta = null; List<TableMeta> tableMetas = null; - if (StringUtils.isNullOrEmpty(project)) { + if (StringUtils.isBlank(project)) { return Collections.emptyList(); } try { http://git-wip-us.apache.org/repos/asf/kylin/blob/6d7d2d71/source-kafka/pom.xml ---------------------------------------------------------------------- diff --git a/source-kafka/pom.xml b/source-kafka/pom.xml index 9e18877..510bcf4 100644 --- a/source-kafka/pom.xml +++ b/source-kafka/pom.xml @@ -29,6 +29,7 @@ <groupId>org.apache.kafka</groupId> <artifactId>kafka_2.10</artifactId> <version>${kafka.version}</version> + <scope>provided</scope> </dependency> <!-- Env & Test --> http://git-wip-us.apache.org/repos/asf/kylin/blob/6d7d2d71/storage-hbase/pom.xml ---------------------------------------------------------------------- diff --git a/storage-hbase/pom.xml b/storage-hbase/pom.xml index e0a5078..d2b2430 100644 --- a/storage-hbase/pom.xml +++ b/storage-hbase/pom.xml @@ -142,11 +142,6 @@ <include>com.esotericsoftware:kryo-shaded</include> <include>com.esotericsoftware:minlog</include> <include>org.objenesis:objenesis</include> - - <!-- include>com.fasterxml.jackson.core:*</include --> - <!-- include>org.apache.commons:commons-lang3</include --> - <!-- include>commons-configuration:*</include --> - <!-- include>com.jcraft:jsch</include --> </includes> </artifactSet> <filters> http://git-wip-us.apache.org/repos/asf/kylin/blob/6d7d2d71/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CreateHTableJob.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CreateHTableJob.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CreateHTableJob.java index 16a6461..818cf85 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CreateHTableJob.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CreateHTableJob.java @@ -26,7 +26,6 @@ import java.util.List; import java.util.Map; import org.apache.commons.cli.Options; -import org.apache.commons.math3.primes.Primes; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; @@ -40,6 +39,7 @@ import org.apache.hadoop.util.ToolRunner; import org.apache.kylin.common.KylinConfig; import org.apache.kylin.common.util.Bytes; import org.apache.kylin.common.util.BytesUtil; +import org.apache.kylin.common.util.Primes; import org.apache.kylin.common.util.ShardingHash; import org.apache.kylin.cube.CubeInstance; import org.apache.kylin.cube.CubeManager;
