diff --git pom.xml pom.xml index d6448fb..2e128fc 100644 --- pom.xml +++ pom.xml @@ -150,7 +150,7 @@ 1.0.1 1.7.5 4.0.4 - 0.5.0-SNAPSHOT + 0.5.0 2.2.0 1.1 0.2 diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/tez/HiveSplitGenerator.java ql/src/java/org/apache/hadoop/hive/ql/exec/tez/HiveSplitGenerator.java index 3df73ee..6e1379e 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/tez/HiveSplitGenerator.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/tez/HiveSplitGenerator.java @@ -39,7 +39,7 @@ import org.apache.hadoop.util.ReflectionUtils; import org.apache.tez.common.TezUtils; import org.apache.tez.dag.api.VertexLocationHint; -import org.apache.tez.dag.api.VertexLocationHint.TaskLocationHint; +import org.apache.tez.dag.api.TaskLocationHint; import org.apache.tez.mapreduce.hadoop.InputSplitInfoMem; import org.apache.tez.mapreduce.hadoop.MRInputHelpers; import org.apache.tez.mapreduce.protos.MRRuntimeProtos.MRInputUserPayloadProto; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/tez/SplitGrouper.java ql/src/java/org/apache/hadoop/hive/ql/exec/tez/SplitGrouper.java index cbe1f84..38d74d5 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/tez/SplitGrouper.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/tez/SplitGrouper.java @@ -35,7 +35,7 @@ import org.apache.hadoop.mapred.InputSplit; import org.apache.hadoop.mapred.split.TezGroupedSplit; import org.apache.hadoop.mapred.split.TezMapredSplitsGrouper; -import org.apache.tez.dag.api.VertexLocationHint.TaskLocationHint; +import org.apache.tez.dag.api.TaskLocationHint; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Lists; @@ -141,13 +141,13 @@ String rack = (split instanceof TezGroupedSplit) ? ((TezGroupedSplit) split).getRack() : null; if (rack == null) { if (split.getLocations() != null) { - locationHints.add(new TaskLocationHint(new HashSet(Arrays.asList(split + locationHints.add(TaskLocationHint.createTaskLocationHint(new HashSet(Arrays.asList(split .getLocations())), null)); } else { - locationHints.add(new TaskLocationHint(null, null)); + locationHints.add(TaskLocationHint.createTaskLocationHint(null, null)); } } else { - locationHints.add(new TaskLocationHint(null, Collections.singleton(rack))); + locationHints.add(TaskLocationHint.createTaskLocationHint(null, Collections.singleton(rack))); } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezTask.java ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezTask.java index e65a00b..428e0ff 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezTask.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezTask.java @@ -211,7 +211,7 @@ DAG build(JobConf conf, TezWork work, Path scratchDir, FileSystem fs = scratchDir.getFileSystem(conf); // the name of the dag is what is displayed in the AM/Job UI - DAG dag = new DAG(work.getName()); + DAG dag = DAG.create(work.getName()); for (BaseWork w: ws) { diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestTezTask.java ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestTezTask.java index f775ef2..45ab672 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestTezTask.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestTezTask.java @@ -203,7 +203,7 @@ public void testEmptyWork() throws IllegalArgumentException, IOException, Except @Test public void testSubmit() throws Exception { - DAG dag = new DAG("test"); + DAG dag = DAG.create("test"); task.submit(conf, dag, path, appLr, sessionState, new LinkedList()); // validate close/reopen verify(sessionState, times(1)).open(any(HiveConf.class));