(kyuubi) branch master updated: [KYUUBI #6168] Check if forcedMaxOutputRows is negative

[chengpan]

This is an automated email from the ASF dual-hosted git repository.

chengpan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kyuubi.git


The following commit(s) were added to refs/heads/master by this push:
     new 6a4f6f0c8 [KYUUBI #6168] Check if forcedMaxOutputRows is negative
6a4f6f0c8 is described below

commit 6a4f6f0c88938633efb4454df9297e7ede26da57
Author: wforget <643348...@qq.com>
AuthorDate: Tue Mar 12 15:59:49 2024 +0800

    [KYUUBI #6168] Check if forcedMaxOutputRows is negative
    
    # :mag: Description
    ## Issue References 🔗
    
    This pull request fixes #6168
    
    ## Describe Your Solution 🔧
    
    Check if forcedMaxOutputRows is negative.
    
    ## Types of changes :bookmark:
    
    - [X] Bugfix (non-breaking change which fixes an issue)
    - [ ] New feature (non-breaking change which adds functionality)
    - [ ] Breaking change (fix or feature that would cause existing 
functionality to change)
    
    ## Test Plan 🧪
    
    #### Behavior Without This Pull Request :coffin:
    
    #### Behavior With This Pull Request :tada:
    
    #### Related Unit Tests
    
    ---
    
    # Checklist 📝
    
    - [X] This patch was not authored or co-authored using [Generative 
Tooling](https://www.apache.org/legal/generative-tooling.html)
    
    **Be nice. Be informative.**
    
    Closes #6169 from wForget/KYUUBI-6168.
    
    Closes #6168
    
    b18d8e5f5 [wforget] fix style
    057c5388b [wforget] Check if forcedMaxOutputRows is negative
    
    Authored-by: wforget <643348...@qq.com>
    Signed-off-by: Cheng Pan <cheng...@apache.org>
---
 .../org/apache/kyuubi/sql/watchdog/ForcedMaxOutputRowsBase.scala    | 6 +++---
 .../org/apache/kyuubi/sql/watchdog/ForcedMaxOutputRowsBase.scala    | 6 +++---
 .../org/apache/kyuubi/sql/watchdog/ForcedMaxOutputRowsBase.scala    | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git 
a/extensions/spark/kyuubi-extension-spark-3-4/src/main/scala/org/apache/kyuubi/sql/watchdog/ForcedMaxOutputRowsBase.scala
 
b/extensions/spark/kyuubi-extension-spark-3-4/src/main/scala/org/apache/kyuubi/sql/watchdog/ForcedMaxOutputRowsBase.scala
index 4f897d1b6..dd329bd65 100644
--- 
a/extensions/spark/kyuubi-extension-spark-3-4/src/main/scala/org/apache/kyuubi/sql/watchdog/ForcedMaxOutputRowsBase.scala
+++ 
b/extensions/spark/kyuubi-extension-spark-3-4/src/main/scala/org/apache/kyuubi/sql/watchdog/ForcedMaxOutputRowsBase.scala
@@ -71,9 +71,9 @@ trait ForcedMaxOutputRowsBase extends Rule[LogicalPlan] {
 
   protected def canInsertLimit(p: LogicalPlan, maxOutputRowsOpt: Option[Int]): 
Boolean = {
     maxOutputRowsOpt match {
-      case Some(forcedMaxOutputRows) => canInsertLimitInner(p) &&
-        !p.maxRows.exists(_ <= forcedMaxOutputRows)
-      case None => false
+      case Some(forcedMaxOutputRows) if forcedMaxOutputRows >= 0 =>
+        canInsertLimitInner(p) && !p.maxRows.exists(_ <= forcedMaxOutputRows)
+      case _ => false
     }
   }
 
diff --git 
a/extensions/spark/kyuubi-extension-spark-3-5/src/main/scala/org/apache/kyuubi/sql/watchdog/ForcedMaxOutputRowsBase.scala
 
b/extensions/spark/kyuubi-extension-spark-3-5/src/main/scala/org/apache/kyuubi/sql/watchdog/ForcedMaxOutputRowsBase.scala
index 4f897d1b6..dd329bd65 100644
--- 
a/extensions/spark/kyuubi-extension-spark-3-5/src/main/scala/org/apache/kyuubi/sql/watchdog/ForcedMaxOutputRowsBase.scala
+++ 
b/extensions/spark/kyuubi-extension-spark-3-5/src/main/scala/org/apache/kyuubi/sql/watchdog/ForcedMaxOutputRowsBase.scala
@@ -71,9 +71,9 @@ trait ForcedMaxOutputRowsBase extends Rule[LogicalPlan] {
 
   protected def canInsertLimit(p: LogicalPlan, maxOutputRowsOpt: Option[Int]): 
Boolean = {
     maxOutputRowsOpt match {
-      case Some(forcedMaxOutputRows) => canInsertLimitInner(p) &&
-        !p.maxRows.exists(_ <= forcedMaxOutputRows)
-      case None => false
+      case Some(forcedMaxOutputRows) if forcedMaxOutputRows >= 0 =>
+        canInsertLimitInner(p) && !p.maxRows.exists(_ <= forcedMaxOutputRows)
+      case _ => false
     }
   }
 
diff --git 
a/extensions/spark/kyuubi-extension-spark-common/src/main/scala/org/apache/kyuubi/sql/watchdog/ForcedMaxOutputRowsBase.scala
 
b/extensions/spark/kyuubi-extension-spark-common/src/main/scala/org/apache/kyuubi/sql/watchdog/ForcedMaxOutputRowsBase.scala
index 4f897d1b6..dd329bd65 100644
--- 
a/extensions/spark/kyuubi-extension-spark-common/src/main/scala/org/apache/kyuubi/sql/watchdog/ForcedMaxOutputRowsBase.scala
+++ 
b/extensions/spark/kyuubi-extension-spark-common/src/main/scala/org/apache/kyuubi/sql/watchdog/ForcedMaxOutputRowsBase.scala
@@ -71,9 +71,9 @@ trait ForcedMaxOutputRowsBase extends Rule[LogicalPlan] {
 
   protected def canInsertLimit(p: LogicalPlan, maxOutputRowsOpt: Option[Int]): 
Boolean = {
     maxOutputRowsOpt match {
-      case Some(forcedMaxOutputRows) => canInsertLimitInner(p) &&
-        !p.maxRows.exists(_ <= forcedMaxOutputRows)
-      case None => false
+      case Some(forcedMaxOutputRows) if forcedMaxOutputRows >= 0 =>
+        canInsertLimitInner(p) && !p.maxRows.exists(_ <= forcedMaxOutputRows)
+      case _ => false
     }
   }