WIP: Create mz-catalog-types crate

Cargo.toml

@@ -17,6 +17,7 @@ members = [
     "src/catalog",
     "src/catalog-debug",
     "src/catalog-protos",
+    "src/catalog-types",
     "src/ccsr",
     "src/cloud-api",
     "src/cloud-provider",
@@ -143,6 +144,7 @@ default-members = [
     "src/catalog",
     "src/catalog-debug",
     "src/catalog-protos",
+    "src/catalog-types",
     "src/ccsr",
     "src/cloud-api",
     "src/cloud-provider",

src/catalog-protos/Cargo.toml

@@ -10,12 +10,9 @@ workspace = true
 
 [dependencies]
 mz-audit-log = { path = "../audit-log" }
-mz-compute-types = { path = "../compute-types" }
-mz-controller-types = { path = "../controller-types" }
+mz-catalog-types = { path = "../catalog-types" }
 mz-proto = { path = "../proto" }
-mz-repr = { path = "../repr" }
 mz-sql = { path = "../sql" }
-mz-storage-types = { path = "../storage-types" }
 num_enum = "0.7.4"
 proptest = { version = "1.9.0", default-features = false, features = ["std"] }
 proptest-derive = "0.7.0"

src/catalog-protos/src/serialization.rs

@@ -15,23 +15,18 @@
 
 use std::time::Duration;
 
-use mz_compute_types::config::ComputeReplicaLogging;
-use mz_controller_types::ReplicaId;
+use mz_catalog_types::{
+    AclMode, CatalogItemId, ComputeReplicaLogging, DatabaseId, GlobalId, MzAclItem,
+    NetworkPolicyId, RelationVersion, ReplicaId, RoleId, SchemaId, StorageInstanceId,
+};
 use mz_proto::{ProtoMapEntry, ProtoType, RustType, TryFromProtoError};
-use mz_repr::adt::mz_acl_item::{AclMode, MzAclItem};
-use mz_repr::network_policy_id::NetworkPolicyId;
-use mz_repr::role_id::RoleId;
-use mz_repr::{CatalogItemId, GlobalId, RelationVersion};
 use mz_sql::catalog::{CatalogItemType, ObjectType, RoleAttributes, RoleMembership, RoleVars};
-use mz_sql::names::{
-    CommentObjectId, DatabaseId, ResolvedDatabaseSpecifier, SchemaId, SchemaSpecifier,
-};
+use mz_sql::names::{CommentObjectId, ResolvedDatabaseSpecifier, SchemaSpecifier};
 use mz_sql::plan::{
     ClusterSchedule, NetworkPolicyRule, NetworkPolicyRuleAction, NetworkPolicyRuleDirection,
     PolicyAddress,
 };
 use mz_sql::session::vars::OwnedVarInput;
-use mz_storage_types::instances::StorageInstanceId;
 
 impl From<String> for crate::objects::StringWrapper {
     fn from(value: String) -> Self {

src/catalog-types/Cargo.toml

@@ -0,0 +1,28 @@
+[package]
+name = "mz-catalog-types"
+description = "Shared types for the Materialize catalog"
+version = "0.0.0"
+edition.workspace = true
+rust-version.workspace = true
+publish = false
+
+[lints]
+workspace = true
+
+[dependencies]
+anyhow = "1.0.100"
+bitflags = "1.3.2"
+columnar = "0.11.1"
+mz-lowertest = { path = "../lowertest", default-features = false }
+mz-ore = { path = "../ore", default-features = false }
+proptest = { version = "1.9.0", default-features = false, features = ["std"] }
+proptest-derive = "0.7.0"
+serde = { version = "1.0.219", features = ["derive"] }
+tracing = "0.1.41"
+workspace-hack = { version = "0.0.0", path = "../workspace-hack", optional = true }
+
+[features]
+default = ["workspace-hack"]
+
+[package.metadata.cargo-udeps.ignore]
+normal = ["workspace-hack"]