hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sp...@apache.org
Subject hive git commit: HIVE-12848: Change derby scripts, for HMS upgrade tests, to accomodate 32-bit VM (Naveen Gangman, reviewed by Sergio Pena)
Date Tue, 12 Jan 2016 19:32:47 GMT
Repository: hive
Updated Branches:
  refs/heads/master 632b4e230 -> ed937233b


HIVE-12848: Change derby scripts, for HMS upgrade tests, to accomodate 32-bit VM (Naveen Gangman,
reviewed by Sergio Pena)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/ed937233
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/ed937233
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/ed937233

Branch: refs/heads/master
Commit: ed937233b2aacd24c739c648d4249fce95e0bfe5
Parents: 632b4e2
Author: Sergio Pena <sergio.pena@cloudera.com>
Authored: Tue Jan 12 13:32:00 2016 -0600
Committer: Sergio Pena <sergio.pena@cloudera.com>
Committed: Tue Jan 12 13:32:00 2016 -0600

----------------------------------------------------------------------
 testutils/metastore/dbs/derby/execute.sh | 5 ++++-
 testutils/metastore/dbs/derby/prepare.sh | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/ed937233/testutils/metastore/dbs/derby/execute.sh
----------------------------------------------------------------------
diff --git a/testutils/metastore/dbs/derby/execute.sh b/testutils/metastore/dbs/derby/execute.sh
old mode 100644
new mode 100755
index d60f05b..fd76ae6
--- a/testutils/metastore/dbs/derby/execute.sh
+++ b/testutils/metastore/dbs/derby/execute.sh
@@ -25,8 +25,11 @@ echo "####################################################"
 echo "Executing script for Derby SQL: $1"
 echo "####################################################"
 
+JAVA_PATH=($(readlink /etc/alternatives/java))
+JAVA_PATH=`dirname $JAVA_PATH`
+
 export DERBY_HOME=/usr/share/javadb
-export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64
+export JAVA_HOME=$JAVA_PATH/..
 export PATH=$PATH:$DERBY_HOME/bin:$JAVA_HOME/bin
 export CLASSPATH=$CLASSPATH:$DERBY_HOME/lib/derby.jar:$DERBY_HOME/lib/derbytools.jar:$DERBY_HOME/lib/derbyclient.jar
 

http://git-wip-us.apache.org/repos/asf/hive/blob/ed937233/testutils/metastore/dbs/derby/prepare.sh
----------------------------------------------------------------------
diff --git a/testutils/metastore/dbs/derby/prepare.sh b/testutils/metastore/dbs/derby/prepare.sh
old mode 100644
new mode 100755
index fe4b2c3..0c91954
--- a/testutils/metastore/dbs/derby/prepare.sh
+++ b/testutils/metastore/dbs/derby/prepare.sh
@@ -50,8 +50,11 @@ else
   apt-get install -y --force-yes -o Dpkg::Options::="--force-overwrite" sun-javadb-core sun-javadb-client
derby-tools
 fi
 
+JAVA_PATH=($(readlink /etc/alternatives/java))
+JAVA_PATH=`dirname $JAVA_PATH`
+
 export DERBY_HOME=/usr/share/javadb
-export JAVA_HOME=//usr/lib/jvm/java-7-openjdk-amd64
+export JAVA_HOME=$JAVA_PATH/..
 export PATH=$PATH:/usr/share/javadb/bin:$JAVA_HOME/bin
 export CLASSPATH=$CLASSPATH:$DERBY_HOME/lib/derby.jar:$DERBY_HOME/lib/derbytools.jar:$DERBY_HOME/lib/derbyclient.jar
 rm -rf /tmp/hive_hms_testing;


Mime
View raw message