You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2016/09/28 05:14:50 UTC
kylin git commit: KYLIN-2054 minor issues
Repository: kylin
Updated Branches:
refs/heads/KYLIN-2054 754899710 -> 26609a20e
KYLIN-2054 minor issues
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/26609a20
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/26609a20
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/26609a20
Branch: refs/heads/KYLIN-2054
Commit: 26609a20eb2af681f41ac7e7397359b5a519b741
Parents: 7548997
Author: shaofengshi <sh...@apache.org>
Authored: Wed Sep 28 13:14:58 2016 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Wed Sep 28 13:14:58 2016 +0800
----------------------------------------------------------------------
build/bin/kylin.sh | 3 ++-
.../src/main/java/org/apache/kylin/source/kafka/KafkaMRInput.java | 2 +-
.../java/org/apache/kylin/source/kafka/TimedJsonStreamParser.java | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/26609a20/build/bin/kylin.sh
----------------------------------------------------------------------
diff --git a/build/bin/kylin.sh b/build/bin/kylin.sh
index 7a9d2a1..e767492 100644
--- a/build/bin/kylin.sh
+++ b/build/bin/kylin.sh
@@ -31,7 +31,7 @@ function retrieveDependency() {
#retrive $hive_dependency and $hbase_dependency
source ${dir}/find-hive-dependency.sh
source ${dir}/find-hbase-dependency.sh
- source ${dir}/find-kafka-dependency.sh
+ #source ${dir}/find-kafka-dependency.sh
#retrive $KYLIN_EXTRA_START_OPTS
if [ -f "${dir}/setenv.sh" ]
@@ -40,6 +40,7 @@ function retrieveDependency() {
export HBASE_CLASSPATH_PREFIX=${KYLIN_HOME}/conf:${KYLIN_HOME}/lib/*:${KYLIN_HOME}/tool/*:${KYLIN_HOME}/ext/*:${HBASE_CLASSPATH_PREFIX}
export HBASE_CLASSPATH=${HBASE_CLASSPATH}:${hive_dependency}
+ #export HBASE_CLASSPATH=${HBASE_CLASSPATH}:${hive_dependency}:${kafka_dependency}
}
# start command
http://git-wip-us.apache.org/repos/asf/kylin/blob/26609a20/source-kafka/src/main/java/org/apache/kylin/source/kafka/KafkaMRInput.java
----------------------------------------------------------------------
diff --git a/source-kafka/src/main/java/org/apache/kylin/source/kafka/KafkaMRInput.java b/source-kafka/src/main/java/org/apache/kylin/source/kafka/KafkaMRInput.java
index 729719a..6358ee1 100644
--- a/source-kafka/src/main/java/org/apache/kylin/source/kafka/KafkaMRInput.java
+++ b/source-kafka/src/main/java/org/apache/kylin/source/kafka/KafkaMRInput.java
@@ -114,7 +114,7 @@ public class KafkaMRInput implements IMRInput {
try {
streamingParser = StreamingParser.getStreamingParser(kafkaConfig.getParserName(), kafkaConfig.getParserProperties(), columns);
} catch (ReflectiveOperationException e) {
- throw new IllegalArgumentException();
+ throw new IllegalArgumentException(e);
}
}
Text text = (Text) mapperInput;
http://git-wip-us.apache.org/repos/asf/kylin/blob/26609a20/source-kafka/src/main/java/org/apache/kylin/source/kafka/TimedJsonStreamParser.java
----------------------------------------------------------------------
diff --git a/source-kafka/src/main/java/org/apache/kylin/source/kafka/TimedJsonStreamParser.java b/source-kafka/src/main/java/org/apache/kylin/source/kafka/TimedJsonStreamParser.java
index 9faf880..5db602d 100644
--- a/source-kafka/src/main/java/org/apache/kylin/source/kafka/TimedJsonStreamParser.java
+++ b/source-kafka/src/main/java/org/apache/kylin/source/kafka/TimedJsonStreamParser.java
@@ -88,7 +88,7 @@ public final class TimedJsonStreamParser extends StreamingParser {
try {
Class clazz = Class.forName(tsParser);
Constructor constructor = clazz.getConstructor(String[].class);
- streamTimeParser = (AbstractTimeParser) constructor.newInstance(properties);
+ streamTimeParser = (AbstractTimeParser) constructor.newInstance((Object)properties);
} catch (Exception e) {
throw new IllegalStateException("Invalid StreamingConfig, tsParser " + tsParser + ", parserProperties " + propertiesStr + ".", e);
}