[KYUUBI apache#6168] Check if forcedMaxOutputRows is negative

# 🔍 Description ## Issue References 🔗 This pull request fixes apache#6168 ## Describe Your Solution 🔧 Check if forcedMaxOutputRows is negative. ## Types of changes 🔖 - [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 ⚰️ #### Behavior With This Pull Request 🎉 #### 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 apache#6169 from wForget/KYUUBI-6168. Closes apache#6168 b18d8e5 [wforget] fix style 057c538 [wforget] Check if forcedMaxOutputRows is negative Authored-by: wforget <[email protected]> Signed-off-by: Cheng Pan <[email protected]> (cherry picked from commit 6a4f6f0)
beryllw · Mar 14, 2024 · 6afab77 · 6afab77
1 parent 4632565
commit 6afab77
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/...ion-spark-3-4/src/main/scala/org/apache/kyuubi/sql/watchdog/ForcedMaxOutputRowsBase.scala b/...ion-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/...ion-spark-3-5/src/main/scala/org/apache/kyuubi/sql/watchdog/ForcedMaxOutputRowsBase.scala b/...ion-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/...-spark-common/src/main/scala/org/apache/kyuubi/sql/watchdog/ForcedMaxOutputRowsBase.scala b/...-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
     }
   }