hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gunt...@apache.org
Subject svn commit: r1602652 - in /hive/trunk/ql/src: java/org/apache/hadoop/hive/ql/parse/GenTezProcContext.java test/results/clientpositive/tez/tez_dml.q.out
Date Sun, 15 Jun 2014 01:53:03 GMT
Author: gunther
Date: Sun Jun 15 01:53:03 2014
New Revision: 1602652

URL: http://svn.apache.org/r1602652
Log:
HIVE-7005: MiniTez tests have non-deterministic explain plans (Gunther Hagleitner, reviewed
by Jason Dere)

Modified:
    hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/GenTezProcContext.java
    hive/trunk/ql/src/test/results/clientpositive/tez/tez_dml.q.out

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/GenTezProcContext.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/GenTezProcContext.java?rev=1602652&r1=1602651&r2=1602652&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/GenTezProcContext.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/GenTezProcContext.java Sun Jun
15 01:53:03 2014
@@ -19,8 +19,8 @@
 package org.apache.hadoop.hive.ql.parse;
 
 import java.io.Serializable;
-import java.util.HashMap;
-import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -147,24 +147,24 @@ public class GenTezProcContext implement
     this.outputs = outputs;
     this.currentTask = (TezTask) TaskFactory.get(
          new TezWork(conf.getVar(HiveConf.ConfVars.HIVEQUERYID)), conf);
-    this.leafOperatorToFollowingWork = new HashMap<Operator<?>, BaseWork>();
-    this.linkOpWithWorkMap = new HashMap<Operator<?>, Map<BaseWork, TezEdgeProperty>>();
-    this.linkWorkWithReduceSinkMap = new HashMap<BaseWork, List<ReduceSinkOperator>>();
-    this.mapJoinWorkMap = new HashMap<MapJoinOperator, List<BaseWork>>();
-    this.rootToWorkMap = new HashMap<Operator<?>, BaseWork>();
-    this.childToWorkMap = new HashMap<Operator<?>, List<BaseWork>>();
-    this.mapJoinParentMap = new HashMap<MapJoinOperator, List<Operator<?>>>();
-    this.currentMapJoinOperators = new HashSet<MapJoinOperator>();
-    this.linkChildOpWithDummyOp = new HashMap<Operator<?>, List<Operator<?>>>();
+    this.leafOperatorToFollowingWork = new LinkedHashMap<Operator<?>, BaseWork>();
+    this.linkOpWithWorkMap = new LinkedHashMap<Operator<?>, Map<BaseWork, TezEdgeProperty>>();
+    this.linkWorkWithReduceSinkMap = new LinkedHashMap<BaseWork, List<ReduceSinkOperator>>();
+    this.mapJoinWorkMap = new LinkedHashMap<MapJoinOperator, List<BaseWork>>();
+    this.rootToWorkMap = new LinkedHashMap<Operator<?>, BaseWork>();
+    this.childToWorkMap = new LinkedHashMap<Operator<?>, List<BaseWork>>();
+    this.mapJoinParentMap = new LinkedHashMap<MapJoinOperator, List<Operator<?>>>();
+    this.currentMapJoinOperators = new LinkedHashSet<MapJoinOperator>();
+    this.linkChildOpWithDummyOp = new LinkedHashMap<Operator<?>, List<Operator<?>>>();
     this.dependencyTask = (DependencyCollectionTask)
         TaskFactory.get(new DependencyCollectionWork(), conf);
-    this.unionWorkMap = new HashMap<Operator<?>, BaseWork>();
+    this.unionWorkMap = new LinkedHashMap<Operator<?>, BaseWork>();
     this.currentUnionOperators = new LinkedList<UnionOperator>();
-    this.workWithUnionOperators = new HashSet<BaseWork>();
-    this.clonedReduceSinks = new HashSet<ReduceSinkOperator>();
-    this.linkedFileSinks = new HashMap<Path, List<FileSinkDesc>>();
-    this.fileSinkSet = new HashSet<FileSinkOperator>();
-    this.connectedReduceSinks = new HashSet<ReduceSinkOperator>();
+    this.workWithUnionOperators = new LinkedHashSet<BaseWork>();
+    this.clonedReduceSinks = new LinkedHashSet<ReduceSinkOperator>();
+    this.linkedFileSinks = new LinkedHashMap<Path, List<FileSinkDesc>>();
+    this.fileSinkSet = new LinkedHashSet<FileSinkOperator>();
+    this.connectedReduceSinks = new LinkedHashSet<ReduceSinkOperator>();
 
     rootTasks.add(currentTask);
   }

Modified: hive/trunk/ql/src/test/results/clientpositive/tez/tez_dml.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/tez/tez_dml.q.out?rev=1602652&r1=1602651&r2=1602652&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/tez/tez_dml.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/tez/tez_dml.q.out Sun Jun 15 01:53:03 2014
@@ -861,10 +861,10 @@ POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
   Stage-3 depends on stages: Stage-2
-  Stage-1 depends on stages: Stage-3
-  Stage-4 depends on stages: Stage-1
   Stage-0 depends on stages: Stage-3
-  Stage-5 depends on stages: Stage-0
+  Stage-4 depends on stages: Stage-0
+  Stage-1 depends on stages: Stage-3
+  Stage-5 depends on stages: Stage-1
 
 STAGE PLANS:
   Stage: Stage-2
@@ -910,7 +910,7 @@ STAGE PLANS:
   Stage: Stage-3
     Dependency Collection
 
-  Stage: Stage-1
+  Stage: Stage-0
     Move Operator
       tables:
           replace: false
@@ -918,12 +918,12 @@ STAGE PLANS:
               input format: org.apache.hadoop.mapred.TextInputFormat
               output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
               serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-              name: default.odd
+              name: default.even
 
   Stage: Stage-4
     Stats-Aggr Operator
 
-  Stage: Stage-0
+  Stage: Stage-1
     Move Operator
       tables:
           replace: false
@@ -931,7 +931,7 @@ STAGE PLANS:
               input format: org.apache.hadoop.mapred.TextInputFormat
               output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
               serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-              name: default.even
+              name: default.odd
 
   Stage: Stage-5
     Stats-Aggr Operator



Mime
View raw message