You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2015/03/03 11:28:34 UTC
[20/50] incubator-kylin git commit: Merge branch 'inverted-index'
into streaming
Merge branch 'inverted-index' into streaming
Conflicts:
bin/find-hive-dependency.sh
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/eb4ea7d6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/eb4ea7d6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/eb4ea7d6
Branch: refs/heads/master
Commit: eb4ea7d6551c9f2db7c0c38f140d1468e68bb2b3
Parents: 301388e f2dd665
Author: qianhao.zhou <qi...@ebay.com>
Authored: Fri Feb 13 15:14:02 2015 +0800
Committer: qianhao.zhou <qi...@ebay.com>
Committed: Fri Feb 13 15:14:02 2015 +0800
----------------------------------------------------------------------
bin/check-env.sh | 20 ++--------
bin/find-hive-dependency.sh | 10 +++--
bin/start-kylin.sh | 3 +-
bin/stop-kylin.sh | 3 ++
.../org/apache/kylin/common/KylinConfig.java | 13 ++++---
.../apache/kylin/common/util/HiveClient.java | 31 ++++++++++++++--
.../kylin/job/engine/JobEngineConfig.java | 24 +++++-------
.../kylin/job/hadoop/AbstractHadoopJob.java | 39 ++++++++++++++------
.../cardinality/HiveColumnCardinalityJob.java | 22 ++---------
.../kylin/job/hadoop/cube/CubeHFileJob.java | 7 +---
.../apache/kylin/job/hadoop/cube/CuboidJob.java | 7 +---
.../job/hadoop/cube/FactDistinctColumnsJob.java | 15 ++------
.../job/hadoop/cube/KeyDistributionJob.java | 2 +-
.../kylin/job/hadoop/cube/MergeCuboidJob.java | 8 +---
.../hadoop/cube/RangeKeyDistributionJob.java | 7 +---
.../cube/RowKeyDistributionCheckerJob.java | 2 +-
.../hadoop/invertedindex/IICreateHFileJob.java | 14 ++-----
.../invertedindex/IIDistinctColumnsJob.java | 18 +++------
.../hadoop/invertedindex/InvertedIndexJob.java | 16 +++-----
.../invertedindex/RandomKeyDistributionJob.java | 3 +-
script/compress.sh | 3 ++
21 files changed, 117 insertions(+), 150 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/eb4ea7d6/bin/check-env.sh
----------------------------------------------------------------------
diff --cc bin/check-env.sh
index 3bef6c4,3e9a814..14eea70
--- a/bin/check-env.sh
+++ b/bin/check-env.sh
@@@ -1,15 -1,12 +1,13 @@@
+#!/bin/sh
+ #by source
- echo "Checking KYLIN_HOME..."
if [ -z "$KYLIN_HOME" ]
then
- echo 'please make sure KYLIN_HOME has been set'
- exit 1
- else
- echo "KYLIN_HOME is set to ${KYLIN_HOME}"
+ bin=$(dirname ${0})
+ export KYLIN_HOME=$(dirname $bin)
fi
+ echo "KYLIN_HOME is set to ${KYLIN_HOME}"
- echo "Checking hbase..."
if [ -z "$(command -v hbase version)" ]
then
echo "Please make sure the user has the privilege to run hbase shell"
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/eb4ea7d6/bin/find-hive-dependency.sh
----------------------------------------------------------------------
diff --cc bin/find-hive-dependency.sh
index 4ae1a26,bc9b00c..f15e87e
--- a/bin/find-hive-dependency.sh
+++ b/bin/find-hive-dependency.sh
@@@ -15,16 -21,6 +21,14 @@@ d
done
hdp_home=`echo $hive_exec_path | awk -F '/hive/lib/' '{print $1}'`
- hive_dependency=${hdp_home}/hive/conf:${hdp_home}/hive/lib/*
-
-hive_dependency=$hive_conf_path:${hdp_home}/hive/lib/*:${hdp_home}/hive-hcatalog/share/hcatalog/*
+hcatalog=`find $hdp_home -name "hive-hcatalog-core[0-9\.-]*jar" 2>&1 | grep -m 1 -v 'Permission denied'`
+
+if [ -z "$hcatalog" ]
+then
+ echo "hcatalog lib not found"
+ exit 1
+fi
+
- hive_dependency=${hive_dependency}:${hcatalog}
++hive_dependency=${hive_conf_path}:${hdp_home}/hive/lib/*:${hcatalog}
echo "hive dependency: $hive_dependency"
export hive_dependency