Author: daijy
Date: Sat Jan 31 04:53:21 2015
New Revision: 1656163
URL: http://svn.apache.org/r1656163
Log:
PIG-4403: Combining -Dpig.additional.jars.uris with -useHCatalog breaks due to
combination with colon instead of comma
Modified:
pig/trunk/CHANGES.txt
pig/trunk/bin/pig
Modified: pig/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1656163&r1=1656162&r2=1656163&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Sat Jan 31 04:53:21 2015
@@ -46,6 +46,9 @@ PIG-4333: Split BigData tests into multi
BUG FIXES
+PIG-4403: Combining -Dpig.additional.jars.uris with -useHCatalog breaks due to
combination
+ with colon instead of comma (ovlaere via daijy)
+
PIG-4402: JavaScript UDF example in the doc is broken (cheolsoo)
PIG-4394: Fix Split_9 and Union_5 e2e failures (rohini)
Modified: pig/trunk/bin/pig
URL:
http://svn.apache.org/viewvc/pig/trunk/bin/pig?rev=1656163&r1=1656162&r2=1656163&view=diff
==============================================================================
--- pig/trunk/bin/pig (original)
+++ pig/trunk/bin/pig Sat Jan 31 04:53:21 2015
@@ -190,7 +190,7 @@ if [ "$includeHCatalog" == "true" ]; the
HCAT_CLASSPATHS=$hiveMetaStoreVersion:$thriftVersion:$hiveExecVersion:$fbJarVersion:$jdoECJarVersion:$slfJarVersion:$hbaseHiveVersion:$hcatJarPath:$hbaseHCatJarPath:$pigHCatJarPath
ADDITIONAL_CLASSPATHS=file://$hiveMetaStoreVersion,file://$thriftVersion,file://$hiveExecVersion,file://$fbJarVersion,file://$jdoECJarVersion,file://$slfJarVersion,file://$hbaseHiveVersion,file://$hcatJarPath,file://$hbaseHCatJarPath,file://$pigHCatJarPath
if [ "$additionalJars" != "" ]; then
- ADDITIONAL_CLASSPATHS=$ADDITIONAL_CLASSPATHS:$additionalJars
+ ADDITIONAL_CLASSPATHS=$ADDITIONAL_CLASSPATHS,$additionalJars
fi
CLASSPATH=${CLASSPATH}:$HCAT_CLASSPATHS:$HIVE_HOME/conf
fi
@@ -355,7 +355,7 @@ PIG_OPTS="$PIG_OPTS -Dpig.home.dir=$PIG_
if [ "$includeHCatalog" == "true" ]; then
addJars=`echo $PIG_OPTS | awk '{ for (i=1; i<=NF; i++) print $i; }' | grep
"\-Dpig.additional.jars.uris=" | sed s/-Dpig.additional.jars.uris=//`
if [ "$addJars" != "" ]; then
- ADDITIONAL_CLASSPATHS=$addJars:$ADDITIONAL_CLASSPATHS
+ ADDITIONAL_CLASSPATHS=$addJars,$ADDITIONAL_CLASSPATHS
PIG_OPTS=`echo $PIG_OPTS | sed 's/-Dpig.additional.jars.uris=[^ ]*//'`
fi
PIG_OPTS="$PIG_OPTS -Dpig.additional.jars.uris=$ADDITIONAL_CLASSPATHS"
