fix warehouse uid modify to id

TCeason · TCeason · commit 8db8cc66cf51 · 2025-02-20T14:58:21.000+08:00
diff --git a/src/meta/app/src/principal/ownership_object.rs b/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(),
             }),
diff --git a/src/meta/app/src/principal/tenant_ownership_object_ident.rs b/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);
diff --git a/src/meta/proto-conv/src/ownership_from_to_protobuf_impl.rs b/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() },
                 ))
             }
         };
diff --git a/src/meta/proto-conv/tests/it/main.rs b/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;
diff --git a/src/meta/proto-conv/tests/it/v120_warehouse_ownershipobject.rs b/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(())
 }
diff --git a/src/meta/protos/proto/ownership.proto b/src/meta/protos/proto/ownership.proto
@@ -47,7 +47,7 @@ message OwnershipObject {
   }
 
   message OwnershipWarehouseObject {
-    string uid = 1;
+    string id = 1;
   }
 
   oneof object {
diff --git a/src/query/management/src/role/role_mgr.rs b/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()),
     }
 }
 
diff --git a/src/query/service/src/interpreters/access/privilege_access.rs b/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
diff --git a/src/query/service/src/interpreters/interpreter_privilege_grant.rs b/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",
diff --git a/src/query/service/src/table_functions/show_grants/show_grants_table.rs b/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
                             ));
                         }
                     }
