Repository: lens Updated Branches: refs/heads/master dbbd0c446 -> 9a40b6455
LENS-1476 : Order By clause is not rewritten correctly when column is wrapped with function Project: http://git-wip-us.apache.org/repos/asf/lens/repo Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/9a40b645 Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/9a40b645 Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/9a40b645 Branch: refs/heads/master Commit: 9a40b6455b50fe0e0930d1542a1ec9745025ccc7 Parents: dbbd0c4 Author: Sushil Mohanty <sushil.k.moha...@gmail.com> Authored: Thu Sep 14 12:43:55 2017 +0530 Committer: sushilmohanty <sushilmoha...@apache.org> Committed: Thu Sep 14 12:43:55 2017 +0530 ---------------------------------------------------------------------- .../main/java/org/apache/lens/cube/parse/UnionQueryWriter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lens/blob/9a40b645/lens-cube/src/main/java/org/apache/lens/cube/parse/UnionQueryWriter.java ---------------------------------------------------------------------- diff --git a/lens-cube/src/main/java/org/apache/lens/cube/parse/UnionQueryWriter.java b/lens-cube/src/main/java/org/apache/lens/cube/parse/UnionQueryWriter.java index 4eb086b..0d512e4 100644 --- a/lens-cube/src/main/java/org/apache/lens/cube/parse/UnionQueryWriter.java +++ b/lens-cube/src/main/java/org/apache/lens/cube/parse/UnionQueryWriter.java @@ -204,7 +204,8 @@ public class UnionQueryWriter extends SimpleHQLContext { ASTNode outerOrderby = new ASTNode(child); ASTNode tokNullsChild = (ASTNode) child.getChild(0); ASTNode outerTokNullsChild = new ASTNode(tokNullsChild); - if (((ASTNode) tokNullsChild.getChild(0)).getToken().getType() == HiveParser.DOT) { + if (((ASTNode) tokNullsChild.getChild(0)).getToken().getType() == HiveParser.DOT || + ((ASTNode) tokNullsChild.getChild(0)).getToken().getType() == HiveParser.TOK_FUNCTION) { outerTokNullsChild.addChild(innerToOuterSelectASTs.get(new HQLParser.HashableASTNode((ASTNode) tokNullsChild))); } else { outerTokNullsChild.addChild(tokNullsChild);
