pig-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From z..@apache.org
Subject svn commit: r1794283 - in /pig/branches/spark: bin/pig build.xml
Date Mon, 08 May 2017 04:32:33 GMT
Author: zly
Date: Mon May  8 04:32:33 2017
New Revision: 1794283

URL: http://svn.apache.org/viewvc?rev=1794283&view=rev
Log:
PIG-5218:Jyhton_Checkin_3 fails with spark exec type(Adam via Liyun)

Modified:
    pig/branches/spark/bin/pig
    pig/branches/spark/build.xml

Modified: pig/branches/spark/bin/pig
URL: http://svn.apache.org/viewvc/pig/branches/spark/bin/pig?rev=1794283&r1=1794282&r2=1794283&view=diff
==============================================================================
--- pig/branches/spark/bin/pig (original)
+++ pig/branches/spark/bin/pig Mon May  8 04:32:33 2017
@@ -415,6 +415,11 @@ if [ "$isSparkMode"  == "true" ]; then
         CLASSPATH=${CLASSPATH}:$SPARK_ASSEMBLY_JAR
     fi
 fi
+
+#spark-assembly.jar contains jcl-over-slf4j which would create a LogFactory implementation
that is incompatible
+if [ "$isSparkMode"  == "true" ]; then
+    PIG_OPTS="$PIG_OPTS -Dorg.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.LogFactoryImpl"
+fi
 ################# ADDING SPARK DEPENDENCIES ##################
 
 # run it

Modified: pig/branches/spark/build.xml
URL: http://svn.apache.org/viewvc/pig/branches/spark/build.xml?rev=1794283&r1=1794282&r2=1794283&view=diff
==============================================================================
--- pig/branches/spark/build.xml (original)
+++ pig/branches/spark/build.xml Mon May  8 04:32:33 2017
@@ -730,6 +730,7 @@
             <fileset dir="${ivy.lib.dir}" includes="httpdlog-*-${basjes-httpdlog-pigloader.version}.jar"/>
             <fileset dir="${ivy.lib.dir}" includes="parser-core-${basjes-httpdlog-pigloader.version}.jar"/>
             <fileset dir="${ivy.lib.dir}" includes="ivy-*.jar"/>
+            <fileset dir="${ivy.lib.dir}" includes="commons-logging-*.jar"/>
         </copy>
     </target>
 



Mime
View raw message