chore: bump proto to e37eff6

GreptimeTeam · Apr 29, 2024 · ad5484c · ad5484c
1 parent 1e5c9d0
commit ad5484c
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 32 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -116,7 +116,7 @@ etcd-client = { git = "https://github.com/MichaelScofield/etcd-client.git", rev
 fst = "0.4.7"
 futures = "0.3"
 futures-util = "0.3"
-greptime-proto = { git = "https://github.com/GreptimeTeam/greptime-proto.git", rev = "aba235025ac5643c12bfdcefd656af11ad58ea8e" }
+greptime-proto = { git = "https://github.com/GreptimeTeam/greptime-proto.git", rev = "e37eff6d0bd4e89625da3ccfab453c4bce185aff" }
 humantime = "2.1"
 humantime-serde = "1.1"
 itertools = "0.10"

diff --git a/src/api/src/helper.rs b/src/api/src/helper.rs
@@ -478,8 +478,8 @@ fn ddl_request_type(request: &DdlRequest) -> &'static str {
         Some(Expr::Alter(_)) => "ddl.alter",
         Some(Expr::DropTable(_)) => "ddl.drop_table",
         Some(Expr::TruncateTable(_)) => "ddl.truncate_table",
-        Some(Expr::CreateFlowTask(_)) => "ddl.create_flow",
-        Some(Expr::DropFlowTask(_)) => "ddl.drop_flow",
+        Some(Expr::CreateFlow(_)) => "ddl.create_flow",
+        Some(Expr::DropFlow(_)) => "ddl.drop_flow",
         None => "ddl.empty",
     }
 }

