Address comments

Signed-off-by: Xuanwo <github@xuanwo.io>

Author: Xuanwo

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

@@ -16,7 +16,6 @@ use std::collections::HashMap;
 use std::sync::Arc;
 
 use common_exception::Result;
-use common_legacy_planners::PlanNode;
 
 use crate::interpreters::access::PrivilegeAccess;
 use crate::interpreters::ManagementModeAccess;
@@ -26,11 +25,7 @@ use crate::sql::plans::Plan;
 #[async_trait::async_trait]
 pub trait AccessChecker: Sync + Send {
     // Check the access permission for the old plan.
-    // TODO(bohu): Remove after new plan done.
-    async fn check(&self, plan: &PlanNode) -> Result<()>;
-
-    // Check the access permission for the old plan.
-    async fn check_new(&self, _plan: &Plan) -> Result<()>;
+    async fn check(&self, _plan: &Plan) -> Result<()>;
 }
 
 pub struct Accessor {
@@ -48,9 +43,9 @@ impl Accessor {
         Accessor { accessors }
     }
 
-    pub async fn check_new(&self, plan: &Plan) -> Result<()> {
+    pub async fn check(&self, plan: &Plan) -> Result<()> {
         for accessor in self.accessors.values() {
-            accessor.check_new(plan).await?;
+            accessor.check(plan).await?;
         }
         Ok(())
     }

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

@@ -16,7 +16,6 @@ use std::sync::Arc;
 
 use common_exception::ErrorCode;
 use common_exception::Result;
-use common_legacy_planners::PlanNode;
 
 use crate::interpreters::access::AccessChecker;
 use crate::sessions::QueryContext;
@@ -36,22 +35,7 @@ impl ManagementModeAccess {
 #[async_trait::async_trait]
 impl AccessChecker for ManagementModeAccess {
     // Check what we can do if in management mode.
-    async fn check(&self, plan: &PlanNode) -> Result<()> {
-        // Allows for management-mode.
-        if self.ctx.get_config().query.management_mode {
-            return match plan {
-                PlanNode::Empty(_) => Ok(()),
-                _ => Err(ErrorCode::ManagementModePermissionDenied(format!(
-                    "Access denied for operation:{:?} in management-mode",
-                    plan.name()
-                ))),
-            };
-        };
-        Ok(())
-    }
-
-    // Check what we can do if in management mode.
-    async fn check_new(&self, plan: &Plan) -> Result<()> {
+    async fn check(&self, plan: &Plan) -> Result<()> {
         // Allows for management-mode.
         if self.ctx.get_config().query.management_mode {
             let ok = match plan {

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

@@ -15,7 +15,6 @@
 use std::sync::Arc;
 
 use common_exception::Result;
-use common_legacy_planners::PlanNode;
 use common_meta_types::GrantObject;
 use common_meta_types::UserPrivilegeType;
 
@@ -35,12 +34,7 @@ impl PrivilegeAccess {
 
 #[async_trait::async_trait]
 impl AccessChecker for PrivilegeAccess {
-    async fn check(&self, _plan: &PlanNode) -> Result<()> {
-        // The old planner *NO* need to check anymore.
-        Ok(())
-    }
-
-    async fn check_new(&self, plan: &Plan) -> Result<()> {
+    async fn check(&self, plan: &Plan) -> Result<()> {
         let session = self.ctx.get_current_session();
 
         match plan {

src/query/service/src/interpreters/interpreter_factory_v2.rs

@@ -47,7 +47,7 @@ impl InterpreterFactoryV2 {
     pub async fn get(ctx: Arc<QueryContext>, plan: &Plan) -> Result<InterpreterPtr> {
         // Check the access permission.
         let access_checker = Accessor::create(ctx.clone());
-        access_checker.check_new(plan).await.map_err(|e| {
+        access_checker.check(plan).await.map_err(|e| {
             error!("Access.denied(v2): {:?}", e);
             e
         })?;