You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by rd...@apache.org on 2011/05/16 19:06:19 UTC
svn commit: r1103796 - in /pig/trunk: CHANGES.txt
src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MultiQueryOptimizer.java
test/org/apache/pig/test/TestMacroExpansion.java
Author: rding
Date: Mon May 16 17:06:18 2011
New Revision: 1103796
URL: http://svn.apache.org/viewvc?rev=1103796&view=rev
Log:
PIG-2069: LoadFunc jar does not ship to backend in MultiQuery case
Modified:
pig/trunk/CHANGES.txt
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MultiQueryOptimizer.java
pig/trunk/test/org/apache/pig/test/TestMacroExpansion.java
Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1103796&r1=1103795&r2=1103796&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Mon May 16 17:06:18 2011
@@ -224,6 +224,8 @@ PIG-1696: Performance: Use System.arrayc
BUG FIXES
+PIG-2069: LoadFunc jar does not ship to backend in MultiQuery case (rding)
+
PIG-2076: update documentation, help command with correct default value
of pig.cachedbag.memusage (thejas)
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MultiQueryOptimizer.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MultiQueryOptimizer.java?rev=1103796&r1=1103795&r2=1103796&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MultiQueryOptimizer.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MultiQueryOptimizer.java Mon May 16 17:06:18 2011
@@ -329,6 +329,11 @@ class MultiQueryOptimizer extends MROpPl
}
}
}
+
+ // PIG-2069: LoadFunc jar does not ship to backend in MultiQuery case
+ if (!mr.UDFs.isEmpty()) {
+ succ.UDFs.addAll(mr.UDFs);
+ }
}
// finally, remove the splitter from the MR plan
Modified: pig/trunk/test/org/apache/pig/test/TestMacroExpansion.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestMacroExpansion.java?rev=1103796&r1=1103795&r2=1103796&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestMacroExpansion.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestMacroExpansion.java Mon May 16 17:06:18 2011
@@ -1095,9 +1095,9 @@ public class TestMacroExpansion {
public void negativeTest9() throws Throwable {
String macro = "define test( out1,out2 ){ A = load 'x' as (u:int, v:int); $B = filter A by u < 3 and v < 20; }";
- String expectedErr = "Error during parsing. <file myscript.pig, line 1, column 24> mismatched input '{' expecting RETURNS";
+ String expectedErr = "<file myscript.pig, line 1, column 24> mismatched input '{' expecting RETURNS";
- validateFailure(macro, expectedErr, "Error");
+ validateFailure(macro, expectedErr, "<file");
}
@Test