You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by da...@apache.org on 2013/03/21 01:28:01 UTC
svn commit: r1459104 - in /pig/trunk: CHANGES.txt bin/pig
Author: daijy
Date: Thu Mar 21 00:28:01 2013
New Revision: 1459104
URL: http://svn.apache.org/r1459104
Log:
PIG-3249: Pig startup script prints out a wrong version of hadoop when using fat jar
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=1459104&r1=1459103&r2=1459104&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Thu Mar 21 00:28:01 2013
@@ -149,6 +149,8 @@ PIG-3013: BinInterSedes improve chararra
BUG FIXES
+PIG-3249: Pig startup script prints out a wrong version of hadoop when using fat jar (prkommireddi via daijy)
+
PIG-3110: pig corrupts chararrays with trailing whitespace when converting them to long (prkommireddi via daijy)
PIG-3253: Misleading comment w.r.t getSplitIndex() method in PigSplit.java (cheolsoo)
Modified: pig/trunk/bin/pig
URL: http://svn.apache.org/viewvc/pig/trunk/bin/pig?rev=1459104&r1=1459103&r2=1459104&view=diff
==============================================================================
--- pig/trunk/bin/pig (original)
+++ pig/trunk/bin/pig Thu Mar 21 00:28:01 2013
@@ -362,10 +362,6 @@ if [ -n "$HADOOP_BIN" ]; then
fi
else
# fall back to use fat pig.jar
- if [ "$debug" == "true" ]; then
- echo "Cannot find local hadoop installation, using bundled hadoop 20.2"
- fi
-
if [ -f $PIG_HOME/pig.jar ]; then
PIG_JAR=$PIG_HOME/pig.jar
else
@@ -379,6 +375,10 @@ else
exit 1
fi
+ if [ "$debug" == "true" ]; then
+ echo "Cannot find local hadoop installation, using bundled `java -cp $PIG_JAR org.apache.hadoop.util.VersionInfo | head -1`"
+ fi
+
CLASS=org.apache.pig.Main
if [ "$debug" == "true" ]; then
echo "dry run:"