spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From joshro...@apache.org
Subject spark git commit: [SPARK-10952] Only add hive to classpath if HIVE_HOME is set.
Date Wed, 07 Oct 2015 16:54:17 GMT
Repository: spark
Updated Branches:
  refs/heads/master f57c63d4c -> 9672602c7


[SPARK-10952] Only add hive to classpath if HIVE_HOME is set.

Currently if it isn't set it scans `/lib/*` and adds every dir to the
classpath which makes the env too large and every command called
afterwords fails.

Author: Kevin Cox <kevincox@kevincox.ca>

Closes #8994 from kevincox/kevincox-only-add-hive-to-classpath-if-var-is-set.


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

Branch: refs/heads/master
Commit: 9672602c7ecb8117a1edb04067e2e3e776ee10d2
Parents: f57c63d
Author: Kevin Cox <kevincox@kevincox.ca>
Authored: Wed Oct 7 09:53:17 2015 -0700
Committer: Josh Rosen <joshrosen@databricks.com>
Committed: Wed Oct 7 09:54:02 2015 -0700

----------------------------------------------------------------------
 build/sbt | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/9672602c/build/sbt
----------------------------------------------------------------------
diff --git a/build/sbt b/build/sbt
index cc3203d..7d8d099 100755
--- a/build/sbt
+++ b/build/sbt
@@ -20,10 +20,12 @@
 # When creating new tests for Spark SQL Hive, the HADOOP_CLASSPATH must contain the hive
jars so
 # that we can run Hive to generate the golden answer.  This is not required for normal development
 # or testing.
-for i in "$HIVE_HOME"/lib/*
-do HADOOP_CLASSPATH="$HADOOP_CLASSPATH:$i"
-done
-export HADOOP_CLASSPATH
+if [ -n "$HIVE_HOME" ]; then
+    for i in "$HIVE_HOME"/lib/*
+    do HADOOP_CLASSPATH="$HADOOP_CLASSPATH:$i"
+    done
+    export HADOOP_CLASSPATH
+fi
 
 realpath () {
 (


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org


Mime
View raw message