Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id D2FC7200B76 for ; Tue, 26 Jul 2016 05:33:27 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id D1CF2160AA6; Tue, 26 Jul 2016 03:33:27 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id AEC4F160AA1 for ; Tue, 26 Jul 2016 05:33:26 +0200 (CEST) Received: (qmail 11869 invoked by uid 500); 26 Jul 2016 03:33:25 -0000 Mailing-List: contact commits-help@kylin.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@kylin.apache.org Delivered-To: mailing list commits@kylin.apache.org Received: (qmail 9959 invoked by uid 99); 26 Jul 2016 03:33:21 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Jul 2016 03:33:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 259D3E02A2; Tue, 26 Jul 2016 03:33:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: shaofengshi@apache.org To: commits@kylin.apache.org Date: Tue, 26 Jul 2016 03:34:00 -0000 Message-Id: In-Reply-To: <5947187d840c4a5a949ac8e15bcf17f6@git.apache.org> References: <5947187d840c4a5a949ac8e15bcf17f6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [41/55] [abbrv] kylin git commit: KYLIN-1797 when use beeline, must specify HIVE_CONF archived-at: Tue, 26 Jul 2016 03:33:28 -0000 KYLIN-1797 when use beeline, must specify HIVE_CONF Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/3e553c0e Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/3e553c0e Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/3e553c0e Branch: refs/heads/1.5.x-CDH5.7 Commit: 3e553c0e944c4f61d5df7f7ee69315a2916654b6 Parents: 9d48273 Author: shaofengshi Authored: Sat Jul 23 18:51:26 2016 +0800 Committer: shaofengshi Committed: Sat Jul 23 18:51:26 2016 +0800 ---------------------------------------------------------------------- build/bin/find-hive-dependency.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/3e553c0e/build/bin/find-hive-dependency.sh ---------------------------------------------------------------------- diff --git a/build/bin/find-hive-dependency.sh b/build/bin/find-hive-dependency.sh index 5b748fc..067a852 100644 --- a/build/bin/find-hive-dependency.sh +++ b/build/bin/find-hive-dependency.sh @@ -16,12 +16,19 @@ # See the License for the specific language governing permissions and # limitations under the License. # - +dir=$(dirname ${0}) +source ${dir}/check-env.sh client_mode=`sh ${KYLIN_HOME}/bin/get-properties.sh kylin.hive.client` hive_env= if [ "${client_mode}" == "beeline" ] then + # when use beeline, need explicitly provide HIVE_CONF + if [ -z "$HIVE_CONF" ] + then + echo "Please set HIVE_CONF to the path which has hive-site.xml." + exit 1 + fi beeline_params=`sh ${KYLIN_HOME}/bin/get-properties.sh kylin.hive.beeline.params` hive_env=`beeline ${beeline_params} --outputformat=dsv -e set | grep 'env:CLASSPATH'` else @@ -60,7 +67,7 @@ done if [ -z "$hive_conf_path" ] then - echo "Couldn't find hive configuration directory. Please set HIVE_CONF to the path which contains hive-site.xml." + echo "Couldn't find hive configuration directory. Please set HIVE_CONF to the path which has hive-site.xml." exit 1 fi