diff --git a/src/meta/app/src/schema/table.rs b/src/meta/app/src/schema/table.rs index 9a926131021dc..de4ad621ea42f 100644 --- a/src/meta/app/src/schema/table.rs +++ b/src/meta/app/src/schema/table.rs @@ -66,7 +66,7 @@ impl Display for TableIdent { } } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, Eq, PartialEq, Default)] +#[derive(Clone, Debug, Eq, PartialEq, Default)] pub struct TableNameIdent { pub tenant: String, pub db_name: String, @@ -112,7 +112,7 @@ impl Display for TableNameIdent { } } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, Eq, PartialEq, Default)] +#[derive(Clone, Debug, Eq, PartialEq, Default)] pub struct DBIdTableName { pub db_id: u64, pub table_name: String, @@ -124,7 +124,7 @@ impl Display for DBIdTableName { } } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, Eq, PartialEq, Default)] +#[derive(Clone, Debug, Eq, PartialEq, Default)] pub struct TableId { pub table_id: u64, } @@ -141,7 +141,7 @@ impl Display for TableId { } } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, Eq, PartialEq, Default)] +#[derive(Clone, Debug, Eq, PartialEq, Default)] pub struct TableIdListKey { pub db_id: u64, pub table_name: String, @@ -458,7 +458,7 @@ impl Display for TableIdList { } } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub struct CreateTableReq { pub create_option: CreateOption, pub name_ident: TableNameIdent, @@ -554,7 +554,7 @@ pub struct DropTableReply { pub spec_vec: Option<(Vec, Vec)>, } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub struct UndropTableReq { pub name_ident: TableNameIdent, } @@ -583,10 +583,10 @@ impl Display for UndropTableReq { } } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub struct UndropTableReply {} -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub struct RenameTableReq { pub if_exists: bool, pub name_ident: TableNameIdent, @@ -620,12 +620,12 @@ impl Display for RenameTableReq { } } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub struct RenameTableReply { pub table_id: u64, } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub struct UpsertTableOptionReq { pub table_id: u64, pub seq: MatchSeq, @@ -644,7 +644,7 @@ pub struct UpdateStreamMetaReq { pub options: BTreeMap, } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub struct UpdateTableMetaReq { pub table_id: u64, pub seq: MatchSeq, @@ -685,7 +685,7 @@ impl Display for UpsertTableOptionReq { } } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub enum SetTableColumnMaskPolicyAction { // new mask name, old mask name(if any) Set(String, Option), @@ -693,7 +693,7 @@ pub enum SetTableColumnMaskPolicyAction { Unset(String), } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub struct SetTableColumnMaskPolicyReq { pub tenant: String, pub table_id: u64, @@ -702,17 +702,17 @@ pub struct SetTableColumnMaskPolicyReq { pub action: SetTableColumnMaskPolicyAction, } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub struct SetTableColumnMaskPolicyReply { pub share_table_info: Option>, } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub struct UpsertTableOptionReply { pub share_table_info: Option>, } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub struct UpdateTableMetaReply { pub share_table_info: Option>, } @@ -745,7 +745,7 @@ impl Display for CreateTableIndexReq { } } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, Eq, PartialEq)] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct CreateTableIndexReply {} #[derive(Clone, Debug, PartialEq, Eq)] @@ -765,10 +765,10 @@ impl Display for DropTableIndexReq { } } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub struct DropTableIndexReply {} -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub struct GetTableReq { pub inner: TableNameIdent, } @@ -799,7 +799,7 @@ impl GetTableReq { } } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub struct ListTableReq { pub inner: DatabaseNameIdent, } @@ -823,7 +823,7 @@ impl ListTableReq { } } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub enum TableInfoFilter { // if datatime is some, filter only dropped tables which drop time before that, // else filter all dropped tables @@ -838,14 +838,14 @@ pub enum TableInfoFilter { All, } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub struct ListDroppedTableReq { pub inner: DatabaseNameIdent, pub filter: TableInfoFilter, pub limit: Option, } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub enum DroppedId { // db id, db name Db(u64, String), @@ -853,22 +853,22 @@ pub enum DroppedId { Table(u64, u64, String), } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub struct ListDroppedTableResp { pub drop_table_infos: Vec>, pub drop_ids: Vec, } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub struct GcDroppedTableReq { pub tenant: String, pub drop_ids: Vec, } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub struct GcDroppedTableResp {} -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, Eq, PartialEq, Default)] +#[derive(Clone, Debug, Eq, PartialEq, Default)] pub struct CountTablesKey { pub tenant: String, } @@ -888,7 +888,7 @@ impl CountTablesKey { } /// count tables for a tenant -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub struct CountTablesReq { pub tenant: String, } @@ -898,7 +898,7 @@ pub struct CountTablesReply { pub count: u64, } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, Default, Eq, PartialEq)] +#[derive(Clone, Debug, Default, Eq, PartialEq)] pub struct TableIdToName { pub table_id: u64, } @@ -909,41 +909,41 @@ impl Display for TableIdToName { } } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, Eq, PartialEq, Default)] +#[derive(Clone, Debug, Eq, PartialEq, Default)] pub struct TableCopiedFileNameIdent { pub table_id: u64, pub file: String, } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, Eq, PartialEq, Default)] +#[derive(Clone, Debug, Eq, PartialEq, Default)] pub struct TableCopiedFileInfo { pub etag: Option, pub content_length: u64, pub last_modified: Option>, } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub struct GetTableCopiedFileReq { pub table_id: u64, pub files: Vec, } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub struct GetTableCopiedFileReply { pub file_info: BTreeMap, } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub struct UpsertTableCopiedFileReq { pub file_info: BTreeMap, pub expire_at: Option, pub fail_if_duplicated: bool, } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub struct UpsertTableCopiedFileReply {} -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub struct TruncateTableReq { pub table_id: u64, /// Specify the max number copied file to delete in every sub-transaction. @@ -952,10 +952,10 @@ pub struct TruncateTableReq { pub batch_size: Option, } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub struct TruncateTableReply {} -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub struct EmptyProto {} mod kvapi_key_impl { diff --git a/src/meta/app/src/share/share.rs b/src/meta/app/src/share/share.rs index 173478b08fb13..f6e63d0125ae3 100644 --- a/src/meta/app/src/share/share.rs +++ b/src/meta/app/src/share/share.rs @@ -195,7 +195,7 @@ pub struct GrantShareObjectReq { pub privilege: ShareGrantObjectPrivilege, } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub struct GrantShareObjectReply { pub share_id: u64, pub spec_vec: Option>, @@ -210,14 +210,14 @@ pub struct RevokeShareObjectReq { pub update_on: DateTime, } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub struct RevokeShareObjectReply { pub share_id: u64, pub spec_vec: Option>, pub share_table_info: ShareTableInfoMap, } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub struct GetShareGrantObjectReq { pub share_name: ShareNameIdent, } @@ -229,13 +229,13 @@ pub struct ShareGrantReplyObject { pub grant_on: DateTime, } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub struct GetShareGrantObjectReply { pub share_name: ShareNameIdent, pub objects: Vec, } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub struct GetShareGrantTenantsReq { pub share_name: ShareNameIdent, } @@ -246,12 +246,12 @@ pub struct GetShareGrantTenants { pub grant_on: DateTime, } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub struct GetShareGrantTenantsReply { pub accounts: Vec, } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub struct GetObjectGrantPrivilegesReq { pub tenant: String, pub object: ShareGrantObjectName, @@ -264,12 +264,12 @@ pub struct ObjectGrantPrivilege { pub grant_on: DateTime, } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub struct GetObjectGrantPrivilegesReply { pub privileges: Vec, } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub struct CreateShareEndpointReq { pub create_option: CreateOption, pub endpoint: ShareEndpointIdent, @@ -280,12 +280,12 @@ pub struct CreateShareEndpointReq { pub create_on: DateTime, } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub struct CreateShareEndpointReply { pub share_endpoint_id: u64, } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub struct UpsertShareEndpointReq { pub endpoint: ShareEndpointIdent, pub url: String, @@ -294,12 +294,12 @@ pub struct UpsertShareEndpointReq { pub create_on: DateTime, } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub struct UpsertShareEndpointReply { pub share_endpoint_id: u64, } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub struct GetShareEndpointReq { pub tenant: String, // If `endpoint` is not None, return the specified endpoint, @@ -310,18 +310,18 @@ pub struct GetShareEndpointReq { pub to_tenant: Option, } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub struct GetShareEndpointReply { pub share_endpoint_meta_vec: Vec<(ShareEndpointIdent, ShareEndpointMeta)>, } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub struct DropShareEndpointReq { pub if_exists: bool, pub endpoint: ShareEndpointIdent, } -#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, PartialEq, Eq)] pub struct DropShareEndpointReply {} #[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq, Default)] diff --git a/src/query/sql/src/executor/physical_plan.rs b/src/query/sql/src/executor/physical_plan.rs index 4a37ee441da0d..5def0737c0df6 100644 --- a/src/query/sql/src/executor/physical_plan.rs +++ b/src/query/sql/src/executor/physical_plan.rs @@ -62,7 +62,7 @@ use crate::executor::physical_plans::UnionAll; use crate::executor::physical_plans::UpdateSource; use crate::executor::physical_plans::Window; -#[derive(Clone, Debug, serde::Serialize, serde::Deserialize, EnumAsInner)] +#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, EnumAsInner)] pub enum PhysicalPlan { /// Query TableScan(TableScan), diff --git a/src/query/sql/src/executor/physical_plans/physical_aggregate_expand.rs b/src/query/sql/src/executor/physical_plans/physical_aggregate_expand.rs index b36b0087680f2..497dc5cc4c863 100644 --- a/src/query/sql/src/executor/physical_plans/physical_aggregate_expand.rs +++ b/src/query/sql/src/executor/physical_plans/physical_aggregate_expand.rs @@ -25,7 +25,7 @@ use crate::plans::GroupingSets; use crate::IndexType; /// Add dummy data before `GROUPING SETS`. -#[derive(Clone, Debug, serde::Serialize, serde::Deserialize)] +#[derive(serde::Serialize, serde::Deserialize, Clone, Debug)] pub struct AggregateExpand { // A unique id of operator in a `PhysicalPlan` tree, only used for display. pub plan_id: u32, diff --git a/src/query/sql/src/executor/physical_plans/physical_aggregate_final.rs b/src/query/sql/src/executor/physical_plans/physical_aggregate_final.rs index f5285e628608b..0e8d2e5aa8911 100644 --- a/src/query/sql/src/executor/physical_plans/physical_aggregate_final.rs +++ b/src/query/sql/src/executor/physical_plans/physical_aggregate_final.rs @@ -37,7 +37,7 @@ use crate::ColumnSet; use crate::IndexType; use crate::ScalarExpr; -#[derive(Clone, Debug, serde::Serialize, serde::Deserialize)] +#[derive(serde::Serialize, serde::Deserialize, Clone, Debug)] pub struct AggregateFinal { // A unique id of operator in a `PhysicalPlan` tree, only used for display. pub plan_id: u32, diff --git a/src/query/sql/src/executor/physical_plans/physical_aggregate_partial.rs b/src/query/sql/src/executor/physical_plans/physical_aggregate_partial.rs index 88d110102cafc..47509cd11e8bd 100644 --- a/src/query/sql/src/executor/physical_plans/physical_aggregate_partial.rs +++ b/src/query/sql/src/executor/physical_plans/physical_aggregate_partial.rs @@ -25,7 +25,7 @@ use crate::executor::physical_plans::common::AggregateFunctionDesc; use crate::executor::PhysicalPlan; use crate::IndexType; -#[derive(Clone, Debug, serde::Serialize, serde::Deserialize)] +#[derive(serde::Serialize, serde::Deserialize, Clone, Debug)] pub struct AggregatePartial { // A unique id of operator in a `PhysicalPlan` tree, only used for display. pub plan_id: u32, diff --git a/src/query/sql/src/executor/physical_plans/physical_commit_sink.rs b/src/query/sql/src/executor/physical_plans/physical_commit_sink.rs index d21239ed57f3f..00c10540b21f4 100644 --- a/src/query/sql/src/executor/physical_plans/physical_commit_sink.rs +++ b/src/query/sql/src/executor/physical_plans/physical_commit_sink.rs @@ -23,7 +23,7 @@ use crate::executor::physical_plans::common::MutationKind; use crate::executor::PhysicalPlan; /// The commit sink is used to commit the data to the table. -#[derive(Clone, Debug, serde::Serialize, serde::Deserialize)] +#[derive(serde::Serialize, serde::Deserialize, Clone, Debug)] pub struct CommitSink { pub plan_id: u32, pub input: Box,