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 2011/10/17 03:39:06 UTC
svn commit: r1184974 - in /pig/trunk: contrib/zebra/build-contrib.xml
src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigOutputCommitter.java
Author: daijy
Date: Mon Oct 17 01:39:05 2011
New Revision: 1184974
URL: http://svn.apache.org/viewvc?rev=1184974&view=rev
Log:
PIG-2125: Make Pig work with hadoop .NEXT (PIG-2125-zebra.patch)
Modified:
pig/trunk/contrib/zebra/build-contrib.xml
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigOutputCommitter.java
Modified: pig/trunk/contrib/zebra/build-contrib.xml
URL: http://svn.apache.org/viewvc/pig/trunk/contrib/zebra/build-contrib.xml?rev=1184974&r1=1184973&r2=1184974&view=diff
==============================================================================
--- pig/trunk/contrib/zebra/build-contrib.xml (original)
+++ pig/trunk/contrib/zebra/build-contrib.xml Mon Oct 17 01:39:05 2011
@@ -100,8 +100,7 @@
<!-- the normal classpath -->
<path id="classpath">
<fileset dir="${pig.root}/lib">
- <include name="${hbase.jarfile}" />
- <include name="${hbase.test.jarfile}" />
+ <include name="*.jar" />
</fileset>
<fileset dir="${pig.root}/build">
<include name="${pig.jarfile}" />
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigOutputCommitter.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigOutputCommitter.java?rev=1184974&r1=1184973&r2=1184974&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigOutputCommitter.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigOutputCommitter.java Mon Oct 17 01:39:05 2011
@@ -172,10 +172,11 @@ public class PigOutputCommitter extends
for (Pair<OutputCommitter, POStore> mapCommitter : mapOutputCommitters) {
JobContext updatedContext = setUpContext(context,
mapCommitter.second);
-
+ storeCleanup(mapCommitter.second, updatedContext.getConfiguration());
try {
// Use reflection, 20.2 does not have such method
Method m = mapCommitter.first.getClass().getMethod("commitJob", JobContext.class);
+ m.setAccessible(true);
m.invoke(mapCommitter.first, updatedContext);
} catch (Exception e) {
// Should not happen
@@ -187,9 +188,11 @@ public class PigOutputCommitter extends
reduceOutputCommitters) {
JobContext updatedContext = setUpContext(context,
reduceCommitter.second);
+ storeCleanup(reduceCommitter.second, updatedContext.getConfiguration());
try {
// Use reflection, 20.2 does not have such method
Method m = reduceCommitter.first.getClass().getMethod("commitJob", JobContext.class);
+ m.setAccessible(true);
m.invoke(reduceCommitter.first, updatedContext);
} catch (Exception e) {
// Should not happen