chore: simplify alter and drop cluster key logic

Author: zhyass

src/common/base/src/runtime/metrics/family_metrics/counter.rs

@@ -42,7 +42,7 @@ impl<Labels: FamilyLabels> FamilyCounter<Labels> {
         FamilyCounter {
             index,
             labels,
-            value: Arc::new(Default::default()),
+            value: Default::default(),
         }
     }
 

src/meta/app/src/schema/table.rs

@@ -262,10 +262,8 @@ pub struct TableMeta {
     pub options: BTreeMap<String, String>,
     // The default cluster key.
     pub default_cluster_key: Option<String>,
-    // All cluster keys that have been defined.
-    pub cluster_keys: Vec<String>,
-    // The sequence number of default_cluster_key in cluster_keys.
-    pub default_cluster_key_id: Option<u32>,
+    // The sequence number of default_cluster_key.
+    pub default_cluster_key_id: u32,
     pub created_on: DateTime<Utc>,
     pub updated_on: DateTime<Utc>,
     pub comment: String,
@@ -407,6 +405,13 @@ impl TableInfo {
         self.meta.schema = schema;
         self
     }
+
+    pub fn cluster_key(&self) -> Option<(u32, String)> {
+        self.meta
+            .default_cluster_key
+            .clone()
+            .map(|k| (self.meta.default_cluster_key_id, k))
+    }
 }
 
 impl Default for TableMeta {
@@ -419,8 +424,7 @@ impl Default for TableMeta {
             part_prefix: "".to_string(),
             options: BTreeMap::new(),
             default_cluster_key: None,
-            cluster_keys: vec![],
-            default_cluster_key_id: None,
+            default_cluster_key_id: 0,
             created_on: Utc::now(),
             updated_on: Utc::now(),
             comment: "".to_string(),
@@ -434,20 +438,6 @@ impl Default for TableMeta {
     }
 }
 
-impl TableMeta {
-    pub fn push_cluster_key(mut self, cluster_key: String) -> Self {
-        self.cluster_keys.push(cluster_key.clone());
-        self.default_cluster_key = Some(cluster_key);
-        self.default_cluster_key_id = Some(self.cluster_keys.len() as u32 - 1);
-        self
-    }
-
-    pub fn cluster_key(&self) -> Option<(u32, String)> {
-        self.default_cluster_key_id
-            .zip(self.default_cluster_key.clone())
-    }
-}
-
 impl Display for TableMeta {
     fn fmt(&self, f: &mut Formatter) -> fmt::Result {
         write!(

src/meta/proto-conv/src/table_from_to_protobuf_impl.rs

@@ -192,6 +192,12 @@ impl FromToProto for mt::TableMeta {
             indexes.insert(name, mt::TableIndex::from_pb(index)?);
         }
 
+        let default_cluster_key_id = if let Some(cluster_key_id) = p.default_cluster_key_id {
+            cluster_key_id
+        } else {
+            p.cluster_keys.len() as u32 - 1
+        };
+
         let v = Self {
             schema: Arc::new(ex::TableSchema::from_pb(schema)?),
             engine: p.engine,
@@ -203,8 +209,7 @@ impl FromToProto for mt::TableMeta {
             part_prefix: p.part_prefix.unwrap_or("".to_string()),
             options: p.options,
             default_cluster_key: p.default_cluster_key,
-            cluster_keys: p.cluster_keys,
-            default_cluster_key_id: p.default_cluster_key_id,
+            default_cluster_key_id,
             created_on: DateTime::<Utc>::from_pb(p.created_on)?,
             updated_on: DateTime::<Utc>::from_pb(p.updated_on)?,
             drop_on: match p.drop_on {
@@ -251,8 +256,9 @@ impl FromToProto for mt::TableMeta {
             },
             options: self.options.clone(),
             default_cluster_key: self.default_cluster_key.clone(),
-            cluster_keys: self.cluster_keys.clone(),
-            default_cluster_key_id: self.default_cluster_key_id,
+            // cluster_keys is deprecated.
+            cluster_keys: vec![],
+            default_cluster_key_id: Some(self.default_cluster_key_id),
             created_on: self.created_on.to_pb()?,
             updated_on: self.updated_on.to_pb()?,
             drop_on: match self.drop_on {

src/meta/proto-conv/tests/it/proto_conv.rs

@@ -141,8 +141,7 @@ fn new_table_meta() -> mt::TableMeta {
         engine_options: btreemap! {s("abc") => s("def")},
         options: btreemap! {s("xyz") => s("foo")},
         default_cluster_key: Some("(a + 2, b)".to_string()),
-        cluster_keys: vec!["(a + 2, b)".to_string()],
-        default_cluster_key_id: Some(0),
+        default_cluster_key_id: 0,
         created_on: Utc.with_ymd_and_hms(2014, 11, 28, 12, 0, 9).unwrap(),
         updated_on: Utc.with_ymd_and_hms(2014, 11, 29, 12, 0, 10).unwrap(),
         comment: s("table_comment"),

src/meta/proto-conv/tests/it/v002_table_meta.rs

@@ -132,8 +132,7 @@ fn test_decode_v2_table_meta() -> anyhow::Result<()> {
         engine_options: btreemap! {s("abc") => s("def")},
         options: btreemap! {s("xyz") => s("foo")},
         default_cluster_key: Some("(a + 2, b)".to_string()),
-        cluster_keys: vec!["(a + 2, b)".to_string()],
-        default_cluster_key_id: Some(0),
+        default_cluster_key_id: 0,
         created_on: Utc.with_ymd_and_hms(2014, 11, 28, 12, 0, 9).unwrap(),
         updated_on: Utc.with_ymd_and_hms(2014, 11, 29, 12, 0, 10).unwrap(),
         comment: s("table_comment"),

src/meta/proto-conv/tests/it/v010_table_meta.rs

@@ -134,8 +134,7 @@ fn test_decode_v10_table_meta() -> anyhow::Result<()> {
         part_prefix: "".to_string(),
         options: btreemap! {s("xyz") => s("foo")},
         default_cluster_key: Some("(a + 2, b)".to_string()),
-        cluster_keys: vec!["(a + 2, b)".to_string()],
-        default_cluster_key_id: Some(0),
+        default_cluster_key_id: 0,
         created_on: Utc.with_ymd_and_hms(2014, 11, 28, 12, 0, 9).unwrap(),
         updated_on: Utc.with_ymd_and_hms(2014, 11, 29, 12, 0, 10).unwrap(),
         comment: s("table_comment"),

src/meta/proto-conv/tests/it/v012_table_meta.rs

@@ -136,8 +136,7 @@ fn test_decode_v12_table_meta() -> anyhow::Result<()> {
         part_prefix: "".to_string(),
         options: btreemap! {s("xyz") => s("foo")},
         default_cluster_key: Some("(a + 2, b)".to_string()),
-        cluster_keys: vec!["(a + 2, b)".to_string()],
-        default_cluster_key_id: Some(0),
+        default_cluster_key_id: 0,
         created_on: Utc.with_ymd_and_hms(2014, 11, 28, 12, 0, 9).unwrap(),
         updated_on: Utc.with_ymd_and_hms(2014, 11, 29, 12, 0, 10).unwrap(),
         comment: s("table_comment"),

src/meta/proto-conv/tests/it/v023_table_meta.rs

@@ -136,8 +136,7 @@ fn test_decode_v23_table_meta() -> anyhow::Result<()> {
         part_prefix: "lulu_".to_string(),
         options: btreemap! {s("xyz") => s("foo")},
         default_cluster_key: Some("(a + 2, b)".to_string()),
-        cluster_keys: vec!["(a + 2, b)".to_string()],
-        default_cluster_key_id: Some(0),
+        default_cluster_key_id: 0,
         created_on: Utc.with_ymd_and_hms(2014, 11, 28, 12, 0, 9).unwrap(),
         updated_on: Utc.with_ymd_and_hms(2014, 11, 29, 12, 0, 10).unwrap(),
         comment: s("table_comment"),

src/meta/proto-conv/tests/it/v024_table_meta.rs

@@ -136,8 +136,7 @@ fn test_decode_v24_table_meta() -> anyhow::Result<()> {
         part_prefix: "lulu_".to_string(),
         options: btreemap! {s("xyz") => s("foo")},
         default_cluster_key: Some("(a + 2, b)".to_string()),
-        cluster_keys: vec!["(a + 2, b)".to_string()],
-        default_cluster_key_id: Some(0),
+        default_cluster_key_id: 0,
         created_on: Utc.with_ymd_and_hms(2014, 11, 28, 12, 0, 9).unwrap(),
         updated_on: Utc.with_ymd_and_hms(2014, 11, 29, 12, 0, 10).unwrap(),
         comment: s("table_comment"),

src/meta/proto-conv/tests/it/v033_table_meta.rs

@@ -138,8 +138,7 @@ fn test_decode_v33_table_meta() -> anyhow::Result<()> {
         engine_options: btreemap! {s("abc") => s("def")},
         options: btreemap! {s("xyz") => s("foo")},
         default_cluster_key: Some("(a + 2, b)".to_string()),
-        cluster_keys: vec!["(a + 2, b)".to_string()],
-        default_cluster_key_id: Some(0),
+        default_cluster_key_id: 0,
         created_on: Utc.with_ymd_and_hms(2014, 11, 28, 12, 0, 9).unwrap(),
         updated_on: Utc.with_ymd_and_hms(2014, 11, 29, 12, 0, 10).unwrap(),
         comment: s("table_comment"),