chore: rename default_cluster_key_id to cluster_key_seq

zhyass · zhyass · commit ab974500febf · 2024-12-28T02:50:31.000+08:00
diff --git a/src/meta/app/src/schema/table.rs b/src/meta/app/src/schema/table.rs
@@ -262,8 +262,11 @@ pub struct TableMeta {
     pub options: BTreeMap<String, String>,
     // The default cluster key.
     pub default_cluster_key: Option<String>,
-    // The sequence number of default_cluster_key.
-    pub default_cluster_key_id: u32,
+    /// A sequential number that uniquely identifies changes to the cluster key.
+    /// This value increments by 1 each time the cluster key is created or modified,
+    /// ensuring a unique identifier for each version of the cluster key.
+    /// It remains unchanged when the cluster key is dropped.
+    pub cluster_key_seq: u32,
     pub created_on: DateTime<Utc>,
     pub updated_on: DateTime<Utc>,
     pub comment: String,
@@ -410,7 +413,7 @@ impl TableInfo {
         self.meta
             .default_cluster_key
             .clone()
-            .map(|k| (self.meta.default_cluster_key_id, k))
+            .map(|k| (self.meta.cluster_key_seq, k))
     }
 }
 
@@ -424,7 +427,7 @@ impl Default for TableMeta {
             part_prefix: "".to_string(),
             options: BTreeMap::new(),
             default_cluster_key: None,
-            default_cluster_key_id: 0,
+            cluster_key_seq: 0,
             created_on: Utc::now(),
             updated_on: Utc::now(),
             comment: "".to_string(),
diff --git a/src/meta/proto-conv/src/table_from_to_protobuf_impl.rs b/src/meta/proto-conv/src/table_from_to_protobuf_impl.rs
@@ -192,8 +192,8 @@ 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
+        let cluster_key_seq = if let Some(seq) = p.cluster_key_seq {
+            seq
         } else if p.cluster_keys.is_empty() {
             0
         } else {
@@ -211,7 +211,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,
-            default_cluster_key_id,
+            cluster_key_seq,
             created_on: DateTime::<Utc>::from_pb(p.created_on)?,
             updated_on: DateTime::<Utc>::from_pb(p.updated_on)?,
             drop_on: match p.drop_on {
@@ -260,7 +260,7 @@ impl FromToProto for mt::TableMeta {
             default_cluster_key: self.default_cluster_key.clone(),
             // cluster_keys is deprecated.
             cluster_keys: vec![],
-            default_cluster_key_id: Some(self.default_cluster_key_id),
+            cluster_key_seq: Some(self.cluster_key_seq),
             created_on: self.created_on.to_pb()?,
             updated_on: self.updated_on.to_pb()?,
             drop_on: match self.drop_on {
diff --git a/src/meta/proto-conv/tests/it/proto_conv.rs b/src/meta/proto-conv/tests/it/proto_conv.rs
@@ -141,7 +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()),
-        default_cluster_key_id: 0,
+        cluster_key_seq: 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"),
diff --git a/src/meta/proto-conv/tests/it/v002_table_meta.rs b/src/meta/proto-conv/tests/it/v002_table_meta.rs
@@ -132,7 +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()),
-        default_cluster_key_id: 0,
+        cluster_key_seq: 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"),
diff --git a/src/meta/proto-conv/tests/it/v010_table_meta.rs b/src/meta/proto-conv/tests/it/v010_table_meta.rs
@@ -134,7 +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()),
-        default_cluster_key_id: 0,
+        cluster_key_seq: 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"),
diff --git a/src/meta/proto-conv/tests/it/v012_table_meta.rs b/src/meta/proto-conv/tests/it/v012_table_meta.rs
@@ -136,7 +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()),
-        default_cluster_key_id: 0,
+        cluster_key_seq: 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"),
diff --git a/src/meta/proto-conv/tests/it/v023_table_meta.rs b/src/meta/proto-conv/tests/it/v023_table_meta.rs
@@ -136,7 +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()),
-        default_cluster_key_id: 0,
+        cluster_key_seq: 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"),
diff --git a/src/meta/proto-conv/tests/it/v024_table_meta.rs b/src/meta/proto-conv/tests/it/v024_table_meta.rs
@@ -136,7 +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()),
-        default_cluster_key_id: 0,
+        cluster_key_seq: 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"),
diff --git a/src/meta/proto-conv/tests/it/v033_table_meta.rs b/src/meta/proto-conv/tests/it/v033_table_meta.rs
@@ -138,7 +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()),
-        default_cluster_key_id: 0,
+        cluster_key_seq: 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"),
diff --git a/src/meta/proto-conv/tests/it/v040_table_meta.rs b/src/meta/proto-conv/tests/it/v040_table_meta.rs
@@ -138,7 +138,7 @@ fn test_decode_v40_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()),
-        default_cluster_key_id: 0,
+        cluster_key_seq: 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"),
diff --git a/src/meta/proto-conv/tests/it/v044_table_meta.rs b/src/meta/proto-conv/tests/it/v044_table_meta.rs
@@ -89,7 +89,7 @@ fn test_decode_v44_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()),
-        default_cluster_key_id: 0,
+        cluster_key_seq: 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"),
diff --git a/src/meta/proto-conv/tests/it/v055_table_meta.rs b/src/meta/proto-conv/tests/it/v055_table_meta.rs
@@ -80,7 +80,7 @@ fn test_decode_v55_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()),
-        default_cluster_key_id: 0,
+        cluster_key_seq: 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"),
diff --git a/src/meta/proto-conv/tests/it/v074_table_db_meta.rs b/src/meta/proto-conv/tests/it/v074_table_db_meta.rs
@@ -79,7 +79,7 @@ fn test_decode_v74_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()),
-        default_cluster_key_id: 0,
+        cluster_key_seq: 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"),
diff --git a/src/meta/proto-conv/tests/it/v080_geometry_datatype.rs b/src/meta/proto-conv/tests/it/v080_geometry_datatype.rs
@@ -206,7 +206,7 @@ fn test_decode_v80_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()),
-        default_cluster_key_id: 0,
+        cluster_key_seq: 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"),
diff --git a/src/meta/proto-conv/tests/it/v082_table_index.rs b/src/meta/proto-conv/tests/it/v082_table_index.rs
@@ -80,7 +80,7 @@ fn test_decode_v82_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()),
-        default_cluster_key_id: 0,
+        cluster_key_seq: 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"),
diff --git a/src/meta/proto-conv/tests/it/v085_table_index.rs b/src/meta/proto-conv/tests/it/v085_table_index.rs
@@ -80,7 +80,7 @@ fn test_decode_v85_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()),
-        default_cluster_key_id: 0,
+        cluster_key_seq: 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"),
diff --git a/src/meta/proto-conv/tests/it/v086_table_index.rs b/src/meta/proto-conv/tests/it/v086_table_index.rs
@@ -83,7 +83,7 @@ fn test_decode_v86_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()),
-        default_cluster_key_id: 0,
+        cluster_key_seq: 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"),
diff --git a/src/meta/proto-conv/tests/it/v094_table_meta.rs b/src/meta/proto-conv/tests/it/v094_table_meta.rs
@@ -78,7 +78,7 @@ fn test_decode_v94_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()),
-        default_cluster_key_id: 0,
+        cluster_key_seq: 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"),
diff --git a/src/meta/proto-conv/tests/it/v107_geography_datatype.rs b/src/meta/proto-conv/tests/it/v107_geography_datatype.rs
@@ -211,7 +211,7 @@ fn test_decode_v107_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()),
-        default_cluster_key_id: 0,
+        cluster_key_seq: 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"),
diff --git a/src/meta/proto-conv/tests/it/v114_interval_datatype.rs b/src/meta/proto-conv/tests/it/v114_interval_datatype.rs
@@ -202,7 +202,7 @@ fn test_decode_v114_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()),
-        default_cluster_key_id: 0,
+        cluster_key_seq: 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"),
diff --git a/src/meta/protos/proto/table.proto b/src/meta/protos/proto/table.proto
@@ -87,8 +87,8 @@ message TableMeta {
   // The vector of cluster keys.
   repeated string cluster_keys = 4;
 
-  // The default cluster keys id.
-  optional uint32 default_cluster_key_id = 8;
+  // A sequential number that uniquely identifies changes to the cluster key.
+  optional uint32 cluster_key_seq = 8;
 
   // The time table created.
   string created_on = 20;
diff --git a/src/query/service/src/interpreters/interpreter_cluster_key_alter.rs b/src/query/service/src/interpreters/interpreter_cluster_key_alter.rs
@@ -80,7 +80,7 @@ impl Interpreter for AlterTableClusterKeyInterpreter {
             .options
             .insert(OPT_KEY_CLUSTER_TYPE.to_owned(), plan.cluster_type.clone());
         new_table_meta.default_cluster_key = Some(cluster_key_str);
-        new_table_meta.default_cluster_key_id += 1;
+        new_table_meta.cluster_key_seq += 1;
 
         let req = UpdateTableMetaReq {
             table_id: table_info.ident.table_id,
diff --git a/src/query/service/src/interpreters/interpreter_table_create.rs b/src/query/service/src/interpreters/interpreter_table_create.rs
@@ -412,7 +412,7 @@ impl CreateTableInterpreter {
 
         if let Some(cluster_key) = &self.plan.cluster_key {
             table_meta.default_cluster_key = Some(cluster_key.clone());
-            table_meta.default_cluster_key_id += 1;
+            table_meta.cluster_key_seq += 1;
         }
 
         let req = CreateTableReq {
