Skip to content

Commit

Permalink
refactor: remove innecessary serde (#15040)
Browse files Browse the repository at this point in the history 
* refactor: remove innecessary serde

* refactor: remove innecessary serde
  • Loading branch information
@drmingdrmer
drmingdrmer authored Mar 20, 2024
1 parent ac27ee7 commit 4c852e2
Show file tree
Hide file tree
Showing 7 changed files with 59 additions and 59 deletions.
76 changes: 38 additions & 38 deletions src/meta/app/src/schema/table.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -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,
}
Expand All @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -554,7 +554,7 @@ pub struct DropTableReply {
pub spec_vec: Option<(Vec<ShareSpec>, Vec<ShareTableInfoMap>)>,
}

#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)]
#[derive(Clone, Debug, PartialEq, Eq)]
pub struct UndropTableReq {
pub name_ident: TableNameIdent,
}
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -644,7 +644,7 @@ pub struct UpdateStreamMetaReq {
pub options: BTreeMap<String, String>,
}

#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)]
#[derive(Clone, Debug, PartialEq, Eq)]
pub struct UpdateTableMetaReq {
pub table_id: u64,
pub seq: MatchSeq,
Expand Down Expand Up @@ -685,15 +685,15 @@ 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<String>),
// prev mask name
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,
Expand All @@ -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<Vec<ShareTableInfoMap>>,
}

#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)]
#[derive(Clone, Debug, PartialEq, Eq)]
pub struct UpsertTableOptionReply {
pub share_table_info: Option<Vec<ShareTableInfoMap>>,
}

#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)]
#[derive(Clone, Debug, PartialEq, Eq)]
pub struct UpdateTableMetaReply {
pub share_table_info: Option<Vec<ShareTableInfoMap>>,
}
Expand Down Expand Up @@ -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)]
Expand All @@ -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,
}
Expand Down Expand Up @@ -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,
}
Expand All @@ -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
Expand All @@ -838,37 +838,37 @@ 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<usize>,
}

#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)]
#[derive(Clone, Debug, PartialEq, Eq)]
pub enum DroppedId {
// db id, db name
Db(u64, String),
// db id, table id, table name
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<Arc<TableInfo>>,
pub drop_ids: Vec<DroppedId>,
}

#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)]
#[derive(Clone, Debug, PartialEq, Eq)]
pub struct GcDroppedTableReq {
pub tenant: String,
pub drop_ids: Vec<DroppedId>,
}

#[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,
}
Expand All @@ -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,
}
Expand All @@ -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,
}
Expand All @@ -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<String>,
pub content_length: u64,
pub last_modified: Option<DateTime<Utc>>,
}

#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)]
#[derive(Clone, Debug, PartialEq, Eq)]
pub struct GetTableCopiedFileReq {
pub table_id: u64,
pub files: Vec<String>,
}

#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)]
#[derive(Clone, Debug, PartialEq, Eq)]
pub struct GetTableCopiedFileReply {
pub file_info: BTreeMap<String, TableCopiedFileInfo>,
}

#[derive(serde::Serialize, serde::Deserialize, Clone, Debug, PartialEq, Eq)]
#[derive(Clone, Debug, PartialEq, Eq)]
pub struct UpsertTableCopiedFileReq {
pub file_info: BTreeMap<String, TableCopiedFileInfo>,
pub expire_at: Option<u64>,
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.
Expand All @@ -952,10 +952,10 @@ pub struct TruncateTableReq {
pub batch_size: Option<u64>,
}

#[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 {
Expand Down
Loading

0 comments on commit 4c852e2

Please sign in to comment.