fix warehouse uid modify to id

Author: TCeason

src/meta/app/src/principal/ownership_object.rs

@@ -84,7 +84,7 @@ impl fmt::Display for OwnershipObject {
             }
             OwnershipObject::UDF { name } => write!(f, "UDF {name}"),
             OwnershipObject::Stage { name } => write!(f, "STAGE {name}"),
-            OwnershipObject::Warehouse { id: uid } => write!(f, "Warehouse {uid}"),
+            OwnershipObject::Warehouse { id } => write!(f, "Warehouse {id}"),
         }
     }
 }
@@ -124,7 +124,7 @@ impl KeyCodec for OwnershipObject {
             }
             OwnershipObject::Stage { name } => b.push_raw("stage-by-name").push_str(name),
             OwnershipObject::UDF { name } => b.push_raw("udf-by-name").push_str(name),
-            OwnershipObject::Warehouse { id: uid } => b.push_raw("warehouse-by-uid").push_str(uid),
+            OwnershipObject::Warehouse { id } => b.push_raw("warehouse-by-id").push_str(id),
         }
     }
 
@@ -171,13 +171,13 @@ impl KeyCodec for OwnershipObject {
                 let name = p.next_str()?;
                 Ok(OwnershipObject::UDF { name })
             }
-            "warehouse-by-uid" => {
-                let uid = p.next_str()?;
-                Ok(OwnershipObject::Warehouse { id: uid })
+            "warehouse-by-id" => {
+                let id = p.next_str()?;
+                Ok(OwnershipObject::Warehouse { id })
             }
             _ => Err(kvapi::KeyError::InvalidSegment {
                 i: p.index(),
-                expect: "database-by-id|database-by-catalog-id|table-by-id|table-by-catalog-id|stage-by-name|udf-by-name|warehouse-by-uid"
+                expect: "database-by-id|database-by-catalog-id|table-by-id|table-by-catalog-id|stage-by-name|udf-by-name|warehouse-by-id"
                     .to_string(),
                 got: q.to_string(),
             }),

src/meta/app/src/principal/tenant_ownership_object_ident.rs

@@ -265,7 +265,7 @@ mod tests {
             );
 
             let key = role_grantee.to_string_key();
-            assert_eq!("__fd_object_owners/test/warehouse-by-uid/n87s", key);
+            assert_eq!("__fd_object_owners/test/warehouse-by-id/n87s", key);
 
             let parsed = TenantOwnershipObjectIdent::from_str_key(&key).unwrap();
             assert_eq!(role_grantee, parsed);

src/meta/proto-conv/src/ownership_from_to_protobuf_impl.rs

@@ -89,8 +89,8 @@ impl FromToProto for mt::principal::OwnershipObject {
                 stage,
             }) => Ok(mt::principal::OwnershipObject::Stage { name: stage }),
             pb::ownership_object::Object::Warehouse(
-                pb::ownership_object::OwnershipWarehouseObject { uid },
-            ) => Ok(mt::principal::OwnershipObject::Warehouse { id: uid }),
+                pb::ownership_object::OwnershipWarehouseObject { id },
+            ) => Ok(mt::principal::OwnershipObject::Warehouse { id }),
         }
     }
 
@@ -126,9 +126,9 @@ impl FromToProto for mt::principal::OwnershipObject {
                     stage: name.clone(),
                 }),
             ),
-            mt::principal::OwnershipObject::Warehouse { id: uid } => {
+            mt::principal::OwnershipObject::Warehouse { id } => {
                 Some(pb::ownership_object::Object::Warehouse(
-                    pb::ownership_object::OwnershipWarehouseObject { uid: uid.clone() },
+                    pb::ownership_object::OwnershipWarehouseObject { id: id.clone() },
                 ))
             }
         };

src/meta/proto-conv/tests/it/main.rs

@@ -117,5 +117,4 @@ mod v116_marked_deleted_index_meta;
 mod v117_webhdfs_add_disable_list_batch;
 mod v118_webhdfs_add_user_name;
 mod v119_virtual_column;
-
 mod v120_warehouse_ownershipobject;

src/meta/proto-conv/tests/it/v120_warehouse_ownershipobject.rs

