You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by je...@apache.org on 2021/08/09 20:43:25 UTC

[tez] branch branch-0.9 updated: TEZ-4321: Do Not Wrap Singleton Collections (#138)

This is an automated email from the ASF dual-hosted git repository.

jeagles pushed a commit to branch branch-0.9
in repository https://gitbox.apache.org/repos/asf/tez.git


The following commit(s) were added to refs/heads/branch-0.9 by this push:
     new 7a104b1  TEZ-4321: Do Not Wrap Singleton Collections (#138)
7a104b1 is described below

commit 7a104b1567c7ae4e9c4315fd707f8356dba6114c
Author: belugabehr <12...@users.noreply.github.com>
AuthorDate: Mon Aug 9 16:05:13 2021 -0400

    TEZ-4321: Do Not Wrap Singleton Collections (#138)
    
    (cherry picked from commit f56075c552dd3c41f8d812d595882eed22f98537)
---
 .../java/org/apache/tez/dag/app/dag/impl/BroadcastEdgeManager.java  | 6 ++----
 .../java/org/apache/tez/dag/app/dag/impl/OneToOneEdgeManager.java   | 3 +--
 .../apache/tez/dag/app/dag/impl/OneToOneEdgeManagerOnDemand.java    | 3 +--
 .../src/test/java/org/apache/tez/dag/app/TestMockDAGAppMaster.java  | 3 +--
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/BroadcastEdgeManager.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/BroadcastEdgeManager.java
index ca510f7..867403f 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/BroadcastEdgeManager.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/BroadcastEdgeManager.java
@@ -53,8 +53,7 @@ public class BroadcastEdgeManager extends EdgeManagerPluginOnDemand {
   public void routeDataMovementEventToDestination(DataMovementEvent event,
       int sourceTaskIndex, int sourceOutputIndex, 
       Map<Integer, List<Integer>> destinationTaskAndInputIndices) {
-    List<Integer> inputIndices = 
-        Collections.unmodifiableList(Collections.singletonList(sourceTaskIndex));
+    List<Integer> inputIndices = Collections.singletonList(sourceTaskIndex);
     // for each task make the i-th source task as the i-th physical input
     for (int i=0; i<getContext().getDestinationVertexNumTasks(); ++i) {
       destinationTaskAndInputIndices.put(i, inputIndices);
@@ -93,8 +92,7 @@ public class BroadcastEdgeManager extends EdgeManagerPluginOnDemand {
   @Override
   public void routeInputSourceTaskFailedEventToDestination(int sourceTaskIndex,
       Map<Integer, List<Integer>> destinationTaskAndInputIndices) {
-    List<Integer> inputIndices = 
-        Collections.unmodifiableList(Collections.singletonList(sourceTaskIndex));
+    List<Integer> inputIndices = Collections.singletonList(sourceTaskIndex);
     // for each task make the i-th source task as the i-th physical input
     for (int i=0; i<getContext().getDestinationVertexNumTasks(); ++i) {
       destinationTaskAndInputIndices.put(i, inputIndices);
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/OneToOneEdgeManager.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/OneToOneEdgeManager.java
index f9bacbf..8a6008a 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/OneToOneEdgeManager.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/OneToOneEdgeManager.java
@@ -32,8 +32,7 @@ import org.apache.tez.common.Preconditions;
 
 public class OneToOneEdgeManager extends EdgeManagerPlugin {
 
-  final List<Integer> destinationInputIndices =
-      Collections.unmodifiableList(Collections.singletonList(0));
+  final List<Integer> destinationInputIndices = Collections.singletonList(0);
   final AtomicBoolean stateChecked = new AtomicBoolean(false);
 
   public OneToOneEdgeManager(EdgeManagerPluginContext context) {
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/OneToOneEdgeManagerOnDemand.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/OneToOneEdgeManagerOnDemand.java
index e2dbf45..464d87d 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/OneToOneEdgeManagerOnDemand.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/OneToOneEdgeManagerOnDemand.java
@@ -34,8 +34,7 @@ import org.apache.tez.common.Preconditions;
 
 public class OneToOneEdgeManagerOnDemand extends EdgeManagerPluginOnDemand {
 
-  final List<Integer> destinationInputIndices =
-      Collections.unmodifiableList(Collections.singletonList(0));
+  final List<Integer> destinationInputIndices = Collections.singletonList(0);
   final AtomicBoolean stateChecked = new AtomicBoolean(false);
  
   final EventRouteMetadata commonRouteMeta = 
diff --git a/tez-dag/src/test/java/org/apache/tez/dag/app/TestMockDAGAppMaster.java b/tez-dag/src/test/java/org/apache/tez/dag/app/TestMockDAGAppMaster.java
index 4d12890..3a70700 100644
--- a/tez-dag/src/test/java/org/apache/tez/dag/app/TestMockDAGAppMaster.java
+++ b/tez-dag/src/test/java/org/apache/tez/dag/app/TestMockDAGAppMaster.java
@@ -298,8 +298,7 @@ public class TestMockDAGAppMaster {
   }
   
   public static class LegacyEdgeTestEdgeManager extends EdgeManagerPlugin {
-    List<Integer> destinationInputIndices = 
-        Collections.unmodifiableList(Collections.singletonList(0));
+    List<Integer> destinationInputIndices = Collections.singletonList(0);
     public LegacyEdgeTestEdgeManager(EdgeManagerPluginContext context) {
       super(context);
     }