chore: minor refine on RoleMgr

Author: drmingdrmer

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

@@ -57,6 +57,7 @@ static TXN_MAX_RETRY_TIMES: u32 = 60;
 
 static BUILTIN_ROLE_ACCOUNT_ADMIN: &str = "account_admin";
 
+#[derive(Clone)]
 pub struct RoleMgr {
     kv_api: Arc<dyn kvapi::KVApi<Error = MetaError> + Send + Sync>,
     tenant: Tenant,

src/query/service/src/interpreters/interpreter_create_warehouses.rs

@@ -83,8 +83,8 @@ impl Interpreter for CreateWarehouseInterpreter {
                 .await?;
 
             if let WarehouseInfo::SystemManaged(sw) = warehouse {
-                let role_api = UserApiProvider::instance().role_api(&tenant);
                 if let Some(current_role) = self.ctx.get_current_role() {
+                    let role_api = UserApiProvider::instance().role_api(&tenant);
                     role_api
                         .grant_ownership(
                             &OwnershipObject::Warehouse { id: sw.role_id },
@@ -114,8 +114,8 @@ impl Interpreter for CreateWarehouseInterpreter {
             .await?;
 
         if let WarehouseInfo::SystemManaged(sw) = warehouse {
-            let role_api = UserApiProvider::instance().role_api(&tenant);
             if let Some(current_role) = self.ctx.get_current_role() {
+                let role_api = UserApiProvider::instance().role_api(&tenant);
                 role_api
                     .grant_ownership(
                         &OwnershipObject::Warehouse { id: sw.role_id },

src/query/service/src/interpreters/interpreter_database_create.rs

@@ -75,8 +75,8 @@ impl Interpreter for CreateDatabaseInterpreter {
 
         // Grant ownership as the current role. The above create_db_req.meta.owner could be removed in
         // the future.
-        let role_api = UserApiProvider::instance().role_api(&tenant);
         if let Some(current_role) = self.ctx.get_current_role() {
+            let role_api = UserApiProvider::instance().role_api(&tenant);
             role_api
                 .grant_ownership(
                     &OwnershipObject::Database {

src/query/service/src/interpreters/interpreter_drop_warehouses.rs

@@ -72,8 +72,8 @@ impl Interpreter for DropWarehouseInterpreter {
         );
 
         if let WarehouseInfo::SystemManaged(sw) = warehouse {
-            let role_api = UserApiProvider::instance().role_api(&tenant);
             if let Some(current_role) = self.ctx.get_current_role() {
+                let role_api = UserApiProvider::instance().role_api(&tenant);
                 role_api
                     .grant_ownership(
                         &OwnershipObject::Warehouse { id: sw.role_id },

src/query/service/src/interpreters/interpreter_user_stage_create.rs

@@ -121,8 +121,8 @@ impl Interpreter for CreateUserStageInterpreter {
 
         // Grant ownership as the current role
         let tenant = self.ctx.get_tenant();
-        let role_api = UserApiProvider::instance().role_api(&tenant);
         if let Some(current_role) = self.ctx.get_current_role() {
+            let role_api = UserApiProvider::instance().role_api(&tenant);
             role_api
                 .grant_ownership(
                     &OwnershipObject::Stage {

src/query/users/src/user_api.rs

@@ -28,7 +28,6 @@ use databend_common_management::PasswordPolicyMgr;
 use databend_common_management::ProcedureMgr;
 use databend_common_management::QuotaApi;
 use databend_common_management::QuotaMgr;
-use databend_common_management::RoleApi;
 use databend_common_management::RoleMgr;
 use databend_common_management::SettingMgr;
 use databend_common_management::StageApi;
@@ -45,6 +44,7 @@ use databend_common_meta_store::MetaStore;
 use databend_common_meta_store::MetaStoreProvider;
 use databend_common_meta_types::MatchSeq;
 use databend_common_meta_types::MetaError;
+use log::debug;
 
 use crate::builtin::BuiltIn;
 use crate::BUILTIN_ROLE_PUBLIC;
@@ -125,13 +125,14 @@ impl UserApiProvider {
         Arc::new(user_mgr)
     }
 
-    pub fn role_api(&self, tenant: &Tenant) -> Arc<impl RoleApi> {
+    pub fn role_api(&self, tenant: &Tenant) -> RoleMgr {
         let role_mgr = RoleMgr::create(
             self.client.clone(),
             tenant,
             GlobalConfig::instance().query.upgrade_to_pb,
         );
-        Arc::new(role_mgr)
+        debug!("RoleMgr created");
+        role_mgr
     }
 
     pub fn stage_api(&self, tenant: &Tenant) -> Arc<dyn StageApi> {