Return-Path: X-Original-To: apmail-hive-commits-archive@www.apache.org Delivered-To: apmail-hive-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8FA7118B30 for ; Mon, 28 Sep 2015 19:10:23 +0000 (UTC) Received: (qmail 98839 invoked by uid 500); 28 Sep 2015 19:10:05 -0000 Delivered-To: apmail-hive-commits-archive@hive.apache.org Received: (qmail 98735 invoked by uid 500); 28 Sep 2015 19:10:05 -0000 Mailing-List: contact commits-help@hive.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hive-dev@hive.apache.org Delivered-To: mailing list commits@hive.apache.org Received: (qmail 97284 invoked by uid 99); 28 Sep 2015 19:10:04 -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; Mon, 28 Sep 2015 19:10:04 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D60E1E08BE; Mon, 28 Sep 2015 19:10:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sershe@apache.org To: commits@hive.apache.org Date: Mon, 28 Sep 2015 19:10:33 -0000 Message-Id: <137737c0de3c4dcea85e9e98be8049f9@git.apache.org> In-Reply-To: <533decb8e0e44ab9b9c45957ea71aceb@git.apache.org> References: <533decb8e0e44ab9b9c45957ea71aceb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [31/43] hive git commit: HIVE-11943: Set old CLI as the default Client when using hive script(Ferdinand Xu, reviewed by Xuefu Zhang) HIVE-11943: Set old CLI as the default Client when using hive script(Ferdinand Xu, reviewed by Xuefu Zhang) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/046c5ebd Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/046c5ebd Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/046c5ebd Branch: refs/heads/llap Commit: 046c5ebdbeaa8155189db13f78ddb28c63c7500c Parents: 1857956 Author: Ferdinand Xu Authored: Thu Sep 24 21:14:33 2015 -0400 Committer: Ferdinand Xu Committed: Thu Sep 24 21:14:33 2015 -0400 ---------------------------------------------------------------------- bin/ext/cli.cmd | 6 +++++- bin/ext/cli.sh | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/046c5ebd/bin/ext/cli.cmd ---------------------------------------------------------------------- diff --git a/bin/ext/cli.cmd b/bin/ext/cli.cmd index 3a96d03..d9185c0 100644 --- a/bin/ext/cli.cmd +++ b/bin/ext/cli.cmd @@ -28,9 +28,13 @@ goto :EOF goto :EOF :update_cli + if [%USE_DEPRECATED_CLI%] == [] ( + set USE_DEPRECATED_CLI=false + ) + if /I "%USE_DEPRECATED_CLI%" == "true" ( call :old_cli - ) else if ( + ) else ( call :new_cli ) goto :EOF http://git-wip-us.apache.org/repos/asf/hive/blob/046c5ebd/bin/ext/cli.sh ---------------------------------------------------------------------- diff --git a/bin/ext/cli.sh b/bin/ext/cli.sh index 893b7fc..e7897b3 100644 --- a/bin/ext/cli.sh +++ b/bin/ext/cli.sh @@ -16,10 +16,14 @@ THISSERVICE=cli export SERVICE_LIST="${SERVICE_LIST}${THISSERVICE} " +# Set old CLI as the default client +if [ -n '$USE_DEPRECATED_CLI' ]; then + USE_DEPRECATED_CLI="true" +fi + updateBeelineOpts() { # If process is backgrounded, don't change terminal settings if [[ ! $(ps -o stat= -p $$) == *+ ]]; then - echo "background" export HADOOP_CLIENT_OPTS="$HADOOP_CLIENT_OPTS -Djline.terminal=jline.UnsupportedTerminal" fi }