Merge pull request #7698 from zhang2014/refactor/remove_useless

refactor(sessions): remove useless code

Author: zhang2014

src/query/catalog/src/table_context.rs

@@ -28,15 +28,12 @@ use common_io::prelude::FormatSettings;
 use common_legacy_planners::Partitions;
 use common_legacy_planners::PlanNode;
 use common_legacy_planners::ReadDataSourcePlan;
-use common_legacy_planners::Statistics;
 use common_meta_types::UserInfo;
 use common_settings::Settings;
-use common_users::UserApiProvider;
 use opendal::Operator;
 use parking_lot::Mutex;
 
 use crate::catalog::Catalog;
-use crate::catalog::CatalogManager;
 use crate::cluster_info::Cluster;
 use crate::table::Table;
 
@@ -76,12 +73,8 @@ pub trait TableContext: Send + Sync {
     fn try_get_partitions(&self, num: u64) -> Result<Partitions>;
     // Update the context partition pool from the pipeline builder.
     fn try_set_partitions(&self, partitions: Partitions) -> Result<()>;
-    fn try_get_statistics(&self) -> Result<Statistics>;
-    fn try_set_statistics(&self, val: &Statistics) -> Result<()>;
     fn attach_query_str(&self, query: &str);
-    fn attach_query_plan(&self, query_plan: &PlanNode);
     fn get_fragment_id(&self) -> usize;
-    fn get_catalog_manager(&self) -> Result<Arc<CatalogManager>>;
     fn get_catalog(&self, catalog_name: &str) -> Result<Arc<dyn Catalog>>;
     fn get_id(&self) -> String;
     fn get_current_catalog(&self) -> String;
@@ -94,7 +87,6 @@ pub trait TableContext: Send + Sync {
     fn apply_changed_settings(&self, changed_settings: Arc<Settings>) -> Result<()>;
     fn get_format_settings(&self) -> Result<FormatSettings>;
     fn get_tenant(&self) -> String;
-    fn set_current_tenant(&self, tenant: String);
     fn get_subquery_name(&self, _query: &PlanNode) -> String;
     /// Get the data accessor metrics.
     fn get_dal_metrics(&self) -> DalMetrics;
@@ -108,10 +100,8 @@ pub trait TableContext: Send + Sync {
     fn try_get_function_context(&self) -> Result<FunctionContext>;
     fn get_connection_id(&self) -> String;
     fn get_settings(&self) -> Arc<Settings>;
-    // Get user manager api.
-    fn get_user_manager(&self) -> Arc<UserApiProvider>;
     fn get_cluster(&self) -> Arc<Cluster>;
     async fn get_table(&self, catalog: &str, database: &str, table: &str)
     -> Result<Arc<dyn Table>>;
-    async fn get_processes_info(&self) -> Vec<ProcessInfo>;
+    fn get_processes_info(&self) -> Vec<ProcessInfo>;
 }

src/query/service/src/interpreters/interpreter.rs

@@ -78,6 +78,11 @@ pub trait Interpreter: Sync + Send {
             )));
         }
 
