This is an automated email from the ASF dual-hosted git repository. krisztiankasa pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push: new 351bfe2 HIVE-25818: Values query with order by position clause fails (Krisztian Kasa, reviewed by Zoltan Haindrich) 351bfe2 is described below commit 351bfe2ffc4abce52801769743e109260d06f9be Author: Krisztian Kasa <kasakri...@gmail.com> AuthorDate: Wed Dec 22 05:44:01 2021 +0100 HIVE-25818: Values query with order by position clause fails (Krisztian Kasa, reviewed by Zoltan Haindrich) --- .../org/apache/hadoop/hive/ql/parse/CalcitePlanner.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java index 65391d3..12dcebd 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java @@ -4777,7 +4777,7 @@ public class CalcitePlanner extends SemanticAnalyzer { // need to remember the expressions and the alias. // In OP return path, we need to generate a SEL and then a UDTF // following old semantic analyzer. - outputRel = genUDTFPlan(genericUDTF, genericUDTFName, udtfTableAlias, udtfColAliases, qb, + return genUDTFPlan(genericUDTF, genericUDTFName, udtfTableAlias, udtfColAliases, qb, columnList, outputRR, srcRel); } else { String dest = qbp.getClauseNames().iterator().next(); @@ -4869,8 +4869,14 @@ public class CalcitePlanner extends SemanticAnalyzer { return i; } - private RelNode genUDTFPlan(GenericUDTF genericUDTF, String genericUDTFName, String outputTableAlias, - ArrayList<String> colAliases, QB qb, List<RexNode> selectColLst, RowResolver selectRR, RelNode input) throws SemanticException { + private Pair<RelNode, RowResolver> genUDTFPlan(GenericUDTF genericUDTF, + String genericUDTFName, + String outputTableAlias, + ArrayList<String> colAliases, + QB qb, + List<RexNode> selectColLst, + RowResolver selectRR, + RelNode input) throws SemanticException { // No GROUP BY / DISTRIBUTE BY / SORT BY / CLUSTER BY QBParseInfo qbp = qb.getParseInfo(); @@ -4968,7 +4974,7 @@ public class CalcitePlanner extends SemanticAnalyzer { relToHiveColNameCalcitePosMap.put(udtf, buildHiveToCalciteColumnMap(outputRR)); relToHiveRR.put(udtf, outputRR); - return udtf; + return new Pair<>(udtf, outputRR); } private Pair<RelNode, RowResolver> genGBSelectDistinctPlan(Pair<RelNode, RowResolver> srcNodeRR)