Allocate globally-unique replica ids

Author: bkirwi

src/catalog/src/durable.rs

@@ -77,6 +77,12 @@ pub const SYSTEM_CLUSTER_ID_ALLOC_KEY: &str = "system_compute";
 pub const USER_REPLICA_ID_ALLOC_KEY: &str = "replica";
 pub const SYSTEM_REPLICA_ID_ALLOC_KEY: &str = "system_replica";
 
+pub const SYSTEM_ALLOC_KEYS: &[&str] = &[
+    SYSTEM_ITEM_ALLOC_KEY,
+    SYSTEM_CLUSTER_ID_ALLOC_KEY,
+    SYSTEM_REPLICA_ID_ALLOC_KEY,
+];
+
 #[derive(Clone, Debug)]
 pub struct BootstrapArgs {
     pub cluster_replica_size_map: ClusterReplicaSizeMap,

src/catalog/src/durable/transaction.rs

@@ -64,8 +64,8 @@ use crate::durable::{
     AUDIT_LOG_ID_ALLOC_KEY, BUILTIN_MIGRATION_SHARD_KEY, CATALOG_CONTENT_VERSION_KEY, CatalogError,
     DATABASE_ID_ALLOC_KEY, DefaultPrivilege, DurableCatalogError, DurableCatalogState,
     EXPRESSION_CACHE_SHARD_KEY, MOCK_AUTHENTICATION_NONCE_KEY, NetworkPolicy, OID_ALLOC_KEY,
-    SCHEMA_ID_ALLOC_KEY, STORAGE_USAGE_ID_ALLOC_KEY, SYSTEM_CLUSTER_ID_ALLOC_KEY,
-    SYSTEM_ITEM_ALLOC_KEY, SYSTEM_REPLICA_ID_ALLOC_KEY, Snapshot, SystemConfiguration,
+    SCHEMA_ID_ALLOC_KEY, STORAGE_USAGE_ID_ALLOC_KEY, SYSTEM_ALLOC_KEYS,
+    SYSTEM_CLUSTER_ID_ALLOC_KEY, SYSTEM_ITEM_ALLOC_KEY, Snapshot, SystemConfiguration,
     USER_ITEM_ALLOC_KEY, USER_NETWORK_POLICY_ID_ALLOC_KEY, USER_REPLICA_ID_ALLOC_KEY,
     USER_ROLE_ID_ALLOC_KEY,
 };
@@ -903,7 +903,7 @@ impl<'a> Transaction<'a> {
     }
 
     pub fn allocate_system_replica_id(&mut self) -> Result<ReplicaId, CatalogError> {
-        let id = self.get_and_increment_id(&[SYSTEM_REPLICA_ID_ALLOC_KEY])?;
+        let id = self.get_and_increment_id(SYSTEM_ALLOC_KEYS)?;
         Ok(ReplicaId::System(id))
     }
 

src/environmentd/tests/testdata/http/ws

@@ -78,7 +78,7 @@ SHOW CREATE TYPE tx;
 simple conn=mz_system,user=mz_system
 SHOW CREATE TYPE map[text=>int]
 ----
-db error: ERROR: map[[s46 AS pg_catalog.text]=>[s20 AS pg_catalog.int4]] is not a named type
+db error: ERROR: map[[s54 AS pg_catalog.text]=>[s28 AS pg_catalog.int4]] is not a named type
 
 # For builtin types
 

test/sqllogictest/create_type_mods.slt

@@ -61,7 +61,7 @@ CREATE TABLE t (i INT)
 query T multiline
 SELECT pretty_sql(create_sql) FROM mz_tables WHERE name = 't'
 ----
-CREATE TABLE materialize.public.t (i [s20 AS pg_catalog.int4]);
+CREATE TABLE materialize.public.t (i [s28 AS pg_catalog.int4]);
 EOF
 
 statement ok
@@ -97,5 +97,5 @@ CREATE TYPE ty AS LIST (ELEMENT TYPE=bool)
 query T multiline
 SELECT pretty_sql(create_sql) FROM mz_types WHERE name = 'ty'
 ----
-CREATE TYPE materialize.public.ty AS LIST (ELEMENT TYPE = [s6 AS pg_catalog.bool]);
+CREATE TYPE materialize.public.ty AS LIST (ELEMENT TYPE = [s14 AS pg_catalog.bool]);
 EOF

test/sqllogictest/mz_catalog_server_index_accounting.slt

@@ -21,7 +21,7 @@ CREATE TABLE t (i INT)
 query T multiline
 SELECT redacted_create_sql FROM mz_tables WHERE name = 't'
 ----
-CREATE TABLE materialize.public.t (i [s20 AS pg_catalog.int4])
+CREATE TABLE materialize.public.t (i [s28 AS pg_catalog.int4])
 EOF
 
 query T multiline
@@ -68,7 +68,7 @@ CREATE TABLE redactable_t (a int) WITH (RETAIN HISTORY = FOR '2s', REDACTED = 'p
 query T multiline
 SELECT redacted_create_sql FROM mz_tables WHERE name = 'redactable_t'
 ----
-CREATE TABLE materialize.public.redactable_t (a [s20 AS pg_catalog.int4]) WITH (RETAIN HISTORY = FOR '2s', REDACTED = '<REDACTED>')
+CREATE TABLE materialize.public.redactable_t (a [s28 AS pg_catalog.int4]) WITH (RETAIN HISTORY = FOR '2s', REDACTED = '<REDACTED>')
 EOF
 
 query T multiline
@@ -80,7 +80,7 @@ EOF
 query T multiline
 SELECT pretty_sql(redacted_create_sql) FROM mz_tables WHERE name = 'redactable_t'
 ----
-CREATE TABLE materialize.public.redactable_t (a [s20 AS pg_catalog.int4]) WITH (RETAIN HISTORY = FOR '2s', REDACTED = '<REDACTED>');
+CREATE TABLE materialize.public.redactable_t (a [s28 AS pg_catalog.int4]) WITH (RETAIN HISTORY = FOR '2s', REDACTED = '<REDACTED>');
 EOF
 
 query T multiline
@@ -165,7 +165,7 @@ CREATE TYPE ty AS LIST (ELEMENT TYPE=bool)
 query T multiline
 SELECT redacted_create_sql FROM mz_types WHERE name = 'ty'
 ----
-CREATE TYPE materialize.public.ty AS LIST (ELEMENT TYPE = [s6 AS pg_catalog.bool])
+CREATE TYPE materialize.public.ty AS LIST (ELEMENT TYPE = [s14 AS pg_catalog.bool])
 EOF
 
 statement ok