svn commit: r1569172 - in /hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez: DagUtils.java HivePreWarmProcessor.java TezProcessor.java

[gunther]

Author: gunther
Date: Tue Feb 18 03:31:07 2014
New Revision: 1569172

URL: http://svn.apache.org/r1569172
Log:
HIVE-6453: Update TezProrcessors to work with Tez API changes (TEZ-668, 
TEZ-837) (Siddharth Seth via Gunther Hagleitner)

Modified:
    
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/DagUtils.java
    
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/HivePreWarmProcessor.java
    
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezProcessor.java

Modified: 
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/DagUtils.java
URL: 
http://svn.apache.org/viewvc/hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/DagUtils.java?rev=1569172&r1=1569171&r2=1569172&view=diff
==============================================================================
--- 
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/DagUtils.java 
(original)
+++ 
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/DagUtils.java 
Tue Feb 18 03:31:07 2014
@@ -480,7 +480,7 @@ public class DagUtils {
     
prewarmProcDescriptor.setUserPayload(MRHelpers.createUserPayloadFromConf(conf));
 
     PreWarmContext context = new PreWarmContext(prewarmProcDescriptor, 
MRHelpers.getMapResource(conf),
-        new VertexLocationHint(numContainers, null));
+        numContainers, new VertexLocationHint(null));
 
     Map<String, LocalResource> combinedResources = new HashMap<String, 
LocalResource>();
 

Modified: 
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/HivePreWarmProcessor.java
URL: 
http://svn.apache.org/viewvc/hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/HivePreWarmProcessor.java?rev=1569172&r1=1569171&r2=1569172&view=diff
==============================================================================
--- 
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/HivePreWarmProcessor.java
 (original)
+++ 
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/HivePreWarmProcessor.java
 Tue Feb 18 03:31:07 2014
@@ -70,6 +70,12 @@ public class HivePreWarmProcessor implem
       /* container reuse */
       return;
     }
+    for (LogicalInput input : inputs.values()) {
+      input.start();
+    }
+    for (LogicalOutput output : outputs.values()) {
+      output.start();
+    }
     /* these are things that goes through singleton initialization on most 
queries */
     FileSystem fs = FileSystem.get(conf);
     Mac mac = Mac.getInstance("HmacSHA1");

Modified: 
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezProcessor.java
URL: 
http://svn.apache.org/viewvc/hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezProcessor.java?rev=1569172&r1=1569171&r2=1569172&view=diff
==============================================================================
--- 
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezProcessor.java
 (original)
+++ 
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezProcessor.java
 Tue Feb 18 03:31:07 2014
@@ -124,6 +124,12 @@ public class TezProcessor implements Log
     // (possibly asynchronously)
 
     LOG.info("Running map: " + processorContext.getUniqueIdentifier());
+    for (LogicalInput input : inputs.values()) {
+      input.start();
+    }
+    for (LogicalOutput output : outputs.values()) {
+      output.start();
+    }
 
     Map<String, OutputCollector> outMap = new HashMap<String, 
OutputCollector>();