Simplify

risingwavelabs · Apr 7, 2023 · f825e60 · f825e60
1 parent fea86be
commit f825e60
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/src/frontend/src/optimizer/plan_node/generic/hop_window.rs b/src/frontend/src/optimizer/plan_node/generic/hop_window.rs
@@ -127,6 +127,16 @@ impl<PlanRef: BatchPlanRef> HopWindow<PlanRef> {
 }
 
 impl<PlanRef: GenericPlanRef> HopWindow<PlanRef> {
+    pub fn output_window_start_col_idx(&self) -> Option<usize> {
+        self.internal2output_col_mapping()
+            .try_map(self.internal_window_start_col_idx())
+    }
+
+    pub fn output_window_end_col_idx(&self) -> Option<usize> {
+        self.internal2output_col_mapping()
+            .try_map(self.internal_window_end_col_idx())
+    }
+
     pub fn into_parts(self) -> (PlanRef, InputRef, Interval, Interval, Interval, Vec<usize>) {
         (
             self.input,

diff --git a/src/frontend/src/optimizer/plan_node/logical_hop_window.rs b/src/frontend/src/optimizer/plan_node/logical_hop_window.rs
@@ -118,13 +118,11 @@ impl LogicalHopWindow {
     }
 
     pub fn output_window_start_col_idx(&self) -> Option<usize> {
-        self.internal2output_col_mapping()
-            .try_map(self.core.internal_window_start_col_idx())
+        self.core.output_window_start_col_idx()
     }
 
     pub fn output_window_end_col_idx(&self) -> Option<usize> {
-        self.internal2output_col_mapping()
-            .try_map(self.core.internal_window_end_col_idx())
+        self.core.output_window_end_col_idx()
     }
 
     pub fn o2i_col_mapping(&self) -> ColIndexMapping {
@@ -135,10 +133,6 @@ impl LogicalHopWindow {
         self.core.output2internal_col_mapping()
     }
 
-    pub fn internal2output_col_mapping(&self) -> ColIndexMapping {
-        self.core.internal2output_col_mapping()
-    }
-
     pub fn clone_with_output_indices(&self, output_indices: Vec<usize>) -> Self {
         Self::new(
             self.input(),