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 0114718F9D for ; Tue, 12 Jan 2016 19:32:53 +0000 (UTC) Received: (qmail 93934 invoked by uid 500); 12 Jan 2016 19:32:47 -0000 Delivered-To: apmail-hive-commits-archive@hive.apache.org Received: (qmail 93890 invoked by uid 500); 12 Jan 2016 19:32:47 -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 93871 invoked by uid 99); 12 Jan 2016 19:32:47 -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, 12 Jan 2016 19:32:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A7C8CE1817; Tue, 12 Jan 2016 19:32:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: spena@apache.org To: commits@hive.apache.org Message-Id: <9b205d6dcd5b43f08e97a8d0b75fd064@git.apache.org> X-Mailer: ASF-Git Admin Mailer 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 +0000 (UTC) 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 Authored: Tue Jan 12 13:32:00 2016 -0600 Committer: Sergio Pena 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;