fix

Author: zhyass

src/meta/app/src/schema/mod.rs

@@ -126,7 +126,6 @@ pub use table::SetTableColumnMaskPolicyReq;
 pub use table::SetTableRowAccessPolicyReply;
 pub use table::SetTableRowAccessPolicyReq;
 pub use table::SnapshotRef;
-pub use table::SnapshotRefInfo;
 pub use table::SnapshotRefType;
 pub use table::SwapTableReply;
 pub use table::SwapTableReq;

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

@@ -194,41 +194,25 @@ pub struct TableMeta {
 pub struct SnapshotRef {
     /// After this timestamp, the reference becomes inactive.
     pub expire_at: Option<DateTime<Utc>>,
-
-    pub info: SnapshotRefInfo,
-}
-
-#[derive(serde::Serialize, serde::Deserialize, Debug, Clone, PartialEq, Eq)]
-pub enum SnapshotRefInfo {
-    Branch {
-        /// The latest snapshot location that this reference currently points to.
-        head: String,
-        /// The earliest protected snapshot location on the snapshot chain.
-        anchor: String,
-    },
-    Tag(String),
+    /// The type of the reference.
+    pub typ: SnapshotRefType,
+    /// The location of the snapshot that this reference points to.
+    pub loc: String,
 }
 
-impl SnapshotRef {
-    pub fn ref_type(&self) -> SnapshotRefType {
-        match self.info {
-            SnapshotRefInfo::Branch { .. } => SnapshotRefType::Branch,
-            SnapshotRefInfo::Tag(_) => SnapshotRefType::Tag,
-        }
-    }
-
-    pub fn head(&self) -> &String {
-        match &self.info {
-            SnapshotRefInfo::Branch { head, .. } => head,
-            SnapshotRefInfo::Tag(loc) => loc,
-        }
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
+#[derive(
+    serde::Serialize,
+    serde::Deserialize,
+    Clone,
+    Debug,
+    Eq,
+    PartialEq,
+    num_derive::FromPrimitive,
+    Hash,
+)]
 pub enum SnapshotRefType {
-    Branch,
-    Tag,
+    Branch = 0,
+    Tag = 1,
 }
 
 impl From<&AstSnapshotRefType> for SnapshotRefType {
@@ -387,9 +371,9 @@ impl TableInfo {
                 name, self.desc
             )));
         };