+        // WTF: We need to implement different logic for the HTTP handler
+        if let Some(handle) = ctx.get_http_query() {
+            return handle.execute(ctx.clone(), build_res, self.schema()).await;
+        }
+
         Ok(Box::pin(Box::pin(ProcessorExecutorStream::create(
             PipelinePullingExecutor::from_pipelines(
                 ctx.query_need_abort(),

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

@@ -19,6 +19,7 @@ use common_exception::Result;
 use common_legacy_planners::CreateDatabasePlan;
 use common_meta_types::GrantObject;
 use common_meta_types::UserPrivilegeType;
+use common_users::UserApiProvider;
 
 use crate::interpreters::Interpreter;
 use crate::pipelines::PipelineBuildResult;
@@ -51,10 +52,7 @@ impl Interpreter for CreateDatabaseInterpreter {
             .await?;
 
         let tenant = self.plan.tenant.clone();
-        let quota_api = self
-            .ctx
-            .get_user_manager()
-            .get_tenant_quota_api_client(&tenant)?;
+        let quota_api = UserApiProvider::instance().get_tenant_quota_api_client(&tenant)?;
         let quota = quota_api.get_quota(None).await?.data;
         let catalog = self.ctx.get_catalog(&self.plan.catalog)?;
         let databases = catalog.list_databases(&tenant).await?;

src/query/service/src/interpreters/interpreter_kill.rs

@@ -35,7 +35,7 @@ impl KillInterpreter {
     }
 
     async fn execute_kill(&self, session_id: &String) -> Result<PipelineBuildResult> {
-        match self.ctx.get_session_by_id(session_id).await {
+        match self.ctx.get_session_by_id(session_id) {
             None => Err(ErrorCode::UnknownSession(format!(
                 "Not found session id {}",
                 session_id
@@ -73,16 +73,13 @@ impl Interpreter for KillInterpreter {
         // otherwise use the session_id.
         // More info Link to: https://github.com/datafuselabs/databend/discussions/5405.
         match id.parse::<u32>() {
-            Ok(mysql_conn_id) => {
-                let session_id = self.ctx.get_id_by_mysql_conn_id(&Some(mysql_conn_id)).await;
-                match session_id {
-                    Some(get) => self.execute_kill(&get).await,
-                    None => Err(ErrorCode::UnknownSession(format!(
-                        "MySQL connection id {} not found session id",
-                        mysql_conn_id
-                    ))),
-                }
-            }
+            Ok(mysql_conn_id) => match self.ctx.get_id_by_mysql_conn_id(&Some(mysql_conn_id)) {
+                Some(get) => self.execute_kill(&get).await,
+                None => Err(ErrorCode::UnknownSession(format!(
+                    "MySQL connection id {} not found session id",
+                    mysql_conn_id
+                ))),
+            },
             Err(_) => self.execute_kill(id).await,
         }
     }

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

@@ -19,6 +19,7 @@ use common_legacy_planners::GrantPrivilegePlan;
 use common_meta_types::GrantObject;
 use common_meta_types::PrincipalIdentity;
 use common_meta_types::UserPrivilegeSet;
+use common_users::UserApiProvider;
 
 use crate::interpreters::interpreter_common::validate_grant_object_exists;
 use crate::interpreters::Interpreter;
@@ -55,7 +56,7 @@ impl Interpreter for GrantPrivilegeInterpreter {
         // TODO: check privilege on granting on the grant object
 
         let tenant = self.ctx.get_tenant();
-        let user_mgr = self.ctx.get_user_manager();
+        let user_mgr = UserApiProvider::instance();
         match plan.principal {
             PrincipalIdentity::User(user) => {
                 user_mgr

src/query/service/src/interpreters/interpreter_privilege_revoke.rs

@@ -17,6 +17,7 @@ use std::sync::Arc;
 use common_exception::Result;
 use common_legacy_planners::RevokePrivilegePlan;
 use common_meta_types::PrincipalIdentity;
+use common_users::UserApiProvider;
 
 use crate::interpreters::interpreter_common::validate_grant_object_exists;
 use crate::interpreters::Interpreter;
@@ -52,7 +53,7 @@ impl Interpreter for RevokePrivilegeInterpreter {
         // TODO: check privilege on granting on the grant object
 
         let tenant = self.ctx.get_tenant();
-        let user_mgr = self.ctx.get_user_manager();
+        let user_mgr = UserApiProvider::instance();
 
         match plan.principal {
             PrincipalIdentity::User(user) => {

src/query/service/src/interpreters/interpreter_role_create.rs

@@ -17,6 +17,7 @@ use std::sync::Arc;
 use common_exception::Result;
 use common_legacy_planners::CreateRolePlan;
 use common_meta_types::RoleInfo;
+use common_users::UserApiProvider;
 
 use crate::interpreters::Interpreter;
 use crate::pipelines::PipelineBuildResult;
@@ -46,10 +47,8 @@ impl Interpreter for CreateRoleInterpreter {
         // TODO: add privilege check about CREATE ROLE
         let plan = self.plan.clone();
         let tenant = self.ctx.get_tenant();
-        let user_mgr = self.ctx.get_user_manager();
-        let role_info = RoleInfo::new(&plan.role_name);
-        user_mgr
-            .add_role(&tenant, role_info, plan.if_not_exists)
+        UserApiProvider::instance()
+            .add_role(&tenant, RoleInfo::new(&plan.role_name), plan.if_not_exists)
             .await?;
 
         Ok(PipelineBuildResult::create())

src/query/service/src/interpreters/interpreter_role_drop.rs

@@ -16,6 +16,7 @@ use std::sync::Arc;
 
 use common_exception::Result;
 use common_legacy_planners::DropRolePlan;
+use common_users::UserApiProvider;
 
 use crate::interpreters::Interpreter;
 use crate::pipelines::PipelineBuildResult;
@@ -45,8 +46,7 @@ impl Interpreter for DropRoleInterpreter {
         // TODO: add privilege check about DROP role
         let plan = self.plan.clone();
         let tenant = self.ctx.get_tenant();
-        let user_mgr = self.ctx.get_user_manager();
-        user_mgr
+        UserApiProvider::instance()
             .drop_role(&tenant, plan.role_name, plan.if_exists)
             .await?;
 

src/query/service/src/interpreters/interpreter_role_grant.rs

@@ -17,6 +17,7 @@ use std::sync::Arc;
 use common_exception::Result;
 use common_legacy_planners::GrantRolePlan;
 use common_meta_types::PrincipalIdentity;
+use common_users::UserApiProvider;
 
 use crate::interpreters::Interpreter;
 use crate::pipelines::PipelineBuildResult;
@@ -45,7 +46,7 @@ impl Interpreter for GrantRoleInterpreter {
     async fn execute2(&self) -> Result<PipelineBuildResult> {
         let plan = self.plan.clone();
         let tenant = self.ctx.get_tenant();
-        let user_mgr = self.ctx.get_user_manager();
+        let user_mgr = UserApiProvider::instance();
 
         // TODO: check privileges
 

src/query/service/src/interpreters/interpreter_role_revoke.rs

@@ -17,6 +17,7 @@ use std::sync::Arc;
 use common_exception::Result;
 use common_legacy_planners::RevokeRolePlan;
 use common_meta_types::PrincipalIdentity;
+use common_users::UserApiProvider;
 
 use crate::interpreters::Interpreter;
 use crate::pipelines::PipelineBuildResult;
@@ -45,15 +46,14 @@ impl Interpreter for RevokeRoleInterpreter {
     async fn execute2(&self) -> Result<PipelineBuildResult> {
         let plan = self.plan.clone();
         let tenant = self.ctx.get_tenant();
-        let user_mgr = self.ctx.get_user_manager();
         match plan.principal {
             PrincipalIdentity::User(user) => {
-                user_mgr
+                UserApiProvider::instance()
                     .revoke_role_from_user(&tenant, user, plan.role)
                     .await?;
             }
             PrincipalIdentity::Role(role) => {
-                user_mgr
+                UserApiProvider::instance()
                     .revoke_role_from_role(&tenant, role.clone(), plan.role)
                     .await?;
             }