Check if forcedMaxOutputRows is negative

apache · Mar 12, 2024 · 057c538 · 057c538
1 parent ddf347f
commit 057c538
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 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) &&
+      case Some(forcedMaxOutputRows) if forcedMaxOutputRows >= 0 => canInsertLimitInner(p) &&
         !p.maxRows.exists(_ <= forcedMaxOutputRows)
-      case None => false
+      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) &&
+      case Some(forcedMaxOutputRows) if forcedMaxOutputRows >= 0 => canInsertLimitInner(p) &&
         !p.maxRows.exists(_ <= forcedMaxOutputRows)
-      case None => false
+      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) &&
+      case Some(forcedMaxOutputRows) if forcedMaxOutputRows >= 0 => canInsertLimitInner(p) &&
         !p.maxRows.exists(_ <= forcedMaxOutputRows)
-      case None => false
+      case _ => false
     }
   }