diff --git hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/HCatStorer.java hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/HCatStorer.java index 848b2fb..54c174b 100644 --- hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/HCatStorer.java +++ hcatalog-pig-adapter/src/main/java/org/apache/hcatalog/pig/HCatStorer.java @@ -156,7 +156,7 @@ public class HCatStorer extends HCatBaseStorer { @Override public void storeSchema(ResourceSchema schema, String arg1, Job job) throws IOException { - HCatHadoopShims.Instance.get().commitJob(getOutputFormat(), schema, arg1, job); + HCatHadoopShims.Instance.get().commitJob(getOutputFormat(), job); } @Override diff --git ivy.xml ivy.xml index 3ddab03..c19972d 100644 --- ivy.xml +++ ivy.xml @@ -36,7 +36,7 @@ - + diff --git server-extensions/pom.xml server-extensions/pom.xml index ee974ad..3f6ee20 100644 --- server-extensions/pom.xml +++ server-extensions/pom.xml @@ -79,5 +79,11 @@ ${hadoop20.version} test + + org.apache.pig + pig + ${pig.version} + test + diff --git shims/ivy.xml shims/ivy.xml index 773d094..29eb330 100644 --- shims/ivy.xml +++ shims/ivy.xml @@ -11,8 +11,6 @@ - - diff --git shims/src/20/java/org/apache/hcatalog/shims/HCatHadoopShims20S.java shims/src/20/java/org/apache/hcatalog/shims/HCatHadoopShims20S.java index 5deea06..d10a581 100644 --- shims/src/20/java/org/apache/hcatalog/shims/HCatHadoopShims20S.java +++ shims/src/20/java/org/apache/hcatalog/shims/HCatHadoopShims20S.java @@ -33,7 +33,6 @@ import org.apache.hadoop.mapreduce.TaskAttemptContext; import org.apache.hadoop.mapreduce.TaskAttemptID; import org.apache.hadoop.mapreduce.TaskID; import org.apache.hadoop.util.Progressable; -import org.apache.pig.ResourceSchema; public class HCatHadoopShims20S implements HCatHadoopShims { @Override @@ -90,8 +89,7 @@ public class HCatHadoopShims20S implements HCatHadoopShims { } @Override - public void commitJob(OutputFormat outputFormat, ResourceSchema schema, - String arg1, Job job) throws IOException { + public void commitJob(OutputFormat outputFormat, Job job) throws IOException { if( job.getConfiguration().get("mapred.job.tracker", "").equalsIgnoreCase("local") ) { try { //In local mode, mapreduce will not call OutputCommitter.cleanupJob. diff --git shims/src/23/java/org/apache/hcatalog/shims/HCatHadoopShims23.java shims/src/23/java/org/apache/hcatalog/shims/HCatHadoopShims23.java index 80d2042..dfefd40 100644 --- shims/src/23/java/org/apache/hcatalog/shims/HCatHadoopShims23.java +++ shims/src/23/java/org/apache/hcatalog/shims/HCatHadoopShims23.java @@ -32,7 +32,6 @@ import org.apache.hadoop.mapreduce.TaskID; import org.apache.hadoop.mapreduce.TaskType; import org.apache.hadoop.mapreduce.task.JobContextImpl; import org.apache.hadoop.util.Progressable; -import org.apache.pig.ResourceSchema; import org.apache.hadoop.mapreduce.MRJobConfig; import org.apache.hadoop.net.NetUtils; @@ -88,8 +87,7 @@ public class HCatHadoopShims23 implements HCatHadoopShims { } @Override - public void commitJob(OutputFormat outputFormat, ResourceSchema schema, - String arg1, Job job) throws IOException { + public void commitJob(OutputFormat outputFormat, Job job) throws IOException { // Do nothing as this was fixed by MAPREDUCE-1447. } diff --git src/java/org/apache/hcatalog/shims/HCatHadoopShims.java src/java/org/apache/hcatalog/shims/HCatHadoopShims.java index ee693b4..b5da1c5 100644 --- src/java/org/apache/hcatalog/shims/HCatHadoopShims.java +++ src/java/org/apache/hcatalog/shims/HCatHadoopShims.java @@ -30,7 +30,6 @@ import org.apache.hadoop.mapreduce.OutputFormat; import org.apache.hadoop.mapreduce.TaskAttemptID; import org.apache.hadoop.mapreduce.TaskID; import org.apache.hadoop.util.Progressable; -import org.apache.pig.ResourceSchema; /** * Shim layer to abstract differences between Hadoop 0.20 and 0.23 @@ -81,8 +80,7 @@ public interface HCatHadoopShims { public org.apache.hadoop.mapred.JobContext createJobContext(JobConf conf, JobID jobId, Progressable progressable); - public void commitJob(OutputFormat outputFormat, ResourceSchema schema, - String arg1, Job job) throws IOException; + public void commitJob(OutputFormat outputFormat, Job job) throws IOException; public void abortJob(OutputFormat outputFormat, Job job) throws IOException;