remove CatalogItemId enum

Make it an alias of `GlobalId`.

Author: teskje

src/adapter/src/coord.rs

@@ -2362,7 +2362,8 @@ impl Coordinator {
                                 CatalogItemId::System(id) => *id >= next_system_item_id,
                                 CatalogItemId::User(id) => *id >= next_user_item_id,
                                 CatalogItemId::IntrospectionSourceIndex(_)
-                                | CatalogItemId::Transient(_) => false,
+                                | CatalogItemId::Transient(_)
+                                | CatalogItemId::Explain => false,
                             };
                             if id_too_large {
                                 info!(

src/catalog-protos/src/serialization.rs

@@ -590,6 +590,7 @@ impl RustType<crate::objects::CatalogItemId> for CatalogItemId {
                 CatalogItemId::Transient(x) => {
                     crate::objects::catalog_item_id::Value::Transient(*x)
                 }
+                CatalogItemId::Explain => unimplemented!(),
             }),
         }
     }

src/catalog/src/durable/objects.rs

@@ -637,6 +637,7 @@ impl TryFrom<CatalogItemId> for SystemCatalogItemId {
             CatalogItemId::IntrospectionSourceIndex(_) => Err("introspection_source_index"),
             CatalogItemId::User(_) => Err("user"),
             CatalogItemId::Transient(_) => Err("transient"),
+            CatalogItemId::Explain => Err("explain"),
         }
     }
 }
@@ -662,6 +663,7 @@ impl TryFrom<CatalogItemId> for IntrospectionSourceIndexCatalogItemId {
             }
             CatalogItemId::User(_) => Err("user"),
             CatalogItemId::Transient(_) => Err("transient"),
+            CatalogItemId::Explain => Err("explain"),
         }
     }
 }

src/repr/src/catalog_item_id.proto

@@ -19,5 +19,6 @@ message ProtoCatalogItemId {
     uint64 user = 2;
     uint64 transient = 3;
     uint64 introspection_source_index = 4;
+    google.protobuf.Empty explain = 5;
   }
 }

src/repr/src/catalog_item_id.rs

@@ -7,100 +7,13 @@
 // the Business Source License, use of this software will be governed
 // by the Apache License, Version 2.0.
 
-use std::fmt;
-use std::str::FromStr;
-
-use anyhow::{Error, anyhow};
-use mz_lowertest::MzReflect;
 use mz_proto::{RustType, TryFromProtoError};
-use proptest_derive::Arbitrary;
-use serde::{Deserialize, Serialize};
-
-include!(concat!(env!("OUT_DIR"), "/mz_repr.catalog_item_id.rs"));
-
-/// The identifier for an item within the Catalog.
-#[derive(
-    Arbitrary,
-    Clone,
-    Copy,
-    Debug,
-    Eq,
-    PartialEq,
-    Ord,
-    PartialOrd,
-    Hash,
-    Serialize,
-    Deserialize,
-    MzReflect,
-)]
-pub enum CatalogItemId {
-    /// System namespace.
-    System(u64),
-    /// Introspection Source Index namespace.
-    IntrospectionSourceIndex(u64),
-    /// User namespace.
-    User(u64),
-    /// Transient item.
-    Transient(u64),
-}
 
-impl CatalogItemId {
-    /// Reports whether this ID is in the system namespace.
-    pub fn is_system(&self) -> bool {
-        matches!(
-            self,
-            CatalogItemId::System(_) | CatalogItemId::IntrospectionSourceIndex(_)
-        )
-    }
-
-    /// Reports whether this ID is in the user namespace.
-    pub fn is_user(&self) -> bool {
-        matches!(self, CatalogItemId::User(_))
-    }
+use crate::GlobalId;
 
-    /// Reports whether this ID is for a transient item.
-    pub fn is_transient(&self) -> bool {
-        matches!(self, CatalogItemId::Transient(_))
-    }
-}
-
-impl FromStr for CatalogItemId {
-    type Err = Error;
-
-    fn from_str(mut s: &str) -> Result<Self, Self::Err> {
-        if s.len() < 2 {
-            return Err(anyhow!("couldn't parse id {}", s));
-        }
-        let tag = s.chars().next().unwrap();
-        s = &s[1..];
-        let variant = match tag {
-            's' => {
-                if Some('i') == s.chars().next() {
-                    s = &s[1..];
-                    CatalogItemId::IntrospectionSourceIndex
-                } else {
-                    CatalogItemId::System
-                }
-            }
-            'u' => CatalogItemId::User,
-            't' => CatalogItemId::Transient,
-            _ => return Err(anyhow!("couldn't parse id {}", s)),
-        };
-        let val: u64 = s.parse()?;
-        Ok(variant(val))
-    }
-}
+include!(concat!(env!("OUT_DIR"), "/mz_repr.catalog_item_id.rs"));
 
-impl fmt::Display for CatalogItemId {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        match self {
-            CatalogItemId::System(id) => write!(f, "s{}", id),
-            CatalogItemId::IntrospectionSourceIndex(id) => write!(f, "si{}", id),
-            CatalogItemId::User(id) => write!(f, "u{}", id),
-            CatalogItemId::Transient(id) => write!(f, "t{}", id),
-        }
-    }
-}
+pub type CatalogItemId = GlobalId;
 
 impl RustType<ProtoCatalogItemId> for CatalogItemId {
     fn into_proto(&self) -> ProtoCatalogItemId {
@@ -111,6 +24,7 @@ impl RustType<ProtoCatalogItemId> for CatalogItemId {
                 CatalogItemId::IntrospectionSourceIndex(x) => IntrospectionSourceIndex(*x),
                 CatalogItemId::User(x) => User(*x),
                 CatalogItemId::Transient(x) => Transient(*x),
+                CatalogItemId::Explain => Explain(()),
             }),
         }
     }
@@ -122,6 +36,7 @@ impl RustType<ProtoCatalogItemId> for CatalogItemId {
             Some(IntrospectionSourceIndex(x)) => Ok(CatalogItemId::IntrospectionSourceIndex(x)),
             Some(User(x)) => Ok(CatalogItemId::User(x)),
             Some(Transient(x)) => Ok(CatalogItemId::Transient(x)),
+            Some(Explain(())) => Ok(CatalogItemId::Explain),
             None => Err(TryFromProtoError::missing_field("ProtoCatalogItemId::kind")),
         }
     }

src/storage-types/src/lib.rs

@@ -48,7 +48,6 @@ pub trait AlterCompatible: std::fmt::Debug + PartialEq {
 }
 
 impl AlterCompatible for mz_repr::GlobalId {}
-impl AlterCompatible for mz_repr::CatalogItemId {}
 
 /// The diff type used by storage.
 pub type StorageDiff = i64;