diff --git a/src/common/meta/src/ddl/create_flow.rs b/src/common/meta/src/ddl/create_flow.rs
@@ -151,7 +151,7 @@ impl Procedure for CreateFlowProcedure {
 
     fn lock_key(&self) -> LockKey {
         let catalog_name = &self.data.task.catalog_name;
-        let task_name = &self.data.task.task_name;
+        let task_name = &self.data.task.flow_name;
         let sink_table_name = &self.data.task.sink_table_name;
 
         LockKey::new(vec![
@@ -195,7 +195,7 @@ impl From<&CreateFlowTaskData> for CreateRequest {
         let source_table_ids = &value.source_table_ids;
 
         CreateRequest {
-            task_id: Some(api::v1::flow::TaskId { id: flow_id }),
+            flow_id: Some(api::v1::flow::TaskId { id: flow_id }),
             source_table_ids: source_table_ids
                 .iter()
                 .map(|table_id| api::v1::TableId { id: *table_id })
@@ -215,7 +215,7 @@ impl From<&CreateFlowTaskData> for FlowInfoValue {
     fn from(value: &CreateFlowTaskData) -> Self {
         let CreateFlowTask {
             catalog_name,
-            task_name,
+            flow_name: task_name,
             sink_table_name,
             expire_when,
             comment,

diff --git a/src/common/meta/src/ddl/create_flow/check.rs b/src/common/meta/src/ddl/create_flow/check.rs
@@ -24,7 +24,7 @@ impl CreateFlowProcedure {
     /// - The sink table doesn't exist.
     pub(crate) async fn check_creation(&self) -> Result<()> {
         let catalog_name = &self.data.task.catalog_name;
-        let task_name = &self.data.task.task_name;
+        let task_name = &self.data.task.flow_name;
         let sink_table_name = &self.data.task.sink_table_name;
 
         // Ensures the task name doesn't exist.

diff --git a/src/common/meta/src/ddl_manager.rs b/src/common/meta/src/ddl_manager.rs
@@ -616,7 +616,7 @@ async fn handle_create_flow_task(
     })?);
     info!(
         "Flow {}.{}({flow_id}) is created via procedure_id {id:?}",
-        create_flow_task.catalog_name, create_flow_task.task_name,
+        create_flow_task.catalog_name, create_flow_task.flow_name,
     );
 
     Ok(SubmitDdlTaskResponse {

diff --git a/src/common/meta/src/rpc/ddl.rs b/src/common/meta/src/rpc/ddl.rs
@@ -26,8 +26,8 @@ use api::v1::meta::{
     TruncateTableTask as PbTruncateTableTask,
 };
 use api::v1::{
-    AlterExpr, CreateDatabaseExpr, CreateFlowTaskExpr, CreateTableExpr, DropDatabaseExpr,
-    DropFlowTaskExpr, DropTableExpr, TruncateTableExpr,
+    AlterExpr, CreateDatabaseExpr, CreateFlowExpr, CreateTableExpr, DropDatabaseExpr, DropFlowExpr,
+    DropTableExpr, TruncateTableExpr,
 };
 use base64::engine::general_purpose;
 use base64::Engine as _;
@@ -733,7 +733,7 @@ impl TryFrom<DropDatabaseTask> for PbDropDatabaseTask {
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct CreateFlowTask {
     pub catalog_name: String,
-    pub task_name: String,
+    pub flow_name: String,
     pub source_table_names: Vec<TableName>,
     pub sink_table_name: TableName,
     pub or_replace: bool,
@@ -748,24 +748,24 @@ impl TryFrom<PbCreateFlowTask> for CreateFlowTask {
     type Error = error::Error;
 
     fn try_from(pb: PbCreateFlowTask) -> Result<Self> {
-        let CreateFlowTaskExpr {
+        let CreateFlowExpr {
             catalog_name,
-            task_name,
+            flow_name,
             source_table_names,
             sink_table_name,
             or_replace,
             create_if_not_exists,
             expire_when,
             comment,
             sql,
-            task_options,
-        } = pb.create_flow_task.context(error::InvalidProtoMsgSnafu {
-            err_msg: "expected create_flow_task",
+            options,
+        } = pb.create_flow.context(error::InvalidProtoMsgSnafu {
+            err_msg: "expected create_flow",
         })?;
 
         Ok(CreateFlowTask {
             catalog_name,
-            task_name,
+            flow_name,
             source_table_names: source_table_names.into_iter().map(Into::into).collect(),
             sink_table_name: sink_table_name
                 .context(error::InvalidProtoMsgSnafu {
@@ -777,7 +777,7 @@ impl TryFrom<PbCreateFlowTask> for CreateFlowTask {
             expire_when,
             comment,
             sql,
-            options: task_options,
+            options,
         })
     }
 }
@@ -786,7 +786,7 @@ impl From<CreateFlowTask> for PbCreateFlowTask {
     fn from(
         CreateFlowTask {
             catalog_name,
-            task_name,
+            flow_name,
             source_table_names,
             sink_table_name,
             or_replace,
@@ -798,17 +798,17 @@ impl From<CreateFlowTask> for PbCreateFlowTask {
         }: CreateFlowTask,
     ) -> Self {
         PbCreateFlowTask {
-            create_flow_task: Some(CreateFlowTaskExpr {
+            create_flow: Some(CreateFlowExpr {
                 catalog_name,
-                task_name,
+                flow_name,
                 source_table_names: source_table_names.into_iter().map(Into::into).collect(),
                 sink_table_name: Some(sink_table_name.into()),
                 or_replace,
                 create_if_not_exists,
                 expire_when,
                 comment,
                 sql,
-                task_options: options,
+                options,
             }),
         }
     }
@@ -817,22 +817,22 @@ impl From<CreateFlowTask> for PbCreateFlowTask {
 /// Drop flow
 pub struct DropFlowTask {
     pub catalog_name: String,
-    pub task_name: String,
+    pub flow_name: String,
 }
 
 impl TryFrom<PbDropFlowTask> for DropFlowTask {
     type Error = error::Error;
 
     fn try_from(pb: PbDropFlowTask) -> Result<Self> {
-        let DropFlowTaskExpr {
+        let DropFlowExpr {
             catalog_name,
-            task_name,
-        } = pb.drop_flow_task.context(error::InvalidProtoMsgSnafu {
+            flow_name,
+        } = pb.drop_flow.context(error::InvalidProtoMsgSnafu {
             err_msg: "expected sink_table_name",
         })?;
         Ok(DropFlowTask {
             catalog_name,
-            task_name,
+            flow_name,
         })
     }
 }
@@ -841,13 +841,13 @@ impl From<DropFlowTask> for PbDropFlowTask {
     fn from(
         DropFlowTask {
             catalog_name,
-            task_name,
+            flow_name,
         }: DropFlowTask,
     ) -> Self {
         PbDropFlowTask {
-            drop_flow_task: Some(DropFlowTaskExpr {
+            drop_flow: Some(DropFlowExpr {
                 catalog_name,
-                task_name,
+                flow_name,
             }),
         }
     }

diff --git a/src/operator/src/expr_factory.rs b/src/operator/src/expr_factory.rs
@@ -541,7 +541,7 @@ pub fn to_create_flow_task_expr(
 
     Ok(CreateFlowTask {
         catalog_name: query_ctx.current_catalog().to_string(),
-        task_name: create_flow.flow_name.to_string(),
+        flow_name: create_flow.flow_name.to_string(),
         source_table_names,
         sink_table_name,
         or_replace: create_flow.or_replace,