Change default Hadoop version to 2.2.0
This change moves the default version of Hadoop to 2.2.0, as well as introducing some dependencyManagement and
property tags to ease management of this and other similar dependencies. Additionally, in this change Hivesterix
and Pregelix are no longer built by default (as part of moving their codebases to separate repositories).
Change-Id: I7609f192cbb246fdec2d0f301130c389688047a9
Reviewed-on: http://fulliautomatix.ics.uci.edu:8443/124
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Reviewed-by: Till Westmann <westmann@gmail.com>
diff --git a/hyracks/hyracks-hadoop-compat/pom.xml b/hyracks/hyracks-hadoop-compat/pom.xml
index 3356611..ea5729a 100644
--- a/hyracks/hyracks-hadoop-compat/pom.xml
+++ b/hyracks/hyracks-hadoop-compat/pom.xml
@@ -80,8 +80,7 @@
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- <version>0.20.2</version>
+ <artifactId>hadoop-client</artifactId>
<type>jar</type>
<scope>compile</scope>
</dependency>
diff --git a/hyracks/hyracks-hadoop-compat/src/main/java/edu/uci/ics/hyracks/hadoop/compat/client/HyracksRunningJob.java b/hyracks/hyracks-hadoop-compat/src/main/java/edu/uci/ics/hyracks/hadoop/compat/client/HyracksRunningJob.java
index 4766cb9..ba6b986 100644
--- a/hyracks/hyracks-hadoop-compat/src/main/java/edu/uci/ics/hyracks/hadoop/compat/client/HyracksRunningJob.java
+++ b/hyracks/hyracks-hadoop-compat/src/main/java/edu/uci/ics/hyracks/hadoop/compat/client/HyracksRunningJob.java
@@ -16,8 +16,10 @@
import java.io.IOException;
+import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.mapred.Counters;
import org.apache.hadoop.mapred.JobID;
+import org.apache.hadoop.mapred.JobStatus;
import org.apache.hadoop.mapred.RunningJob;
import org.apache.hadoop.mapred.TaskAttemptID;
import org.apache.hadoop.mapred.TaskCompletionEvent;
@@ -169,4 +171,34 @@
}
+ @Override
+ public Configuration getConfiguration() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public String getFailureInfo() throws IOException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public String getHistoryUrl() throws IOException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public JobStatus getJobStatus() throws IOException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public boolean isRetired() throws IOException {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
}
diff --git a/hyracks/hyracks-hadoop-compat/src/main/java/edu/uci/ics/hyracks/hadoop/compat/util/HadoopAdapter.java b/hyracks/hyracks-hadoop-compat/src/main/java/edu/uci/ics/hyracks/hadoop/compat/util/HadoopAdapter.java
index 3cab22d..d72b44d 100644
--- a/hyracks/hyracks-hadoop-compat/src/main/java/edu/uci/ics/hyracks/hadoop/compat/util/HadoopAdapter.java
+++ b/hyracks/hyracks-hadoop-compat/src/main/java/edu/uci/ics/hyracks/hadoop/compat/util/HadoopAdapter.java
@@ -33,7 +33,8 @@
import org.apache.hadoop.mapred.InputSplit;
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapred.Partitioner;
-import org.apache.hadoop.mapreduce.JobContext;
+import org.apache.hadoop.mapred.JobContext;
+import org.apache.hadoop.mapred.JobContextImpl;
import org.apache.hadoop.util.ReflectionUtils;
import edu.uci.ics.hyracks.api.constraints.PartitionConstraintHelper;
@@ -110,8 +111,8 @@
public JobConf getConf() {
return jobConf;
}
-
- public static VersionedProtocol getProtocol(Class protocolClass,
+ //TODO: Why is there now a type mismatch? Why does a bounded wildcard fix it?
+ public static VersionedProtocol getProtocol(Class<? extends VersionedProtocol> protocolClass,
InetSocketAddress inetAddress, JobConf jobConf) throws IOException {
VersionedProtocol versionedProtocol = RPC.getProxy(protocolClass,
ClientProtocol.versionID, inetAddress, jobConf);
@@ -144,7 +145,7 @@
JobConf conf) throws ClassNotFoundException, IOException,
InterruptedException {
org.apache.hadoop.mapreduce.InputSplit[] splits = null;
- JobContext context = new JobContext(conf, null);
+ JobContext context = new JobContextImpl(conf, null);
org.apache.hadoop.mapreduce.InputFormat inputFormat = ReflectionUtils
.newInstance(context.getInputFormatClass(), conf);
List<org.apache.hadoop.mapreduce.InputSplit> inputSplits = inputFormat
diff --git a/hyracks/hyracks-hadoop-compat/src/main/java/edu/uci/ics/hyracks/hadoop/compat/util/Utilities.java b/hyracks/hyracks-hadoop-compat/src/main/java/edu/uci/ics/hyracks/hadoop/compat/util/Utilities.java
index d80f55d..8aad37e 100644
--- a/hyracks/hyracks-hadoop-compat/src/main/java/edu/uci/ics/hyracks/hadoop/compat/util/Utilities.java
+++ b/hyracks/hyracks-hadoop-compat/src/main/java/edu/uci/ics/hyracks/hadoop/compat/util/Utilities.java
@@ -121,6 +121,12 @@
public Counter getCounter(Enum<?> arg0) {
return null;
}
+
+ @Override
+ public float getProgress() {
+ // TODO Auto-generated method stub
+ return 0f;
+ }
};
return reporter;
}