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 2012/01/07 02:48:23 UTC
svn commit: r1228545 - in /pig/branches/branch-0.10: CHANGES.txt bin/pig
test/e2e/pig/tests/nightly.conf
Author: daijy
Date: Sat Jan 7 01:48:22 2012
New Revision: 1228545
URL: http://svn.apache.org/viewvc?rev=1228545&view=rev
Log:
PIG-2458: Can't have spaces in parameter substitution
Modified:
pig/branches/branch-0.10/CHANGES.txt
pig/branches/branch-0.10/bin/pig
pig/branches/branch-0.10/test/e2e/pig/tests/nightly.conf
Modified: pig/branches/branch-0.10/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.10/CHANGES.txt?rev=1228545&r1=1228544&r2=1228545&view=diff
==============================================================================
--- pig/branches/branch-0.10/CHANGES.txt (original)
+++ pig/branches/branch-0.10/CHANGES.txt Sat Jan 7 01:48:22 2012
@@ -323,6 +323,8 @@ PIG-2431: Upgrade bundled hadoop version
BUG FIXES
+PIG-2458: Can't have spaces in parameter substitution (jcoveney via daijy)
+
PIG-2410: Piggybank does not compile in 23 (daijy)
PIG-2418: rpm release package does not take PIG_CLASSPATH (daijy)
Modified: pig/branches/branch-0.10/bin/pig
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.10/bin/pig?rev=1228545&r1=1228544&r2=1228545&view=diff
==============================================================================
--- pig/branches/branch-0.10/bin/pig (original)
+++ pig/branches/branch-0.10/bin/pig Sat Jan 7 01:48:22 2012
@@ -254,15 +254,14 @@ if [ -n "$HADOOP_BIN" ]; then
export HADOOP_CLASSPATH=$CLASSPATH:$HADOOP_CLASSPATH
export HADOOP_OPTS="$JAVA_HEAP_MAX $PIG_OPTS $HADOOP_OPTS"
- COMMAND_LINE="$HADOOP_BIN jar $PIG_JAR ${remaining[@]}"
if [ "$debug" == "true" ]; then
echo "dry run:"
echo "HADOOP_CLASSPATH: $HADOOP_CLASSPATH"
echo "HADOOP_OPTS: $HADOOP_OPTS"
- echo "$COMMAND_LINE"
+ echo "$HADOOP_BIN" jar "$PIG_JAR" "${remaining[@]}"
echo
else
- exec $COMMAND_LINE
+ exec "$HADOOP_BIN" jar "$PIG_JAR" "${remaining[@]}"
fi
else
# fall back to use fat pig.jar
@@ -284,13 +283,12 @@ else
fi
CLASS=org.apache.pig.Main
- COMMAND_LINE="$JAVA $JAVA_HEAP_MAX $PIG_OPTS -classpath $CLASSPATH $CLASS ${remaining[@]}"
if [ "$debug" == "true" ]; then
echo "dry run:"
- echo "$COMMAND_LINE"
+ echo "$JAVA" $JAVA_HEAP_MAX $PIG_OPTS -classpath "$CLASSPATH" $CLASS "${remaining[@]}"
echo
else
- exec $COMMAND_LINE
+ exec "$JAVA" $JAVA_HEAP_MAX $PIG_OPTS -classpath "$CLASSPATH" $CLASS "${remaining[@]}"
fi
fi
shopt -u nullglob
Modified: pig/branches/branch-0.10/test/e2e/pig/tests/nightly.conf
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.10/test/e2e/pig/tests/nightly.conf?rev=1228545&r1=1228544&r2=1228545&view=diff
==============================================================================
--- pig/branches/branch-0.10/test/e2e/pig/tests/nightly.conf (original)
+++ pig/branches/branch-0.10/test/e2e/pig/tests/nightly.conf Sat Jan 7 01:48:22 2012
@@ -1435,6 +1435,15 @@ a = load ':INPATH:/singlefile/$cmd' usin
b = foreach a generate name;
store b into ':OUTPATH:';\,
},
+ {
+ # test parameter with a space
+ 'num' => 5,
+ 'pig_params' => ['-p', qq(setting='set default_parallel 100;'),'-p',qq(fname='studenttab10k')],
+ 'pig' => q\a = load ':INPATH:/singlefile/$fname' using PigStorage() as (name, age, gpa);
+$setting
+b = foreach a generate name;
+store b into ':OUTPATH:';\,
+ },
]
},