svn commit: r1619566 - in /hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez: CustomPartitionVertex.java DagUtils.java HiveSplitGenerator.java TezTask.java

[go...@apache.org]

Author: gopalv
Date: Thu Aug 21 20:32:07 2014
New Revision: 1619566

URL: http://svn.apache.org/r1619566
Log:
HIVE-7825: Bring tez-branch up-to the API changes made by TEZ-1472, TEZ-1469 (Siddharth Seth via Gopal V)

Modified:
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/CustomPartitionVertex.java
    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/HiveSplitGenerator.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezTask.java

Modified: hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/CustomPartitionVertex.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/CustomPartitionVertex.java?rev=1619566&r1=1619565&r2=1619566&view=diff
==============================================================================
--- hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/CustomPartitionVertex.java (original)
+++ hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/CustomPartitionVertex.java Thu Aug 21 20:32:07 2014
@@ -272,8 +272,8 @@ public class CustomPartitionVertex exten
     int count = 0;
     for (InputSplit inputSplit : finalSplits) {
       MRSplitProto serializedSplit = MRInputHelpers.createSplitProto(inputSplit);
-      InputDataInformationEvent diEvent =
-          InputDataInformationEvent.create(count, serializedSplit.toByteString().asReadOnlyByteBuffer());
+      InputDataInformationEvent diEvent = InputDataInformationEvent.createWithSerializedPayload(
+          count, serializedSplit.toByteString().asReadOnlyByteBuffer());
       diEvent.setTargetIndex(count);
       count++;
       taskEvents.add(diEvent);

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=1619566&r1=1619565&r2=1619566&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 Thu Aug 21 20:32:07 2014
@@ -505,7 +505,7 @@ public class DagUtils {
       localResources.put(getBaseName(lr), lr);
     }
 
-    map.setTaskLocalFiles(localResources);
+    map.addTaskLocalFiles(localResources);
     return map;
   }
 
@@ -554,7 +554,7 @@ public class DagUtils {
     for (LocalResource lr: additionalLr) {
       localResources.put(getBaseName(lr), lr);
     }
-    reducer.setTaskLocalFiles(localResources);
+    reducer.addTaskLocalFiles(localResources);
 
     return reducer;
   }
@@ -607,7 +607,7 @@ public class DagUtils {
       combinedResources.putAll(localResources);
     }
 
-    prewarmVertex.setTaskLocalFiles(localResources);
+    prewarmVertex.addTaskLocalFiles(localResources);
     prewarmVertex.setTaskLaunchCmdOpts(getContainerJavaOpts(conf));
     prewarmVertex.setTaskEnvironment(getContainerEnvironment(conf, false));
     return prewarmVertex;

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=1619566&r1=1619565&r2=1619566&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 Thu Aug 21 20:32:07 2014
@@ -207,14 +207,15 @@ public class HiveSplitGenerator extends 
       MRSplitsProto splitsProto = inputSplitInfo.getSplitsProto();
       int count = 0;
       for (MRSplitProto mrSplit : splitsProto.getSplitsList()) {
-        InputDataInformationEvent diEvent =
-            InputDataInformationEvent.create(count++, mrSplit.toByteString().asReadOnlyByteBuffer());
+        InputDataInformationEvent diEvent = InputDataInformationEvent.createWithSerializedPayload(
+            count++, mrSplit.toByteString().asReadOnlyByteBuffer());
         events.add(diEvent);
       }
     } else {
       int count = 0;
       for (org.apache.hadoop.mapred.InputSplit split : inputSplitInfo.getOldFormatSplits()) {
-        InputDataInformationEvent diEvent = InputDataInformationEvent.create(count++, split);
+        InputDataInformationEvent diEvent = InputDataInformationEvent.createWithObjectPayload(
+            count++, split);
         events.add(diEvent);
       }
     }

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=1619566&r1=1619565&r2=1619566&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 Thu Aug 21 20:32:07 2014
@@ -66,7 +66,7 @@ import org.apache.tez.dag.api.client.Sta
  * using the Tez APIs directly.
  *
  */
-@SuppressWarnings({"serial", "deprecation"})
+@SuppressWarnings({"serial"})
 public class TezTask extends Task<TezWork> {
 
   private static final String CLASS_NAME = TezTask.class.getName();
@@ -302,7 +302,7 @@ public class TezTask extends Task<TezWor
 
     try {
       // ready to start execution on the cluster
-      sessionState.getSession().addAppMasterLocalResources(resourceMap);
+      sessionState.getSession().addAppMasterLocalFiles(resourceMap);
       dagClient = sessionState.getSession().submitDAG(dag);
     } catch (SessionNotRunning nr) {
       console.printInfo("Tez session was closed. Reopening...");