diff --git a/src/adapter/src/catalog/open.rs b/src/adapter/src/catalog/open.rs index b3fe318f75359..78426cf2aeb02 100644 --- a/src/adapter/src/catalog/open.rs +++ b/src/adapter/src/catalog/open.rs @@ -204,8 +204,6 @@ impl Catalog { txn.set_system_config_synced_once()?; } // Add any new builtin objects and remove old ones. - let new_builtin_collections = - add_new_remove_old_builtin_items_migration(&state.config().builtins_cfg, &mut txn)?; let builtin_bootstrap_cluster_config_map = BuiltinBootstrapClusterConfigMap { system_cluster: config.builtin_system_cluster_config, catalog_server_cluster: config.builtin_catalog_server_cluster_config, @@ -217,11 +215,14 @@ impl Catalog { &mut txn, &builtin_bootstrap_cluster_config_map, )?; - add_new_remove_old_builtin_introspection_source_migration(&mut txn)?; add_new_remove_old_builtin_cluster_replicas_migration( &mut txn, &builtin_bootstrap_cluster_config_map, )?; + + let new_builtin_collections = + add_new_remove_old_builtin_items_migration(&state.config().builtins_cfg, &mut txn)?; + add_new_remove_old_builtin_introspection_source_migration(&mut txn)?; add_new_remove_old_builtin_roles_migration(&mut txn)?; remove_invalid_config_param_role_defaults_migration(&mut txn)?; remove_pending_cluster_replicas_migration(&mut txn)?; diff --git a/src/adapter/tests/testdata/sql b/src/adapter/tests/testdata/sql index 912251ac4a1b4..98e66fb43688f 100644 --- a/src/adapter/tests/testdata/sql +++ b/src/adapter/tests/testdata/sql @@ -10,12 +10,12 @@ add-table foo ---- -u1 +u2 resolve SELECT 1 FROM foo ---- -SELECT 1 FROM [u1 AS materialize.public.foo] +SELECT 1 FROM [u2 AS materialize.public.foo] resolve SELECT 1 FROM bar @@ -25,7 +25,7 @@ error: unknown catalog item 'bar' resolve SELECT 1 FROM materialize.public.foo ---- -SELECT 1 FROM [u1 AS materialize.public.foo] +SELECT 1 FROM [u2 AS materialize.public.foo] resolve WITH foo AS (SELECT 1) @@ -43,13 +43,13 @@ resolve WITH bar AS (SELECT 1) SELECT 1 FROM foo CROSS JOIN bar ---- -WITH bar AS (SELECT 1) SELECT 1 FROM [u1 AS materialize.public.foo] CROSS JOIN bar +WITH bar AS (SELECT 1) SELECT 1 FROM [u2 AS materialize.public.foo] CROSS JOIN bar resolve WITH bar AS (SELECT 1), baz AS (SELECT 2) SELECT 1 FROM foo CROSS JOIN bar CROSS JOIN baz ---- -WITH bar AS (SELECT 1), baz AS (SELECT 2) SELECT 1 FROM [u1 AS materialize.public.foo] CROSS JOIN bar CROSS JOIN baz +WITH bar AS (SELECT 1), baz AS (SELECT 2) SELECT 1 FROM [u2 AS materialize.public.foo] CROSS JOIN bar CROSS JOIN baz resolve WITH outermost(x) AS ( diff --git a/src/catalog/src/durable.rs b/src/catalog/src/durable.rs index 1b611a0f3f6d8..6b7b6fffa0c93 100644 --- a/src/catalog/src/durable.rs +++ b/src/catalog/src/durable.rs @@ -61,10 +61,6 @@ pub const SCHEMA_ID_ALLOC_KEY: &str = "schema"; pub const USER_ITEM_ALLOC_KEY: &str = "user"; pub const SYSTEM_ITEM_ALLOC_KEY: &str = "system"; pub const USER_ROLE_ID_ALLOC_KEY: &str = "user_role"; -pub const USER_CLUSTER_ID_ALLOC_KEY: &str = "user_compute"; -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 AUDIT_LOG_ID_ALLOC_KEY: &str = "auditlog"; pub const STORAGE_USAGE_ID_ALLOC_KEY: &str = "storage_usage"; pub const USER_NETWORK_POLICY_ID_ALLOC_KEY: &str = "user_network_policy"; @@ -74,6 +70,25 @@ pub const BUILTIN_MIGRATION_SHARD_KEY: &str = "builtin_migration_shard"; pub const EXPRESSION_CACHE_SHARD_KEY: &str = "expression_cache_shard"; pub const MOCK_AUTHENTICATION_NONCE_KEY: &str = "mock_authentication_nonce"; +// Note: these ID types are generally merged with the main system and user item keys, +// but are kept separate here for backwards-compatibility reasons. +pub const USER_CLUSTER_ID_ALLOC_KEY: &str = "user_compute"; +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, +]; + +pub const USER_ALLOC_KEYS: &[&str] = &[ + USER_ITEM_ALLOC_KEY, + USER_CLUSTER_ID_ALLOC_KEY, + USER_REPLICA_ID_ALLOC_KEY, +]; + #[derive(Clone, Debug)] pub struct BootstrapArgs { pub cluster_replica_size_map: ClusterReplicaSizeMap, @@ -319,7 +334,7 @@ pub trait DurableCatalogState: ReadOnlyDurableCatalogState { #[mz_ore::instrument(level = "debug")] async fn allocate_id( &mut self, - id_type: &str, + id_type: &[&str], amount: u64, commit_ts: Timestamp, ) -> Result, CatalogError> { @@ -327,7 +342,7 @@ pub trait DurableCatalogState: ReadOnlyDurableCatalogState { return Ok(Vec::new()); } let mut txn = self.transaction().await?; - let ids = txn.get_and_increment_id_by(id_type.to_string(), amount)?; + let ids = txn.get_and_increment_id_by(id_type, amount)?; txn.commit_internal(commit_ts).await?; Ok(ids) } @@ -340,9 +355,7 @@ pub trait DurableCatalogState: ReadOnlyDurableCatalogState { amount: u64, commit_ts: Timestamp, ) -> Result, CatalogError> { - let ids = self - .allocate_id(USER_ITEM_ALLOC_KEY, amount, commit_ts) - .await?; + let ids = self.allocate_id(USER_ALLOC_KEYS, amount, commit_ts).await?; let ids = ids .iter() .map(|id| (CatalogItemId::User(*id), GlobalId::User(*id))) @@ -357,7 +370,7 @@ pub trait DurableCatalogState: ReadOnlyDurableCatalogState { &mut self, commit_ts: Timestamp, ) -> Result<(CatalogItemId, GlobalId), CatalogError> { - let id = self.allocate_id(USER_ITEM_ALLOC_KEY, 1, commit_ts).await?; + let id = self.allocate_id(USER_ALLOC_KEYS, 1, commit_ts).await?; let id = id.into_element(); Ok((CatalogItemId::User(id), GlobalId::User(id))) } @@ -370,7 +383,7 @@ pub trait DurableCatalogState: ReadOnlyDurableCatalogState { commit_ts: Timestamp, ) -> Result { let id = self - .allocate_id(USER_CLUSTER_ID_ALLOC_KEY, 1, commit_ts) + .allocate_id(USER_ALLOC_KEYS, 1, commit_ts) .await? .into_element(); Ok(ClusterId::user(id).ok_or(SqlCatalogError::IdExhaustion)?) diff --git a/src/catalog/src/durable/initialize.rs b/src/catalog/src/durable/initialize.rs index 4256bc99a9cf5..a58bb3592d571 100644 --- a/src/catalog/src/durable/initialize.rs +++ b/src/catalog/src/durable/initialize.rs @@ -602,7 +602,7 @@ pub(crate) async fn initialize( // We created a network policy with a prefined ID user(1) and OID. We need // to increment the id alloc key. It should be safe to assume that there's // no user(1), as a sanity check, we'll assert this is the case. - let id = tx.get_and_increment_id(USER_NETWORK_POLICY_ID_ALLOC_KEY.to_string())?; + let id = tx.get_and_increment_id(&[USER_NETWORK_POLICY_ID_ALLOC_KEY])?; assert!(DEFAULT_USER_NETWORK_POLICY_ID == NetworkPolicyId::User(id)); audit_events.extend([( @@ -720,7 +720,7 @@ pub(crate) async fn initialize( // Allocate an ID for each audit log event. let mut audit_events_with_id = Vec::with_capacity(audit_events.len()); for (ty, obj, details) in audit_events { - let id = tx.get_and_increment_id(AUDIT_LOG_ID_ALLOC_KEY.to_string())?; + let id = tx.get_and_increment_id(&[AUDIT_LOG_ID_ALLOC_KEY])?; audit_events_with_id.push((id, ty, obj, details)); } diff --git a/src/catalog/src/durable/transaction.rs b/src/catalog/src/durable/transaction.rs index 7fd1c5c3b6243..664b783f4b73a 100644 --- a/src/catalog/src/durable/transaction.rs +++ b/src/catalog/src/durable/transaction.rs @@ -64,9 +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, - USER_ITEM_ALLOC_KEY, USER_NETWORK_POLICY_ID_ALLOC_KEY, USER_REPLICA_ID_ALLOC_KEY, + SCHEMA_ID_ALLOC_KEY, STORAGE_USAGE_ID_ALLOC_KEY, SYSTEM_ALLOC_KEYS, SYSTEM_ITEM_ALLOC_KEY, + Snapshot, SystemConfiguration, USER_ALLOC_KEYS, USER_NETWORK_POLICY_ID_ALLOC_KEY, USER_ROLE_ID_ALLOC_KEY, }; use crate::memory::objects::{StateDiff, StateUpdate, StateUpdateKind}; @@ -230,7 +229,7 @@ impl<'a> Transaction<'a> { privileges: Vec, temporary_oids: &HashSet, ) -> Result<(DatabaseId, u32), CatalogError> { - let id = self.get_and_increment_id(DATABASE_ID_ALLOC_KEY.to_string())?; + let id = self.get_and_increment_id(&[DATABASE_ID_ALLOC_KEY])?; let id = DatabaseId::User(id); let oid = self.allocate_oid(temporary_oids)?; self.insert_database(id, database_name, owner_id, privileges, oid)?; @@ -268,7 +267,7 @@ impl<'a> Transaction<'a> { privileges: Vec, temporary_oids: &HashSet, ) -> Result<(SchemaId, u32), CatalogError> { - let id = self.get_and_increment_id(SCHEMA_ID_ALLOC_KEY.to_string())?; + let id = self.get_and_increment_id(&[SCHEMA_ID_ALLOC_KEY])?; let id = SchemaId::User(id); let oid = self.allocate_oid(temporary_oids)?; self.insert_schema( @@ -341,7 +340,7 @@ impl<'a> Transaction<'a> { vars: RoleVars, temporary_oids: &HashSet, ) -> Result<(RoleId, u32), CatalogError> { - let id = self.get_and_increment_id(USER_ROLE_ID_ALLOC_KEY.to_string())?; + let id = self.get_and_increment_id(&[USER_ROLE_ID_ALLOC_KEY])?; let id = RoleId::User(id); let oid = self.allocate_oid(temporary_oids)?; self.insert_role(id, name, attributes, membership, vars, oid)?; @@ -436,7 +435,7 @@ impl<'a> Transaction<'a> { config: ClusterConfig, temporary_oids: &HashSet, ) -> Result<(), CatalogError> { - let cluster_id = self.get_and_increment_id(SYSTEM_CLUSTER_ID_ALLOC_KEY.to_string())?; + let cluster_id = self.get_and_increment_id(SYSTEM_ALLOC_KEYS)?; let cluster_id = ClusterId::system(cluster_id).ok_or(SqlCatalogError::IdExhaustion)?; self.insert_cluster( cluster_id, @@ -615,7 +614,7 @@ impl<'a> Transaction<'a> { temporary_oids: &HashSet, ) -> Result { let oid = self.allocate_oid(temporary_oids)?; - let id = self.get_and_increment_id(USER_NETWORK_POLICY_ID_ALLOC_KEY.to_string())?; + let id = self.get_and_increment_id(&[USER_NETWORK_POLICY_ID_ALLOC_KEY])?; let id = NetworkPolicyId::User(id); self.insert_network_policy(id, name, rules, privileges, owner_id, oid) } @@ -733,40 +732,48 @@ impl<'a> Transaction<'a> { } } - pub fn get_and_increment_id(&mut self, key: String) -> Result { - Ok(self.get_and_increment_id_by(key, 1)?.into_element()) + pub fn get_and_increment_id(&mut self, keys: &[&str]) -> Result { + Ok(self.get_and_increment_id_by(keys, 1)?.into_element()) } pub fn get_and_increment_id_by( &mut self, - key: String, + keys: &[&str], amount: u64, ) -> Result, CatalogError> { + let items = self.id_allocator.items(); + assert!( - key != SYSTEM_ITEM_ALLOC_KEY || !self.durable_catalog.is_bootstrap_complete(), + keys != &[SYSTEM_ITEM_ALLOC_KEY] || !self.durable_catalog.is_bootstrap_complete(), "system item IDs cannot be allocated outside of bootstrap" ); - let current_id = self - .id_allocator - .items() - .get(&IdAllocKey { name: key.clone() }) - .unwrap_or_else(|| panic!("{key} id allocator missing")) - .next_id; + let mut current_id = 1; + for key in keys { + let next_id = items + .get(&IdAllocKey { + name: key.to_string(), + }) + .unwrap_or_else(|| panic!("{key} id allocator missing")) + .next_id; + + current_id = current_id.max(next_id) + } + let next_id = current_id .checked_add(amount) .ok_or(SqlCatalogError::IdExhaustion)?; - let prev = self.id_allocator.set( - IdAllocKey { name: key }, - Some(IdAllocValue { next_id }), - self.op_id, - )?; - assert_eq!( - prev, - Some(IdAllocValue { - next_id: current_id - }) - ); + for key in keys { + let prev = self.id_allocator.set( + IdAllocKey { + name: key.to_string(), + }, + Some(IdAllocValue { next_id }), + self.op_id, + )?; + assert!(prev.is_some_and(|value| value.next_id <= current_id),); + } + Ok((current_id..next_id).collect()) } @@ -779,7 +786,7 @@ impl<'a> Transaction<'a> { "we can only allocate system item IDs during bootstrap" ); Ok(self - .get_and_increment_id_by(SYSTEM_ITEM_ALLOC_KEY.to_string(), amount)? + .get_and_increment_id_by(SYSTEM_ALLOC_KEYS, amount)? .into_iter() // TODO(alter_table): Use separate ID allocators. .map(|x| (CatalogItemId::System(x), GlobalId::System(x))) @@ -882,7 +889,7 @@ impl<'a> Transaction<'a> { amount: u64, ) -> Result, CatalogError> { Ok(self - .get_and_increment_id_by(USER_ITEM_ALLOC_KEY.to_string(), amount)? + .get_and_increment_id_by(USER_ALLOC_KEYS, amount)? .into_iter() // TODO(alter_table): Use separate ID allocators. .map(|x| (CatalogItemId::User(x), GlobalId::User(x))) @@ -890,21 +897,21 @@ impl<'a> Transaction<'a> { } pub fn allocate_user_replica_id(&mut self) -> Result { - let id = self.get_and_increment_id(USER_REPLICA_ID_ALLOC_KEY.to_string())?; + let id = self.get_and_increment_id(USER_ALLOC_KEYS)?; Ok(ReplicaId::User(id)) } pub fn allocate_system_replica_id(&mut self) -> Result { - let id = self.get_and_increment_id(SYSTEM_REPLICA_ID_ALLOC_KEY.to_string())?; + let id = self.get_and_increment_id(SYSTEM_ALLOC_KEYS)?; Ok(ReplicaId::System(id)) } pub fn allocate_audit_log_id(&mut self) -> Result { - self.get_and_increment_id(AUDIT_LOG_ID_ALLOC_KEY.to_string()) + self.get_and_increment_id(&[AUDIT_LOG_ID_ALLOC_KEY]) } pub fn allocate_storage_usage_ids(&mut self) -> Result { - self.get_and_increment_id(STORAGE_USAGE_ID_ALLOC_KEY.to_string()) + self.get_and_increment_id(&[STORAGE_USAGE_ID_ALLOC_KEY]) } /// Allocates `amount` OIDs. OIDs can be recycled if they aren't currently assigned to any diff --git a/src/catalog/tests/read-write.rs b/src/catalog/tests/read-write.rs index 32c9233cf3acd..f4c131e3d1877 100644 --- a/src/catalog/tests/read-write.rs +++ b/src/catalog/tests/read-write.rs @@ -98,7 +98,7 @@ async fn test_allocate_id(state_builder: TestCatalogStateBuilder) { let start_id = state.get_next_id(id_type).await.unwrap(); let commit_ts = state.current_upper().await; - let ids = state.allocate_id(id_type, 3, commit_ts).await.unwrap(); + let ids = state.allocate_id(&[id_type], 3, commit_ts).await.unwrap(); assert_eq!(ids, (start_id..(start_id + 3)).collect::>()); let snapshot_id_allocs: Vec<_> = state diff --git a/src/environmentd/tests/server.rs b/src/environmentd/tests/server.rs index 7e51a7ff3dfbb..2545137128e7a 100644 --- a/src/environmentd/tests/server.rs +++ b/src/environmentd/tests/server.rs @@ -161,7 +161,7 @@ fn test_persistence() { .into_iter() .map(|row| row.get(0)) .collect::>(), - vec!["u1", "u2", "u3", "u4", "u5", "u6", "u7"] + vec!["u2", "u3", "u4", "u5", "u6", "u7", "u8"] ); } diff --git a/src/environmentd/tests/sql.rs b/src/environmentd/tests/sql.rs index e394dad2e90c8..f0d8d6099643c 100644 --- a/src/environmentd/tests/sql.rs +++ b/src/environmentd/tests/sql.rs @@ -1244,13 +1244,13 @@ largest not in advance of upper: timeline: Some(EpochMilliseconds) session wall time: -source materialize.public.t1 (u1, storage): +source materialize.public.t1 (u2, storage): read frontier:[] write frontier:[] binding constraints: lower: - (StorageInput([User(1)])): [] + (StorageInput([User(2)])): [] (IsolationLevel(StrictSerializable)): []\n"; let row = client diff --git a/src/environmentd/tests/testdata/http/ws b/src/environmentd/tests/testdata/http/ws index 94623d6b8dd80..db9964a8bcbfc 100644 --- a/src/environmentd/tests/testdata/http/ws +++ b/src/environmentd/tests/testdata/http/ws @@ -410,7 +410,7 @@ ws-text ws-text {"query": "SELECT 1 FROM mz_sources LIMIT 1"} ---- -{"type":"Notice","payload":{"message":"{\n \"plans\": {\n \"raw\": {\n \"text\": \"Finish limit=1 output=[#0]\\n Project (#15)\\n Map (1)\\n Get mz_catalog.mz_sources\\n\\nTarget cluster: mz_catalog_server\\n\",\n \"json\": {\n \"Project\": {\n \"input\": {\n \"Map\": {\n \"input\": {\n \"Get\": {\n \"id\": {\n \"Global\": {\n \"System\": 469\n }\n },\n \"typ\": {\n \"column_types\": [\n {\n \"scalar_type\": \"String\",\n \"nullable\": false\n },\n {\n \"scalar_type\": \"Oid\",\n \"nullable\": false\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": false\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": false\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": false\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": false\n },\n {\n \"scalar_type\": {\n \"Array\": \"MzAclItem\"\n },\n \"nullable\": false\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n }\n ],\n \"keys\": [\n [\n 0\n ],\n [\n 1\n ]\n ]\n }\n }\n },\n \"scalars\": [\n {\n \"Literal\": [\n {\n \"data\": [\n 45,\n 1\n ]\n },\n {\n \"scalar_type\": \"Int32\",\n \"nullable\": false\n },\n null\n ]\n }\n ]\n }\n },\n \"outputs\": [\n 15\n ]\n }\n }\n },\n \"optimized\": {\n \"global\": {\n \"text\": \"t62:\\n Finish limit=1 output=[#0]\\n ArrangeBy keys=[[#0]]\\n ReadGlobalFromSameDataflow t61\\n\\nt61:\\n Project (#15)\\n Map (1)\\n ReadIndex on=mz_sources mz_sources_ind=[*** full scan ***]\\n\\nTarget cluster: mz_catalog_server\\n\",\n \"json\": {\n \"plans\": [\n {\n \"id\": \"t62\",\n \"plan\": {\n \"ArrangeBy\": {\n \"input\": {\n \"Get\": {\n \"id\": {\n \"Global\": {\n \"Transient\": 61\n }\n },\n \"typ\": {\n \"column_types\": [\n {\n \"scalar_type\": \"Int32\",\n \"nullable\": false\n }\n ],\n \"keys\": []\n },\n \"access_strategy\": \"SameDataflow\"\n }\n },\n \"keys\": [\n [\n {\n \"Column\": [\n 0,\n null\n ]\n }\n ]\n ]\n }\n }\n },\n {\n \"id\": \"t61\",\n \"plan\": {\n \"Project\": {\n \"input\": {\n \"Map\": {\n \"input\": {\n \"Get\": {\n \"id\": {\n \"Global\": {\n \"System\": 469\n }\n },\n \"typ\": {\n \"column_types\": [\n {\n \"scalar_type\": \"String\",\n \"nullable\": false\n },\n {\n \"scalar_type\": \"Oid\",\n \"nullable\": false\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": false\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": false\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": false\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": false\n },\n {\n \"scalar_type\": {\n \"Array\": \"MzAclItem\"\n },\n \"nullable\": false\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n }\n ],\n \"keys\": [\n [\n 0\n ],\n [\n 1\n ]\n ]\n },\n \"access_strategy\": {\n \"Index\": [\n [\n {\n \"System\": 752\n },\n \"FullScan\"\n ]\n ]\n }\n }\n },\n \"scalars\": [\n {\n \"Literal\": [\n {\n \"Ok\": {\n \"data\": [\n 45,\n 1\n ]\n }\n },\n {\n \"scalar_type\": \"Int32\",\n \"nullable\": false\n }\n ]\n }\n ]\n }\n },\n \"outputs\": [\n 15\n ]\n }\n }\n }\n ],\n \"sources\": []\n }\n },\n \"fast_path\": {\n \"text\": \"Explained Query (fast path):\\n Finish limit=1 output=[#0]\\n →Map/Filter/Project\\n Project: #15\\n Map: 1\\n →Indexed mz_catalog.mz_sources (using mz_catalog.mz_sources_ind)\\n\\nTarget cluster: mz_catalog_server\\n\",\n \"json\": {\n \"plans\": [\n {\n \"id\": \"Explained Query (fast path)\",\n \"plan\": {\n \"PeekExisting\": [\n {\n \"System\": 469\n },\n {\n \"System\": 752\n },\n null,\n {\n \"mfp\": {\n \"expressions\": [\n {\n \"Literal\": [\n {\n \"Ok\": {\n \"data\": [\n 45,\n 1\n ]\n }\n },\n {\n \"scalar_type\": \"Int32\",\n \"nullable\": false\n }\n ]\n }\n ],\n \"predicates\": [],\n \"projection\": [\n 15\n ],\n \"input_arity\": 15\n }\n }\n ]\n }\n }\n ],\n \"sources\": []\n }\n }\n }\n },\n \"insights\": {\n \"imports\": {\n \"s752\": {\n \"name\": {\n \"schema\": \"mz_catalog\",\n \"item\": \"mz_sources_ind\"\n },\n \"type\": \"compute\"\n }\n },\n \"fast_path_clusters\": {},\n \"fast_path_limit\": null,\n \"persist_count\": []\n },\n \"cluster\": {\n \"name\": \"mz_catalog_server\",\n \"id\": {\n \"System\": 2\n }\n },\n \"redacted_sql\": \"SELECT '' FROM [s469 AS mz_catalog.mz_sources] LIMIT ''\"\n}","code":"MZ001","severity":"notice"}} +{"type":"Notice","payload":{"message":"{\n \"plans\": {\n \"raw\": {\n \"text\": \"Finish limit=1 output=[#0]\\n Project (#15)\\n Map (1)\\n Get mz_catalog.mz_sources\\n\\nTarget cluster: mz_catalog_server\\n\",\n \"json\": {\n \"Project\": {\n \"input\": {\n \"Map\": {\n \"input\": {\n \"Get\": {\n \"id\": {\n \"Global\": {\n \"System\": 477\n }\n },\n \"typ\": {\n \"column_types\": [\n {\n \"scalar_type\": \"String\",\n \"nullable\": false\n },\n {\n \"scalar_type\": \"Oid\",\n \"nullable\": false\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": false\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": false\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": false\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": false\n },\n {\n \"scalar_type\": {\n \"Array\": \"MzAclItem\"\n },\n \"nullable\": false\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n }\n ],\n \"keys\": [\n [\n 0\n ],\n [\n 1\n ]\n ]\n }\n }\n },\n \"scalars\": [\n {\n \"Literal\": [\n {\n \"data\": [\n 45,\n 1\n ]\n },\n {\n \"scalar_type\": \"Int32\",\n \"nullable\": false\n },\n null\n ]\n }\n ]\n }\n },\n \"outputs\": [\n 15\n ]\n }\n }\n },\n \"optimized\": {\n \"global\": {\n \"text\": \"t62:\\n Finish limit=1 output=[#0]\\n ArrangeBy keys=[[#0]]\\n ReadGlobalFromSameDataflow t61\\n\\nt61:\\n Project (#15)\\n Map (1)\\n ReadIndex on=mz_sources mz_sources_ind=[*** full scan ***]\\n\\nTarget cluster: mz_catalog_server\\n\",\n \"json\": {\n \"plans\": [\n {\n \"id\": \"t62\",\n \"plan\": {\n \"ArrangeBy\": {\n \"input\": {\n \"Get\": {\n \"id\": {\n \"Global\": {\n \"Transient\": 61\n }\n },\n \"typ\": {\n \"column_types\": [\n {\n \"scalar_type\": \"Int32\",\n \"nullable\": false\n }\n ],\n \"keys\": []\n },\n \"access_strategy\": \"SameDataflow\"\n }\n },\n \"keys\": [\n [\n {\n \"Column\": [\n 0,\n null\n ]\n }\n ]\n ]\n }\n }\n },\n {\n \"id\": \"t61\",\n \"plan\": {\n \"Project\": {\n \"input\": {\n \"Map\": {\n \"input\": {\n \"Get\": {\n \"id\": {\n \"Global\": {\n \"System\": 477\n }\n },\n \"typ\": {\n \"column_types\": [\n {\n \"scalar_type\": \"String\",\n \"nullable\": false\n },\n {\n \"scalar_type\": \"Oid\",\n \"nullable\": false\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": false\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": false\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": false\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": false\n },\n {\n \"scalar_type\": {\n \"Array\": \"MzAclItem\"\n },\n \"nullable\": false\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n }\n ],\n \"keys\": [\n [\n 0\n ],\n [\n 1\n ]\n ]\n },\n \"access_strategy\": {\n \"Index\": [\n [\n {\n \"System\": 760\n },\n \"FullScan\"\n ]\n ]\n }\n }\n },\n \"scalars\": [\n {\n \"Literal\": [\n {\n \"Ok\": {\n \"data\": [\n 45,\n 1\n ]\n }\n },\n {\n \"scalar_type\": \"Int32\",\n \"nullable\": false\n }\n ]\n }\n ]\n }\n },\n \"outputs\": [\n 15\n ]\n }\n }\n }\n ],\n \"sources\": []\n }\n },\n \"fast_path\": {\n \"text\": \"Explained Query (fast path):\\n Finish limit=1 output=[#0]\\n →Map/Filter/Project\\n Project: #15\\n Map: 1\\n →Indexed mz_catalog.mz_sources (using mz_catalog.mz_sources_ind)\\n\\nTarget cluster: mz_catalog_server\\n\",\n \"json\": {\n \"plans\": [\n {\n \"id\": \"Explained Query (fast path)\",\n \"plan\": {\n \"PeekExisting\": [\n {\n \"System\": 477\n },\n {\n \"System\": 760\n },\n null,\n {\n \"mfp\": {\n \"expressions\": [\n {\n \"Literal\": [\n {\n \"Ok\": {\n \"data\": [\n 45,\n 1\n ]\n }\n },\n {\n \"scalar_type\": \"Int32\",\n \"nullable\": false\n }\n ]\n }\n ],\n \"predicates\": [],\n \"projection\": [\n 15\n ],\n \"input_arity\": 15\n }\n }\n ]\n }\n }\n ],\n \"sources\": []\n }\n }\n }\n },\n \"insights\": {\n \"imports\": {\n \"s760\": {\n \"name\": {\n \"schema\": \"mz_catalog\",\n \"item\": \"mz_sources_ind\"\n },\n \"type\": \"compute\"\n }\n },\n \"fast_path_clusters\": {},\n \"fast_path_limit\": null,\n \"persist_count\": []\n },\n \"cluster\": {\n \"name\": \"mz_catalog_server\",\n \"id\": {\n \"System\": 2\n }\n },\n \"redacted_sql\": \"SELECT '' FROM [s477 AS mz_catalog.mz_sources] LIMIT ''\"\n}","code":"MZ001","severity":"notice"}} {"type":"CommandStarting","payload":{"has_rows":true,"is_streaming":false}} {"type":"Rows","payload":{"columns":[{"name":"?column?","type_oid":23,"type_len":4,"type_mod":-1}]}} {"type":"Row","payload":["1"]} @@ -420,7 +420,7 @@ ws-text ws-text {"query": "SELECT 1 / 0 FROM mz_sources LIMIT 1"} ---- -{"type":"Notice","payload":{"message":"{\n \"plans\": {\n \"raw\": {\n \"text\": \"Finish limit=1 output=[#0]\\n Project (#15)\\n Map ((1 / 0))\\n Get mz_catalog.mz_sources\\n\\nTarget cluster: mz_catalog_server\\n\",\n \"json\": {\n \"Project\": {\n \"input\": {\n \"Map\": {\n \"input\": {\n \"Get\": {\n \"id\": {\n \"Global\": {\n \"System\": 469\n }\n },\n \"typ\": {\n \"column_types\": [\n {\n \"scalar_type\": \"String\",\n \"nullable\": false\n },\n {\n \"scalar_type\": \"Oid\",\n \"nullable\": false\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": false\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": false\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": false\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": false\n },\n {\n \"scalar_type\": {\n \"Array\": \"MzAclItem\"\n },\n \"nullable\": false\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n }\n ],\n \"keys\": [\n [\n 0\n ],\n [\n 1\n ]\n ]\n }\n }\n },\n \"scalars\": [\n {\n \"CallBinary\": {\n \"func\": {\n \"DivInt32\": null\n },\n \"expr1\": {\n \"Literal\": [\n {\n \"data\": [\n 45,\n 1\n ]\n },\n {\n \"scalar_type\": \"Int32\",\n \"nullable\": false\n },\n null\n ]\n },\n \"expr2\": {\n \"Literal\": [\n {\n \"data\": [\n 44\n ]\n },\n {\n \"scalar_type\": \"Int32\",\n \"nullable\": false\n },\n null\n ]\n },\n \"name\": null\n }\n }\n ]\n }\n },\n \"outputs\": [\n 15\n ]\n }\n }\n },\n \"optimized\": {\n \"global\": {\n \"text\": \"t64:\\n Finish limit=1 output=[#0]\\n ArrangeBy keys=[[#0]]\\n ReadGlobalFromSameDataflow t63\\n\\nt63:\\n Project (#15)\\n Map (error(\\\"division by zero\\\"))\\n ReadIndex on=mz_sources mz_sources_ind=[*** full scan ***]\\n\\nTarget cluster: mz_catalog_server\\n\",\n \"json\": {\n \"plans\": [\n {\n \"id\": \"t64\",\n \"plan\": {\n \"ArrangeBy\": {\n \"input\": {\n \"Get\": {\n \"id\": {\n \"Global\": {\n \"Transient\": 63\n }\n },\n \"typ\": {\n \"column_types\": [\n {\n \"scalar_type\": \"Int32\",\n \"nullable\": false\n }\n ],\n \"keys\": []\n },\n \"access_strategy\": \"SameDataflow\"\n }\n },\n \"keys\": [\n [\n {\n \"Column\": [\n 0,\n null\n ]\n }\n ]\n ]\n }\n }\n },\n {\n \"id\": \"t63\",\n \"plan\": {\n \"Project\": {\n \"input\": {\n \"Map\": {\n \"input\": {\n \"Get\": {\n \"id\": {\n \"Global\": {\n \"System\": 469\n }\n },\n \"typ\": {\n \"column_types\": [\n {\n \"scalar_type\": \"String\",\n \"nullable\": false\n },\n {\n \"scalar_type\": \"Oid\",\n \"nullable\": false\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": false\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": false\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": false\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": false\n },\n {\n \"scalar_type\": {\n \"Array\": \"MzAclItem\"\n },\n \"nullable\": false\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n }\n ],\n \"keys\": [\n [\n 0\n ],\n [\n 1\n ]\n ]\n },\n \"access_strategy\": {\n \"Index\": [\n [\n {\n \"System\": 752\n },\n \"FullScan\"\n ]\n ]\n }\n }\n },\n \"scalars\": [\n {\n \"Literal\": [\n {\n \"Err\": \"DivisionByZero\"\n },\n {\n \"scalar_type\": \"Int32\",\n \"nullable\": false\n }\n ]\n }\n ]\n }\n },\n \"outputs\": [\n 15\n ]\n }\n }\n }\n ],\n \"sources\": []\n }\n },\n \"fast_path\": {\n \"text\": \"Explained Query (fast path):\\n Finish limit=1 output=[#0]\\n →Map/Filter/Project\\n Project: #15\\n Map: error(\\\"division by zero\\\")\\n →Indexed mz_catalog.mz_sources (using mz_catalog.mz_sources_ind)\\n\\nTarget cluster: mz_catalog_server\\n\",\n \"json\": {\n \"plans\": [\n {\n \"id\": \"Explained Query (fast path)\",\n \"plan\": {\n \"PeekExisting\": [\n {\n \"System\": 469\n },\n {\n \"System\": 752\n },\n null,\n {\n \"mfp\": {\n \"expressions\": [\n {\n \"Literal\": [\n {\n \"Err\": \"DivisionByZero\"\n },\n {\n \"scalar_type\": \"Int32\",\n \"nullable\": false\n }\n ]\n }\n ],\n \"predicates\": [],\n \"projection\": [\n 15\n ],\n \"input_arity\": 15\n }\n }\n ]\n }\n }\n ],\n \"sources\": []\n }\n }\n }\n },\n \"insights\": {\n \"imports\": {\n \"s752\": {\n \"name\": {\n \"schema\": \"mz_catalog\",\n \"item\": \"mz_sources_ind\"\n },\n \"type\": \"compute\"\n }\n },\n \"fast_path_clusters\": {},\n \"fast_path_limit\": null,\n \"persist_count\": []\n },\n \"cluster\": {\n \"name\": \"mz_catalog_server\",\n \"id\": {\n \"System\": 2\n }\n },\n \"redacted_sql\": \"SELECT '' / '' FROM [s469 AS mz_catalog.mz_sources] LIMIT ''\"\n}","code":"MZ001","severity":"notice"}} +{"type":"Notice","payload":{"message":"{\n \"plans\": {\n \"raw\": {\n \"text\": \"Finish limit=1 output=[#0]\\n Project (#15)\\n Map ((1 / 0))\\n Get mz_catalog.mz_sources\\n\\nTarget cluster: mz_catalog_server\\n\",\n \"json\": {\n \"Project\": {\n \"input\": {\n \"Map\": {\n \"input\": {\n \"Get\": {\n \"id\": {\n \"Global\": {\n \"System\": 477\n }\n },\n \"typ\": {\n \"column_types\": [\n {\n \"scalar_type\": \"String\",\n \"nullable\": false\n },\n {\n \"scalar_type\": \"Oid\",\n \"nullable\": false\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": false\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": false\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": false\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": false\n },\n {\n \"scalar_type\": {\n \"Array\": \"MzAclItem\"\n },\n \"nullable\": false\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n }\n ],\n \"keys\": [\n [\n 0\n ],\n [\n 1\n ]\n ]\n }\n }\n },\n \"scalars\": [\n {\n \"CallBinary\": {\n \"func\": {\n \"DivInt32\": null\n },\n \"expr1\": {\n \"Literal\": [\n {\n \"data\": [\n 45,\n 1\n ]\n },\n {\n \"scalar_type\": \"Int32\",\n \"nullable\": false\n },\n null\n ]\n },\n \"expr2\": {\n \"Literal\": [\n {\n \"data\": [\n 44\n ]\n },\n {\n \"scalar_type\": \"Int32\",\n \"nullable\": false\n },\n null\n ]\n },\n \"name\": null\n }\n }\n ]\n }\n },\n \"outputs\": [\n 15\n ]\n }\n }\n },\n \"optimized\": {\n \"global\": {\n \"text\": \"t64:\\n Finish limit=1 output=[#0]\\n ArrangeBy keys=[[#0]]\\n ReadGlobalFromSameDataflow t63\\n\\nt63:\\n Project (#15)\\n Map (error(\\\"division by zero\\\"))\\n ReadIndex on=mz_sources mz_sources_ind=[*** full scan ***]\\n\\nTarget cluster: mz_catalog_server\\n\",\n \"json\": {\n \"plans\": [\n {\n \"id\": \"t64\",\n \"plan\": {\n \"ArrangeBy\": {\n \"input\": {\n \"Get\": {\n \"id\": {\n \"Global\": {\n \"Transient\": 63\n }\n },\n \"typ\": {\n \"column_types\": [\n {\n \"scalar_type\": \"Int32\",\n \"nullable\": false\n }\n ],\n \"keys\": []\n },\n \"access_strategy\": \"SameDataflow\"\n }\n },\n \"keys\": [\n [\n {\n \"Column\": [\n 0,\n null\n ]\n }\n ]\n ]\n }\n }\n },\n {\n \"id\": \"t63\",\n \"plan\": {\n \"Project\": {\n \"input\": {\n \"Map\": {\n \"input\": {\n \"Get\": {\n \"id\": {\n \"Global\": {\n \"System\": 477\n }\n },\n \"typ\": {\n \"column_types\": [\n {\n \"scalar_type\": \"String\",\n \"nullable\": false\n },\n {\n \"scalar_type\": \"Oid\",\n \"nullable\": false\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": false\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": false\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": false\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": false\n },\n {\n \"scalar_type\": {\n \"Array\": \"MzAclItem\"\n },\n \"nullable\": false\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n },\n {\n \"scalar_type\": \"String\",\n \"nullable\": true\n }\n ],\n \"keys\": [\n [\n 0\n ],\n [\n 1\n ]\n ]\n },\n \"access_strategy\": {\n \"Index\": [\n [\n {\n \"System\": 760\n },\n \"FullScan\"\n ]\n ]\n }\n }\n },\n \"scalars\": [\n {\n \"Literal\": [\n {\n \"Err\": \"DivisionByZero\"\n },\n {\n \"scalar_type\": \"Int32\",\n \"nullable\": false\n }\n ]\n }\n ]\n }\n },\n \"outputs\": [\n 15\n ]\n }\n }\n }\n ],\n \"sources\": []\n }\n },\n \"fast_path\": {\n \"text\": \"Explained Query (fast path):\\n Finish limit=1 output=[#0]\\n →Map/Filter/Project\\n Project: #15\\n Map: error(\\\"division by zero\\\")\\n →Indexed mz_catalog.mz_sources (using mz_catalog.mz_sources_ind)\\n\\nTarget cluster: mz_catalog_server\\n\",\n \"json\": {\n \"plans\": [\n {\n \"id\": \"Explained Query (fast path)\",\n \"plan\": {\n \"PeekExisting\": [\n {\n \"System\": 477\n },\n {\n \"System\": 760\n },\n null,\n {\n \"mfp\": {\n \"expressions\": [\n {\n \"Literal\": [\n {\n \"Err\": \"DivisionByZero\"\n },\n {\n \"scalar_type\": \"Int32\",\n \"nullable\": false\n }\n ]\n }\n ],\n \"predicates\": [],\n \"projection\": [\n 15\n ],\n \"input_arity\": 15\n }\n }\n ]\n }\n }\n ],\n \"sources\": []\n }\n }\n }\n },\n \"insights\": {\n \"imports\": {\n \"s760\": {\n \"name\": {\n \"schema\": \"mz_catalog\",\n \"item\": \"mz_sources_ind\"\n },\n \"type\": \"compute\"\n }\n },\n \"fast_path_clusters\": {},\n \"fast_path_limit\": null,\n \"persist_count\": []\n },\n \"cluster\": {\n \"name\": \"mz_catalog_server\",\n \"id\": {\n \"System\": 2\n }\n },\n \"redacted_sql\": \"SELECT '' / '' FROM [s477 AS mz_catalog.mz_sources] LIMIT ''\"\n}","code":"MZ001","severity":"notice"}} {"type":"CommandStarting","payload":{"has_rows":false,"is_streaming":false}} {"type":"Error","payload":{"message":"division by zero","code":"XX000"}} {"type":"ReadyForQuery","payload":"I"} diff --git a/test/cluster/mzcompose.py b/test/cluster/mzcompose.py index 8d34b81fe8e8f..c2f0f658548d7 100644 --- a/test/cluster/mzcompose.py +++ b/test/cluster/mzcompose.py @@ -1461,8 +1461,8 @@ def workflow_test_system_table_indexes(c: Composition) -> None: FROM mz_views; CREATE DEFAULT INDEX ON v_mz_views; - > SELECT id FROM mz_indexes WHERE id like 'u%'; - u2 + > SELECT name FROM mz_indexes WHERE id like 'u%'; + v_mz_views_primary_idx """ ) ) @@ -1476,8 +1476,8 @@ def workflow_test_system_table_indexes(c: Composition) -> None: c.testdrive( input=dedent( """ - > SELECT id FROM mz_indexes WHERE id like 'u%'; - u2 + > SELECT name FROM mz_indexes WHERE id like 'u%'; + v_mz_views_primary_idx """ ) ) @@ -4794,7 +4794,7 @@ def workflow_test_adhoc_system_indexes( WHERE i.name = 'mz_test_idx1' """ ) - assert output[0] == ("u1", "mz_tables", "mz_catalog_server"), output + assert output[0][1:] == ("mz_tables", "mz_catalog_server"), output output = c.sql_query("EXPLAIN SELECT * FROM mz_tables WHERE char_length(name) = 9") assert "mz_test_idx1" in output[0][0], output output = c.sql_query("SELECT * FROM mz_tables WHERE char_length(name) = 9") @@ -4823,7 +4823,7 @@ def workflow_test_adhoc_system_indexes( WHERE i.name = 'mz_test_idx2' """ ) - assert output[0] == ("u2", "mz_hydration_statuses", "mz_catalog_server"), output + assert output[0][1:] == ("mz_hydration_statuses", "mz_catalog_server"), output output = c.sql_query( "EXPLAIN SELECT * FROM mz_internal.mz_hydration_statuses WHERE hydrated" ) @@ -4848,8 +4848,8 @@ def workflow_test_adhoc_system_indexes( ORDER BY id """ ) - assert output[0] == ("u1", "mz_tables", "mz_catalog_server"), output - assert output[1] == ("u2", "mz_hydration_statuses", "mz_catalog_server"), output + assert output[0][1:] == ("mz_tables", "mz_catalog_server"), output + assert output[1][1:] == ("mz_hydration_statuses", "mz_catalog_server"), output # Make sure the new indexes can be dropped again. c.sql( diff --git a/test/kafka-auth/mzcompose.py b/test/kafka-auth/mzcompose.py index 0b3f607ce293b..316ad982b8a55 100644 --- a/test/kafka-auth/mzcompose.py +++ b/test/kafka-auth/mzcompose.py @@ -240,7 +240,15 @@ def workflow_default(c: Composition, parser: WorkflowArgumentParser) -> None: """ ) public_key = c.sql_query( - "select public_key_1 from mz_ssh_tunnel_connections where id = 'u1';" + """ + SELECT + public_key_1 + FROM + mz_connections JOIN + mz_ssh_tunnel_connections USING(id) + WHERE + mz_connections.name = 'ssh'; + """ )[0][0] c.exec( "ssh-bastion-host", @@ -261,7 +269,15 @@ def workflow_default(c: Composition, parser: WorkflowArgumentParser) -> None: """ ) public_key = c.sql_query( - "select public_key_1 from mz_ssh_tunnel_connections where id = 'u2';" + """ + SELECT + public_key_1 + FROM + mz_connections JOIN + mz_ssh_tunnel_connections USING(id) + WHERE + mz_connections.name = 'ssh_backup'; + """ )[0][0] c.exec( "ssh-bastion-host", diff --git a/test/kafka-auth/test-kafka-ssl.td b/test/kafka-auth/test-kafka-ssl.td index c3a7442679c29..be536a6ca787c 100644 --- a/test/kafka-auth/test-kafka-ssl.td +++ b/test/kafka-auth/test-kafka-ssl.td @@ -172,19 +172,19 @@ running > SELECT COUNT(*) FROM mz_ssh_tunnel_connections 2 -> SELECT COUNT(*) FROM mz_internal.mz_object_dependencies WHERE referenced_object_id = 'u1'; +> SELECT COUNT(*) FROM mz_internal.mz_object_dependencies as mzo, mz_objects as mo WHERE mzo.referenced_object_id = mo.id and mo.name = 'ssh'; 1 ! DROP CONNECTION testdrive_no_reset_connections.public.ssh; contains:still depended upon by connection "kafka_ssh" -> SELECT COUNT(*) FROM mz_internal.mz_object_dependencies WHERE referenced_object_id = 'u1'; +> SELECT COUNT(*) FROM mz_internal.mz_object_dependencies as mzo, mz_objects as mo WHERE mzo.referenced_object_id = mo.id and mo.name = 'ssh'; 1 > ALTER CONNECTION kafka_ssh SET (BROKER 'kafka:9093' USING SSH TUNNEL testdrive_no_reset_connections.public.ssh_backup); # We've removed all dependencies on testdrive_no_reset_connections.public.ssh, so it could be dropped -> SELECT COUNT(*) FROM mz_internal.mz_object_dependencies WHERE referenced_object_id = 'u1'; +> SELECT COUNT(*) FROM mz_internal.mz_object_dependencies as mzo, mz_objects as mo WHERE mzo.referenced_object_id = mo.id and mo.name = 'ssh'; 0 # Break new SSH tunnel to show that we can fix it diff --git a/test/persistence/mzcompose.py b/test/persistence/mzcompose.py index 99a32b0db1cf4..89b39a2b522d2 100644 --- a/test/persistence/mzcompose.py +++ b/test/persistence/mzcompose.py @@ -194,7 +194,12 @@ def workflow_inspect_shard(c: Composition) -> None: """ ) ) - json_dict = c.sql_query("INSPECT SHARD 'u1'", port=6877, user="mz_system")[0][0] + object_id = c.sql_query( + "SELECT id from mz_objects where name = 'foo'", port=6877, user="mz_system" + )[0][0] + json_dict = c.sql_query( + f"INSPECT SHARD '{object_id}'", port=6877, user="mz_system" + )[0][0] parts = [ part for batch in json_dict["batches"] diff --git a/test/sqllogictest/alter-table.slt b/test/sqllogictest/alter-table.slt index 5b42a3dd0cc2e..b826431518723 100644 --- a/test/sqllogictest/alter-table.slt +++ b/test/sqllogictest/alter-table.slt @@ -19,7 +19,7 @@ CREATE TABLE t2 (a int); # TODO(alter_table): Manually specifying a VERSION when referencing an item (maybe?) shouldn't be allowed. statement ok -CREATE VIEW v1 AS SELECT * FROM [u1 AS "materialize"."public"."t2" VERSION 0]; +CREATE VIEW v1 AS SELECT * FROM [u2 AS "materialize"."public"."t2" VERSION 0]; statement ok CREATE VIEW v2 AS SELECT * FROM t2; @@ -57,7 +57,7 @@ statement ok ALTER TABLE t1 ADD COLUMN IF NOT EXISTS a int; query error db error: ERROR: invalid version "1000" for "t2" -CREATE VIEW v1 AS SELECT * FROM [u1 AS "materialize"."public"."t2" VERSION 1000]; +CREATE VIEW v1 AS SELECT * FROM [u2 AS "materialize"."public"."t2" VERSION 1000]; query TTTT SHOW COLUMNS FROM t1; @@ -413,15 +413,15 @@ DROP TABLE t1 CASCADE; query TT SELECT id, name FROM mz_tables WHERE id LIKE 'u%'; ---- -u1 t2 +u2 t2 statement ok COMMENT ON COLUMN t2.a IS 'this column existed originally'; query TTIT -SELECT * FROM mz_internal.mz_comments WHERE id = 'u1'; +SELECT * FROM mz_internal.mz_comments WHERE id = 'u2'; ---- -u1 table 1 this␠column␠existed␠originally +u2 table 1 this␠column␠existed␠originally statement ok ALTER TABLE t2 ADD COLUMN c timestamp; @@ -430,14 +430,14 @@ statement ok COMMENT ON COLUMN t2.c IS 'added later'; query TTIT rowsort -SELECT * FROM mz_internal.mz_comments WHERE id = 'u1'; +SELECT * FROM mz_internal.mz_comments WHERE id = 'u2'; ---- -u1 table 3 added␠later -u1 table 1 this␠column␠existed␠originally +u2 table 3 added␠later +u2 table 1 this␠column␠existed␠originally statement ok DROP TABLE t2 CASCADE; query TTIT -SELECT * FROM mz_internal.mz_comments WHERE id = 'u1'; +SELECT * FROM mz_internal.mz_comments WHERE id = 'u2'; ---- diff --git a/test/sqllogictest/cluster.slt b/test/sqllogictest/cluster.slt index f8dae2e241fcc..d2a237cda8717 100644 --- a/test/sqllogictest/cluster.slt +++ b/test/sqllogictest/cluster.slt @@ -94,7 +94,7 @@ s4 mz_support s5 mz_analytics u1 quickstart u4 foo -u7 bar +u8 bar query T rowsort SELECT name FROM (SHOW CLUSTERS LIKE 'q%') @@ -176,83 +176,83 @@ FROM WHERE clusters.name = 'bar' ORDER BY on_name, seq_in_index ASC; ---- -bar mz_active_peeks_per_worker mz_active_peeks_per_worker_u7_primary_idx 1 id NULL false -bar mz_active_peeks_per_worker mz_active_peeks_per_worker_u7_primary_idx 2 worker_id NULL false -bar mz_arrangement_batcher_allocations_raw mz_arrangement_batcher_allocations_raw_u7_primary_idx 1 operator_id NULL false -bar mz_arrangement_batcher_allocations_raw mz_arrangement_batcher_allocations_raw_u7_primary_idx 2 worker_id NULL false -bar mz_arrangement_batcher_capacity_raw mz_arrangement_batcher_capacity_raw_u7_primary_idx 1 operator_id NULL false -bar mz_arrangement_batcher_capacity_raw mz_arrangement_batcher_capacity_raw_u7_primary_idx 2 worker_id NULL false -bar mz_arrangement_batcher_records_raw mz_arrangement_batcher_records_raw_u7_primary_idx 1 operator_id NULL false -bar mz_arrangement_batcher_records_raw mz_arrangement_batcher_records_raw_u7_primary_idx 2 worker_id NULL false -bar mz_arrangement_batcher_size_raw mz_arrangement_batcher_size_raw_u7_primary_idx 1 operator_id NULL false -bar mz_arrangement_batcher_size_raw mz_arrangement_batcher_size_raw_u7_primary_idx 2 worker_id NULL false -bar mz_arrangement_batches_raw mz_arrangement_batches_raw_u7_primary_idx 1 operator_id NULL false -bar mz_arrangement_batches_raw mz_arrangement_batches_raw_u7_primary_idx 2 worker_id NULL false -bar mz_arrangement_heap_allocations_raw mz_arrangement_heap_allocations_raw_u7_primary_idx 1 operator_id NULL false -bar mz_arrangement_heap_allocations_raw mz_arrangement_heap_allocations_raw_u7_primary_idx 2 worker_id NULL false -bar mz_arrangement_heap_capacity_raw mz_arrangement_heap_capacity_raw_u7_primary_idx 1 operator_id NULL false -bar mz_arrangement_heap_capacity_raw mz_arrangement_heap_capacity_raw_u7_primary_idx 2 worker_id NULL false -bar mz_arrangement_heap_size_raw mz_arrangement_heap_size_raw_u7_primary_idx 1 operator_id NULL false -bar mz_arrangement_heap_size_raw mz_arrangement_heap_size_raw_u7_primary_idx 2 worker_id NULL false -bar mz_arrangement_records_raw mz_arrangement_records_raw_u7_primary_idx 1 operator_id NULL false -bar mz_arrangement_records_raw mz_arrangement_records_raw_u7_primary_idx 2 worker_id NULL false -bar mz_arrangement_sharing_raw mz_arrangement_sharing_raw_u7_primary_idx 1 operator_id NULL false -bar mz_arrangement_sharing_raw mz_arrangement_sharing_raw_u7_primary_idx 2 worker_id NULL false -bar mz_compute_dataflow_global_ids_per_worker mz_compute_dataflow_global_ids_per_worker_u7_primary_idx 1 id NULL false -bar mz_compute_dataflow_global_ids_per_worker mz_compute_dataflow_global_ids_per_worker_u7_primary_idx 2 worker_id NULL false -bar mz_compute_error_counts_raw mz_compute_error_counts_raw_u7_primary_idx 1 export_id NULL false -bar mz_compute_error_counts_raw mz_compute_error_counts_raw_u7_primary_idx 2 worker_id NULL false -bar mz_compute_exports_per_worker mz_compute_exports_per_worker_u7_primary_idx 1 export_id NULL false -bar mz_compute_exports_per_worker mz_compute_exports_per_worker_u7_primary_idx 2 worker_id NULL false -bar mz_compute_frontiers_per_worker mz_compute_frontiers_per_worker_u7_primary_idx 1 export_id NULL false -bar mz_compute_frontiers_per_worker mz_compute_frontiers_per_worker_u7_primary_idx 2 worker_id NULL false -bar mz_compute_hydration_times_per_worker mz_compute_hydration_times_per_worker_u7_primary_idx 1 export_id NULL false -bar mz_compute_hydration_times_per_worker mz_compute_hydration_times_per_worker_u7_primary_idx 2 worker_id NULL false -bar mz_compute_import_frontiers_per_worker mz_compute_import_frontiers_per_worker_u7_primary_idx 1 export_id NULL false -bar mz_compute_import_frontiers_per_worker mz_compute_import_frontiers_per_worker_u7_primary_idx 2 import_id NULL false -bar mz_compute_import_frontiers_per_worker mz_compute_import_frontiers_per_worker_u7_primary_idx 3 worker_id NULL false -bar mz_compute_lir_mapping_per_worker mz_compute_lir_mapping_per_worker_u7_primary_idx 1 global_id NULL false -bar mz_compute_lir_mapping_per_worker mz_compute_lir_mapping_per_worker_u7_primary_idx 2 lir_id NULL false -bar mz_compute_lir_mapping_per_worker mz_compute_lir_mapping_per_worker_u7_primary_idx 3 worker_id NULL false -bar mz_compute_operator_durations_histogram_raw mz_compute_operator_durations_histogram_raw_u7_primary_idx 1 id NULL false -bar mz_compute_operator_durations_histogram_raw mz_compute_operator_durations_histogram_raw_u7_primary_idx 2 worker_id NULL false -bar mz_compute_operator_durations_histogram_raw mz_compute_operator_durations_histogram_raw_u7_primary_idx 3 duration_ns NULL false -bar mz_compute_operator_hydration_statuses_per_worker mz_compute_operator_hydration_statuses_per_worker_u7_primary_idx 1 export_id NULL false -bar mz_compute_operator_hydration_statuses_per_worker mz_compute_operator_hydration_statuses_per_worker_u7_primary_idx 2 lir_id NULL false -bar mz_dataflow_addresses_per_worker mz_dataflow_addresses_per_worker_u7_primary_idx 1 id NULL false -bar mz_dataflow_addresses_per_worker mz_dataflow_addresses_per_worker_u7_primary_idx 2 worker_id NULL false -bar mz_dataflow_channels_per_worker mz_dataflow_channels_per_worker_u7_primary_idx 1 id NULL false -bar mz_dataflow_channels_per_worker mz_dataflow_channels_per_worker_u7_primary_idx 2 worker_id NULL false -bar mz_dataflow_operator_reachability_raw mz_dataflow_operator_reachability_raw_u7_primary_idx 1 id NULL false -bar mz_dataflow_operator_reachability_raw mz_dataflow_operator_reachability_raw_u7_primary_idx 2 worker_id NULL false -bar mz_dataflow_operator_reachability_raw mz_dataflow_operator_reachability_raw_u7_primary_idx 3 source NULL false -bar mz_dataflow_operator_reachability_raw mz_dataflow_operator_reachability_raw_u7_primary_idx 4 port NULL false -bar mz_dataflow_operator_reachability_raw mz_dataflow_operator_reachability_raw_u7_primary_idx 5 update_type NULL false -bar mz_dataflow_operator_reachability_raw mz_dataflow_operator_reachability_raw_u7_primary_idx 6 time NULL true -bar mz_dataflow_operators_per_worker mz_dataflow_operators_per_worker_u7_primary_idx 1 id NULL false -bar mz_dataflow_operators_per_worker mz_dataflow_operators_per_worker_u7_primary_idx 2 worker_id NULL false -bar mz_dataflow_shutdown_durations_histogram_raw mz_dataflow_shutdown_durations_histogram_raw_u7_primary_idx 1 worker_id NULL false -bar mz_dataflow_shutdown_durations_histogram_raw mz_dataflow_shutdown_durations_histogram_raw_u7_primary_idx 2 duration_ns NULL false -bar mz_message_batch_counts_received_raw mz_message_batch_counts_received_raw_u7_primary_idx 1 channel_id NULL false -bar mz_message_batch_counts_received_raw mz_message_batch_counts_received_raw_u7_primary_idx 2 from_worker_id NULL false -bar mz_message_batch_counts_received_raw mz_message_batch_counts_received_raw_u7_primary_idx 3 to_worker_id NULL false -bar mz_message_batch_counts_sent_raw mz_message_batch_counts_sent_raw_u7_primary_idx 1 channel_id NULL false -bar mz_message_batch_counts_sent_raw mz_message_batch_counts_sent_raw_u7_primary_idx 2 from_worker_id NULL false -bar mz_message_batch_counts_sent_raw mz_message_batch_counts_sent_raw_u7_primary_idx 3 to_worker_id NULL false -bar mz_message_counts_received_raw mz_message_counts_received_raw_u7_primary_idx 1 channel_id NULL false -bar mz_message_counts_received_raw mz_message_counts_received_raw_u7_primary_idx 2 from_worker_id NULL false -bar mz_message_counts_received_raw mz_message_counts_received_raw_u7_primary_idx 3 to_worker_id NULL false -bar mz_message_counts_sent_raw mz_message_counts_sent_raw_u7_primary_idx 1 channel_id NULL false -bar mz_message_counts_sent_raw mz_message_counts_sent_raw_u7_primary_idx 2 from_worker_id NULL false -bar mz_message_counts_sent_raw mz_message_counts_sent_raw_u7_primary_idx 3 to_worker_id NULL false -bar mz_peek_durations_histogram_raw mz_peek_durations_histogram_raw_u7_primary_idx 1 worker_id NULL false -bar mz_peek_durations_histogram_raw mz_peek_durations_histogram_raw_u7_primary_idx 2 type NULL false -bar mz_peek_durations_histogram_raw mz_peek_durations_histogram_raw_u7_primary_idx 3 duration_ns NULL false -bar mz_scheduling_elapsed_raw mz_scheduling_elapsed_raw_u7_primary_idx 1 id NULL false -bar mz_scheduling_elapsed_raw mz_scheduling_elapsed_raw_u7_primary_idx 2 worker_id NULL false -bar mz_scheduling_parks_histogram_raw mz_scheduling_parks_histogram_raw_u7_primary_idx 1 worker_id NULL false -bar mz_scheduling_parks_histogram_raw mz_scheduling_parks_histogram_raw_u7_primary_idx 2 slept_for_ns NULL false -bar mz_scheduling_parks_histogram_raw mz_scheduling_parks_histogram_raw_u7_primary_idx 3 requested_ns NULL false +bar mz_active_peeks_per_worker mz_active_peeks_per_worker_u8_primary_idx 1 id NULL false +bar mz_active_peeks_per_worker mz_active_peeks_per_worker_u8_primary_idx 2 worker_id NULL false +bar mz_arrangement_batcher_allocations_raw mz_arrangement_batcher_allocations_raw_u8_primary_idx 1 operator_id NULL false +bar mz_arrangement_batcher_allocations_raw mz_arrangement_batcher_allocations_raw_u8_primary_idx 2 worker_id NULL false +bar mz_arrangement_batcher_capacity_raw mz_arrangement_batcher_capacity_raw_u8_primary_idx 1 operator_id NULL false +bar mz_arrangement_batcher_capacity_raw mz_arrangement_batcher_capacity_raw_u8_primary_idx 2 worker_id NULL false +bar mz_arrangement_batcher_records_raw mz_arrangement_batcher_records_raw_u8_primary_idx 1 operator_id NULL false +bar mz_arrangement_batcher_records_raw mz_arrangement_batcher_records_raw_u8_primary_idx 2 worker_id NULL false +bar mz_arrangement_batcher_size_raw mz_arrangement_batcher_size_raw_u8_primary_idx 1 operator_id NULL false +bar mz_arrangement_batcher_size_raw mz_arrangement_batcher_size_raw_u8_primary_idx 2 worker_id NULL false +bar mz_arrangement_batches_raw mz_arrangement_batches_raw_u8_primary_idx 1 operator_id NULL false +bar mz_arrangement_batches_raw mz_arrangement_batches_raw_u8_primary_idx 2 worker_id NULL false +bar mz_arrangement_heap_allocations_raw mz_arrangement_heap_allocations_raw_u8_primary_idx 1 operator_id NULL false +bar mz_arrangement_heap_allocations_raw mz_arrangement_heap_allocations_raw_u8_primary_idx 2 worker_id NULL false +bar mz_arrangement_heap_capacity_raw mz_arrangement_heap_capacity_raw_u8_primary_idx 1 operator_id NULL false +bar mz_arrangement_heap_capacity_raw mz_arrangement_heap_capacity_raw_u8_primary_idx 2 worker_id NULL false +bar mz_arrangement_heap_size_raw mz_arrangement_heap_size_raw_u8_primary_idx 1 operator_id NULL false +bar mz_arrangement_heap_size_raw mz_arrangement_heap_size_raw_u8_primary_idx 2 worker_id NULL false +bar mz_arrangement_records_raw mz_arrangement_records_raw_u8_primary_idx 1 operator_id NULL false +bar mz_arrangement_records_raw mz_arrangement_records_raw_u8_primary_idx 2 worker_id NULL false +bar mz_arrangement_sharing_raw mz_arrangement_sharing_raw_u8_primary_idx 1 operator_id NULL false +bar mz_arrangement_sharing_raw mz_arrangement_sharing_raw_u8_primary_idx 2 worker_id NULL false +bar mz_compute_dataflow_global_ids_per_worker mz_compute_dataflow_global_ids_per_worker_u8_primary_idx 1 id NULL false +bar mz_compute_dataflow_global_ids_per_worker mz_compute_dataflow_global_ids_per_worker_u8_primary_idx 2 worker_id NULL false +bar mz_compute_error_counts_raw mz_compute_error_counts_raw_u8_primary_idx 1 export_id NULL false +bar mz_compute_error_counts_raw mz_compute_error_counts_raw_u8_primary_idx 2 worker_id NULL false +bar mz_compute_exports_per_worker mz_compute_exports_per_worker_u8_primary_idx 1 export_id NULL false +bar mz_compute_exports_per_worker mz_compute_exports_per_worker_u8_primary_idx 2 worker_id NULL false +bar mz_compute_frontiers_per_worker mz_compute_frontiers_per_worker_u8_primary_idx 1 export_id NULL false +bar mz_compute_frontiers_per_worker mz_compute_frontiers_per_worker_u8_primary_idx 2 worker_id NULL false +bar mz_compute_hydration_times_per_worker mz_compute_hydration_times_per_worker_u8_primary_idx 1 export_id NULL false +bar mz_compute_hydration_times_per_worker mz_compute_hydration_times_per_worker_u8_primary_idx 2 worker_id NULL false +bar mz_compute_import_frontiers_per_worker mz_compute_import_frontiers_per_worker_u8_primary_idx 1 export_id NULL false +bar mz_compute_import_frontiers_per_worker mz_compute_import_frontiers_per_worker_u8_primary_idx 2 import_id NULL false +bar mz_compute_import_frontiers_per_worker mz_compute_import_frontiers_per_worker_u8_primary_idx 3 worker_id NULL false +bar mz_compute_lir_mapping_per_worker mz_compute_lir_mapping_per_worker_u8_primary_idx 1 global_id NULL false +bar mz_compute_lir_mapping_per_worker mz_compute_lir_mapping_per_worker_u8_primary_idx 2 lir_id NULL false +bar mz_compute_lir_mapping_per_worker mz_compute_lir_mapping_per_worker_u8_primary_idx 3 worker_id NULL false +bar mz_compute_operator_durations_histogram_raw mz_compute_operator_durations_histogram_raw_u8_primary_idx 1 id NULL false +bar mz_compute_operator_durations_histogram_raw mz_compute_operator_durations_histogram_raw_u8_primary_idx 2 worker_id NULL false +bar mz_compute_operator_durations_histogram_raw mz_compute_operator_durations_histogram_raw_u8_primary_idx 3 duration_ns NULL false +bar mz_compute_operator_hydration_statuses_per_worker mz_compute_operator_hydration_statuses_per_worker_u8_primary_idx 1 export_id NULL false +bar mz_compute_operator_hydration_statuses_per_worker mz_compute_operator_hydration_statuses_per_worker_u8_primary_idx 2 lir_id NULL false +bar mz_dataflow_addresses_per_worker mz_dataflow_addresses_per_worker_u8_primary_idx 1 id NULL false +bar mz_dataflow_addresses_per_worker mz_dataflow_addresses_per_worker_u8_primary_idx 2 worker_id NULL false +bar mz_dataflow_channels_per_worker mz_dataflow_channels_per_worker_u8_primary_idx 1 id NULL false +bar mz_dataflow_channels_per_worker mz_dataflow_channels_per_worker_u8_primary_idx 2 worker_id NULL false +bar mz_dataflow_operator_reachability_raw mz_dataflow_operator_reachability_raw_u8_primary_idx 1 id NULL false +bar mz_dataflow_operator_reachability_raw mz_dataflow_operator_reachability_raw_u8_primary_idx 2 worker_id NULL false +bar mz_dataflow_operator_reachability_raw mz_dataflow_operator_reachability_raw_u8_primary_idx 3 source NULL false +bar mz_dataflow_operator_reachability_raw mz_dataflow_operator_reachability_raw_u8_primary_idx 4 port NULL false +bar mz_dataflow_operator_reachability_raw mz_dataflow_operator_reachability_raw_u8_primary_idx 5 update_type NULL false +bar mz_dataflow_operator_reachability_raw mz_dataflow_operator_reachability_raw_u8_primary_idx 6 time NULL true +bar mz_dataflow_operators_per_worker mz_dataflow_operators_per_worker_u8_primary_idx 1 id NULL false +bar mz_dataflow_operators_per_worker mz_dataflow_operators_per_worker_u8_primary_idx 2 worker_id NULL false +bar mz_dataflow_shutdown_durations_histogram_raw mz_dataflow_shutdown_durations_histogram_raw_u8_primary_idx 1 worker_id NULL false +bar mz_dataflow_shutdown_durations_histogram_raw mz_dataflow_shutdown_durations_histogram_raw_u8_primary_idx 2 duration_ns NULL false +bar mz_message_batch_counts_received_raw mz_message_batch_counts_received_raw_u8_primary_idx 1 channel_id NULL false +bar mz_message_batch_counts_received_raw mz_message_batch_counts_received_raw_u8_primary_idx 2 from_worker_id NULL false +bar mz_message_batch_counts_received_raw mz_message_batch_counts_received_raw_u8_primary_idx 3 to_worker_id NULL false +bar mz_message_batch_counts_sent_raw mz_message_batch_counts_sent_raw_u8_primary_idx 1 channel_id NULL false +bar mz_message_batch_counts_sent_raw mz_message_batch_counts_sent_raw_u8_primary_idx 2 from_worker_id NULL false +bar mz_message_batch_counts_sent_raw mz_message_batch_counts_sent_raw_u8_primary_idx 3 to_worker_id NULL false +bar mz_message_counts_received_raw mz_message_counts_received_raw_u8_primary_idx 1 channel_id NULL false +bar mz_message_counts_received_raw mz_message_counts_received_raw_u8_primary_idx 2 from_worker_id NULL false +bar mz_message_counts_received_raw mz_message_counts_received_raw_u8_primary_idx 3 to_worker_id NULL false +bar mz_message_counts_sent_raw mz_message_counts_sent_raw_u8_primary_idx 1 channel_id NULL false +bar mz_message_counts_sent_raw mz_message_counts_sent_raw_u8_primary_idx 2 from_worker_id NULL false +bar mz_message_counts_sent_raw mz_message_counts_sent_raw_u8_primary_idx 3 to_worker_id NULL false +bar mz_peek_durations_histogram_raw mz_peek_durations_histogram_raw_u8_primary_idx 1 worker_id NULL false +bar mz_peek_durations_histogram_raw mz_peek_durations_histogram_raw_u8_primary_idx 2 type NULL false +bar mz_peek_durations_histogram_raw mz_peek_durations_histogram_raw_u8_primary_idx 3 duration_ns NULL false +bar mz_scheduling_elapsed_raw mz_scheduling_elapsed_raw_u8_primary_idx 1 id NULL false +bar mz_scheduling_elapsed_raw mz_scheduling_elapsed_raw_u8_primary_idx 2 worker_id NULL false +bar mz_scheduling_parks_histogram_raw mz_scheduling_parks_histogram_raw_u8_primary_idx 1 worker_id NULL false +bar mz_scheduling_parks_histogram_raw mz_scheduling_parks_histogram_raw_u8_primary_idx 2 slept_for_ns NULL false +bar mz_scheduling_parks_histogram_raw mz_scheduling_parks_histogram_raw_u8_primary_idx 3 requested_ns NULL false bar v v_primary_idx 1 ?column? NULL false query TTTTT @@ -779,7 +779,7 @@ COMPLETE 0 query TTTT SELECT event_type, object_type, regexp_replace(details::text, '"replica_id":"u[^"]*"', '"replica_id":"u%"'), user FROM mz_audit_events ORDER BY occurred_at DESC LIMIT 1; ---- -create cluster-replica {"billed_as":"free","cluster_id":"u4","cluster_name":"t1","internal":true,"logical_size":"scale=1,workers=2","reason":"manual","replica_id":"u%","replica_name":"free"} mz_system +create cluster-replica {"billed_as":"free","cluster_id":"u9","cluster_name":"t1","internal":true,"logical_size":"scale=1,workers=2","reason":"manual","replica_id":"u%","replica_name":"free"} mz_system simple conn=mz_system,user=mz_system CREATE CLUSTER REPLICA t1.internal_r2 SIZE 'scale=1,workers=2', INTERNAL @@ -798,10 +798,11 @@ statement ok DROP CLUSTER REPLICA t1.r2 query TTTT rowsort -SELECT name, cluster_id, size, owner_id FROM mz_cluster_replicas WHERE cluster_id = 'u4' +SELECT name, cluster_id, size, owner_id FROM mz_cluster_replicas WHERE cluster_id = 'u9' ---- -r1 u4 scale=1,workers=1 u1 -free u4 scale=1,workers=2 u1 +free u9 scale=1,workers=2 u1 +r1 u9 scale=1,workers=1 u1 + simple conn=mz_system,user=mz_system CREATE CLUSTER REPLICA t1.r3 SIZE 'scale=1,workers=2', BILLED AS 'free' @@ -967,14 +968,14 @@ CREATE CLUSTER c1 SIZE 'scale=1,workers=1' query TT colnames SELECT * FROM mz_internal.mz_cluster_workload_classes ---- -id workload_class +id workload_class s1 NULL s2 NULL s3 NULL s4 NULL s5 NULL u1 NULL -u3 NULL +u4 NULL statement error WORKLOAD CLASS not supported for non-system users ALTER CLUSTER c1 RESET (WORKLOAD CLASS) @@ -993,14 +994,14 @@ COMPLETE 0 query TT colnames SELECT * FROM mz_internal.mz_cluster_workload_classes ---- -id workload_class +id workload_class s1 NULL s2 NULL s3 NULL s4 NULL s5 NULL u1 NULL -u3 NULL +u4 NULL simple conn=mz_system,user=mz_system ALTER CLUSTER c1 SET (WORKLOAD CLASS 'qa') @@ -1010,14 +1011,14 @@ COMPLETE 0 query TT colnames SELECT * FROM mz_internal.mz_cluster_workload_classes ---- -id workload_class +id workload_class s1 NULL s2 NULL s3 NULL s4 NULL s5 NULL u1 NULL -u3 qa +u4 qa simple conn=mz_system,user=mz_system ALTER CLUSTER c1 SET (WORKLOAD CLASS NULL) @@ -1027,14 +1028,14 @@ COMPLETE 0 query TT colnames SELECT * FROM mz_internal.mz_cluster_workload_classes ---- -id workload_class +id workload_class s1 NULL s2 NULL s3 NULL s4 NULL s5 NULL u1 NULL -u3 NULL +u4 NULL statement ok DROP CLUSTER c1 diff --git a/test/sqllogictest/cluster_deployment_lineage.slt b/test/sqllogictest/cluster_deployment_lineage.slt index 210dfb3970439..c1ba11e950882 100644 --- a/test/sqllogictest/cluster_deployment_lineage.slt +++ b/test/sqllogictest/cluster_deployment_lineage.slt @@ -26,11 +26,11 @@ statement ok CREATE CLUSTER non_blue_green (SIZE = 'scale=1,workers=1'); query TT -SELECT id, name FROM mz_clusters WHERE id IN ('u2', 'u3', 'u4') ORDER BY id; +SELECT id, name FROM mz_clusters WHERE id IN ('u2', 'u4', 'u6') ORDER BY id; ---- u2 blue_green -u3 blue_green_dbt_deploy -u4 non_blue_green +u4 blue_green_dbt_deploy +u6 non_blue_green # Initiate the blue/green deployment statement ok @@ -43,9 +43,9 @@ DROP CLUSTER blue_green_dbt_deploy; query TTT SELECT cluster_id, current_deployment_cluster_id, cluster_name FROM mz_internal.mz_cluster_deployment_lineage -WHERE cluster_id IN ('u2', 'u3', 'u4') +WHERE cluster_id IN ('u2', 'u4', 'u6') ORDER BY cluster_id; ---- -u2 u3 blue_green -u3 u3 blue_green -u4 u4 non_blue_green +u2 u4 blue_green +u4 u4 blue_green +u6 u6 non_blue_green diff --git a/test/sqllogictest/create_type_mods.slt b/test/sqllogictest/create_type_mods.slt index 200f78371b847..3d815322b68f7 100644 --- a/test/sqllogictest/create_type_mods.slt +++ b/test/sqllogictest/create_type_mods.slt @@ -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 diff --git a/test/sqllogictest/explain/decorrelated_plan_as_json.slt b/test/sqllogictest/explain/decorrelated_plan_as_json.slt index 2393972a5cc01..03fb803440f13 100644 --- a/test/sqllogictest/explain/decorrelated_plan_as_json.slt +++ b/test/sqllogictest/explain/decorrelated_plan_as_json.slt @@ -399,7 +399,7 @@ SELECT 1, a + b as c FROM mv WHERE a > 0 and b < 0 and a + b > 0 "Get": { "id": { "Global": { - "User": 5 + "User": 6 } }, "typ": { @@ -662,7 +662,7 @@ SELECT generate_series(a, b) from t "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -808,7 +808,7 @@ SELECT a FROM t EXCEPT SELECT b FROM mv "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -878,7 +878,7 @@ SELECT a FROM t EXCEPT SELECT b FROM mv "Get": { "id": { "Global": { - "User": 5 + "User": 6 } }, "typ": { @@ -984,7 +984,7 @@ SELECT a FROM t EXCEPT ALL SELECT b FROM mv "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -1039,7 +1039,7 @@ SELECT a FROM t EXCEPT ALL SELECT b FROM mv "Get": { "id": { "Global": { - "User": 5 + "User": 6 } }, "typ": { @@ -1126,7 +1126,7 @@ SELECT * FROM t ORDER BY b asc, a desc LIMIT 5 "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -1213,7 +1213,7 @@ SELECT abs(min(a) - max(a)) FROM t "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -1548,7 +1548,7 @@ SELECT abs(min(a) - max(a)) FROM t GROUP BY b "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -1779,7 +1779,7 @@ SELECT * FROM t WHERE EXISTS(SELECT * FROM mv WHERE t.a < mv.a) AND EXISTS(SELEC "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -1946,7 +1946,7 @@ SELECT * FROM t WHERE EXISTS(SELECT * FROM mv WHERE t.a < mv.a) AND EXISTS(SELEC "Get": { "id": { "Global": { - "User": 5 + "User": 6 } }, "typ": { @@ -2377,7 +2377,7 @@ SELECT * FROM t WHERE EXISTS(SELECT * FROM mv WHERE t.a < mv.a) AND EXISTS(SELEC "Get": { "id": { "Global": { - "User": 5 + "User": 6 } }, "typ": { @@ -2764,7 +2764,7 @@ SELECT (SELECT v.a FROM v WHERE v.b = t.b LIMIT 1), (SELECT mv.a FROM mv WHERE m "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -2972,7 +2972,7 @@ SELECT (SELECT v.a FROM v WHERE v.b = t.b LIMIT 1), (SELECT mv.a FROM mv WHERE m "Get": { "id": { "Global": { - "User": 3 + "User": 4 } }, "typ": { @@ -3554,7 +3554,7 @@ SELECT (SELECT v.a FROM v WHERE v.b = t.b LIMIT 1), (SELECT mv.a FROM mv WHERE m "Get": { "id": { "Global": { - "User": 5 + "User": 6 } }, "typ": { @@ -4102,7 +4102,7 @@ SELECT t1.a, t2.a FROM t as t1, t as t2 "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -4150,7 +4150,7 @@ SELECT t1.a, t2.a FROM t as t1, t as t2 "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -4334,7 +4334,7 @@ SELECT t1.a, t2.a FROM t as t1 INNER JOIN t as t2 ON true "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -4382,7 +4382,7 @@ SELECT t1.a, t2.a FROM t as t1 INNER JOIN t as t2 ON true "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -4576,7 +4576,7 @@ WHERE t1.b = t2.b AND t2.b = t3.b "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -4624,7 +4624,7 @@ WHERE t1.b = t2.b AND t2.b = t3.b "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -4770,7 +4770,7 @@ WHERE t1.b = t2.b AND t2.b = t3.b "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -5027,7 +5027,7 @@ INNER JOIN t as t3 ON t2.b = t3.b "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -5075,7 +5075,7 @@ INNER JOIN t as t3 ON t2.b = t3.b "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -5246,7 +5246,7 @@ INNER JOIN t as t3 ON t2.b = t3.b "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -5479,7 +5479,7 @@ RIGHT JOIN t as t3 ON t2.b = t3.b "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -5527,7 +5527,7 @@ RIGHT JOIN t as t3 ON t2.b = t3.b "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -5926,7 +5926,7 @@ RIGHT JOIN t as t3 ON t2.b = t3.b "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -6438,7 +6438,7 @@ WITH x AS (SELECT t.a * t.b as v from t) SELECT a.v + b.v FROM x as a, x as b "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -6731,7 +6731,7 @@ FROM "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -6856,7 +6856,7 @@ FROM "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -7308,7 +7308,7 @@ FROM "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -7775,7 +7775,7 @@ FROM "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -7900,7 +7900,7 @@ FROM "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -8278,7 +8278,7 @@ FROM "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { diff --git a/test/sqllogictest/explain/optimized_plan_as_json.slt b/test/sqllogictest/explain/optimized_plan_as_json.slt index 704d0cdfd14f4..9c959ab35df56 100644 --- a/test/sqllogictest/explain/optimized_plan_as_json.slt +++ b/test/sqllogictest/explain/optimized_plan_as_json.slt @@ -148,10 +148,10 @@ SELECT 1, a + b as c FROM t WHERE a > 0 and b < 0 and a + b > 0 "plan": { "PeekExisting": [ { - "User": 1 + "User": 2 }, { - "User": 4 + "User": 5 }, null, { @@ -322,7 +322,7 @@ SELECT 1, a + b as c FROM mv WHERE a > 0 and b < 0 and a + b > 0 "Get": { "id": { "Global": { - "User": 8 + "User": 9 } }, "typ": { @@ -479,7 +479,7 @@ SELECT 1, a + b as c FROM mv WHERE a > 0 and b < 0 and a + b > 0 "sources": [ { "id": { - "User": 8 + "User": 9 }, "op": { "expressions": [], @@ -619,7 +619,7 @@ SELECT generate_series(a, b) from t "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -639,7 +639,7 @@ SELECT generate_series(a, b) from t "Index": [ [ { - "User": 4 + "User": 5 }, "FullScan" ] @@ -712,7 +712,7 @@ SELECT a FROM t EXCEPT SELECT b FROM mv "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -732,7 +732,7 @@ SELECT a FROM t EXCEPT SELECT b FROM mv "Index": [ [ { - "User": 4 + "User": 5 }, "FullScan" ] @@ -769,7 +769,7 @@ SELECT a FROM t EXCEPT SELECT b FROM mv "Get": { "id": { "Global": { - "User": 8 + "User": 9 } }, "typ": { @@ -818,7 +818,7 @@ SELECT a FROM t EXCEPT SELECT b FROM mv "sources": [ { "id": { - "User": 8 + "User": 9 }, "op": null } @@ -845,7 +845,7 @@ SELECT a FROM t EXCEPT ALL SELECT b FROM mv "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -865,7 +865,7 @@ SELECT a FROM t EXCEPT ALL SELECT b FROM mv "Index": [ [ { - "User": 4 + "User": 5 }, "FullScan" ] @@ -887,7 +887,7 @@ SELECT a FROM t EXCEPT ALL SELECT b FROM mv "Get": { "id": { "Global": { - "User": 8 + "User": 9 } }, "typ": { @@ -923,7 +923,7 @@ SELECT a FROM t EXCEPT ALL SELECT b FROM mv "sources": [ { "id": { - "User": 8 + "User": 9 }, "op": null } @@ -946,7 +946,7 @@ SELECT * FROM ov "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -966,7 +966,7 @@ SELECT * FROM ov "Index": [ [ { - "User": 4 + "User": 5 }, "FullScan" ] @@ -1026,10 +1026,10 @@ SELECT * FROM t ORDER BY b asc, a desc LIMIT 5 "plan": { "PeekExisting": [ { - "User": 1 + "User": 2 }, { - "User": 4 + "User": 5 }, null, { @@ -1071,7 +1071,7 @@ SELECT abs(min(a) - max(a)) FROM t "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -1091,7 +1091,7 @@ SELECT abs(min(a) - max(a)) FROM t "Index": [ [ { - "User": 4 + "User": 5 }, "FullScan" ] @@ -1318,7 +1318,7 @@ SELECT abs(min(a) - max(a)) FROM t GROUP BY b "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -1338,7 +1338,7 @@ SELECT abs(min(a) - max(a)) FROM t GROUP BY b "Index": [ [ { - "User": 4 + "User": 5 }, "FullScan" ] @@ -1444,7 +1444,7 @@ SELECT * FROM t WHERE EXISTS(SELECT * FROM mv WHERE t.a < mv.a) AND EXISTS(SELEC "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -1464,7 +1464,7 @@ SELECT * FROM t WHERE EXISTS(SELECT * FROM mv WHERE t.a < mv.a) AND EXISTS(SELEC "Index": [ [ { - "User": 4 + "User": 5 }, "DifferentialJoin" ] @@ -1505,7 +1505,7 @@ SELECT * FROM t WHERE EXISTS(SELECT * FROM mv WHERE t.a < mv.a) AND EXISTS(SELEC "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -1525,7 +1525,7 @@ SELECT * FROM t WHERE EXISTS(SELECT * FROM mv WHERE t.a < mv.a) AND EXISTS(SELEC "Index": [ [ { - "User": 4 + "User": 5 }, "FullScan" ] @@ -1564,7 +1564,7 @@ SELECT * FROM t WHERE EXISTS(SELECT * FROM mv WHERE t.a < mv.a) AND EXISTS(SELEC "Get": { "id": { "Global": { - "User": 8 + "User": 9 } }, "typ": { @@ -1890,7 +1890,7 @@ SELECT * FROM t WHERE EXISTS(SELECT * FROM mv WHERE t.a < mv.a) AND EXISTS(SELEC "Get": { "id": { "Global": { - "User": 8 + "User": 9 } }, "typ": { @@ -2114,7 +2114,7 @@ SELECT * FROM t WHERE EXISTS(SELECT * FROM mv WHERE t.a < mv.a) AND EXISTS(SELEC "sources": [ { "id": { - "User": 8 + "User": 9 }, "op": null } @@ -2140,7 +2140,7 @@ SELECT (SELECT iv.a FROM iv WHERE iv.b = t.b LIMIT 1), (SELECT mv.a FROM mv WHER "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -2160,7 +2160,7 @@ SELECT (SELECT iv.a FROM iv WHERE iv.b = t.b LIMIT 1), (SELECT mv.a FROM mv WHER "Index": [ [ { - "User": 4 + "User": 5 }, "FullScan" ] @@ -2285,7 +2285,7 @@ SELECT (SELECT iv.a FROM iv WHERE iv.b = t.b LIMIT 1), (SELECT mv.a FROM mv WHER "Get": { "id": { "Global": { - "User": 6 + "User": 7 } }, "typ": { @@ -2305,7 +2305,7 @@ SELECT (SELECT iv.a FROM iv WHERE iv.b = t.b LIMIT 1), (SELECT mv.a FROM mv WHER "Index": [ [ { - "User": 7 + "User": 8 }, "FullScan" ] @@ -2498,7 +2498,7 @@ SELECT (SELECT iv.a FROM iv WHERE iv.b = t.b LIMIT 1), (SELECT mv.a FROM mv WHER "Get": { "id": { "Global": { - "User": 8 + "User": 9 } }, "typ": { @@ -3175,7 +3175,7 @@ SELECT (SELECT iv.a FROM iv WHERE iv.b = t.b LIMIT 1), (SELECT mv.a FROM mv WHER "sources": [ { "id": { - "User": 8 + "User": 9 }, "op": { "expressions": [], @@ -3236,7 +3236,7 @@ RIGHT JOIN t as t3 ON t2.b = t3.b "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -3256,7 +3256,7 @@ RIGHT JOIN t as t3 ON t2.b = t3.b "Index": [ [ { - "User": 4 + "User": 5 }, "FullScan" ] @@ -3824,7 +3824,7 @@ RIGHT JOIN t as t3 ON t2.b = t3.b "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -3844,7 +3844,7 @@ RIGHT JOIN t as t3 ON t2.b = t3.b "Index": [ [ { - "User": 4 + "User": 5 }, "FullScan" ] @@ -3979,7 +3979,7 @@ FROM "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -3999,7 +3999,7 @@ FROM "Index": [ [ { - "User": 4 + "User": 5 }, "FullScan" ] @@ -4055,7 +4055,7 @@ FROM "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -4075,7 +4075,7 @@ FROM "Index": [ [ { - "User": 4 + "User": 5 }, "DifferentialJoin" ] @@ -4731,7 +4731,7 @@ SELECT t1.a, t2.a FROM t as t1, t as t2 "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -4751,7 +4751,7 @@ SELECT t1.a, t2.a FROM t as t1, t as t2 "Index": [ [ { - "User": 4 + "User": 5 }, "FullScan" ] @@ -4887,7 +4887,7 @@ WHERE t1.b = t2.b AND t2.b = t3.b "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -4907,7 +4907,7 @@ WHERE t1.b = t2.b AND t2.b = t3.b "Index": [ [ { - "User": 4 + "User": 5 }, "FullScan" ] @@ -5314,7 +5314,7 @@ WHERE a = c and d = e and b = f "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -5334,7 +5334,7 @@ WHERE a = c and d = e and b = f "Index": [ [ { - "User": 4 + "User": 5 }, "FullScan" ] @@ -5418,7 +5418,7 @@ WHERE a = c and d = e and b = f "Get": { "id": { "Global": { - "User": 2 + "User": 3 } }, "typ": { @@ -5438,7 +5438,7 @@ WHERE a = c and d = e and b = f "Index": [ [ { - "User": 9 + "User": 10 }, { "DeltaJoin": "Lookup" @@ -5446,7 +5446,7 @@ WHERE a = c and d = e and b = f ], [ { - "User": 10 + "User": 11 }, { "DeltaJoin": "Lookup" @@ -5484,7 +5484,7 @@ WHERE a = c and d = e and b = f "Get": { "id": { "Global": { - "User": 3 + "User": 4 } }, "typ": { @@ -5504,7 +5504,7 @@ WHERE a = c and d = e and b = f "Index": [ [ { - "User": 11 + "User": 12 }, "FullScan" ] @@ -5856,7 +5856,7 @@ WHERE b = c and d = e "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -5876,7 +5876,7 @@ WHERE b = c and d = e "Index": [ [ { - "User": 12 + "User": 13 }, { "DeltaJoin": "FirstInputFullScan" @@ -5904,7 +5904,7 @@ WHERE b = c and d = e "Get": { "id": { "Global": { - "User": 2 + "User": 3 } }, "typ": { @@ -5924,7 +5924,7 @@ WHERE b = c and d = e "Index": [ [ { - "User": 9 + "User": 10 }, { "DeltaJoin": "Lookup" @@ -5932,7 +5932,7 @@ WHERE b = c and d = e ], [ { - "User": 10 + "User": 11 }, { "DeltaJoin": "Lookup" @@ -5968,7 +5968,7 @@ WHERE b = c and d = e "Get": { "id": { "Global": { - "User": 3 + "User": 4 } }, "typ": { @@ -5988,7 +5988,7 @@ WHERE b = c and d = e "Index": [ [ { - "User": 11 + "User": 12 }, { "DeltaJoin": "Lookup" @@ -6300,7 +6300,7 @@ SELECT s FROM t2 WHERE s ~ 'a.*'; "Get": { "id": { "Global": { - "User": 13 + "User": 14 } }, "typ": { @@ -6354,7 +6354,7 @@ SELECT s FROM t2 WHERE s ~ 'a.*'; "sources": [ { "id": { - "User": 13 + "User": 14 }, "op": { "expressions": [], diff --git a/test/sqllogictest/explain/physical_plan_as_json.slt b/test/sqllogictest/explain/physical_plan_as_json.slt index d0fe72e0ffa62..512b5685984dc 100644 --- a/test/sqllogictest/explain/physical_plan_as_json.slt +++ b/test/sqllogictest/explain/physical_plan_as_json.slt @@ -192,7 +192,7 @@ SELECT * FROM t "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "keys": { @@ -242,7 +242,7 @@ SELECT * FROM u "Get": { "id": { "Global": { - "User": 2 + "User": 3 } }, "keys": { @@ -258,7 +258,7 @@ SELECT * FROM u "sources": [ { "id": { - "User": 2 + "User": 3 }, "op": null } @@ -281,7 +281,7 @@ SELECT a + b, 1 FROM t "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "keys": { @@ -388,7 +388,7 @@ SELECT c + d, 1 FROM u "Get": { "id": { "Global": { - "User": 2 + "User": 3 } }, "keys": { @@ -414,7 +414,7 @@ SELECT c + d, 1 FROM u "sources": [ { "id": { - "User": 2 + "User": 3 }, "op": { "expressions": [ @@ -497,7 +497,7 @@ SELECT * FROM ov "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "keys": { @@ -615,7 +615,7 @@ SELECT a FROM t EXCEPT ALL SELECT b FROM mv "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "keys": { @@ -674,7 +674,7 @@ SELECT a FROM t EXCEPT ALL SELECT b FROM mv "Get": { "id": { "Global": { - "User": 7 + "User": 8 } }, "keys": { @@ -758,7 +758,7 @@ SELECT a FROM t EXCEPT ALL SELECT b FROM mv "sources": [ { "id": { - "User": 7 + "User": 8 }, "op": { "expressions": [], @@ -803,7 +803,7 @@ SELECT * FROM ov "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "keys": { @@ -927,7 +927,7 @@ WITH cte(x) as (SELECT a FROM t EXCEPT ALL SELECT b FROM mv) "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "keys": { @@ -986,7 +986,7 @@ WITH cte(x) as (SELECT a FROM t EXCEPT ALL SELECT b FROM mv) "Get": { "id": { "Global": { - "User": 7 + "User": 8 } }, "keys": { @@ -1243,7 +1243,7 @@ WITH cte(x) as (SELECT a FROM t EXCEPT ALL SELECT b FROM mv) "sources": [ { "id": { - "User": 7 + "User": 8 }, "op": { "expressions": [], @@ -1297,7 +1297,7 @@ SELECT x * 5 FROM cte WHERE x = 5 "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "keys": { @@ -1446,7 +1446,7 @@ SELECT x * 5 FROM cte WHERE x = 5 "Get": { "id": { "Global": { - "User": 7 + "User": 8 } }, "keys": { @@ -1569,7 +1569,7 @@ SELECT x * 5 FROM cte WHERE x = 5 "sources": [ { "id": { - "User": 7 + "User": 8 }, "op": { "expressions": [], @@ -1644,7 +1644,7 @@ SELECT generate_series(a, b) from t "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "keys": { @@ -1748,7 +1748,7 @@ SELECT DISTINCT a, b FROM t "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "keys": { @@ -1849,7 +1849,7 @@ GROUP BY a "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "keys": { @@ -2006,7 +2006,7 @@ FROM t "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "keys": { @@ -2361,7 +2361,7 @@ SELECT * FROM hierarchical_group_by "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "keys": { @@ -2472,7 +2472,7 @@ MATERIALIZED VIEW hierarchical_global_mv "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "keys": { @@ -2790,7 +2790,7 @@ SELECT * FROM hierarchical_global "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "keys": { @@ -3112,7 +3112,7 @@ GROUP BY a "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "keys": { @@ -3372,7 +3372,7 @@ GROUP BY a "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "keys": { @@ -3701,7 +3701,7 @@ FROM t "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "keys": { @@ -4430,7 +4430,7 @@ MATERIALIZED VIEW collated_group_by_mv "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "keys": { @@ -4536,7 +4536,7 @@ MATERIALIZED VIEW collated_group_by_mv "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "keys": { @@ -4677,7 +4677,7 @@ MATERIALIZED VIEW collated_group_by_mv "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "keys": { @@ -4937,7 +4937,7 @@ MATERIALIZED VIEW collated_group_by_mv "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "keys": { @@ -5859,7 +5859,7 @@ SELECT * FROM collated_group_by "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "keys": { @@ -5957,7 +5957,7 @@ SELECT * FROM collated_group_by "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "keys": { @@ -6098,7 +6098,7 @@ SELECT * FROM collated_group_by "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "keys": { @@ -6358,7 +6358,7 @@ SELECT * FROM collated_group_by "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "keys": { @@ -7268,7 +7268,7 @@ MATERIALIZED VIEW collated_global_mv "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "keys": { @@ -8632,7 +8632,7 @@ SELECT * FROM collated_global "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "keys": { @@ -9990,7 +9990,7 @@ WHERE a = c AND d = e AND b + d > 42 "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "keys": { @@ -10030,7 +10030,7 @@ WHERE a = c AND d = e AND b + d > 42 "Get": { "id": { "Global": { - "User": 2 + "User": 3 } }, "keys": { @@ -10113,7 +10113,7 @@ WHERE a = c AND d = e AND b + d > 42 "Get": { "id": { "Global": { - "User": 3 + "User": 4 } }, "keys": { @@ -10737,7 +10737,7 @@ WHERE a = c AND d = e AND b + d > 42 "sources": [ { "id": { - "User": 2 + "User": 3 }, "op": { "expressions": [], @@ -10798,7 +10798,7 @@ WHERE a = c AND d = e AND b + d > 42 }, { "id": { - "User": 3 + "User": 4 }, "op": { "expressions": [], @@ -10870,7 +10870,7 @@ WHERE a = c AND d = e AND f = a "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "keys": { @@ -10910,7 +10910,7 @@ WHERE a = c AND d = e AND f = a "Get": { "id": { "Global": { - "User": 2 + "User": 3 } }, "keys": { @@ -11073,7 +11073,7 @@ WHERE a = c AND d = e AND f = a "Get": { "id": { "Global": { - "User": 3 + "User": 4 } }, "keys": { @@ -11639,7 +11639,7 @@ WHERE a = c and a = e "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "keys": { @@ -11674,7 +11674,7 @@ WHERE a = c and a = e "Get": { "id": { "Global": { - "User": 2 + "User": 3 } }, "keys": { @@ -11709,7 +11709,7 @@ WHERE a = c and a = e "Get": { "id": { "Global": { - "User": 3 + "User": 4 } }, "keys": { diff --git a/test/sqllogictest/explain/plan_insights.slt b/test/sqllogictest/explain/plan_insights.slt index 5b39f635d722c..59b4c3b9b32b8 100644 --- a/test/sqllogictest/explain/plan_insights.slt +++ b/test/sqllogictest/explain/plan_insights.slt @@ -27,7 +27,7 @@ EXPLAIN PLAN INSIGHTS AS JSON FOR SELECT * FROM t "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -53,7 +53,7 @@ EXPLAIN PLAN INSIGHTS AS JSON FOR SELECT * FROM t "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -73,7 +73,7 @@ EXPLAIN PLAN INSIGHTS AS JSON FOR SELECT * FROM t "sources": [ { "id": { - "User": 1 + "User": 2 }, "op": null } @@ -88,7 +88,7 @@ EXPLAIN PLAN INSIGHTS AS JSON FOR SELECT * FROM t }, "insights": { "imports": { - "u1": { + "u2": { "name": { "database": "materialize", "schema": "public", @@ -107,7 +107,7 @@ EXPLAIN PLAN INSIGHTS AS JSON FOR SELECT * FROM t "User": 1 } }, - "redacted_sql": "SELECT * FROM [u1 AS materialize.public.t]" + "redacted_sql": "SELECT * FROM [u2 AS materialize.public.t]" } EOF @@ -128,7 +128,7 @@ EXPLAIN PLAN INSIGHTS AS JSON FOR SELECT * FROM t "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -154,7 +154,7 @@ EXPLAIN PLAN INSIGHTS AS JSON FOR SELECT * FROM t "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -174,7 +174,7 @@ EXPLAIN PLAN INSIGHTS AS JSON FOR SELECT * FROM t "sources": [ { "id": { - "User": 1 + "User": 2 }, "op": null } @@ -189,7 +189,7 @@ EXPLAIN PLAN INSIGHTS AS JSON FOR SELECT * FROM t }, "insights": { "imports": { - "u1": { + "u2": { "name": { "database": "materialize", "schema": "public", @@ -208,7 +208,7 @@ EXPLAIN PLAN INSIGHTS AS JSON FOR SELECT * FROM t "User": 1 } }, - "redacted_sql": "SELECT * FROM [u1 AS materialize.public.t]" + "redacted_sql": "SELECT * FROM [u2 AS materialize.public.t]" } EOF @@ -225,7 +225,7 @@ EXPLAIN PLAN INSIGHTS AS JSON FOR SELECT * FROM t t1, t t2 "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -243,7 +243,7 @@ EXPLAIN PLAN INSIGHTS AS JSON FOR SELECT * FROM t t1, t t2 "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -291,7 +291,7 @@ EXPLAIN PLAN INSIGHTS AS JSON FOR SELECT * FROM t t1, t t2 "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -405,7 +405,7 @@ EXPLAIN PLAN INSIGHTS AS JSON FOR SELECT * FROM t t1, t t2 "sources": [ { "id": { - "User": 1 + "User": 2 }, "op": null } @@ -420,7 +420,7 @@ EXPLAIN PLAN INSIGHTS AS JSON FOR SELECT * FROM t t1, t t2 }, "insights": { "imports": { - "u1": { + "u2": { "name": { "database": "materialize", "schema": "public", @@ -439,7 +439,7 @@ EXPLAIN PLAN INSIGHTS AS JSON FOR SELECT * FROM t t1, t t2 "User": 1 } }, - "redacted_sql": "SELECT * FROM [u1 AS materialize.public.t] AS t1, [u1 AS materialize.public.t] AS t2" + "redacted_sql": "SELECT * FROM [u2 AS materialize.public.t] AS t1, [u2 AS materialize.public.t] AS t2" } EOF @@ -457,7 +457,7 @@ EXPLAIN PLAN INSIGHTS AS JSON FOR SELECT * FROM t "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -483,7 +483,7 @@ EXPLAIN PLAN INSIGHTS AS JSON FOR SELECT * FROM t "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -499,7 +499,7 @@ EXPLAIN PLAN INSIGHTS AS JSON FOR SELECT * FROM t "Index": [ [ { - "User": 2 + "User": 3 }, "FullScan" ] @@ -521,10 +521,10 @@ EXPLAIN PLAN INSIGHTS AS JSON FOR SELECT * FROM t "plan": { "PeekExisting": [ { - "User": 1 + "User": 2 }, { - "User": 2 + "User": 3 }, null, { @@ -548,7 +548,7 @@ EXPLAIN PLAN INSIGHTS AS JSON FOR SELECT * FROM t }, "insights": { "imports": { - "u2": { + "u3": { "name": { "database": "materialize", "schema": "public", @@ -567,7 +567,7 @@ EXPLAIN PLAN INSIGHTS AS JSON FOR SELECT * FROM t "User": 1 } }, - "redacted_sql": "SELECT * FROM [u1 AS materialize.public.t]" + "redacted_sql": "SELECT * FROM [u2 AS materialize.public.t]" } EOF @@ -584,7 +584,7 @@ EXPLAIN PLAN INSIGHTS AS JSON FOR SELECT * FROM t t1, t t2 "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -602,7 +602,7 @@ EXPLAIN PLAN INSIGHTS AS JSON FOR SELECT * FROM t t1, t t2 "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -650,7 +650,7 @@ EXPLAIN PLAN INSIGHTS AS JSON FOR SELECT * FROM t t1, t t2 "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -666,7 +666,7 @@ EXPLAIN PLAN INSIGHTS AS JSON FOR SELECT * FROM t t1, t t2 "Index": [ [ { - "User": 2 + "User": 3 }, "FullScan" ] @@ -781,7 +781,7 @@ EXPLAIN PLAN INSIGHTS AS JSON FOR SELECT * FROM t t1, t t2 }, "insights": { "imports": { - "u2": { + "u3": { "name": { "database": "materialize", "schema": "public", @@ -800,7 +800,7 @@ EXPLAIN PLAN INSIGHTS AS JSON FOR SELECT * FROM t t1, t t2 "User": 1 } }, - "redacted_sql": "SELECT * FROM [u1 AS materialize.public.t] AS t1, [u1 AS materialize.public.t] AS t2" + "redacted_sql": "SELECT * FROM [u2 AS materialize.public.t] AS t1, [u2 AS materialize.public.t] AS t2" } EOF @@ -822,7 +822,7 @@ EXPLAIN PLAN INSIGHTS AS JSON FOR SELECT * FROM t "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -848,7 +848,7 @@ EXPLAIN PLAN INSIGHTS AS JSON FOR SELECT * FROM t "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -868,7 +868,7 @@ EXPLAIN PLAN INSIGHTS AS JSON FOR SELECT * FROM t "sources": [ { "id": { - "User": 1 + "User": 2 }, "op": null } @@ -883,7 +883,7 @@ EXPLAIN PLAN INSIGHTS AS JSON FOR SELECT * FROM t }, "insights": { "imports": { - "u1": { + "u2": { "name": { "database": "materialize", "schema": "public", @@ -912,10 +912,10 @@ EXPLAIN PLAN INSIGHTS AS JSON FOR SELECT * FROM t "cluster": { "name": "other", "id": { - "User": 2 + "User": 4 } }, - "redacted_sql": "SELECT * FROM [u1 AS materialize.public.t]" + "redacted_sql": "SELECT * FROM [u2 AS materialize.public.t]" } EOF @@ -933,7 +933,7 @@ EXPLAIN PLAN INSIGHTS AS JSON FOR SELECT count(*) FROM t "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -990,7 +990,7 @@ EXPLAIN PLAN INSIGHTS AS JSON FOR SELECT count(*) FROM t "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -1139,7 +1139,7 @@ EXPLAIN PLAN INSIGHTS AS JSON FOR SELECT count(*) FROM t "sources": [ { "id": { - "User": 1 + "User": 2 }, "op": null } @@ -1154,7 +1154,7 @@ EXPLAIN PLAN INSIGHTS AS JSON FOR SELECT count(*) FROM t }, "insights": { "imports": { - "u1": { + "u2": { "name": { "database": "materialize", "schema": "public", @@ -1176,10 +1176,10 @@ EXPLAIN PLAN INSIGHTS AS JSON FOR SELECT count(*) FROM t "cluster": { "name": "other", "id": { - "User": 2 + "User": 4 } }, - "redacted_sql": "SELECT pg_catalog.count(*) FROM [u1 AS materialize.public.t]" + "redacted_sql": "SELECT pg_catalog.count(*) FROM [u2 AS materialize.public.t]" } EOF diff --git a/test/sqllogictest/explain/raw_plan_as_json.slt b/test/sqllogictest/explain/raw_plan_as_json.slt index 7230572ca1cc9..5f08f22a7612f 100644 --- a/test/sqllogictest/explain/raw_plan_as_json.slt +++ b/test/sqllogictest/explain/raw_plan_as_json.slt @@ -47,7 +47,7 @@ SELECT a + 1, b, 4 FROM mv WHERE a > 0 "Get": { "id": { "Global": { - "User": 5 + "User": 6 } }, "typ": { @@ -236,7 +236,7 @@ SELECT a FROM t EXCEPT SELECT b FROM mv "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -272,7 +272,7 @@ SELECT a FROM t EXCEPT SELECT b FROM mv "Get": { "id": { "Global": { - "User": 5 + "User": 6 } }, "typ": { @@ -315,7 +315,7 @@ SELECT * FROM t ORDER BY b asc, a desc LIMIT 5 "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -350,7 +350,7 @@ SELECT abs(min(a) - max(a)) FROM t "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -462,7 +462,7 @@ SELECT abs(min(a) - max(a)) FROM t GROUP BY b "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -587,7 +587,7 @@ SELECT * FROM t WHERE EXISTS(SELECT * FROM mv WHERE t.a < mv.a) AND EXISTS(SELEC "Get": { "id": { "Global": { - "User": 5 + "User": 6 } }, "typ": { @@ -645,7 +645,7 @@ SELECT * FROM t WHERE EXISTS(SELECT * FROM mv WHERE t.a < mv.a) AND EXISTS(SELEC "Get": { "id": { "Global": { - "User": 5 + "User": 6 } }, "typ": { @@ -699,7 +699,7 @@ SELECT * FROM t WHERE EXISTS(SELECT * FROM mv WHERE t.a < mv.a) AND EXISTS(SELEC "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -788,7 +788,7 @@ SELECT (SELECT v.a FROM v WHERE v.b = t.b LIMIT 1), (SELECT mv.a FROM mv WHERE m "Get": { "id": { "Global": { - "User": 5 + "User": 6 } }, "typ": { @@ -889,7 +889,7 @@ SELECT (SELECT v.a FROM v WHERE v.b = t.b LIMIT 1), (SELECT mv.a FROM mv WHERE m "Get": { "id": { "Global": { - "User": 3 + "User": 4 } }, "typ": { @@ -982,7 +982,7 @@ SELECT (SELECT v.a FROM v WHERE v.b = t.b LIMIT 1), (SELECT mv.a FROM mv WHERE m "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -1061,7 +1061,7 @@ SELECT t1.a, t2.a FROM t as t1, t as t2 "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -1083,7 +1083,7 @@ SELECT t1.a, t2.a FROM t as t1, t as t2 "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -1148,7 +1148,7 @@ WHERE t1.b = t2.b AND t2.b = t3.b "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -1170,7 +1170,7 @@ WHERE t1.b = t2.b AND t2.b = t3.b "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { @@ -1209,7 +1209,7 @@ WHERE t1.b = t2.b AND t2.b = t3.b "Get": { "id": { "Global": { - "User": 1 + "User": 2 } }, "typ": { diff --git a/test/sqllogictest/id.slt b/test/sqllogictest/id.slt index 9de1ace23da3a..6834c4d3910f7 100644 --- a/test/sqllogictest/id.slt +++ b/test/sqllogictest/id.slt @@ -21,7 +21,7 @@ INSERT INTO x VALUES (1), (2), (3) query T SELECT id FROM mz_catalog.mz_tables WHERE name = 'x' ---- -u1 +u2 query I rowsort SELECT a FROM x @@ -31,7 +31,7 @@ SELECT a FROM x 3 query I rowsort -SELECT a FROM [u1 AS materialize.public.y] +SELECT a FROM [u2 AS materialize.public.y] ---- 1 2 @@ -41,11 +41,11 @@ SELECT a FROM [u1 AS materialize.public.y] # Referring to it by its "true" name should not work. statement error column "x.a" does not exist -SELECT x.a FROM [u1 AS materialize.public.y] +SELECT x.a FROM [u2 AS materialize.public.y] # Referring to it by its assigned name should work. query I rowsort -SELECT y.a FROM [u1 AS materialize.public.y] +SELECT y.a FROM [u2 AS materialize.public.y] ---- 1 2 @@ -78,7 +78,7 @@ statement ok DROP VIEW foo; statement ok -CREATE VIEW foo AS SELECT * FROM [u1 AS materialize.public.x] +CREATE VIEW foo AS SELECT * FROM [u2 AS materialize.public.x] query TT SHOW CREATE VIEW foo @@ -92,10 +92,10 @@ statement ok DROP VIEW foo; statement ok -CREATE VIEW foo AS SELECT * FROM [u1 AS materialize.public.y] +CREATE VIEW foo AS SELECT * FROM [u2 AS materialize.public.y] query TT SHOW CREATE VIEW foo ---- materialize.public.foo -CREATE VIEW materialize.public.foo AS SELECT * FROM [u1 AS materialize.public.y]; +CREATE VIEW materialize.public.foo AS SELECT * FROM [u2 AS materialize.public.y]; diff --git a/test/sqllogictest/id_reuse.slt b/test/sqllogictest/id_reuse.slt index e8c88c785c0a1..468f1bc7efd9d 100644 --- a/test/sqllogictest/id_reuse.slt +++ b/test/sqllogictest/id_reuse.slt @@ -136,4 +136,4 @@ s3 mz_probe s4 mz_support s5 mz_analytics u1 quickstart -u3 bar +u4 bar diff --git a/test/sqllogictest/introspection/relations.slt b/test/sqllogictest/introspection/relations.slt index 11fee259f20ca..19630efed8a3e 100644 --- a/test/sqllogictest/introspection/relations.slt +++ b/test/sqllogictest/introspection/relations.slt @@ -52,14 +52,14 @@ WHERE mdod_to.dataflow_name LIKE '%test_primary_idx' ArrangeBy[[Column(0,␠"a"),␠Column(1,␠"b")]] ArrangementSize alloc::vec::Vec)>>>> ArrangeBy[[Column(0,␠"a"),␠Column(1,␠"b")]]-errors ArrangementSize alloc::vec::Vec)>>>> ArrangementSize LogOperatorHydration␠(2) alloc::vec::Vec)>>>> -BuildingObject(User(2)) expire_stream_at(materialize.public.test_primary_idx_export_index_errs) alloc::vec::Vec)>>>> -BuildingObject(User(2)) expire_stream_at(materialize.public.test_primary_idx_export_index_oks) alloc::vec::Vec)>>>> +BuildingObject(User(5)) expire_stream_at(materialize.public.test_primary_idx_export_index_errs) alloc::vec::Vec)>>>> +BuildingObject(User(5)) expire_stream_at(materialize.public.test_primary_idx_export_index_oks) alloc::vec::Vec)>>>> Concatenate FlatMap alloc::vec::Vec<(mz_storage_types::errors::DataflowError,␠mz_repr::timestamp::Timestamp,␠mz_ore::overflowing::Overflowing)> Exchange FlatMap alloc::vec::Vec<(u64,␠mz_txn_wal::txn_read::DataRemapEntry)> -Feedback persist_source_backpressure(backpressure(u1)) alloc::vec::Vec +Feedback persist_source_backpressure(backpressure(u2)) alloc::vec::Vec FlatMap ArrangeBy[[Column(0,␠"a"),␠Column(1,␠"b")]]-errors alloc::vec::Vec<((mz_storage_types::errors::DataflowError,␠()),␠mz_repr::timestamp::Timestamp,␠mz_ore::overflowing::Overflowing)> FlatMap Exchange alloc::vec::Vec<(u64,␠mz_txn_wal::txn_read::DataRemapEntry)> -FlatMap txns_progress_frontiers(u1) alloc::vec::Vec> +FlatMap txns_progress_frontiers(u2) alloc::vec::Vec> FormArrangementKey ArrangeBy[[Column(0,␠"a"),␠Column(1,␠"b")]] mz_timely_util::columnar::Column<((mz_repr::row::Row,␠mz_repr::row::Row),␠mz_repr::timestamp::Timestamp,␠mz_ore::overflowing::Overflowing)> FormArrangementKey Concatenate alloc::vec::Vec<(mz_storage_types::errors::DataflowError,␠mz_repr::timestamp::Timestamp,␠mz_ore::overflowing::Overflowing)> InputRegion:␠materialize.public.test_primary_idx BuildRegion:␠materialize.public.test_primary_idx alloc::vec::Vec<(mz_storage_types::errors::DataflowError,␠mz_repr::timestamp::Timestamp,␠mz_ore::overflowing::Overflowing)> @@ -69,18 +69,18 @@ LogOperatorHydration␠(1) FormArrangementKey alloc::vec::Vec<(mz_repr::row::R OkErr SuppressEarlyProgress alloc::vec::Vec<(mz_repr::row::Row,␠mz_repr::timestamp::Timestamp,␠mz_ore::overflowing::Overflowing)> SuppressEarlyProgress LimitProgress(Dataflow:␠materialize.public.test_primary_idx) alloc::vec::Vec<(mz_repr::row::Row,␠mz_repr::timestamp::Timestamp,␠mz_ore::overflowing::Overflowing)> Temporal␠delay BuildRegion:␠materialize.public.test_primary_idx alloc::vec::Vec<(mz_repr::row::Row,␠mz_repr::timestamp::Timestamp,␠mz_ore::overflowing::Overflowing)> -decode_backpressure_probe(u1) Feedback alloc::vec::Vec +decode_backpressure_probe(u2) Feedback alloc::vec::Vec expire_stream_at(materialize.public.test_primary_idx_export_index_errs) LogDataflowErrorsStream alloc::vec::Vec)>>>> expire_stream_at(materialize.public.test_primary_idx_export_index_oks) InspectBatch alloc::vec::Vec)>>>> -granular_backpressure(u1) shard_source_descs_return(u1) alloc::vec::Vec -granular_backpressure(u1) txns_progress_frontiers(u1) alloc::vec::Vec<(core::result::Result,␠(mz_repr::timestamp::Timestamp,␠mz_storage_operators::persist_source::Subtime),␠mz_ore::overflowing::Overflowing)> -persist_source::decode_and_mfp(u1) InspectBatch alloc::vec::Vec<(core::result::Result,␠(mz_repr::timestamp::Timestamp,␠mz_storage_operators::persist_source::Subtime),␠mz_ore::overflowing::Overflowing)> -persist_source_backpressure(backpressure(u1)) shard_source_fetch(u1) alloc::vec::Vec<(usize,␠mz_persist_client::fetch::ExchangeableBatchPart)> -shard_source_descs(u1) granular_backpressure(u1) alloc::vec::Vec<(usize,␠mz_persist_client::fetch::ExchangeableBatchPart)> -shard_source_fetch(u1) Feedback alloc::vec::Vec -shard_source_fetch(u1) persist_source::decode_and_mfp(u1) alloc::vec::Vec> -txns_progress_frontiers(u1) OkErr alloc::vec::Vec<(core::result::Result,␠(mz_repr::timestamp::Timestamp,␠mz_storage_operators::persist_source::Subtime),␠mz_ore::overflowing::Overflowing)> -txns_progress_source(u1) FlatMap alloc::vec::Vec> +granular_backpressure(u2) shard_source_descs_return(u2) alloc::vec::Vec +granular_backpressure(u2) txns_progress_frontiers(u2) alloc::vec::Vec<(core::result::Result,␠(mz_repr::timestamp::Timestamp,␠mz_storage_operators::persist_source::Subtime),␠mz_ore::overflowing::Overflowing)> +persist_source::decode_and_mfp(u2) InspectBatch alloc::vec::Vec<(core::result::Result,␠(mz_repr::timestamp::Timestamp,␠mz_storage_operators::persist_source::Subtime),␠mz_ore::overflowing::Overflowing)> +persist_source_backpressure(backpressure(u2)) shard_source_fetch(u2) alloc::vec::Vec<(usize,␠mz_persist_client::fetch::ExchangeableBatchPart)> +shard_source_descs(u2) granular_backpressure(u2) alloc::vec::Vec<(usize,␠mz_persist_client::fetch::ExchangeableBatchPart)> +shard_source_fetch(u2) Feedback alloc::vec::Vec +shard_source_fetch(u2) persist_source::decode_and_mfp(u2) alloc::vec::Vec> +txns_progress_frontiers(u2) OkErr alloc::vec::Vec<(core::result::Result,␠(mz_repr::timestamp::Timestamp,␠mz_storage_operators::persist_source::Subtime),␠mz_ore::overflowing::Overflowing)> +txns_progress_source(u2) FlatMap alloc::vec::Vec> query IT rowsort SELECT COUNT(*), type diff --git a/test/sqllogictest/managed_cluster.slt b/test/sqllogictest/managed_cluster.slt index 31c3208655585..6bd2c69d3b667 100644 --- a/test/sqllogictest/managed_cluster.slt +++ b/test/sqllogictest/managed_cluster.slt @@ -146,7 +146,7 @@ mz_system r1 scale=1,workers=2 query TTTTT rowsort SELECT id, name, managed, replication_factor, size FROM mz_clusters WHERE name LIKE 'foo' ---- -u5 foo true 3 scale=1,workers=1 +u6 foo true 3 scale=1,workers=1 statement ok ALTER CLUSTER foo SET (MANAGED = false) @@ -164,7 +164,7 @@ mz_system r1 scale=1,workers=2 query TTTTT rowsort SELECT id, name, managed, replication_factor, size FROM mz_clusters WHERE name LIKE 'foo' ---- -u5 foo false NULL NULL +u6 foo false NULL NULL statement error db error: ERROR: REPLICATION FACTOR 4 does not match number of replicas \(3\) ALTER CLUSTER foo SET (MANAGED, REPLICATION FACTOR 4) @@ -191,7 +191,7 @@ mz_system r1 scale=1,workers=2 query TTTTT rowsort SELECT id, name, managed, replication_factor, size FROM mz_clusters WHERE name LIKE 'foo' ---- -u5 foo true 3 scale=1,workers=1 +u6 foo true 3 scale=1,workers=1 query TT SELECT mz_clusters.name, mz_cluster_replicas.name FROM mz_cluster_replicas JOIN mz_clusters ON mz_cluster_replicas.cluster_id = mz_clusters.id WHERE mz_clusters.name != 'quickstart' ORDER BY 1, 2 @@ -223,7 +223,7 @@ mz_system r1 scale=1,workers=2 query TTTTT rowsort SELECT id, name, managed, replication_factor, size FROM mz_clusters WHERE name LIKE 'foo' ---- -u5 foo true 1 scale=1,workers=1 +u6 foo true 1 scale=1,workers=1 statement ok ALTER CLUSTER foo SET (REPLICATION FACTOR 2) @@ -240,7 +240,7 @@ mz_system r1 scale=1,workers=2 query TTTTT rowsort SELECT id, name, managed, replication_factor, size FROM mz_clusters WHERE name LIKE 'foo' ---- -u5 foo true 2 scale=1,workers=1 +u6 foo true 2 scale=1,workers=1 statement ok ALTER CLUSTER foo RESET (REPLICATION FACTOR) @@ -256,7 +256,7 @@ mz_system r1 scale=1,workers=2 query TTTTT rowsort SELECT id, name, managed, replication_factor, size FROM mz_clusters WHERE name LIKE 'foo' ---- -u5 foo true 1 scale=1,workers=1 +u6 foo true 1 scale=1,workers=1 statement ok ALTER CLUSTER foo SET (SIZE 'scale=1,workers=2') @@ -272,7 +272,7 @@ mz_system r1 scale=1,workers=2 query TTTTT rowsort SELECT id, name, managed, replication_factor, size FROM mz_clusters WHERE name LIKE 'foo' ---- -u5 foo true 1 scale=1,workers=2 +u6 foo true 1 scale=1,workers=2 statement ok ALTER CLUSTER foo SET (SIZE 'scale=1,workers=1', REPLICATION FACTOR 1) @@ -288,7 +288,7 @@ mz_system r1 scale=1,workers=2 query TTTTT rowsort SELECT id, name, managed, replication_factor, size FROM mz_clusters WHERE name LIKE 'foo' ---- -u5 foo true 1 scale=1,workers=1 +u6 foo true 1 scale=1,workers=1 statement error db error: ERROR: cannot drop replica of managed cluster DROP CLUSTER REPLICA foo.r1 diff --git a/test/sqllogictest/mz_catalog_server_index_accounting.slt b/test/sqllogictest/mz_catalog_server_index_accounting.slt index 2fbc7a067aadf..69ce04405df08 100644 --- a/test/sqllogictest/mz_catalog_server_index_accounting.slt +++ b/test/sqllogictest/mz_catalog_server_index_accounting.slt @@ -37,98 +37,98 @@ mz_arrangement_heap_capacity_raw_s2_primary_idx CREATE␠INDEX␠"mz_arrangemen mz_arrangement_heap_size_raw_s2_primary_idx CREATE␠INDEX␠"mz_arrangement_heap_size_raw_s2_primary_idx"␠IN␠CLUSTER␠[s2]␠ON␠"mz_introspection"."mz_arrangement_heap_size_raw"␠("operator_id",␠"worker_id") mz_arrangement_records_raw_s2_primary_idx CREATE␠INDEX␠"mz_arrangement_records_raw_s2_primary_idx"␠IN␠CLUSTER␠[s2]␠ON␠"mz_introspection"."mz_arrangement_records_raw"␠("operator_id",␠"worker_id") mz_arrangement_sharing_raw_s2_primary_idx CREATE␠INDEX␠"mz_arrangement_sharing_raw_s2_primary_idx"␠IN␠CLUSTER␠[s2]␠ON␠"mz_introspection"."mz_arrangement_sharing_raw"␠("operator_id",␠"worker_id") -mz_cluster_deployment_lineage_ind CREATE␠INDEX␠"mz_cluster_deployment_lineage_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s732␠AS␠"mz_internal"."mz_cluster_deployment_lineage"]␠("cluster_id") -mz_cluster_replica_frontiers_ind CREATE␠INDEX␠"mz_cluster_replica_frontiers_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s727␠AS␠"mz_catalog"."mz_cluster_replica_frontiers"]␠("object_id") -mz_cluster_replica_history_ind CREATE␠INDEX␠"mz_cluster_replica_history_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s592␠AS␠"mz_internal"."mz_cluster_replica_history"]␠("dropped_at") -mz_cluster_replica_metrics_history_ind CREATE␠INDEX␠"mz_cluster_replica_metrics_history_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s501␠AS␠"mz_internal"."mz_cluster_replica_metrics_history"]␠("replica_id") -mz_cluster_replica_metrics_ind CREATE␠INDEX␠"mz_cluster_replica_metrics_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s502␠AS␠"mz_internal"."mz_cluster_replica_metrics"]␠("replica_id") -mz_cluster_replica_name_history_ind CREATE␠INDEX␠"mz_cluster_replica_name_history_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s593␠AS␠"mz_internal"."mz_cluster_replica_name_history"]␠("id") -mz_cluster_replica_sizes_ind CREATE␠INDEX␠"mz_cluster_replica_sizes_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s503␠AS␠"mz_catalog"."mz_cluster_replica_sizes"]␠("size") -mz_cluster_replica_status_history_ind CREATE␠INDEX␠"mz_cluster_replica_status_history_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s504␠AS␠"mz_internal"."mz_cluster_replica_status_history"]␠("replica_id") -mz_cluster_replica_statuses_ind CREATE␠INDEX␠"mz_cluster_replica_statuses_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s505␠AS␠"mz_internal"."mz_cluster_replica_statuses"]␠("replica_id") -mz_cluster_replicas_ind CREATE␠INDEX␠"mz_cluster_replicas_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s500␠AS␠"mz_catalog"."mz_cluster_replicas"]␠("id") -mz_clusters_ind CREATE␠INDEX␠"mz_clusters_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s494␠AS␠"mz_catalog"."mz_clusters"]␠("id") -mz_columns_ind CREATE␠INDEX␠"mz_columns_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s465␠AS␠"mz_catalog"."mz_columns"]␠("name") -mz_comments_ind CREATE␠INDEX␠"mz_comments_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s517␠AS␠"mz_internal"."mz_comments"]␠("id") +mz_cluster_deployment_lineage_ind CREATE␠INDEX␠"mz_cluster_deployment_lineage_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s740␠AS␠"mz_internal"."mz_cluster_deployment_lineage"]␠("cluster_id") +mz_cluster_replica_frontiers_ind CREATE␠INDEX␠"mz_cluster_replica_frontiers_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s735␠AS␠"mz_catalog"."mz_cluster_replica_frontiers"]␠("object_id") +mz_cluster_replica_history_ind CREATE␠INDEX␠"mz_cluster_replica_history_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s600␠AS␠"mz_internal"."mz_cluster_replica_history"]␠("dropped_at") +mz_cluster_replica_metrics_history_ind CREATE␠INDEX␠"mz_cluster_replica_metrics_history_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s509␠AS␠"mz_internal"."mz_cluster_replica_metrics_history"]␠("replica_id") +mz_cluster_replica_metrics_ind CREATE␠INDEX␠"mz_cluster_replica_metrics_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s510␠AS␠"mz_internal"."mz_cluster_replica_metrics"]␠("replica_id") +mz_cluster_replica_name_history_ind CREATE␠INDEX␠"mz_cluster_replica_name_history_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s601␠AS␠"mz_internal"."mz_cluster_replica_name_history"]␠("id") +mz_cluster_replica_sizes_ind CREATE␠INDEX␠"mz_cluster_replica_sizes_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s511␠AS␠"mz_catalog"."mz_cluster_replica_sizes"]␠("size") +mz_cluster_replica_status_history_ind CREATE␠INDEX␠"mz_cluster_replica_status_history_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s512␠AS␠"mz_internal"."mz_cluster_replica_status_history"]␠("replica_id") +mz_cluster_replica_statuses_ind CREATE␠INDEX␠"mz_cluster_replica_statuses_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s513␠AS␠"mz_internal"."mz_cluster_replica_statuses"]␠("replica_id") +mz_cluster_replicas_ind CREATE␠INDEX␠"mz_cluster_replicas_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s508␠AS␠"mz_catalog"."mz_cluster_replicas"]␠("id") +mz_clusters_ind CREATE␠INDEX␠"mz_clusters_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s502␠AS␠"mz_catalog"."mz_clusters"]␠("id") +mz_columns_ind CREATE␠INDEX␠"mz_columns_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s473␠AS␠"mz_catalog"."mz_columns"]␠("name") +mz_comments_ind CREATE␠INDEX␠"mz_comments_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s525␠AS␠"mz_internal"."mz_comments"]␠("id") mz_compute_dataflow_global_ids_per_worker_s2_primary_idx CREATE␠INDEX␠"mz_compute_dataflow_global_ids_per_worker_s2_primary_idx"␠IN␠CLUSTER␠[s2]␠ON␠"mz_introspection"."mz_compute_dataflow_global_ids_per_worker"␠("id",␠"worker_id") -mz_compute_dependencies_ind CREATE␠INDEX␠"mz_compute_dependencies_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s716␠AS␠"mz_internal"."mz_compute_dependencies"]␠("dependency_id") +mz_compute_dependencies_ind CREATE␠INDEX␠"mz_compute_dependencies_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s724␠AS␠"mz_internal"."mz_compute_dependencies"]␠("dependency_id") mz_compute_error_counts_raw_s2_primary_idx CREATE␠INDEX␠"mz_compute_error_counts_raw_s2_primary_idx"␠IN␠CLUSTER␠[s2]␠ON␠"mz_introspection"."mz_compute_error_counts_raw"␠("export_id",␠"worker_id") mz_compute_exports_per_worker_s2_primary_idx CREATE␠INDEX␠"mz_compute_exports_per_worker_s2_primary_idx"␠IN␠CLUSTER␠[s2]␠ON␠"mz_introspection"."mz_compute_exports_per_worker"␠("export_id",␠"worker_id") mz_compute_frontiers_per_worker_s2_primary_idx CREATE␠INDEX␠"mz_compute_frontiers_per_worker_s2_primary_idx"␠IN␠CLUSTER␠[s2]␠ON␠"mz_introspection"."mz_compute_frontiers_per_worker"␠("export_id",␠"worker_id") -mz_compute_hydration_times_ind CREATE␠INDEX␠"mz_compute_hydration_times_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s723␠AS␠"mz_internal"."mz_compute_hydration_times"]␠("replica_id") +mz_compute_hydration_times_ind CREATE␠INDEX␠"mz_compute_hydration_times_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s731␠AS␠"mz_internal"."mz_compute_hydration_times"]␠("replica_id") mz_compute_hydration_times_per_worker_s2_primary_idx CREATE␠INDEX␠"mz_compute_hydration_times_per_worker_s2_primary_idx"␠IN␠CLUSTER␠[s2]␠ON␠"mz_introspection"."mz_compute_hydration_times_per_worker"␠("export_id",␠"worker_id") mz_compute_import_frontiers_per_worker_s2_primary_idx CREATE␠INDEX␠"mz_compute_import_frontiers_per_worker_s2_primary_idx"␠IN␠CLUSTER␠[s2]␠ON␠"mz_introspection"."mz_compute_import_frontiers_per_worker"␠("export_id",␠"import_id",␠"worker_id") mz_compute_lir_mapping_per_worker_s2_primary_idx CREATE␠INDEX␠"mz_compute_lir_mapping_per_worker_s2_primary_idx"␠IN␠CLUSTER␠[s2]␠ON␠"mz_introspection"."mz_compute_lir_mapping_per_worker"␠("global_id",␠"lir_id",␠"worker_id") mz_compute_operator_durations_histogram_raw_s2_primary_idx CREATE␠INDEX␠"mz_compute_operator_durations_histogram_raw_s2_primary_idx"␠IN␠CLUSTER␠[s2]␠ON␠"mz_introspection"."mz_compute_operator_durations_histogram_raw"␠("id",␠"worker_id",␠"duration_ns") mz_compute_operator_hydration_statuses_per_worker_s2_primary_idx CREATE␠INDEX␠"mz_compute_operator_hydration_statuses_per_worker_s2_primary_idx"␠IN␠CLUSTER␠[s2]␠ON␠"mz_introspection"."mz_compute_operator_hydration_statuses_per_worker"␠("export_id",␠"lir_id") -mz_connections_ind CREATE␠INDEX␠"mz_connections_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s498␠AS␠"mz_catalog"."mz_connections"]␠("schema_id") -mz_console_cluster_utilization_overview_ind CREATE␠INDEX␠"mz_console_cluster_utilization_overview_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s719␠AS␠"mz_internal"."mz_console_cluster_utilization_overview"]␠("cluster_id") -mz_continual_tasks_ind CREATE␠INDEX␠"mz_continual_tasks_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s520␠AS␠"mz_internal"."mz_continual_tasks"]␠("id") -mz_databases_ind CREATE␠INDEX␠"mz_databases_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s463␠AS␠"mz_catalog"."mz_databases"]␠("name") +mz_connections_ind CREATE␠INDEX␠"mz_connections_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s506␠AS␠"mz_catalog"."mz_connections"]␠("schema_id") +mz_console_cluster_utilization_overview_ind CREATE␠INDEX␠"mz_console_cluster_utilization_overview_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s727␠AS␠"mz_internal"."mz_console_cluster_utilization_overview"]␠("cluster_id") +mz_continual_tasks_ind CREATE␠INDEX␠"mz_continual_tasks_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s528␠AS␠"mz_internal"."mz_continual_tasks"]␠("id") +mz_databases_ind CREATE␠INDEX␠"mz_databases_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s471␠AS␠"mz_catalog"."mz_databases"]␠("name") mz_dataflow_addresses_per_worker_s2_primary_idx CREATE␠INDEX␠"mz_dataflow_addresses_per_worker_s2_primary_idx"␠IN␠CLUSTER␠[s2]␠ON␠"mz_introspection"."mz_dataflow_addresses_per_worker"␠("id",␠"worker_id") mz_dataflow_channels_per_worker_s2_primary_idx CREATE␠INDEX␠"mz_dataflow_channels_per_worker_s2_primary_idx"␠IN␠CLUSTER␠[s2]␠ON␠"mz_introspection"."mz_dataflow_channels_per_worker"␠("id",␠"worker_id") mz_dataflow_operator_reachability_raw_s2_primary_idx CREATE␠INDEX␠"mz_dataflow_operator_reachability_raw_s2_primary_idx"␠IN␠CLUSTER␠[s2]␠ON␠"mz_introspection"."mz_dataflow_operator_reachability_raw"␠("id",␠"worker_id",␠"source",␠"port",␠"update_type",␠"time") mz_dataflow_operators_per_worker_s2_primary_idx CREATE␠INDEX␠"mz_dataflow_operators_per_worker_s2_primary_idx"␠IN␠CLUSTER␠[s2]␠ON␠"mz_introspection"."mz_dataflow_operators_per_worker"␠("id",␠"worker_id") mz_dataflow_shutdown_durations_histogram_raw_s2_primary_idx CREATE␠INDEX␠"mz_dataflow_shutdown_durations_histogram_raw_s2_primary_idx"␠IN␠CLUSTER␠[s2]␠ON␠"mz_introspection"."mz_dataflow_shutdown_durations_histogram_raw"␠("worker_id",␠"duration_ns") -mz_frontiers_ind CREATE␠INDEX␠"mz_frontiers_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s707␠AS␠"mz_internal"."mz_frontiers"]␠("object_id") -mz_indexes_ind CREATE␠INDEX␠"mz_indexes_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s466␠AS␠"mz_catalog"."mz_indexes"]␠("id") -mz_kafka_sources_ind CREATE␠INDEX␠"mz_kafka_sources_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s460␠AS␠"mz_catalog"."mz_kafka_sources"]␠("id") -mz_materialized_views_ind CREATE␠INDEX␠"mz_materialized_views_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s478␠AS␠"mz_catalog"."mz_materialized_views"]␠("id") +mz_frontiers_ind CREATE␠INDEX␠"mz_frontiers_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s715␠AS␠"mz_internal"."mz_frontiers"]␠("object_id") +mz_indexes_ind CREATE␠INDEX␠"mz_indexes_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s474␠AS␠"mz_catalog"."mz_indexes"]␠("id") +mz_kafka_sources_ind CREATE␠INDEX␠"mz_kafka_sources_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s468␠AS␠"mz_catalog"."mz_kafka_sources"]␠("id") +mz_materialized_views_ind CREATE␠INDEX␠"mz_materialized_views_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s486␠AS␠"mz_catalog"."mz_materialized_views"]␠("id") mz_message_batch_counts_received_raw_s2_primary_idx CREATE␠INDEX␠"mz_message_batch_counts_received_raw_s2_primary_idx"␠IN␠CLUSTER␠[s2]␠ON␠"mz_introspection"."mz_message_batch_counts_received_raw"␠("channel_id",␠"from_worker_id",␠"to_worker_id") mz_message_batch_counts_sent_raw_s2_primary_idx CREATE␠INDEX␠"mz_message_batch_counts_sent_raw_s2_primary_idx"␠IN␠CLUSTER␠[s2]␠ON␠"mz_introspection"."mz_message_batch_counts_sent_raw"␠("channel_id",␠"from_worker_id",␠"to_worker_id") mz_message_counts_received_raw_s2_primary_idx CREATE␠INDEX␠"mz_message_counts_received_raw_s2_primary_idx"␠IN␠CLUSTER␠[s2]␠ON␠"mz_introspection"."mz_message_counts_received_raw"␠("channel_id",␠"from_worker_id",␠"to_worker_id") mz_message_counts_sent_raw_s2_primary_idx CREATE␠INDEX␠"mz_message_counts_sent_raw_s2_primary_idx"␠IN␠CLUSTER␠[s2]␠ON␠"mz_introspection"."mz_message_counts_sent_raw"␠("channel_id",␠"from_worker_id",␠"to_worker_id") -mz_notices_ind CREATE␠INDEX␠"mz_notices_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s796␠AS␠"mz_internal"."mz_notices"]␠("id") -mz_object_dependencies_ind CREATE␠INDEX␠"mz_object_dependencies_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s461␠AS␠"mz_internal"."mz_object_dependencies"]␠("object_id") -mz_object_history_ind CREATE␠INDEX␠"mz_object_history_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s529␠AS␠"mz_internal"."mz_object_history"]␠("id") -mz_object_lifetimes_ind CREATE␠INDEX␠"mz_object_lifetimes_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s530␠AS␠"mz_internal"."mz_object_lifetimes"]␠("id") -mz_object_transitive_dependencies_ind CREATE␠INDEX␠"mz_object_transitive_dependencies_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s545␠AS␠"mz_internal"."mz_object_transitive_dependencies"]␠("object_id") -mz_objects_ind CREATE␠INDEX␠"mz_objects_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s526␠AS␠"mz_catalog"."mz_objects"]␠("schema_id") +mz_notices_ind CREATE␠INDEX␠"mz_notices_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s804␠AS␠"mz_internal"."mz_notices"]␠("id") +mz_object_dependencies_ind CREATE␠INDEX␠"mz_object_dependencies_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s469␠AS␠"mz_internal"."mz_object_dependencies"]␠("object_id") +mz_object_history_ind CREATE␠INDEX␠"mz_object_history_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s537␠AS␠"mz_internal"."mz_object_history"]␠("id") +mz_object_lifetimes_ind CREATE␠INDEX␠"mz_object_lifetimes_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s538␠AS␠"mz_internal"."mz_object_lifetimes"]␠("id") +mz_object_transitive_dependencies_ind CREATE␠INDEX␠"mz_object_transitive_dependencies_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s553␠AS␠"mz_internal"."mz_object_transitive_dependencies"]␠("object_id") +mz_objects_ind CREATE␠INDEX␠"mz_objects_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s534␠AS␠"mz_catalog"."mz_objects"]␠("schema_id") mz_peek_durations_histogram_raw_s2_primary_idx CREATE␠INDEX␠"mz_peek_durations_histogram_raw_s2_primary_idx"␠IN␠CLUSTER␠[s2]␠ON␠"mz_introspection"."mz_peek_durations_histogram_raw"␠("worker_id",␠"type",␠"duration_ns") -mz_recent_activity_log_thinned_ind CREATE␠INDEX␠"mz_recent_activity_log_thinned_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s691␠AS␠"mz_internal"."mz_recent_activity_log_thinned"]␠("sql_hash") -mz_recent_sql_text_ind CREATE␠INDEX␠"mz_recent_sql_text_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s687␠AS␠"mz_internal"."mz_recent_sql_text"]␠("sql_hash") -mz_recent_storage_usage_ind CREATE␠INDEX␠"mz_recent_storage_usage_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s791␠AS␠"mz_catalog"."mz_recent_storage_usage"]␠("object_id") -mz_roles_ind CREATE␠INDEX␠"mz_roles_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s486␠AS␠"mz_catalog"."mz_roles"]␠("id") +mz_recent_activity_log_thinned_ind CREATE␠INDEX␠"mz_recent_activity_log_thinned_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s699␠AS␠"mz_internal"."mz_recent_activity_log_thinned"]␠("sql_hash") +mz_recent_sql_text_ind CREATE␠INDEX␠"mz_recent_sql_text_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s695␠AS␠"mz_internal"."mz_recent_sql_text"]␠("sql_hash") +mz_recent_storage_usage_ind CREATE␠INDEX␠"mz_recent_storage_usage_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s799␠AS␠"mz_catalog"."mz_recent_storage_usage"]␠("object_id") +mz_roles_ind CREATE␠INDEX␠"mz_roles_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s494␠AS␠"mz_catalog"."mz_roles"]␠("id") mz_scheduling_elapsed_raw_s2_primary_idx CREATE␠INDEX␠"mz_scheduling_elapsed_raw_s2_primary_idx"␠IN␠CLUSTER␠[s2]␠ON␠"mz_introspection"."mz_scheduling_elapsed_raw"␠("id",␠"worker_id") mz_scheduling_parks_histogram_raw_s2_primary_idx CREATE␠INDEX␠"mz_scheduling_parks_histogram_raw_s2_primary_idx"␠IN␠CLUSTER␠[s2]␠ON␠"mz_introspection"."mz_scheduling_parks_histogram_raw"␠("worker_id",␠"slept_for_ns",␠"requested_ns") -mz_schemas_ind CREATE␠INDEX␠"mz_schemas_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s464␠AS␠"mz_catalog"."mz_schemas"]␠("database_id") -mz_secrets_ind CREATE␠INDEX␠"mz_secrets_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s497␠AS␠"mz_catalog"."mz_secrets"]␠("name") -mz_show_all_objects_ind CREATE␠INDEX␠"mz_show_all_objects_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s576␠AS␠"mz_internal"."mz_show_all_objects"]␠("schema_id") -mz_show_cluster_replicas_ind CREATE␠INDEX␠"mz_show_cluster_replicas_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s730␠AS␠"mz_internal"."mz_show_cluster_replicas"]␠("cluster") -mz_show_clusters_ind CREATE␠INDEX␠"mz_show_clusters_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s578␠AS␠"mz_internal"."mz_show_clusters"]␠("name") -mz_show_columns_ind CREATE␠INDEX␠"mz_show_columns_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s577␠AS␠"mz_internal"."mz_show_columns"]␠("id") -mz_show_connections_ind CREATE␠INDEX␠"mz_show_connections_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s586␠AS␠"mz_internal"."mz_show_connections"]␠("schema_id") -mz_show_databases_ind CREATE␠INDEX␠"mz_show_databases_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s580␠AS␠"mz_internal"."mz_show_databases"]␠("name") -mz_show_indexes_ind CREATE␠INDEX␠"mz_show_indexes_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s590␠AS␠"mz_internal"."mz_show_indexes"]␠("schema_id") -mz_show_materialized_views_ind CREATE␠INDEX␠"mz_show_materialized_views_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s589␠AS␠"mz_internal"."mz_show_materialized_views"]␠("schema_id") -mz_show_roles_ind CREATE␠INDEX␠"mz_show_roles_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s585␠AS␠"mz_internal"."mz_show_roles"]␠("name") -mz_show_schemas_ind CREATE␠INDEX␠"mz_show_schemas_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s581␠AS␠"mz_internal"."mz_show_schemas"]␠("database_id") -mz_show_secrets_ind CREATE␠INDEX␠"mz_show_secrets_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s579␠AS␠"mz_internal"."mz_show_secrets"]␠("schema_id") -mz_show_sinks_ind CREATE␠INDEX␠"mz_show_sinks_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s588␠AS␠"mz_internal"."mz_show_sinks"]␠("schema_id") -mz_show_sources_ind CREATE␠INDEX␠"mz_show_sources_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s587␠AS␠"mz_internal"."mz_show_sources"]␠("schema_id") -mz_show_tables_ind CREATE␠INDEX␠"mz_show_tables_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s582␠AS␠"mz_internal"."mz_show_tables"]␠("schema_id") -mz_show_types_ind CREATE␠INDEX␠"mz_show_types_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s584␠AS␠"mz_internal"."mz_show_types"]␠("schema_id") -mz_show_views_ind CREATE␠INDEX␠"mz_show_views_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s583␠AS␠"mz_internal"."mz_show_views"]␠("schema_id") -mz_sink_statistics_ind CREATE␠INDEX␠"mz_sink_statistics_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s704␠AS␠"mz_internal"."mz_sink_statistics"]␠("id",␠"replica_id") -mz_sink_status_history_ind CREATE␠INDEX␠"mz_sink_status_history_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s676␠AS␠"mz_internal"."mz_sink_status_history"]␠("sink_id") -mz_sink_statuses_ind CREATE␠INDEX␠"mz_sink_statuses_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s677␠AS␠"mz_internal"."mz_sink_statuses"]␠("id") -mz_sinks_ind CREATE␠INDEX␠"mz_sinks_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s476␠AS␠"mz_catalog"."mz_sinks"]␠("id") -mz_source_statistics_ind CREATE␠INDEX␠"mz_source_statistics_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s702␠AS␠"mz_internal"."mz_source_statistics"]␠("id",␠"replica_id") -mz_source_statistics_with_history_ind CREATE␠INDEX␠"mz_source_statistics_with_history_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s700␠AS␠"mz_internal"."mz_source_statistics_with_history"]␠("id",␠"replica_id") -mz_source_status_history_ind CREATE␠INDEX␠"mz_source_status_history_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s678␠AS␠"mz_internal"."mz_source_status_history"]␠("source_id") -mz_source_statuses_ind CREATE␠INDEX␠"mz_source_statuses_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s695␠AS␠"mz_internal"."mz_source_statuses"]␠("id") -mz_sources_ind CREATE␠INDEX␠"mz_sources_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s469␠AS␠"mz_catalog"."mz_sources"]␠("id") -mz_tables_ind CREATE␠INDEX␠"mz_tables_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s468␠AS␠"mz_catalog"."mz_tables"]␠("schema_id") -mz_types_ind CREATE␠INDEX␠"mz_types_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s480␠AS␠"mz_catalog"."mz_types"]␠("schema_id") -mz_views_ind CREATE␠INDEX␠"mz_views_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s477␠AS␠"mz_catalog"."mz_views"]␠("schema_id") -mz_wallclock_global_lag_recent_history_ind CREATE␠INDEX␠"mz_wallclock_global_lag_recent_history_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s711␠AS␠"mz_internal"."mz_wallclock_global_lag_recent_history"]␠("object_id") -mz_webhook_sources_ind CREATE␠INDEX␠"mz_webhook_sources_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s518␠AS␠"mz_internal"."mz_webhook_sources"]␠("id") -pg_attrdef_all_databases_ind CREATE␠INDEX␠"pg_attrdef_all_databases_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s618␠AS␠"mz_internal"."pg_attrdef_all_databases"]␠("oid",␠"adrelid",␠"adnum",␠"adbin",␠"adsrc") -pg_attribute_all_databases_ind CREATE␠INDEX␠"pg_attribute_all_databases_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s611␠AS␠"mz_internal"."pg_attribute_all_databases"]␠("attrelid",␠"attname",␠"atttypid",␠"attlen",␠"attnum",␠"atttypmod",␠"attnotnull",␠"atthasdef",␠"attidentity",␠"attgenerated",␠"attisdropped",␠"attcollation",␠"database_name",␠"pg_type_database_name") -pg_class_all_databases_ind CREATE␠INDEX␠"pg_class_all_databases_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s599␠AS␠"mz_internal"."pg_class_all_databases"]␠("relname") -pg_description_all_databases_ind CREATE␠INDEX␠"pg_description_all_databases_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s608␠AS␠"mz_internal"."pg_description_all_databases"]␠("objoid",␠"classoid",␠"objsubid",␠"description",␠"oid_database_name",␠"class_database_name") -pg_namespace_all_databases_ind CREATE␠INDEX␠"pg_namespace_all_databases_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s596␠AS␠"mz_internal"."pg_namespace_all_databases"]␠("nspname") -pg_type_all_databases_ind CREATE␠INDEX␠"pg_type_all_databases_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s605␠AS␠"mz_internal"."pg_type_all_databases"]␠("oid") +mz_schemas_ind CREATE␠INDEX␠"mz_schemas_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s472␠AS␠"mz_catalog"."mz_schemas"]␠("database_id") +mz_secrets_ind CREATE␠INDEX␠"mz_secrets_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s505␠AS␠"mz_catalog"."mz_secrets"]␠("name") +mz_show_all_objects_ind CREATE␠INDEX␠"mz_show_all_objects_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s584␠AS␠"mz_internal"."mz_show_all_objects"]␠("schema_id") +mz_show_cluster_replicas_ind CREATE␠INDEX␠"mz_show_cluster_replicas_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s738␠AS␠"mz_internal"."mz_show_cluster_replicas"]␠("cluster") +mz_show_clusters_ind CREATE␠INDEX␠"mz_show_clusters_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s586␠AS␠"mz_internal"."mz_show_clusters"]␠("name") +mz_show_columns_ind CREATE␠INDEX␠"mz_show_columns_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s585␠AS␠"mz_internal"."mz_show_columns"]␠("id") +mz_show_connections_ind CREATE␠INDEX␠"mz_show_connections_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s594␠AS␠"mz_internal"."mz_show_connections"]␠("schema_id") +mz_show_databases_ind CREATE␠INDEX␠"mz_show_databases_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s588␠AS␠"mz_internal"."mz_show_databases"]␠("name") +mz_show_indexes_ind CREATE␠INDEX␠"mz_show_indexes_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s598␠AS␠"mz_internal"."mz_show_indexes"]␠("schema_id") +mz_show_materialized_views_ind CREATE␠INDEX␠"mz_show_materialized_views_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s597␠AS␠"mz_internal"."mz_show_materialized_views"]␠("schema_id") +mz_show_roles_ind CREATE␠INDEX␠"mz_show_roles_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s593␠AS␠"mz_internal"."mz_show_roles"]␠("name") +mz_show_schemas_ind CREATE␠INDEX␠"mz_show_schemas_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s589␠AS␠"mz_internal"."mz_show_schemas"]␠("database_id") +mz_show_secrets_ind CREATE␠INDEX␠"mz_show_secrets_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s587␠AS␠"mz_internal"."mz_show_secrets"]␠("schema_id") +mz_show_sinks_ind CREATE␠INDEX␠"mz_show_sinks_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s596␠AS␠"mz_internal"."mz_show_sinks"]␠("schema_id") +mz_show_sources_ind CREATE␠INDEX␠"mz_show_sources_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s595␠AS␠"mz_internal"."mz_show_sources"]␠("schema_id") +mz_show_tables_ind CREATE␠INDEX␠"mz_show_tables_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s590␠AS␠"mz_internal"."mz_show_tables"]␠("schema_id") +mz_show_types_ind CREATE␠INDEX␠"mz_show_types_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s592␠AS␠"mz_internal"."mz_show_types"]␠("schema_id") +mz_show_views_ind CREATE␠INDEX␠"mz_show_views_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s591␠AS␠"mz_internal"."mz_show_views"]␠("schema_id") +mz_sink_statistics_ind CREATE␠INDEX␠"mz_sink_statistics_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s712␠AS␠"mz_internal"."mz_sink_statistics"]␠("id",␠"replica_id") +mz_sink_status_history_ind CREATE␠INDEX␠"mz_sink_status_history_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s684␠AS␠"mz_internal"."mz_sink_status_history"]␠("sink_id") +mz_sink_statuses_ind CREATE␠INDEX␠"mz_sink_statuses_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s685␠AS␠"mz_internal"."mz_sink_statuses"]␠("id") +mz_sinks_ind CREATE␠INDEX␠"mz_sinks_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s484␠AS␠"mz_catalog"."mz_sinks"]␠("id") +mz_source_statistics_ind CREATE␠INDEX␠"mz_source_statistics_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s710␠AS␠"mz_internal"."mz_source_statistics"]␠("id",␠"replica_id") +mz_source_statistics_with_history_ind CREATE␠INDEX␠"mz_source_statistics_with_history_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s708␠AS␠"mz_internal"."mz_source_statistics_with_history"]␠("id",␠"replica_id") +mz_source_status_history_ind CREATE␠INDEX␠"mz_source_status_history_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s686␠AS␠"mz_internal"."mz_source_status_history"]␠("source_id") +mz_source_statuses_ind CREATE␠INDEX␠"mz_source_statuses_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s703␠AS␠"mz_internal"."mz_source_statuses"]␠("id") +mz_sources_ind CREATE␠INDEX␠"mz_sources_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s477␠AS␠"mz_catalog"."mz_sources"]␠("id") +mz_tables_ind CREATE␠INDEX␠"mz_tables_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s476␠AS␠"mz_catalog"."mz_tables"]␠("schema_id") +mz_types_ind CREATE␠INDEX␠"mz_types_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s488␠AS␠"mz_catalog"."mz_types"]␠("schema_id") +mz_views_ind CREATE␠INDEX␠"mz_views_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s485␠AS␠"mz_catalog"."mz_views"]␠("schema_id") +mz_wallclock_global_lag_recent_history_ind CREATE␠INDEX␠"mz_wallclock_global_lag_recent_history_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s719␠AS␠"mz_internal"."mz_wallclock_global_lag_recent_history"]␠("object_id") +mz_webhook_sources_ind CREATE␠INDEX␠"mz_webhook_sources_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s526␠AS␠"mz_internal"."mz_webhook_sources"]␠("id") +pg_attrdef_all_databases_ind CREATE␠INDEX␠"pg_attrdef_all_databases_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s626␠AS␠"mz_internal"."pg_attrdef_all_databases"]␠("oid",␠"adrelid",␠"adnum",␠"adbin",␠"adsrc") +pg_attribute_all_databases_ind CREATE␠INDEX␠"pg_attribute_all_databases_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s619␠AS␠"mz_internal"."pg_attribute_all_databases"]␠("attrelid",␠"attname",␠"atttypid",␠"attlen",␠"attnum",␠"atttypmod",␠"attnotnull",␠"atthasdef",␠"attidentity",␠"attgenerated",␠"attisdropped",␠"attcollation",␠"database_name",␠"pg_type_database_name") +pg_class_all_databases_ind CREATE␠INDEX␠"pg_class_all_databases_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s607␠AS␠"mz_internal"."pg_class_all_databases"]␠("relname") +pg_description_all_databases_ind CREATE␠INDEX␠"pg_description_all_databases_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s616␠AS␠"mz_internal"."pg_description_all_databases"]␠("objoid",␠"classoid",␠"objsubid",␠"description",␠"oid_database_name",␠"class_database_name") +pg_namespace_all_databases_ind CREATE␠INDEX␠"pg_namespace_all_databases_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s604␠AS␠"mz_internal"."pg_namespace_all_databases"]␠("nspname") +pg_type_all_databases_ind CREATE␠INDEX␠"pg_type_all_databases_ind"␠IN␠CLUSTER␠[s2]␠ON␠[s613␠AS␠"mz_internal"."pg_type_all_databases"]␠("oid") # Record all transitive dependencies (tables, sources, views, mvs) of indexes on # the mz_catalog_server cluster. diff --git a/test/sqllogictest/pg_get_viewdef.slt b/test/sqllogictest/pg_get_viewdef.slt index 37cbb1e4936b9..dfe232f40e1c8 100644 --- a/test/sqllogictest/pg_get_viewdef.slt +++ b/test/sqllogictest/pg_get_viewdef.slt @@ -33,7 +33,7 @@ NULL query T SELECT pg_get_viewdef('t_view') ---- -SELECT "t"."a", "b" FROM [u1 AS "materialize"."public"."t"]; +SELECT "t"."a", "b" FROM [u2 AS "materialize"."public"."t"]; # Test pg_get_viewdef(view_oid) @@ -45,7 +45,7 @@ NULL query T SELECT pg_get_viewdef('t_view'::regclass::oid) ---- -SELECT "t"."a", "b" FROM [u1 AS "materialize"."public"."t"]; +SELECT "t"."a", "b" FROM [u2 AS "materialize"."public"."t"]; # Test pg_get_viewdef(view_name, pretty) @@ -62,12 +62,12 @@ NULL query T SELECT pg_get_viewdef('t_view', true) ---- -SELECT "t"."a", "b" FROM [u1 AS "materialize"."public"."t"]; +SELECT "t"."a", "b" FROM [u2 AS "materialize"."public"."t"]; query T SELECT pg_get_viewdef('t_view', false) ---- -SELECT "t"."a", "b" FROM [u1 AS "materialize"."public"."t"]; +SELECT "t"."a", "b" FROM [u2 AS "materialize"."public"."t"]; # Test pg_get_viewdef(view_oid, pretty) @@ -84,12 +84,12 @@ NULL query T SELECT pg_get_viewdef('t_view'::regclass::oid, true) ---- -SELECT "t"."a", "b" FROM [u1 AS "materialize"."public"."t"]; +SELECT "t"."a", "b" FROM [u2 AS "materialize"."public"."t"]; query T SELECT pg_get_viewdef('t_view'::regclass::oid, false) ---- -SELECT "t"."a", "b" FROM [u1 AS "materialize"."public"."t"]; +SELECT "t"."a", "b" FROM [u2 AS "materialize"."public"."t"]; # Test pg_get_viewdef(view_oid, wrap_column) @@ -101,7 +101,7 @@ NULL query T SELECT pg_get_viewdef('t_view'::regclass::oid, 80) ---- -SELECT "t"."a", "b" FROM [u1 AS "materialize"."public"."t"]; +SELECT "t"."a", "b" FROM [u2 AS "materialize"."public"."t"]; # Test retrieving view definition after table rename @@ -111,4 +111,4 @@ ALTER TABLE t RENAME TO t2 query T SELECT pg_get_viewdef('t_view'::regclass::oid) ---- -SELECT "t2"."a", "b" FROM [u1 AS "materialize"."public"."t2"]; +SELECT "t2"."a", "b" FROM [u2 AS "materialize"."public"."t2"]; diff --git a/test/sqllogictest/pretty.slt b/test/sqllogictest/pretty.slt index 9bf9641087991..ebc5128dd9bbc 100644 --- a/test/sqllogictest/pretty.slt +++ b/test/sqllogictest/pretty.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 diff --git a/test/sqllogictest/redacted.slt b/test/sqllogictest/redacted.slt index fec646a625454..8084196297419 100644 --- a/test/sqllogictest/redacted.slt +++ b/test/sqllogictest/redacted.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 = '') +CREATE TABLE materialize.public.redactable_t (a [s28 AS pg_catalog.int4]) WITH (RETAIN HISTORY = FOR '2s', 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 = ''); +CREATE TABLE materialize.public.redactable_t (a [s28 AS pg_catalog.int4]) WITH (RETAIN HISTORY = FOR '2s', REDACTED = ''); EOF query T multiline @@ -95,7 +95,7 @@ CREATE INDEX t_idx_i ON t (i) query T multiline SELECT redacted_create_sql FROM mz_indexes WHERE name = 't_idx_i' ---- -CREATE INDEX t_idx_i IN CLUSTER [u1] ON [u1 AS materialize.public.t] (i) +CREATE INDEX t_idx_i IN CLUSTER [u1] ON [u2 AS materialize.public.t] (i) 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 @@ -175,7 +175,7 @@ SELECT i+i+5 FROM t; query T multiline SELECT regexp_replace(redacted_create_sql, 'AS OF [0-9]+', 'AS OF xxxxxxx', 'g') FROM mz_materialized_views WHERE name = 'mv1' ---- -CREATE MATERIALIZED VIEW materialize.public.mv1 IN CLUSTER [u1] WITH (REFRESH = ON COMMIT) AS SELECT i + i + '' FROM [u1 AS materialize.public.t] AS OF xxxxxxx +CREATE MATERIALIZED VIEW materialize.public.mv1 IN CLUSTER [u1] WITH (REFRESH = ON COMMIT) AS SELECT i + i + '' FROM [u2 AS materialize.public.t] AS OF xxxxxxx EOF query T multiline @@ -193,7 +193,7 @@ SELECT pretty_sql(redacted_create_sql) FROM mz_materialized_views WHERE name = ' CREATE MATERIALIZED VIEW materialize.public.mv1 IN CLUSTER [u1] WITH (REFRESH = ON COMMIT) - AS SELECT i + i + '' FROM [u1 AS materialize.public.t]; + AS SELECT i + i + '' FROM [u2 AS materialize.public.t]; EOF query T multiline diff --git a/test/sqllogictest/secret.slt b/test/sqllogictest/secret.slt index c21c48e3ebf95..392eb20806271 100644 --- a/test/sqllogictest/secret.slt +++ b/test/sqllogictest/secret.slt @@ -33,8 +33,8 @@ CREATE SECRET key AS decode('c2VjcmV0Cg==', 'base64'); query TTT rowsort SELECT id, schema_id, name FROM mz_secrets ---- -u1 u3 secret -u4 u3 key +u2 u3 secret +u5 u3 key query TT rowsort SHOW SECRETS diff --git a/test/sqllogictest/singlereplica_audit_log.slt b/test/sqllogictest/singlereplica_audit_log.slt index 3eea6faf331da..a5cfa80d747fb 100644 --- a/test/sqllogictest/singlereplica_audit_log.slt +++ b/test/sqllogictest/singlereplica_audit_log.slt @@ -167,36 +167,36 @@ SELECT id, event_type, object_type, details, user FROM mz_audit_events ORDER BY 28 create role {"id":"u2","name":"foo"} materialize 29 drop role {"id":"u2","name":"foo"} materialize 30 create cluster {"id":"u2","name":"foo"} materialize -31 create cluster-replica {"billed_as":null,"cluster_id":"u2","cluster_name":"foo","internal":false,"logical_size":"scale=1,workers=1","reason":"manual","replica_id":"u2","replica_name":"r"} materialize -32 create materialized-view {"cluster_id":"u1","database":"materialize","id":"u1","item":"v2","schema":"public"} materialize -33 create view {"database":"materialize","id":"u2","item":"unmat","schema":"public"} materialize -34 create table {"database":"materialize","id":"u3","item":"t","schema":"public"} materialize -35 create index {"cluster_id":"u1","database":"materialize","id":"u4","item":"t_primary_idx","schema":"public"} materialize -36 alter view {"id":"u2","new_name":{"database":"materialize","item":"renamed","schema":"public"},"old_name":{"database":"materialize","item":"unmat","schema":"public"}} materialize -37 drop materialized-view {"database":"materialize","id":"u1","item":"v2","schema":"public"} materialize -38 create materialized-view {"cluster_id":"u1","database":"materialize","id":"u5","item":"v2","schema":"public"} materialize -39 create index {"cluster_id":"u1","database":"materialize","id":"u6","item":"renamed_primary_idx","schema":"public"} materialize -40 drop index {"database":"materialize","id":"u6","item":"renamed_primary_idx","schema":"public"} materialize -41 drop view {"database":"materialize","id":"u2","item":"renamed","schema":"public"} materialize -42 create source {"cluster_id":"u1","database":"materialize","id":"u7","item":"s","schema":"public","type":"load-generator"} materialize -43 drop source {"database":"materialize","id":"u7","item":"s","schema":"public"} materialize -44 create source {"cluster_id":"u1","database":"materialize","id":"u8","item":"multiplex","schema":"public","type":"load-generator"} materialize -45 create table {"database":"materialize","id":"u9","item":"accounts","schema":"public"} materialize -46 create table {"database":"materialize","id":"u10","item":"auctions","schema":"public"} materialize -47 create table {"database":"materialize","id":"u11","item":"bids","schema":"public"} materialize -48 create table {"database":"materialize","id":"u12","item":"organizations","schema":"public"} materialize -49 create table {"database":"materialize","id":"u13","item":"users","schema":"public"} materialize -50 alter cluster-replica {"cluster_id":"u2","new_name":"s","old_name":"r","replica_id":"u2"} materialize +31 create cluster-replica {"billed_as":null,"cluster_id":"u2","cluster_name":"foo","internal":false,"logical_size":"scale=1,workers=1","reason":"manual","replica_id":"u3","replica_name":"r"} materialize +32 create materialized-view {"cluster_id":"u1","database":"materialize","id":"u4","item":"v2","schema":"public"} materialize +33 create view {"database":"materialize","id":"u5","item":"unmat","schema":"public"} materialize +34 create table {"database":"materialize","id":"u6","item":"t","schema":"public"} materialize +35 create index {"cluster_id":"u1","database":"materialize","id":"u7","item":"t_primary_idx","schema":"public"} materialize +36 alter view {"id":"u5","new_name":{"database":"materialize","item":"renamed","schema":"public"},"old_name":{"database":"materialize","item":"unmat","schema":"public"}} materialize +37 drop materialized-view {"database":"materialize","id":"u4","item":"v2","schema":"public"} materialize +38 create materialized-view {"cluster_id":"u1","database":"materialize","id":"u8","item":"v2","schema":"public"} materialize +39 create index {"cluster_id":"u1","database":"materialize","id":"u9","item":"renamed_primary_idx","schema":"public"} materialize +40 drop index {"database":"materialize","id":"u9","item":"renamed_primary_idx","schema":"public"} materialize +41 drop view {"database":"materialize","id":"u5","item":"renamed","schema":"public"} materialize +42 create source {"cluster_id":"u1","database":"materialize","id":"u10","item":"s","schema":"public","type":"load-generator"} materialize +43 drop source {"database":"materialize","id":"u10","item":"s","schema":"public"} materialize +44 create source {"cluster_id":"u1","database":"materialize","id":"u11","item":"multiplex","schema":"public","type":"load-generator"} materialize +45 create table {"database":"materialize","id":"u12","item":"accounts","schema":"public"} materialize +46 create table {"database":"materialize","id":"u13","item":"auctions","schema":"public"} materialize +47 create table {"database":"materialize","id":"u14","item":"bids","schema":"public"} materialize +48 create table {"database":"materialize","id":"u15","item":"organizations","schema":"public"} materialize +49 create table {"database":"materialize","id":"u16","item":"users","schema":"public"} materialize +50 alter cluster-replica {"cluster_id":"u2","new_name":"s","old_name":"r","replica_id":"u3"} materialize 51 comment cluster {"id":"Cluster(User(2))","name":"foo"} materialize 52 comment cluster {"id":"Cluster(User(2))","name":"foo"} materialize 53 alter cluster {"id":"u2","new_name":"bar","old_name":"foo"} materialize -54 drop cluster-replica {"cluster_id":"u2","cluster_name":"bar","reason":"manual","replica_id":"u2","replica_name":"s"} materialize +54 drop cluster-replica {"cluster_id":"u2","cluster_name":"bar","reason":"manual","replica_id":"u3","replica_name":"s"} materialize 55 drop cluster {"id":"u2","name":"bar"} materialize -56 alter materialized-view {"id":"u5","new_history":"'5m'","old_history":null} materialize -57 alter materialized-view {"id":"u5","new_history":null,"old_history":"FOR␠'5m'"} materialize -58 comment materialized-view {"id":"MaterializedView(User(5))","name":"materialize.public.v2"} materialize -59 create connection {"database":"materialize","id":"u14","item":"conn","schema":"public"} materialize -60 alter connection {"database":"materialize","id":"u14","item":"conn","schema":"public"} materialize +56 alter materialized-view {"id":"u8","new_history":"'5m'","old_history":null} materialize +57 alter materialized-view {"id":"u8","new_history":null,"old_history":"FOR␠'5m'"} materialize +58 comment materialized-view {"id":"MaterializedView(User(8))","name":"materialize.public.v2"} materialize +59 create connection {"database":"materialize","id":"u17","item":"conn","schema":"public"} materialize +60 alter connection {"database":"materialize","id":"u17","item":"conn","schema":"public"} materialize 61 alter system {"name":"max_aws_privatelink_connections","value":"10"} mz_system 62 alter system {"name":"max_aws_privatelink_connections","value":null} mz_system 63 alter system null mz_system @@ -212,7 +212,7 @@ CREATE TABLE tt () query ITTTTT SELECT id, event_type, object_type, details, user, occurred_at FROM mz_audit_events ORDER BY id DESC LIMIT 1 ---- -65 create table {"database":"materialize","id":"u15","item":"tt","schema":"public"} materialize 1970-01-01␠00:00:00.666+00 +65 create table {"database":"materialize","id":"u18","item":"tt","schema":"public"} materialize 1970-01-01␠00:00:00.666+00 simple conn=mz_system,user=mz_system ALTER SYSTEM RESET unsafe_mock_audit_event_timestamp @@ -231,7 +231,7 @@ query TTTTBBBT SELECT replica_id, cluster_name, replica_name, size, created_at IS NOT NULL, dropped_at IS NOT NULL, created_at < dropped_at, credits_per_hour FROM mz_internal.mz_cluster_replica_history ORDER BY created_at ---- u1 quickstart r1 scale=1,workers=2 true false NULL 1 -u2 foo r scale=1,workers=1 true true true 1 +u3 foo r scale=1,workers=1 true true true 1 simple conn=mz_system,user=mz_system CREATE ROLE r1; @@ -246,7 +246,7 @@ COMPLETE 0 query ITTTT SELECT id, event_type, object_type, details, user FROM mz_audit_events ORDER BY id DESC LIMIT 1 ---- -69 grant table {"grantee_id":"u3","grantor_id":"u1","object_id":"Iu3","privileges":"r"} mz_system +69 grant table {"grantee_id":"u3","grantor_id":"u1","object_id":"Iu6","privileges":"r"} mz_system simple conn=mz_system,user=mz_system REVOKE SELECT ON t FROM r1; @@ -256,7 +256,7 @@ COMPLETE 0 query ITTTT SELECT id, event_type, object_type, details, user FROM mz_audit_events ORDER BY id DESC LIMIT 1 ---- -70 revoke table {"grantee_id":"u3","grantor_id":"u1","object_id":"Iu3","privileges":"r"} mz_system +70 revoke table {"grantee_id":"u3","grantor_id":"u1","object_id":"Iu6","privileges":"r"} mz_system simple conn=mz_system,user=mz_system ALTER DEFAULT PRIVILEGES FOR ROLE r1 IN SCHEMA public GRANT SELECT ON TABLES to PUBLIC; @@ -289,7 +289,7 @@ COMPLETE 0 query ITTTT SELECT id, event_type, object_type, details, user FROM mz_audit_events ORDER BY id DESC LIMIT 1 ---- -74 alter table {"new_owner_id":"u3","object_id":"Iu16","old_owner_id":"u1"} mz_system +74 alter table {"new_owner_id":"u3","object_id":"Iu19","old_owner_id":"u1"} mz_system # Test events for auto-created users, which have the username only in the event details, but not the user column. simple conn=c,user=new_user diff --git a/test/sqllogictest/source_sizing.slt b/test/sqllogictest/source_sizing.slt index 590862915e0af..b96047862660a 100644 --- a/test/sqllogictest/source_sizing.slt +++ b/test/sqllogictest/source_sizing.slt @@ -21,8 +21,8 @@ CREATE SOURCE s2 FROM LOAD GENERATOR COUNTER; query TTTTTT rowsort SELECT id, schema_id, name, type, connection_id, size FROM mz_sources WHERE id LIKE 'u%' ---- -u1 u3 s1 load-generator NULL NULL -u2 u3 s2 load-generator NULL NULL +u2 u3 s1 load-generator NULL NULL +u3 u3 s2 load-generator NULL NULL # clusters. query TTTT diff --git a/test/sqllogictest/system-cluster.slt b/test/sqllogictest/system-cluster.slt index 9f7154ecaddf7..8614efff31df4 100644 --- a/test/sqllogictest/system-cluster.slt +++ b/test/sqllogictest/system-cluster.slt @@ -208,7 +208,7 @@ EXPLAIN OPTIMIZED PLAN WITH (humanized expressions) AS VERBOSE TEXT FOR SHOW COL ---- Explained Query (fast path): Project (#1{name}..=#3{type}, #5{comment}) - ReadIndex on=mz_internal.mz_show_columns mz_show_columns_ind=[lookup value=("u1")] + ReadIndex on=mz_internal.mz_show_columns mz_show_columns_ind=[lookup value=("u2")] Used Indexes: - mz_internal.mz_show_columns_ind (lookup) diff --git a/test/sqllogictest/transactions.slt b/test/sqllogictest/transactions.slt index e6171e331aaec..eb2053a6675db 100644 --- a/test/sqllogictest/transactions.slt +++ b/test/sqllogictest/transactions.slt @@ -189,7 +189,7 @@ COMPLETE 0 simple COMMIT ---- -db error: ERROR: unknown catalog item 'u1' +db error: ERROR: unknown catalog item 'u2' # Verify SUBSCRIBE must be only read statement in a transaction. # We use FETCH 0 with SUBSCRIBE below so that we don't need to worry about @@ -432,7 +432,7 @@ COMPLETE 0 simple conn=t1 COMMIT; ---- -db error: ERROR: unknown catalog item 'u8' +db error: ERROR: unknown catalog item 'u9' # Test transaction syntax that we don't support. @@ -1273,8 +1273,8 @@ SELECT * FROM blue_mv1; query TT SELECT name, id FROM mz_clusters WHERE id LIKE 'u%' AND name != 'quickstart' ORDER BY name; ---- -blue_compute u3 -c u2 +blue_compute u11 +c u6 statement ok BEGIN; diff --git a/test/sqllogictest/vars.slt b/test/sqllogictest/vars.slt index e8e83521a5e89..22f21f73e7c3e 100644 --- a/test/sqllogictest/vars.slt +++ b/test/sqllogictest/vars.slt @@ -245,7 +245,7 @@ COMPLETE 0 simple conn=1 COMMIT; ---- -db error: ERROR: unknown catalog item 'u1' +db error: ERROR: unknown catalog item 'u2' simple conn=1 SHOW extra_float_digits diff --git a/test/sqllogictest/web-console.slt b/test/sqllogictest/web-console.slt index cb90ffc5f3f89..eedc8af00e871 100644 --- a/test/sqllogictest/web-console.slt +++ b/test/sqllogictest/web-console.slt @@ -104,7 +104,7 @@ DROP MATERIALIZED VIEW temp_view; query TTTTT SELECT id, cluster_id, object_type, created_at, dropped_at FROM mz_internal.mz_object_history WHERE id LIKE 'u%'; ---- -u1 u1 materialized-view 1970-01-01␠00:00:00.666+00 1970-01-01␠00:00:00.666+00 +u2 u1 materialized-view 1970-01-01␠00:00:00.666+00 1970-01-01␠00:00:00.666+00 # ---- mz_cluster_replica_name_history diff --git a/test/sqllogictest/webhook.slt b/test/sqllogictest/webhook.slt index 79d60d18f427b..0e5ed847141a7 100644 --- a/test/sqllogictest/webhook.slt +++ b/test/sqllogictest/webhook.slt @@ -49,7 +49,7 @@ DROP SOURCE "weird-name-(]%/'" query TT SELECT id, regexp_match(url, '(/api/webhook/.*)') FROM mz_internal.mz_webhook_sources ---- -u1 {/api/webhook/materialize/public/webhook_bytes} +u4 {/api/webhook/materialize/public/webhook_bytes} statement ok CREATE SOURCE webhook_bytes_include_headers IN CLUSTER webhook_cluster FROM WEBHOOK