fix: fix system acl column type to support \l command (#19379)

risingwavelabs · Nov 14, 2024 · c1435dd · c1435dd
1 parent fa99969
commit c1435dd
Show file tree

Hide file tree

Showing 20 changed files with 48 additions and 36 deletions.
diff --git a/e2e_test/batch/catalog/slash_l_database.slt.part b/e2e_test/batch/catalog/slash_l_database.slt.part
@@ -0,0 +1,17 @@
+# wrapped test of `\l` command for better consistency.
+query T
+SELECT count(*) > 0
+FROM
+(SELECT
+  d.datname                                               AS "Name",
+  pg_catalog.pg_get_userbyid (d.datdba)                   AS "Owner",
+  pg_catalog.pg_encoding_to_char (d.encoding)             AS "Encoding",
+  d.datcollate                                            AS "Collate",
+  d.datctype                                              AS "Ctype",
+  pg_catalog.array_to_string (d.datacl, E'\n') AS "Access privileges"
+FROM
+  pg_catalog.pg_database AS d
+ORDER BY
+  1);
+----
+t
diff --git a/src/frontend/src/catalog/system_catalog/mod.rs b/src/frontend/src/catalog/system_catalog/mod.rs
@@ -237,9 +237,8 @@ fn get_acl_items(
     for_dml_table: bool,
     users: &Vec<UserCatalog>,
     username_map: &HashMap<UserId, String>,
-) -> String {
-    let mut res = String::from("{");
-    let mut empty_flag = true;
+) -> Vec<String> {
+    let mut res = vec![];
     let super_privilege = available_prost_privilege(*object, for_dml_table);
     for user in users {
         let privileges = if user.is_super {
@@ -263,25 +262,21 @@ fn get_acl_items(
             })
         });
         for (granted_by, actions) in grantor_map {
-            if empty_flag {
-                empty_flag = false;
-            } else {
-                res.push(',');
-            }
-            res.push_str(&user.name);
-            res.push('=');
+            let mut aclitem = String::new();
+            aclitem.push_str(&user.name);
+            aclitem.push('=');
             for (action, option) in actions {
-                res.push_str(&AclMode::from(action).to_string());
+                aclitem.push_str(&AclMode::from(action).to_string());
                 if option {
-                    res.push('*');
+                    aclitem.push('*');
                 }
             }
-            res.push('/');
+            aclitem.push('/');
             // should be able to query grantor's name
-            res.push_str(username_map.get(&granted_by).unwrap());
+            aclitem.push_str(username_map.get(&granted_by).unwrap());
+            res.push(aclitem);
         }
     }
-    res.push('}');
     res
 }
 

diff --git a/src/frontend/src/catalog/system_catalog/pg_catalog/pg_database.rs b/src/frontend/src/catalog/system_catalog/pg_catalog/pg_database.rs
@@ -58,5 +58,5 @@ struct PgDatabase {
     datallowconn: bool,
     datconnlimit: i32,
     dattablespace: i32,
-    datacl: String,
+    datacl: Vec<String>,
 }
diff --git a/src/frontend/src/catalog/system_catalog/pg_catalog/pg_namespace.rs b/src/frontend/src/catalog/system_catalog/pg_catalog/pg_namespace.rs
@@ -28,5 +28,5 @@ struct PgNamespace {
     oid: i32,
     nspname: String,
     nspowner: i32,
-    nspacl: String,
+    nspacl: Vec<String>,
 }
diff --git a/src/frontend/src/catalog/system_catalog/pg_catalog/pg_tablespace.rs b/src/frontend/src/catalog/system_catalog/pg_catalog/pg_tablespace.rs
@@ -24,6 +24,6 @@ struct PgTablespace {
     oid: i32,
     spcname: String,
     spcowner: i32,
-    spcacl: String,
+    spcacl: Vec<String>,
     spcoptions: String,
 }
diff --git a/src/frontend/src/catalog/system_catalog/rw_catalog/rw_connections.rs b/src/frontend/src/catalog/system_catalog/rw_catalog/rw_connections.rs
@@ -27,7 +27,7 @@ struct RwConnection {
     owner: i32,
     type_: String,
     provider: String,
-    acl: String,
+    acl: Vec<String>,
 }
 
 #[system_catalog(table, "rw_catalog.rw_connections")]