-        let ref_type = table_ref.ref_type();
+        let ref_type = &table_ref.typ;
         if let Some(typ) = typ {
-            if &ref_type != typ {
+            if ref_type != typ {
                 return Err(ErrorCode::MismatchedReferenceType(format!(
                     "'{}' is a {} reference, please use 'AT({} => {})' instead.",
                     name, ref_type, ref_type, name,

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

@@ -499,39 +499,22 @@ impl FromToProto for mt::SnapshotRef {
     }
     fn from_pb(p: pb::SnapshotRef) -> Result<Self, Incompatible> {
         reader_check_msg(p.ver, p.min_reader_ver)?;
-        let expire_at = p.expire_at.map(DateTime::<Utc>::from_pb).transpose()?;
-        let Some(info) = p.info else {
-            return Err(Incompatible::new(
-                "SnapshotRefInfo cannot be None".to_string(),
-            ));
-        };
-        let info = match info {
-            pb::snapshot_ref::Info::Branch(branch) => mt::SnapshotRefInfo::Branch {
-                head: branch.head,
-                anchor: branch.anchor,
-            },
-            pb::snapshot_ref::Info::Tag(loc) => mt::SnapshotRefInfo::Tag(loc),
+        let v = Self {
+            expire_at: p.expire_at.map(DateTime::<Utc>::from_pb).transpose()?,
+            typ: FromPrimitive::from_i32(p.typ)
+                .ok_or_else(|| Incompatible::new(format!("invalid RefType: {}", p.typ)))?,
+            loc: p.loc,
         };
-        let v = Self { expire_at, info };
         Ok(v)
     }
 
     fn to_pb(&self) -> Result<pb::SnapshotRef, Incompatible> {
-        let expire_at = self.expire_at.map(|x| x.to_pb()).transpose()?;
-        let info = match &self.info {
-            mt::SnapshotRefInfo::Branch { head, anchor } => {
-                pb::snapshot_ref::Info::Branch(pb::snapshot_ref::Branch {
-                    head: head.clone(),
-                    anchor: anchor.clone(),
-                })
-            }
-            mt::SnapshotRefInfo::Tag(loc) => pb::snapshot_ref::Info::Tag(loc.clone()),
-        };
         let p = pb::SnapshotRef {
             ver: VER,
             min_reader_ver: MIN_READER_VER,
-            expire_at,
-            info: Some(info),
+            expire_at: self.expire_at.map(|x| x.to_pb()).transpose()?,
+            typ: self.typ.clone() as i32,
+            loc: self.loc.clone(),
         };
         Ok(p)
     }

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

@@ -19,6 +19,7 @@ use chrono::Utc;
 use databend_common_expression as ce;
 use databend_common_meta_app::schema as mt;
 use databend_common_meta_app::schema::SnapshotRef;
+use databend_common_meta_app::schema::SnapshotRefType;
 use fastrace::func_name;
 use maplit::btreemap;
 use maplit::btreeset;
@@ -41,10 +42,10 @@ fn test_decode_v161_snapshot_ref() -> anyhow::Result<()> {
         10, 7, 160, 6, 161, 1, 168, 6, 24, 64, 0, 162, 1, 23, 50, 48, 49, 52, 45, 49, 49, 45, 50,
         56, 32, 49, 50, 58, 48, 48, 58, 48, 57, 32, 85, 84, 67, 170, 1, 23, 50, 48, 49, 52, 45, 49,
         49, 45, 50, 57, 32, 49, 50, 58, 48, 48, 58, 49, 48, 32, 85, 84, 67, 186, 1, 7, 160, 6, 161,
-        1, 168, 6, 24, 226, 1, 1, 1, 170, 2, 52, 10, 8, 98, 114, 97, 110, 99, 104, 95, 49, 18, 40,
+        1, 168, 6, 24, 226, 1, 1, 1, 170, 2, 47, 10, 8, 98, 114, 97, 110, 99, 104, 95, 49, 18, 35,
         10, 23, 50, 48, 49, 52, 45, 49, 49, 45, 50, 56, 32, 49, 50, 58, 48, 48, 58, 48, 57, 32, 85,
-        84, 67, 18, 6, 10, 1, 97, 18, 1, 98, 160, 6, 161, 1, 168, 6, 24, 170, 2, 19, 10, 5, 116,
-        97, 103, 95, 49, 18, 10, 26, 1, 99, 160, 6, 161, 1, 168, 6, 24, 160, 6, 161, 1, 168, 6, 24,
+        84, 67, 26, 1, 97, 160, 6, 161, 1, 168, 6, 24, 170, 2, 21, 10, 5, 116, 97, 103, 95, 49, 18,
+        12, 16, 1, 26, 1, 99, 160, 6, 161, 1, 168, 6, 24, 160, 6, 161, 1, 168, 6, 24,
     ];
 
     let want = || mt::TableMeta {
@@ -73,14 +74,13 @@ fn test_decode_v161_snapshot_ref() -> anyhow::Result<()> {
         refs: btreemap! {
             "branch_1".to_string() => SnapshotRef {
                 expire_at: Some(Utc.with_ymd_and_hms(2014, 11, 28, 12, 0, 9).unwrap()),
-                info: mt::SnapshotRefInfo::Branch {
-                    head: "a".to_string(),
-                    anchor: "b".to_string(),
-                },
+                typ: SnapshotRefType::Branch,
+                loc: "a".to_string(),
             },
             "tag_1".to_string() => SnapshotRef {
                 expire_at: None,
-                info: mt::SnapshotRefInfo::Tag("c".to_string()),
+                typ: SnapshotRefType::Tag,
+                loc: "c".to_string(),
             }
         },
     };

src/meta/protos/proto/table.proto

@@ -149,17 +149,14 @@ message SnapshotRef {
   uint64 ver = 100;
   uint64 min_reader_ver = 101;
 
-  optional string expire_at = 1;
-
-  message Branch {
-    string head = 1;
-    string anchor = 2;
+  enum RefType {
+    Branch = 0;
+    Tag = 1;
   }
 
-  oneof info {
-    Branch branch = 2;
-    string tag = 3;
-  }
+  optional string expire_at = 1;
+  RefType typ = 2;
+  string loc = 3;
 }
 
 message RowAccessPolicyColumnMap {