diff --git a/src/query/users/src/visibility_checker.rs b/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

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ impl fmt::Display for OwnershipObject {`
`84`	`84`	`}`
`85`	`85`	`OwnershipObject::UDF { name } => write!(f, "UDF {name}"),`
`86`	`86`	`OwnershipObject::Stage { name } => write!(f, "STAGE {name}"),`
`87`		`- OwnershipObject::Warehouse { id: uid } => write!(f, "Warehouse {uid}"),`
	`87`	`+ OwnershipObject::Warehouse { id } => write!(f, "Warehouse {id}"),`
`88`	`88`	`}`
`89`	`89`	`}`
`90`	`90`	`}`
`@@ -124,7 +124,7 @@ impl KeyCodec for OwnershipObject {`
`124`	`124`	`}`
`125`	`125`	`OwnershipObject::Stage { name } => b.push_raw("stage-by-name").push_str(name),`
`126`	`126`	`OwnershipObject::UDF { name } => b.push_raw("udf-by-name").push_str(name),`
`127`		`- OwnershipObject::Warehouse { id: uid } => b.push_raw("warehouse-by-uid").push_str(uid),`
	`127`	`+ OwnershipObject::Warehouse { id } => b.push_raw("warehouse-by-id").push_str(id),`
`128`	`128`	`}`
`129`	`129`	`}`
`130`	`130`
`@@ -171,13 +171,13 @@ impl KeyCodec for OwnershipObject {`
`171`	`171`	`let name = p.next_str()?;`
`172`	`172`	`Ok(OwnershipObject::UDF { name })`
`173`	`173`	`}`
`174`		`- "warehouse-by-uid" => {`
`175`		`- let uid = p.next_str()?;`
`176`		`- Ok(OwnershipObject::Warehouse { id: uid })`
	`174`	`+ "warehouse-by-id" => {`
	`175`	`+ let id = p.next_str()?;`
	`176`	`+ Ok(OwnershipObject::Warehouse { id })`
`177`	`177`	`}`
`178`	`178`	`_ => Err(kvapi::KeyError::InvalidSegment {`
`179`	`179`	`i: p.index(),`
`180`		`- expect: "database-by-id\|database-by-catalog-id\|table-by-id\|table-by-catalog-id\|stage-by-name\|udf-by-name\|warehouse-by-uid"`
	`180`	`+ expect: "database-by-id\|database-by-catalog-id\|table-by-id\|table-by-catalog-id\|stage-by-name\|udf-by-name\|warehouse-by-id"`
`181`	`181`	`.to_string(),`
`182`	`182`	`got: q.to_string(),`
`183`	`183`	`}),`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ message OwnershipObject {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`message OwnershipWarehouseObject {`
`50`		`- string uid = 1;`
	`50`	`+ string id = 1;`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`oneof object {`
Original file line number	Diff line number	Diff line change
`@@ -504,7 +504,7 @@ fn convert_to_grant_obj(owner_obj: &OwnershipObject) -> GrantObject {`
`504`	`504`	`} => GrantObject::TableById(catalog_name.to_string(), db_id, table_id),`
`505`	`505`	`OwnershipObject::Stage { name } => GrantObject::Stage(name.to_string()),`
`506`	`506`	`OwnershipObject::UDF { name } => GrantObject::UDF(name.to_string()),`
`507`		`- OwnershipObject::Warehouse { id: uid } => GrantObject::Warehouse(uid.to_string()),`
	`507`	`+ OwnershipObject::Warehouse { id } => GrantObject::Warehouse(id.to_string()),`
`508`	`508`	`}`
`509`	`509`	`}`
`510`	`510`
Original file line number	Diff line number	Diff line change
`@@ -439,7 +439,7 @@ async fn show_account_grants(`
`439`	`439`	`privileges.push(get_priv_str(&grant_entry));`
`440`	`440`	`grant_list.push(format!("{} TO {}", grant_entry, identity));`
`441`	`441`	`}`
`442`		`- GrantObject::Warehouse(uid) => {`
	`442`	`+ GrantObject::Warehouse(id) => {`
`443`	`443`	`if let Some(sw) = warehouses`
`444`	`444`	`.iter()`
`445`	`445`	`.filter_map(\|w\| {`
`@@ -449,10 +449,10 @@ async fn show_account_grants(`
`449`	`449`	`None`
`450`	`450`	`}`
`451`	`451`	`})`
`452`		`- .find(\|sw\| sw.role_id == *uid)`
	`452`	`+ .find(\|sw\| sw.role_id == *id)`
`453`	`453`	`{`
`454`	`454`	`object_name.push(sw.id.to_string());`
`455`		`- object_id.push(Some(uid.to_string()));`
	`455`	`+ object_id.push(Some(id.to_string()));`
`456`	`456`	`privileges.push(get_priv_str(&grant_entry));`
`457`	`457`	`grant_list.push(format!("{} TO {}", grant_entry, identity));`
`458`	`458`	`}`
`@@ -516,7 +516,7 @@ async fn show_account_grants(`
`516`	`516`	`privileges.push("OWNERSHIP".to_string());`
`517`	`517`	`grant_list.push(format!("GRANT OWNERSHIP ON UDF {} TO {}", name, identity));`
`518`	`518`	`}`
`519`		`- OwnershipObject::Warehouse { id: uid } => {`
	`519`	`+ OwnershipObject::Warehouse { id } => {`
`520`	`520`	`if let Some(sw) = warehouses`
`521`	`521`	`.iter()`
`522`	`522`	`.filter_map(\|w\| {`
`@@ -526,14 +526,14 @@ async fn show_account_grants(`
`526`	`526`	`None`
`527`	`527`	`}`
`528`	`528`	`})`
`529`		`- .find(\|sw\| sw.role_id == uid)`
	`529`	`+ .find(\|sw\| sw.role_id == id)`
`530`	`530`	`{`
`531`	`531`	`object_name.push(sw.id.to_string());`
`532`		`- object_id.push(Some(uid.to_string()));`
	`532`	`+ object_id.push(Some(id.to_string()));`
`533`	`533`	`privileges.push("OWNERSHIP".to_string());`
`534`	`534`	`grant_list.push(format!(`
`535`	`535`	`"GRANT OWNERSHIP ON WAREHOUSE {} TO {}",`
`536`		`- uid, identity`
	`536`	`+ id, identity`
`537`	`537`	`));`
`538`	`538`	`}`
`539`	`539`	`}`
Original file line number	Diff line number	Diff line change
`@@ -200,8 +200,8 @@ impl GrantObjectVisibilityChecker {`
`200`	`200`	`OwnershipObject::UDF { name } => {`
`201`	`201`	`granted_udfs.insert(name.to_string());`
`202`	`202`	`}`
`203`		`- OwnershipObject::Warehouse { id: uid } => {`
`204`		`- granted_ws.insert(uid.to_string());`
	`203`	`+ OwnershipObject::Warehouse { id } => {`
	`204`	`+ granted_ws.insert(id.to_string());`
`205`	`205`	`}`
`206`	`206`	`}`
`207`	`207`	`}`
`@@ -262,12 +262,12 @@ impl GrantObjectVisibilityChecker {`
`262`	`262`	`false`
`263`	`263`	`}`
`264`	`264`
`265`		`- pub fn check_warehouse_visibility(&self, uid: &str) -> bool {`
	`265`	`+ pub fn check_warehouse_visibility(&self, id: &str) -> bool {`
`266`	`266`	`if self.granted_global_ws {`
`267`	`267`	`return true;`
`268`	`268`	`}`
`269`	`269`
`270`		`- if self.granted_ws.contains(uid) {`
	`270`	`+ if self.granted_ws.contains(id) {`
`271`	`271`	`return true;`
`272`	`272`	`}`
`273`	`273`	`false`