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 2014/05/22 20:58:14 UTC
svn commit: r1596941 - in /pig/branches/branch-0.13: CHANGES.txt
shims/src/hadoop23/org/apache/pig/backend/hadoop/executionengine/shims/HadoopShims.java
Author: daijy
Date: Thu May 22 18:58:14 2014
New Revision: 1596941
URL: http://svn.apache.org/r1596941
Log:
PIG-3960: Compile fail against Hadoop 2.4.0 after PIG-3913
Modified:
pig/branches/branch-0.13/CHANGES.txt
pig/branches/branch-0.13/shims/src/hadoop23/org/apache/pig/backend/hadoop/executionengine/shims/HadoopShims.java
Modified: pig/branches/branch-0.13/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.13/CHANGES.txt?rev=1596941&r1=1596940&r2=1596941&view=diff
==============================================================================
--- pig/branches/branch-0.13/CHANGES.txt (original)
+++ pig/branches/branch-0.13/CHANGES.txt Thu May 22 18:58:14 2014
@@ -139,6 +139,8 @@ PIG-3882: Multiquery off mode execution
BUG FIXES
+PIG-3960: Compile fail against Hadoop 2.4.0 after PIG-3913 (daijy)
+
PIG-3950: Removing empty file PColFilterExtractor.java speeds up rebuilds (mrflip via cheolsoo)
PIG-3940: NullPointerException writing .pig_header for field with null name in JsonMetadata.java (mrflip via cheolsoo)
Modified: pig/branches/branch-0.13/shims/src/hadoop23/org/apache/pig/backend/hadoop/executionengine/shims/HadoopShims.java
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.13/shims/src/hadoop23/org/apache/pig/backend/hadoop/executionengine/shims/HadoopShims.java?rev=1596941&r1=1596940&r2=1596941&view=diff
==============================================================================
--- pig/branches/branch-0.13/shims/src/hadoop23/org/apache/pig/backend/hadoop/executionengine/shims/HadoopShims.java (original)
+++ pig/branches/branch-0.13/shims/src/hadoop23/org/apache/pig/backend/hadoop/executionengine/shims/HadoopShims.java Thu May 22 18:58:14 2014
@@ -119,7 +119,7 @@ public class HadoopShims {
public static Counters getCounters(Job job) throws IOException {
try {
return new Counters(job.getJob().getCounters());
- } catch (InterruptedException ir) {
+ } catch (Exception ir) {
throw new IOException(ir);
}
}
@@ -196,7 +196,7 @@ public class HadoopShims {
org.apache.hadoop.mapreduce.Job mrJob = j.getJob();
try {
return (mrJob.mapProgress() + mrJob.reduceProgress()) / 2;
- } catch (InterruptedException ir) {
+ } catch (Exception ir) {
return 0;
}
}
@@ -207,7 +207,7 @@ public class HadoopShims {
if (mrJob != null) {
mrJob.killJob();
}
- } catch (InterruptedException ir) {
+ } catch (Exception ir) {
throw new IOException(ir);
}
}