fix proto field name compatibility

Signed-off-by: Richard Chien <[email protected]>
risingwavelabs · Sep 24, 2024 · 9b244c6 · 9b244c6
1 parent 32637bf
commit 9b244c6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/proto/expr.proto b/proto/expr.proto
@@ -576,8 +576,8 @@ message WindowFunction {
 
   oneof type {
     GeneralType general = 1;
-    AggCall.Kind aggregate_simple = 2 [deprecated = true]; // Deprecated since we have a new `aggregate` variant.
-    AggType aggregate = 103;
+    AggCall.Kind aggregate = 2 [deprecated = true]; // Deprecated since we have a new `aggregate` variant.
+    AggType aggregate2 = 103;
   }
   repeated InputRef args = 3;
   data.DataType return_type = 4;

diff --git a/src/expr/core/src/window_function/kind.rs b/src/expr/core/src/window_function/kind.rs
@@ -52,12 +52,12 @@ impl WindowFuncKind {
                 Ok(PbGeneralType::Lead) => Self::Lead,
                 Err(_) => bail!("no such window function type"),
             },
-            PbType::AggregateSimple(kind) => Self::Aggregate(AggType::from_protobuf_flatten(
+            PbType::Aggregate(kind) => Self::Aggregate(AggType::from_protobuf_flatten(
                 PbAggKind::try_from(*kind).context("no such aggregate function type")?,
                 None,
                 None,
             )?),
-            PbType::Aggregate(agg_type) => Self::Aggregate(AggType::from_protobuf(agg_type)?),
+            PbType::Aggregate2(agg_type) => Self::Aggregate(AggType::from_protobuf(agg_type)?),
         };
         Ok(kind)
     }

diff --git a/src/frontend/src/optimizer/plan_node/generic/over_window.rs b/src/frontend/src/optimizer/plan_node/generic/over_window.rs
@@ -121,7 +121,7 @@ impl PlanWindowFunction {
             DenseRank => PbType::General(PbGeneralType::DenseRank as _),
             Lag => PbType::General(PbGeneralType::Lag as _),
             Lead => PbType::General(PbGeneralType::Lead as _),
-            Aggregate(agg_type) => PbType::Aggregate(agg_type.to_protobuf()),
+            Aggregate(agg_type) => PbType::Aggregate2(agg_type.to_protobuf()),
         };
 
         PbWindowFunction {