You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by jd...@apache.org on 2015/10/21 19:58:05 UTC

hive git commit: HIVE-12179: Add option to not add spark-assembly.jar to Hive classpath (Jason Dere, reviewed by Ashutosh Chauhan)

Repository: hive
Updated Branches:
  refs/heads/master 7302e22b7 -> a9f0a8501


HIVE-12179: Add option to not add spark-assembly.jar to Hive classpath (Jason Dere, reviewed by Ashutosh Chauhan)


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

Branch: refs/heads/master
Commit: a9f0a8501d133f9de01ea2d64ce01f80e5422871
Parents: 7302e22
Author: Jason Dere <jd...@hortonworks.com>
Authored: Wed Oct 21 10:56:52 2015 -0700
Committer: Jason Dere <jd...@hortonworks.com>
Committed: Wed Oct 21 10:56:52 2015 -0700

----------------------------------------------------------------------
 bin/hive | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/a9f0a850/bin/hive
----------------------------------------------------------------------
diff --git a/bin/hive b/bin/hive
index 9dc18a2..47d99f7 100755
--- a/bin/hive
+++ b/bin/hive
@@ -111,7 +111,7 @@ for f in ${HIVE_LIB}/*.jar; do
 done
 
 # add Spark assembly jar to the classpath
-if [[ -n "$SPARK_HOME" ]]
+if [[ -n "$SPARK_HOME" && !("$HIVE_SKIP_SPARK_ASSEMBLY" = "true") ]]
 then
   sparkAssemblyPath=`ls ${SPARK_HOME}/lib/spark-assembly-*.jar`
   CLASSPATH="${CLASSPATH}:${sparkAssemblyPath}"