@@ -44,7 +44,7 @@ fn read_rw_connections(reader: &SysCatalogReaderImpl) -> Result<Vec<RwConnection
                 owner: conn.owner as i32,
                 type_: conn.connection_type().into(),
                 provider: conn.provider().into(),
-                acl: "".into(),
+                acl: vec![],
             })
         })
         .collect())

diff --git a/src/frontend/src/catalog/system_catalog/rw_catalog/rw_databases.rs b/src/frontend/src/catalog/system_catalog/rw_catalog/rw_databases.rs
@@ -26,7 +26,7 @@ struct RwDatabases {
     id: i32,
     name: String,
     owner: i32,
-    acl: String,
+    acl: Vec<String>,
 }
 
 #[system_catalog(table, "rw_catalog.rw_databases")]

diff --git a/src/frontend/src/catalog/system_catalog/rw_catalog/rw_functions.rs b/src/frontend/src/catalog/system_catalog/rw_catalog/rw_functions.rs
@@ -31,7 +31,7 @@ struct RwFunction {
     return_type_id: i32,
     language: String,
     link: Option<String>,
-    acl: String,
+    acl: Vec<String>,
     always_retry_on_network_error: bool,
 }
 

diff --git a/src/frontend/src/catalog/system_catalog/rw_catalog/rw_indexes.rs b/src/frontend/src/catalog/system_catalog/rw_catalog/rw_indexes.rs
@@ -29,7 +29,7 @@ struct RwIndex {
     schema_id: i32,
     owner: i32,
     definition: String,
-    acl: String,
+    acl: Vec<String>,
     initialized_at: Option<Timestamptz>,
     created_at: Option<Timestamptz>,
     initialized_at_cluster_version: Option<String>,
@@ -76,7 +76,7 @@ fn read_rw_indexes(reader: &SysCatalogReaderImpl) -> Result<Vec<RwIndex>> {
                 schema_id: schema.id() as i32,
                 owner: index.index_table.owner as i32,
                 definition: index.index_table.create_sql(),
-                acl: "".into(),
+                acl: vec![],
                 initialized_at: index.initialized_at_epoch.map(|e| e.as_timestamptz()),
                 created_at: index.created_at_epoch.map(|e| e.as_timestamptz()),
                 initialized_at_cluster_version: index.initialized_at_cluster_version.clone(),

diff --git a/src/frontend/src/catalog/system_catalog/rw_catalog/rw_internal_tables.rs b/src/frontend/src/catalog/system_catalog/rw_catalog/rw_internal_tables.rs
@@ -27,7 +27,7 @@ struct RwInternalTable {
     schema_id: i32,
     owner: i32,
     definition: String,
-    acl: String,
+    acl: Vec<String>,
     initialized_at: Option<Timestamptz>,
     created_at: Option<Timestamptz>,
     initialized_at_cluster_version: Option<String>,

diff --git a/src/frontend/src/catalog/system_catalog/rw_catalog/rw_materialized_views.rs b/src/frontend/src/catalog/system_catalog/rw_catalog/rw_materialized_views.rs
@@ -29,7 +29,7 @@ struct RwMaterializedView {
     owner: i32,
     definition: String,
     append_only: bool,
-    acl: String,
+    acl: Vec<String>,
     initialized_at: Option<Timestamptz>,
     created_at: Option<Timestamptz>,
     initialized_at_cluster_version: Option<String>,

diff --git a/src/frontend/src/catalog/system_catalog/rw_catalog/rw_relations.rs b/src/frontend/src/catalog/system_catalog/rw_catalog/rw_relations.rs
@@ -37,5 +37,5 @@ struct RwRelation {
     schema_id: i32,
     owner: i32,
     definition: String,
-    acl: String,
+    acl: Vec<String>,
 }
diff --git a/src/frontend/src/catalog/system_catalog/rw_catalog/rw_schemas.rs b/src/frontend/src/catalog/system_catalog/rw_catalog/rw_schemas.rs
@@ -26,7 +26,7 @@ struct RwSchema {
     id: i32,
     name: String,
     owner: i32,
-    acl: String,
+    acl: Vec<String>,
 }
 
 #[system_catalog(table, "rw_catalog.rw_schemas")]

diff --git a/src/frontend/src/catalog/system_catalog/rw_catalog/rw_secrets.rs b/src/frontend/src/catalog/system_catalog/rw_catalog/rw_secrets.rs
@@ -24,7 +24,7 @@ struct RwSecret {
     id: i32,
     name: String,
     owner: i32,
-    acl: String,
+    acl: Vec<String>,
 }
 
 #[system_catalog(table, "rw_catalog.rw_secrets")]
@@ -38,7 +38,7 @@ fn read_rw_view_info(reader: &SysCatalogReaderImpl) -> Result<Vec<RwSecret>> {
                 id: secret.id.secret_id() as i32,
                 name: secret.name.clone(),
                 owner: secret.owner as i32,
-                acl: "".into(),
+                acl: vec![],
             })
         })
         .collect())