@@ -38,17 +38,17 @@ use crate::common;
 #[test]
 fn test_decode_v120_grant_object() -> anyhow::Result<()> {
     let role_info_v120 = vec![
-        10, 2, 114, 49, 18, 172, 1, 10, 21, 10, 8, 10, 0, 160, 6, 117, 168, 6, 24, 16, 128, 128,
-        128, 1, 160, 6, 117, 168, 6, 24, 10, 31, 10, 21, 18, 13, 10, 7, 100, 101, 102, 97, 117,
-        108, 116, 18, 2, 100, 98, 160, 6, 117, 168, 6, 24, 16, 2, 160, 6, 117, 168, 6, 24, 10, 35,
+        10, 2, 114, 49, 18, 172, 1, 10, 21, 10, 8, 10, 0, 160, 6, 120, 168, 6, 24, 16, 128, 128,
+        128, 1, 160, 6, 120, 168, 6, 24, 10, 31, 10, 21, 18, 13, 10, 7, 100, 101, 102, 97, 117,
+        108, 116, 18, 2, 100, 98, 160, 6, 120, 168, 6, 24, 16, 2, 160, 6, 120, 168, 6, 24, 10, 35,
         10, 25, 26, 17, 10, 7, 100, 101, 102, 97, 117, 108, 116, 18, 2, 100, 98, 26, 2, 116, 98,
-        160, 6, 117, 168, 6, 24, 16, 2, 160, 6, 117, 168, 6, 24, 10, 22, 10, 12, 34, 4, 10, 2, 102,
-        49, 160, 6, 117, 168, 6, 24, 16, 1, 160, 6, 117, 168, 6, 24, 10, 24, 10, 12, 42, 4, 10, 2,
-        115, 49, 160, 6, 117, 168, 6, 24, 16, 128, 128, 32, 160, 6, 117, 168, 6, 24, 10, 21, 10, 8,
-        10, 0, 160, 6, 117, 168, 6, 24, 16, 254, 255, 191, 1, 160, 6, 117, 168, 6, 24, 160, 6, 117,
+        160, 6, 120, 168, 6, 24, 16, 2, 160, 6, 120, 168, 6, 24, 10, 22, 10, 12, 34, 4, 10, 2, 102,
+        49, 160, 6, 120, 168, 6, 24, 16, 1, 160, 6, 120, 168, 6, 24, 10, 24, 10, 12, 42, 4, 10, 2,
+        115, 49, 160, 6, 120, 168, 6, 24, 16, 128, 128, 32, 160, 6, 120, 168, 6, 24, 10, 21, 10, 8,
+        10, 0, 160, 6, 120, 168, 6, 24, 16, 254, 255, 191, 1, 160, 6, 120, 168, 6, 24, 160, 6, 120,
         168, 6, 24, 26, 23, 49, 57, 55, 48, 45, 48, 49, 45, 48, 49, 32, 48, 48, 58, 48, 48, 58, 48,
         48, 32, 85, 84, 67, 34, 23, 49, 57, 55, 48, 45, 48, 49, 45, 48, 49, 32, 48, 48, 58, 48, 48,
-        58, 48, 48, 32, 85, 84, 67, 160, 6, 117, 168, 6, 24,
+        58, 48, 48, 32, 85, 84, 67, 160, 6, 120, 168, 6, 24,
     ];
     let want = || mt::principal::RoleInfo {
         name: "r1".to_string(),
@@ -91,7 +91,7 @@ fn test_decode_v120_grant_object() -> anyhow::Result<()> {
     };
 
     common::test_pb_from_to(func_name!(), want())?;
-    common::test_load_old(func_name!(), role_info_v120.as_slice(), 117, want())?;
+    common::test_load_old(func_name!(), role_info_v120.as_slice(), 120, want())?;
 
     Ok(())
 }
@@ -100,7 +100,7 @@ fn test_decode_v120_grant_object() -> anyhow::Result<()> {
 fn test_decode_v120_ownership() -> anyhow::Result<()> {
     let ownership_info_v120 = vec![
         10, 2, 114, 49, 18, 19, 42, 11, 10, 9, 97, 117, 110, 105, 113, 117, 101, 105, 100, 160, 6,
-        117, 168, 6, 24, 160, 6, 117, 168, 6, 24,
+        120, 168, 6, 24, 160, 6, 120, 168, 6, 24,
     ];
 
     let want = || mt::principal::OwnershipInfo {
@@ -110,7 +110,7 @@ fn test_decode_v120_ownership() -> anyhow::Result<()> {
         },
     };
     common::test_pb_from_to(func_name!(), want())?;
-    common::test_load_old(func_name!(), ownership_info_v120.as_slice(), 117, want())?;
+    common::test_load_old(func_name!(), ownership_info_v120.as_slice(), 120, want())?;
 
     Ok(())
 }

src/meta/protos/proto/ownership.proto

@@ -47,7 +47,7 @@ message OwnershipObject {
   }
 
   message OwnershipWarehouseObject {
-    string uid = 1;
+    string id = 1;
   }
 
   oneof object {

src/query/management/src/role/role_mgr.rs

@@ -504,7 +504,7 @@ fn convert_to_grant_obj(owner_obj: &OwnershipObject) -> GrantObject {
         } => GrantObject::TableById(catalog_name.to_string(), *db_id, *table_id),
         OwnershipObject::Stage { name } => GrantObject::Stage(name.to_string()),
         OwnershipObject::UDF { name } => GrantObject::UDF(name.to_string()),
-        OwnershipObject::Warehouse { id: uid } => GrantObject::Warehouse(uid.to_string()),
+        OwnershipObject::Warehouse { id } => GrantObject::Warehouse(id.to_string()),
     }
 }
 

src/query/service/src/interpreters/access/privilege_access.rs

@@ -154,9 +154,7 @@ impl PrivilegeAccess {
             GrantObject::UDF(name) => OwnershipObject::UDF {
                 name: name.to_string(),
             },
-            GrantObject::Warehouse(uid) => OwnershipObject::Warehouse {
-                id: uid.to_string(),
-            },
+            GrantObject::Warehouse(id) => OwnershipObject::Warehouse { id: id.to_string() },
             GrantObject::Global => return Ok(None),
         };
 
@@ -409,8 +407,8 @@ impl PrivilegeAccess {
                     })
                     .find(|sw| sw.id == warehouse.clone())
                 {
-                    let uid = sw.role_id.to_string();
-                    let grant_object = GrantObject::Warehouse(uid);
+                    let id = sw.role_id.to_string();
+                    let grant_object = GrantObject::Warehouse(id);
                     match self
                         .has_ownership(&session, &grant_object, false, false)
                         .await

src/query/service/src/interpreters/interpreter_privilege_grant.rs

@@ -103,8 +103,8 @@ impl GrantPrivilegeInterpreter {
             GrantObject::UDF(name) => Ok(OwnershipObject::UDF {
                 name: name.to_string(),
             }),
-            GrantObject::Warehouse(uid) => Ok(OwnershipObject::Warehouse {
-                id: uid.to_string(),
+            GrantObject::Warehouse(id) => Ok(OwnershipObject::Warehouse {
+                id: id.to_string(),
             }),
             GrantObject::Global => Err(ErrorCode::IllegalGrant(
                 "Illegal GRANT/REVOKE command; please consult the manual to see which privileges can be used",

src/query/service/src/table_functions/show_grants/show_grants_table.rs

@@ -439,7 +439,7 @@ async fn show_account_grants(
                     privileges.push(get_priv_str(&grant_entry));
                     grant_list.push(format!("{} TO {}", grant_entry, identity));
                 }
-                GrantObject::Warehouse(uid) => {
+                GrantObject::Warehouse(id) => {
                     if let Some(sw) = warehouses
                         .iter()
                         .filter_map(|w| {
@@ -449,10 +449,10 @@ async fn show_account_grants(
                                 None
                             }
                         })
-                        .find(|sw| sw.role_id == *uid)
+                        .find(|sw| sw.role_id == *id)
                     {
                         object_name.push(sw.id.to_string());
-                        object_id.push(Some(uid.to_string()));
+                        object_id.push(Some(id.to_string()));
                         privileges.push(get_priv_str(&grant_entry));
                         grant_list.push(format!("{} TO {}", grant_entry, identity));
                     }
@@ -516,7 +516,7 @@ async fn show_account_grants(
                         privileges.push("OWNERSHIP".to_string());
                         grant_list.push(format!("GRANT OWNERSHIP ON UDF {} TO {}", name, identity));
                     }
-                    OwnershipObject::Warehouse { id: uid } => {
+                    OwnershipObject::Warehouse { id } => {
                         if let Some(sw) = warehouses
                             .iter()
                             .filter_map(|w| {
@@ -526,14 +526,14 @@ async fn show_account_grants(
                                     None
                                 }
                             })
-                            .find(|sw| sw.role_id == uid)
+                            .find(|sw| sw.role_id == id)
                         {
                             object_name.push(sw.id.to_string());
-                            object_id.push(Some(uid.to_string()));
+                            object_id.push(Some(id.to_string()));
                             privileges.push("OWNERSHIP".to_string());
                             grant_list.push(format!(
                                 "GRANT OWNERSHIP ON WAREHOUSE {} TO {}",
-                                uid, identity
+                                id, identity
                             ));
                         }
                     }

src/query/users/src/visibility_checker.rs

@@ -200,8 +200,8 @@ impl GrantObjectVisibilityChecker {
                 OwnershipObject::UDF { name } => {
                     granted_udfs.insert(name.to_string());
                 }
-                OwnershipObject::Warehouse { id: uid } => {
-                    granted_ws.insert(uid.to_string());
+                OwnershipObject::Warehouse { id } => {
+                    granted_ws.insert(id.to_string());
                 }
             }
         }
@@ -262,12 +262,12 @@ impl GrantObjectVisibilityChecker {
         false
     }
 
-    pub fn check_warehouse_visibility(&self, uid: &str) -> bool {
+    pub fn check_warehouse_visibility(&self, id: &str) -> bool {
         if self.granted_global_ws {
             return true;
         }
 
-        if self.granted_ws.contains(uid) {
+        if self.granted_ws.contains(id) {
             return true;
         }
         false