You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by jc...@apache.org on 2015/12/13 12:41:47 UTC

hive git commit: HIVE-12662: StackOverflowError in HiveSortJoinReduceRule when limit=0 (Jesus Camacho Rodriguez, reviewed by Pengcheng Xiong)

Repository: hive
Updated Branches:
  refs/heads/master 08f73adca -> b98da82f5


HIVE-12662: StackOverflowError in HiveSortJoinReduceRule when limit=0 (Jesus Camacho Rodriguez, reviewed by Pengcheng Xiong)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/b98da82f
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/b98da82f
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/b98da82f

Branch: refs/heads/master
Commit: b98da82f5a6ce839e11c209cca3437fae7d4361f
Parents: 08f73ad
Author: Jesus Camacho Rodriguez <jc...@apache.org>
Authored: Sat Dec 12 14:04:20 2015 +0100
Committer: Jesus Camacho Rodriguez <jc...@apache.org>
Committed: Sun Dec 13 12:37:41 2015 +0100

----------------------------------------------------------------------
 .../calcite/rules/HiveSortJoinReduceRule.java   |  5 +-
 .../clientpositive/limit_join_transpose.q       | 17 +++++++
 .../clientpositive/limit_join_transpose.q.out   | 48 ++++++++++++++++++++
 3 files changed, 68 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/b98da82f/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveSortJoinReduceRule.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveSortJoinReduceRule.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveSortJoinReduceRule.java
index d8b9c54..180c647 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveSortJoinReduceRule.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveSortJoinReduceRule.java
@@ -57,8 +57,9 @@ public class HiveSortJoinReduceRule extends RelOptRule {
     final HiveSortLimit sortLimit = call.rel(0);
     final HiveJoin join = call.rel(1);
 
-    // If sort does not contain a limit operation, we bail out
-    if (!HiveCalciteUtil.limitRelNode(sortLimit)) {
+    // If sort does not contain a limit operation or limit is 0, we bail out
+    if (!HiveCalciteUtil.limitRelNode(sortLimit) ||
+            RexLiteral.intValue(sortLimit.fetch) == 0) {
       return false;
     }
 

http://git-wip-us.apache.org/repos/asf/hive/blob/b98da82f/ql/src/test/queries/clientpositive/limit_join_transpose.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/limit_join_transpose.q b/ql/src/test/queries/clientpositive/limit_join_transpose.q
index 98eefe9..80430c6 100644
--- a/ql/src/test/queries/clientpositive/limit_join_transpose.q
+++ b/ql/src/test/queries/clientpositive/limit_join_transpose.q
@@ -98,3 +98,20 @@ from src src1 right outer join (
 on src1.key = src2.key
 order by src2.key
 limit 1;
+
+explain
+select *
+from src src1 right outer join (
+  select *
+  from src src2 left outer join src src3
+  on src2.value = src3.value) src2
+on src1.key = src2.key
+limit 0;
+
+select *
+from src src1 right outer join (
+  select *
+  from src src2 left outer join src src3
+  on src2.value = src3.value) src2
+on src1.key = src2.key
+limit 0;

http://git-wip-us.apache.org/repos/asf/hive/blob/b98da82f/ql/src/test/results/clientpositive/limit_join_transpose.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/limit_join_transpose.q.out b/ql/src/test/results/clientpositive/limit_join_transpose.q.out
index 3181cdf..058ddd4 100644
--- a/ql/src/test/results/clientpositive/limit_join_transpose.q.out
+++ b/ql/src/test/results/clientpositive/limit_join_transpose.q.out
@@ -874,3 +874,51 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 0	val_0	0	val_0
+PREHOOK: query: explain
+select *
+from src src1 right outer join (
+  select *
+  from src src2 left outer join src src3
+  on src2.value = src3.value) src2
+on src1.key = src2.key
+limit 0
+PREHOOK: type: QUERY
+POSTHOOK: query: explain
+select *
+from src src1 right outer join (
+  select *
+  from src src2 left outer join src src3
+  on src2.value = src3.value) src2
+on src1.key = src2.key
+limit 0
+POSTHOOK: type: QUERY
+STAGE DEPENDENCIES:
+  Stage-0 is a root stage
+
+STAGE PLANS:
+  Stage: Stage-0
+    Fetch Operator
+      limit: 0
+      Processor Tree:
+        ListSink
+
+PREHOOK: query: select *
+from src src1 right outer join (
+  select *
+  from src src2 left outer join src src3
+  on src2.value = src3.value) src2
+on src1.key = src2.key
+limit 0
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
+POSTHOOK: query: select *
+from src src1 right outer join (
+  select *
+  from src src2 left outer join src src3
+  on src2.value = src3.value) src2
+on src1.key = src2.key
+limit 0
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####