diff --git a/tez-api/src/main/java/org/apache/tez/dag/api/DAG.java b/tez-api/src/main/java/org/apache/tez/dag/api/DAG.java index 0864b82e80..f38e2da255 100644 --- a/tez-api/src/main/java/org/apache/tez/dag/api/DAG.java +++ b/tez-api/src/main/java/org/apache/tez/dag/api/DAG.java @@ -26,6 +26,7 @@ import java.util.Collections; import java.util.Deque; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.HashSet; import java.util.LinkedList; import java.util.List; @@ -577,7 +578,7 @@ Deque verify(boolean restricted) throws IllegalStateException { // check for valid vertices, duplicate vertex names, // and prepare for cycle detection - Map vertexMap = new HashMap(); + Map vertexMap = new LinkedHashMap(); Map> inboundVertexMap = new HashMap>(); Map> outboundVertexMap = new HashMap>(); for (Vertex v : vertices.values()) { @@ -909,7 +910,7 @@ public synchronized DAGPlan createDag(Configuration tezConf, Credentials extraCr TezConfiguration.TEZ_TASK_RESOURCE_CPU_VCORES, TezConfiguration.TEZ_TASK_RESOURCE_CPU_VCORES_DEFAULT)); } - Map vertexLRs = Maps.newHashMap(); + Map vertexLRs = Maps.newLinkedHashMap(); vertexLRs.putAll(vertex.getTaskLocalFiles()); List dataSources = vertex.getDataSources(); for (DataSourceDescriptor dataSource : dataSources) { @@ -1007,7 +1008,7 @@ public synchronized DAGPlan createDag(Configuration tezConf, Credentials extraCr taskConfigBuilder.addAllLocalResource(DagTypeConverters.convertToDAGPlan(vertexLRs)); } - Map taskEnv = Maps.newHashMap(vertex.getTaskEnvironment()); + Map taskEnv = Maps.newLinkedHashMap(vertex.getTaskEnvironment()); TezYARNUtils.setupDefaultEnv(taskEnv, tezConf, TezConfiguration.TEZ_TASK_LAUNCH_ENV, TezConfiguration.TEZ_TASK_LAUNCH_ENV_DEFAULT, diff --git a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestVertexImpl.java b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestVertexImpl.java index 139f2fd915..3b7e7407ed 100644 --- a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestVertexImpl.java +++ b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestVertexImpl.java @@ -53,6 +53,7 @@ import java.util.Collections; import java.util.EnumSet; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; import java.util.Locale; @@ -2701,7 +2702,7 @@ private void parseVertexEdges() { VertexPlan vertexPlan = dagPlan.getVertex(i); Vertex vertex = vertices.get(vertexPlan.getName()); Map inVertices = - new HashMap(); + new LinkedHashMap<>(); Map outVertices = new HashMap();