Repository: hive Updated Branches: refs/heads/master f3d9a5ba3 -> ce7b353ca
HIVE-14351 : Minor improvement in genUnionPlan method (Ratandeep Ratti via Ashutosh Chauhan) Signed-off-by: Ashutosh Chauhan <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/ce7b353c Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/ce7b353c Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/ce7b353c Branch: refs/heads/master Commit: ce7b353ca59df0e2f6cfff10092026a093415aff Parents: f3d9a5b Author: Ratandeep Ratti <[email protected]> Authored: Tue Jul 26 21:44:00 2016 -0800 Committer: Ashutosh Chauhan <[email protected]> Committed: Sat Aug 13 11:10:54 2016 -0700 ---------------------------------------------------------------------- ql/src/java/org/apache/hadoop/hive/ql/parse/RowResolver.java | 2 +- .../java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/ce7b353c/ql/src/java/org/apache/hadoop/hive/ql/parse/RowResolver.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/RowResolver.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/RowResolver.java index 5128505..e14f1cf 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/parse/RowResolver.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/RowResolver.java @@ -250,7 +250,7 @@ public class RowResolver implements Serializable{ return new ArrayList<String>(columnNames); } - public HashMap<String, ColumnInfo> getFieldMap(String tabAlias) { + public LinkedHashMap<String, ColumnInfo> getFieldMap(String tabAlias) { if (tabAlias == null) { return rslvMap.get(null); } else { http://git-wip-us.apache.org/repos/asf/hive/blob/ce7b353c/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java index 6758741..ae1def1 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java @@ -9508,8 +9508,8 @@ public class SemanticAnalyzer extends BaseSemanticAnalyzer { // This can be easily merged into 1 union RowResolver leftRR = opParseCtx.get(leftOp).getRowResolver(); RowResolver rightRR = opParseCtx.get(rightOp).getRowResolver(); - HashMap<String, ColumnInfo> leftmap = leftRR.getFieldMap(leftalias); - HashMap<String, ColumnInfo> rightmap = rightRR.getFieldMap(rightalias); + LinkedHashMap<String, ColumnInfo> leftmap = leftRR.getFieldMap(leftalias); + LinkedHashMap<String, ColumnInfo> rightmap = rightRR.getFieldMap(rightalias); // make sure the schemas of both sides are the same ASTNode tabref = qb.getAliases().isEmpty() ? null : qb.getParseInfo().getSrcForAlias(qb.getAliases().get(0));