diff --git a/src/frontend/src/catalog/system_catalog/rw_catalog/rw_sinks.rs b/src/frontend/src/catalog/system_catalog/rw_catalog/rw_sinks.rs
@@ -31,7 +31,7 @@ struct RwSink {
     sink_type: String,
     connection_id: Option<i32>,
     definition: String,
-    acl: String,
+    acl: Vec<String>,
     initialized_at: Option<Timestamptz>,
     created_at: Option<Timestamptz>,
     initialized_at_cluster_version: Option<String>,

diff --git a/src/frontend/src/catalog/system_catalog/rw_catalog/rw_sources.rs b/src/frontend/src/catalog/system_catalog/rw_catalog/rw_sources.rs
@@ -35,7 +35,7 @@ struct RwSource {
     associated_table_id: Option<i32>,
     connection_id: Option<i32>,
     definition: String,
-    acl: String,
+    acl: Vec<String>,
     initialized_at: Option<Timestamptz>,
     created_at: Option<Timestamptz>,
     initialized_at_cluster_version: Option<String>,

diff --git a/src/frontend/src/catalog/system_catalog/rw_catalog/rw_subscriptions.rs b/src/frontend/src/catalog/system_catalog/rw_catalog/rw_subscriptions.rs
@@ -27,7 +27,7 @@ struct RwSubscription {
     schema_id: i32,
     owner: i32,
     definition: String,
-    acl: String,
+    acl: Vec<String>,
     initialized_at: Option<Timestamptz>,
     created_at: Option<Timestamptz>,
     initialized_at_cluster_version: Option<String>,

diff --git a/src/frontend/src/catalog/system_catalog/rw_catalog/rw_system_tables.rs b/src/frontend/src/catalog/system_catalog/rw_catalog/rw_system_tables.rs
@@ -28,7 +28,7 @@ struct SystemTable {
     schema_id: i32,
     owner: i32,
     definition: Option<String>,
-    acl: String,
+    acl: Vec<String>,
 }
 
 #[system_catalog(table, "rw_catalog.rw_system_tables")]

diff --git a/src/frontend/src/catalog/system_catalog/rw_catalog/rw_tables.rs b/src/frontend/src/catalog/system_catalog/rw_catalog/rw_tables.rs
@@ -28,7 +28,7 @@ struct RwTable {
     owner: i32,
     definition: String,
     append_only: bool,
-    acl: String,
+    acl: Vec<String>,
     initialized_at: Option<Timestamptz>,
     created_at: Option<Timestamptz>,
     initialized_at_cluster_version: Option<String>,

diff --git a/src/frontend/src/catalog/system_catalog/rw_catalog/rw_views.rs b/src/frontend/src/catalog/system_catalog/rw_catalog/rw_views.rs
@@ -27,7 +27,7 @@ struct RwView {
     schema_id: i32,
     owner: i32,
     definition: String,
-    acl: String,
+    acl: Vec<String>,
 }
 
 #[system_catalog(table, "rw_catalog.rw_views")]