drop ac when drop catalog

Author: morningman

fe/fe-core/src/main/java/org/apache/doris/analysis/DropCatalogStmt.java

@@ -59,7 +59,7 @@ public void analyze(Analyzer analyzer) throws UserException {
         if (!Env.getCurrentEnv().getAccessManager().checkCtlPriv(
                 ConnectContext.get(), catalogName, PrivPredicate.DROP)) {
             ErrorReport.reportAnalysisException(ErrorCode.ERR_CATALOG_ACCESS_DENIED,
-                    analyzer.getQualifiedUser(), catalogName);
+                    ConnectContext.get().getQualifiedUser(), catalogName);
         }
     }
 

fe/fe-core/src/main/java/org/apache/doris/catalog/external/TestExternalTable.java

@@ -28,7 +28,7 @@
 import java.util.List;
 
 /**
- * Elasticsearch external table.
+ * TestExternalTable is a table for unit test.
  */
 public class TestExternalTable extends ExternalTable {
     private static final Logger LOG = LogManager.getLogger(TestExternalTable.class);

fe/fe-core/src/main/java/org/apache/doris/datasource/CatalogIf.java

@@ -136,7 +136,7 @@ default T getDbOrAnalysisException(long dbId) throws AnalysisException {
                 s -> new AnalysisException(ErrorCode.ERR_BAD_DB_ERROR.formatErrorMsg(s), ErrorCode.ERR_BAD_DB_ERROR));
     }
 
+    // Called when catalog is dropped
     default void onClose() {
-
     }
 }

fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalCatalog.java

@@ -296,6 +296,16 @@ public void write(DataOutput out) throws IOException {
         Text.writeString(out, GsonUtils.GSON.toJson(this));
     }
 
+    @Override
+    public void onClose() {
+        removeAccessController();
+        CatalogIf.super.onClose();
+    }
+
+    private void removeAccessController() {
+        Env.getCurrentEnv().getAccessManager().removeAccessController(name);
+    }
+
     public void replayInitCatalog(InitCatalogLog log) {
         Map<String, Long> tmpDbNameToId = Maps.newConcurrentMap();
         Map<Long, ExternalDatabase> tmpIdToDb = Maps.newConcurrentMap();

fe/fe-core/src/main/java/org/apache/doris/datasource/JdbcExternalCatalog.java

@@ -52,6 +52,7 @@ public JdbcExternalCatalog(long catalogId, String name, String resource, Map<Str
 
     @Override
     public void onClose() {
+        super.onClose();
         if (jdbcClient != null) {
             jdbcClient.closeClient();
         }

fe/fe-core/src/main/java/org/apache/doris/datasource/test/TestExternalCatalog.java

@@ -61,10 +61,6 @@ public TestExternalCatalog(long catalogId, String name, String resource, Map<Str
         }
     }
 
-    @Override
-    public void onClose() {
-    }
-
     @Override
     protected void initLocalObjectsImpl() {
     }

fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/AccessControllerManager.java

@@ -57,6 +57,10 @@ private CatalogAccessController getAccessControllerOrDefault(String ctl) {
         return ctlToCtlAccessController.getOrDefault(ctl, internalAccessController);
     }
 
+    public boolean checkIfAccessControllerExist(String ctl) {
+        return ctlToCtlAccessController.containsKey(ctl);
+    }
+
     public void createAccessController(String ctl, String acFactoryClassName, Map<String, String> prop) {
         Class<?> factoryClazz = null;
         try {
@@ -74,6 +78,11 @@ public void createAccessController(String ctl, String acFactoryClassName, Map<St
         }
     }
 
+    public void removeAccessController(String ctl) {
+        ctlToCtlAccessController.remove(ctl);
+        LOG.info("remove access controller for catalog {}", ctl);
+    }
+
     public Auth getAuth() {
         return sysAccessController.getAuth();
     }

fe/fe-core/src/test/java/org/apache/doris/datasource/ColumnPrivTest.java

@@ -23,6 +23,7 @@
 import org.apache.doris.analysis.CreateTableStmt;
 import org.apache.doris.analysis.CreateUserStmt;
 import org.apache.doris.analysis.CreateViewStmt;
+import org.apache.doris.analysis.DropCatalogStmt;
 import org.apache.doris.analysis.GrantStmt;
 import org.apache.doris.analysis.ShowCatalogStmt;
 import org.apache.doris.analysis.UserIdentity;
@@ -56,12 +57,13 @@ public class ColumnPrivTest extends TestWithFeService {
     private static Auth auth;
     private static Env env;
     private CatalogMgr mgr;
+    private ConnectContext rootCtx;
 
     @Override
     protected void runBeforeAll() throws Exception {
         FeConstants.runningUnitTest = true;
         mgr = Env.getCurrentEnv().getCatalogMgr();
-        ConnectContext rootCtx = createDefaultCtx();
+        rootCtx = createDefaultCtx();
         env = Env.getCurrentEnv();
         auth = env.getAuth();
 
@@ -116,14 +118,23 @@ protected void runBeforeAll() throws Exception {
         env.createTable(createTableStmt);
     }
 
+    @Override
+    protected void runAfterAll() throws Exception {
+        super.runAfterAll();
+        rootCtx.setThreadLocalInfo();
+        Assert.assertTrue(env.getAccessManager().checkIfAccessControllerExist("test1"));
+        DropCatalogStmt stmt = (DropCatalogStmt) parseAndAnalyzeStmt("drop catalog test1");
+        env.getCatalogMgr().dropCatalog(stmt);
+        Assert.assertFalse(env.getAccessManager().checkIfAccessControllerExist("test1"));
+    }
+
     @Test
     public void testColumnPrivs() throws Exception {
         String showCatalogSql = "SHOW CATALOGS";
         ShowCatalogStmt showStmt = (ShowCatalogStmt) parseAndAnalyzeStmt(showCatalogSql);
         ShowResultSet showResultSet = mgr.showCatalogs(showStmt);
         Assertions.assertEquals(2, showResultSet.getResultRows().size());
 
-        ConnectContext rootCtx = createDefaultCtx();
         CreateRoleStmt createRole1 = (CreateRoleStmt) parseAndAnalyzeStmt("create role role1;", rootCtx);
         auth.createRole(createRole1);
         GrantStmt grantRole = (GrantStmt) parseAndAnalyzeStmt("grant select_priv on test1.*.* to role 'role1';",