You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by bi...@apache.org on 2017/02/13 01:34:05 UTC
kylin git commit: KYLIN-2428 exclude guava & reflection for spark
Repository: kylin
Updated Branches:
refs/heads/KYLIN-2428 7c2632d96 -> 93507a654
KYLIN-2428 exclude guava & reflection for spark
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/93507a65
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/93507a65
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/93507a65
Branch: refs/heads/KYLIN-2428
Commit: 93507a65461186558b185507c22ee719c757f699
Parents: 7c2632d
Author: Billy Liu <bi...@apache.org>
Authored: Mon Feb 13 09:33:51 2017 +0800
Committer: Billy Liu <bi...@apache.org>
Committed: Mon Feb 13 09:33:51 2017 +0800
----------------------------------------------------------------------
engine-spark/pom.xml | 7 ++----
.../engine/spark/KylinKryoRegistrator.java | 24 ++++++++++----------
pom.xml | 4 ++++
3 files changed, 18 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/93507a65/engine-spark/pom.xml
----------------------------------------------------------------------
diff --git a/engine-spark/pom.xml b/engine-spark/pom.xml
index fe6d998..a279279 100644
--- a/engine-spark/pom.xml
+++ b/engine-spark/pom.xml
@@ -67,11 +67,13 @@
<scope>provided</scope>
</dependency>
+ <!--
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
<scope>provided</scope>
</dependency>
+ -->
<!-- Hadoop dependency -->
<dependency>
@@ -117,11 +119,6 @@
<artifactId>maven-model</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
-
</dependencies>
http://git-wip-us.apache.org/repos/asf/kylin/blob/93507a65/engine-spark/src/main/java/org/apache/kylin/engine/spark/KylinKryoRegistrator.java
----------------------------------------------------------------------
diff --git a/engine-spark/src/main/java/org/apache/kylin/engine/spark/KylinKryoRegistrator.java b/engine-spark/src/main/java/org/apache/kylin/engine/spark/KylinKryoRegistrator.java
index 3d33aa8..322e835 100644
--- a/engine-spark/src/main/java/org/apache/kylin/engine/spark/KylinKryoRegistrator.java
+++ b/engine-spark/src/main/java/org/apache/kylin/engine/spark/KylinKryoRegistrator.java
@@ -21,13 +21,13 @@ package org.apache.kylin.engine.spark;
import com.esotericsoftware.kryo.Kryo;
import com.google.common.collect.Sets;
import com.google.common.hash.Hashing;
-import org.apache.kylin.measure.MeasureIngester;
+//import org.apache.kylin.measure.MeasureIngester;
import org.apache.spark.serializer.KryoRegistrator;
-import org.reflections.Reflections;
+//import org.reflections.Reflections;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.Serializable;
+//import java.io.Serializable;
import java.util.Set;
/**
@@ -55,15 +55,15 @@ public class KylinKryoRegistrator implements KryoRegistrator {
kyroClasses.add(java.util.HashMap.class);
kyroClasses.add(java.util.TreeMap.class);
kyroClasses.add(java.util.Properties.class);
- kyroClasses.addAll(new Reflections("org.apache.kylin").getSubTypesOf(Serializable.class));
- kyroClasses.addAll(new Reflections("org.apache.kylin.dimension").getSubTypesOf(Serializable.class));
- kyroClasses.addAll(new Reflections("org.apache.kylin.cube").getSubTypesOf(Serializable.class));
- kyroClasses.addAll(new Reflections("org.apache.kylin.cube.model").getSubTypesOf(Object.class));
- kyroClasses.addAll(new Reflections("org.apache.kylin.metadata").getSubTypesOf(Object.class));
- kyroClasses.addAll(new Reflections("org.apache.kylin.metadata.model").getSubTypesOf(Object.class));
- kyroClasses.addAll(new Reflections("org.apache.kylin.metadata.measure").getSubTypesOf(Object.class));
- kyroClasses.addAll(new Reflections("org.apache.kylin.metadata.datatype").getSubTypesOf(org.apache.kylin.common.util.BytesSerializer.class));
- kyroClasses.addAll(new Reflections("org.apache.kylin.measure").getSubTypesOf(MeasureIngester.class));
+// kyroClasses.addAll(new Reflections("org.apache.kylin").getSubTypesOf(Serializable.class));
+// kyroClasses.addAll(new Reflections("org.apache.kylin.dimension").getSubTypesOf(Serializable.class));
+// kyroClasses.addAll(new Reflections("org.apache.kylin.cube").getSubTypesOf(Serializable.class));
+// kyroClasses.addAll(new Reflections("org.apache.kylin.cube.model").getSubTypesOf(Object.class));
+// kyroClasses.addAll(new Reflections("org.apache.kylin.metadata").getSubTypesOf(Object.class));
+// kyroClasses.addAll(new Reflections("org.apache.kylin.metadata.model").getSubTypesOf(Object.class));
+// kyroClasses.addAll(new Reflections("org.apache.kylin.metadata.measure").getSubTypesOf(Object.class));
+// kyroClasses.addAll(new Reflections("org.apache.kylin.metadata.datatype").getSubTypesOf(org.apache.kylin.common.util.BytesSerializer.class));
+// kyroClasses.addAll(new Reflections("org.apache.kylin.measure").getSubTypesOf(MeasureIngester.class));
kyroClasses.add(org.apache.spark.sql.Row[].class);
kyroClasses.add(org.apache.spark.sql.Row.class);
http://git-wip-us.apache.org/repos/asf/kylin/blob/93507a65/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 68a5372..72ef9ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,9 @@
<!-- Spark versions -->
<spark.version>1.6.3</spark.version>
<kryo.version>4.0.0</kryo.version>
+ <!--
<reflections.version>0.9.10</reflections.version>
+ -->
<!-- Calcite Version -->
<calcite.version>1.11.0</calcite.version>
@@ -580,12 +582,14 @@
<version>${kryo.version}</version>
<scope>provided</scope>
</dependency>
+ <!--
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
<version>${reflections.version}</version>
<scope>provided</scope>
</dependency>
+ -->
<!-- Kafka dependency -->
<dependency>
<groupId>org.apache.kafka</groupId>