fix watermark derivation

risingwavelabs · Oct 5, 2023 · cdde515 · cdde515
1 parent 5b4971f
commit cdde515
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/src/frontend/src/expr/utils.rs b/src/frontend/src/expr/utils.rs
@@ -489,14 +489,16 @@ impl WatermarkAnalyzer {
         use WatermarkDerivation::{Constant, Nondecreasing, Watermark};
         match func_call.func_type() {
             ExprType::Unspecified => unreachable!(),
-            ExprType::Add => match self.visit_binary_op(func_call.inputs()) {
-                (Constant, Constant) => Constant,
-                (Constant, Watermark(idx)) | (Watermark(idx), Constant) => Watermark(idx),
-                (Constant, Nondecreasing) | (Nondecreasing, Constant) => Nondecreasing,
-                _ => WatermarkDerivation::None,
-            },
-            ExprType::Subtract | ExprType::TumbleStart => {
-                match self.visit_binary_op(func_call.inputs()) {
+            ExprType::Add | ExprType::AddWithTimeZone => {
+                match self.visit_binary_op(&func_call.inputs()[..2]) {
+                    (Constant, Constant) => Constant,
+                    (Constant, Watermark(idx)) | (Watermark(idx), Constant) => Watermark(idx),
+                    (Constant, Nondecreasing) | (Nondecreasing, Constant) => Nondecreasing,
+                    _ => WatermarkDerivation::None,
+                }
+            }
+            ExprType::Subtract | ExprType::SubtractWithTimeZone | ExprType::TumbleStart => {
+                match self.visit_binary_op(&func_call.inputs()[..2]) {
                     (Constant, Constant) => Constant,
                     (Watermark(idx), Constant) => Watermark(idx),
                     (Nondecreasing, Constant) => Nondecreasing,