You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by li...@apache.org on 2017/02/17 03:09:36 UTC
hive git commit: HIVE-15710: HS2 Stopped when running in background
(Rui reviewed by Ferdinand, Xuefu and Mohit)
Repository: hive
Updated Branches:
refs/heads/master ef61a9bcf -> 90688bde9
HIVE-15710: HS2 Stopped when running in background (Rui reviewed by Ferdinand, Xuefu and Mohit)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/90688bde
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/90688bde
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/90688bde
Branch: refs/heads/master
Commit: 90688bde9b1172fb2a042905dba645fbeda92510
Parents: ef61a9b
Author: Rui Li <li...@apache.org>
Authored: Fri Feb 17 11:08:40 2017 +0800
Committer: Rui Li <sh...@cn.ibm.com>
Committed: Fri Feb 17 11:08:40 2017 +0800
----------------------------------------------------------------------
bin/beeline | 5 -----
bin/ext/cli.sh | 8 --------
bin/hive | 7 +++++++
3 files changed, 7 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/90688bde/bin/beeline
----------------------------------------------------------------------
diff --git a/bin/beeline b/bin/beeline
index 7b974d4..d247c39 100644
--- a/bin/beeline
+++ b/bin/beeline
@@ -18,9 +18,4 @@
bin=`dirname "$0"`
bin=`cd "$bin"; pwd`
-# If process is backgrounded, don't change terminal settings
-if [[ ( ! $(ps -o stat= -p $$) =~ "+" ) && ! ( -p /dev/stdin ) ]]; then
- export HADOOP_CLIENT_OPTS="$HADOOP_CLIENT_OPTS -Djline.terminal=jline.UnsupportedTerminal"
-fi
-
. "$bin"/hive --service beeline "$@"
http://git-wip-us.apache.org/repos/asf/hive/blob/90688bde/bin/ext/cli.sh
----------------------------------------------------------------------
diff --git a/bin/ext/cli.sh b/bin/ext/cli.sh
index 4933c2e..87329f3 100644
--- a/bin/ext/cli.sh
+++ b/bin/ext/cli.sh
@@ -22,13 +22,6 @@ if [ -z "$USE_DEPRECATED_CLI" ] || [ "$USE_DEPRECATED_CLI" != "false" ]; then
USE_DEPRECATED_CLI="true"
fi
-updateBeelineOpts() {
- # If process is backgrounded, don't change terminal settings
- if [[ ( ! $(ps -o stat= -p $$) =~ *+ ) && ! ( -p /dev/stdin ) ]]; then
- export HADOOP_CLIENT_OPTS="$HADOOP_CLIENT_OPTS -Djline.terminal=jline.UnsupportedTerminal"
- fi
-}
-
updateCli() {
if [ "$USE_DEPRECATED_CLI" == "true" ]; then
CLASS=org.apache.hadoop.hive.cli.CliDriver
@@ -37,7 +30,6 @@ updateCli() {
export HADOOP_CLIENT_OPTS="$HADOOP_CLIENT_OPTS -Dlog4j.configurationFile=beeline-log4j2.properties"
CLASS=org.apache.hive.beeline.cli.HiveCli
JAR=hive-beeline-*.jar
- updateBeelineOpts
fi
}
http://git-wip-us.apache.org/repos/asf/hive/blob/90688bde/bin/hive
----------------------------------------------------------------------
diff --git a/bin/hive b/bin/hive
index 50fbddd..e1ee206 100755
--- a/bin/hive
+++ b/bin/hive
@@ -344,6 +344,13 @@ else
export HADOOP_CLIENT_OPTS="$HADOOP_CLIENT_OPTS -Dlog4j.configurationFile=hive-log4j2.properties -Djava.util.logging.config.file=$bin/../conf/parquet-logging.properties "
fi
+if [[ "$SERVICE" =~ ^(hiveserver2|beeline|cli)$ ]] ; then
+ # If process is backgrounded, don't change terminal settings
+ if [[ ( ! $(ps -o stat= -p $$) =~ "+" ) && ! ( -p /dev/stdin ) ]]; then
+ export HADOOP_CLIENT_OPTS="$HADOOP_CLIENT_OPTS -Djline.terminal=jline.UnsupportedTerminal"
+ fi
+fi
+
if [ "$TORUN" = "" ] ; then
echo "Service $SERVICE not found"
echo "Available Services: $SERVICE_LIST"