You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by gu...@apache.org on 2014/09/03 23:56:34 UTC
svn commit: r1622366 - in /hive/branches/tez: ./
ql/src/java/org/apache/hadoop/hive/ql/exec/tez/
ql/src/test/org/apache/hadoop/hive/ql/exec/tez/
Author: gunther
Date: Wed Sep 3 21:56:34 2014
New Revision: 1622366
URL: http://svn.apache.org/r1622366
Log:
HIVE-7907: Bring up tez branch to changes in TEZ-1038, TEZ-1500 (Gopal V via Gunther Hagleitner)
Modified:
hive/branches/tez/pom.xml
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/HiveSplitGenerator.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/SplitGrouper.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezTask.java
hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestTezTask.java
Modified: hive/branches/tez/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/pom.xml?rev=1622366&r1=1622365&r2=1622366&view=diff
==============================================================================
--- hive/branches/tez/pom.xml (original)
+++ hive/branches/tez/pom.xml Wed Sep 3 21:56:34 2014
@@ -150,7 +150,7 @@
<stax.version>1.0.1</stax.version>
<slf4j.version>1.7.5</slf4j.version>
<ST4.version>4.0.4</ST4.version>
- <tez.version>0.5.0-SNAPSHOT</tez.version>
+ <tez.version>0.5.0</tez.version>
<super-csv.version>2.2.0</super-csv.version>
<tempus-fugit.version>1.1</tempus-fugit.version>
<snappy.version>0.2</snappy.version>
Modified: hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/HiveSplitGenerator.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/HiveSplitGenerator.java?rev=1622366&r1=1622365&r2=1622366&view=diff
==============================================================================
--- hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/HiveSplitGenerator.java (original)
+++ hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/HiveSplitGenerator.java Wed Sep 3 21:56:34 2014
@@ -39,7 +39,7 @@ import org.apache.hadoop.mapreduce.split
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;
Modified: hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/SplitGrouper.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/SplitGrouper.java?rev=1622366&r1=1622365&r2=1622366&view=diff
==============================================================================
--- hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/SplitGrouper.java (original)
+++ hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/SplitGrouper.java Wed Sep 3 21:56:34 2014
@@ -35,7 +35,7 @@ import org.apache.hadoop.mapred.FileSpli
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 @@ public class SplitGrouper {
String rack = (split instanceof TezGroupedSplit) ? ((TezGroupedSplit) split).getRack() : null;
if (rack == null) {
if (split.getLocations() != null) {
- locationHints.add(new TaskLocationHint(new HashSet<String>(Arrays.asList(split
+ locationHints.add(TaskLocationHint.createTaskLocationHint(new HashSet<String>(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)));
}
}
Modified: hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezTask.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezTask.java?rev=1622366&r1=1622365&r2=1622366&view=diff
==============================================================================
--- hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezTask.java (original)
+++ hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezTask.java Wed Sep 3 21:56:34 2014
@@ -211,7 +211,7 @@ public class TezTask extends Task<TezWor
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) {
Modified: hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestTezTask.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestTezTask.java?rev=1622366&r1=1622365&r2=1622366&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestTezTask.java (original)
+++ hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestTezTask.java Wed Sep 3 21:56:34 2014
@@ -203,7 +203,7 @@ public class TestTezTask {
@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));