lirui-apache commented on a change in pull request #12197: URL: https://github.com/apache/flink/pull/12197#discussion_r426236545
########## File path: flink-table/flink-sql-parser/src/main/java/org/apache/flink/sql/parser/ddl/SqlDropCatalog.java ########## @@ -0,0 +1,66 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.sql.parser.ddl; + +import org.apache.calcite.sql.SqlDrop; +import org.apache.calcite.sql.SqlIdentifier; +import org.apache.calcite.sql.SqlKind; +import org.apache.calcite.sql.SqlNode; +import org.apache.calcite.sql.SqlOperator; +import org.apache.calcite.sql.SqlSpecialOperator; +import org.apache.calcite.sql.SqlWriter; +import org.apache.calcite.sql.parser.SqlParserPos; +import org.apache.calcite.util.ImmutableNullableList; + +import java.util.List; + +/** + * DROP CATALOG DDL sql call. + */ +public class SqlDropCatalog extends SqlDrop { + + private static final SqlOperator OPERATOR = new SqlSpecialOperator("DROP CATALOG", SqlKind.OTHER_DDL); + + private final SqlIdentifier catalogName; + + public SqlDropCatalog(SqlParserPos pos, SqlIdentifier catalogName) { + super(OPERATOR, pos, false); + this.catalogName = catalogName; + } + + @Override + public List<SqlNode> getOperandList() { + return ImmutableNullableList.of(catalogName); + } + + public SqlIdentifier getCatalogName() { + return catalogName; + } + + @Override + public void unparse(SqlWriter writer, int leftPrec, int rightPrec) { + writer.keyword("DROP"); + writer.keyword("CATALOG"); + catalogName.unparse(writer, leftPrec, rightPrec); + } + + public String catalogName() { + return catalogName.names.get(0); Review comment: ```suggestion return catalogName.getSimple(); ``` ########## File path: flink-table/flink-sql-parser/src/main/codegen/includes/parserImpls.ftl ########## @@ -1302,6 +1315,8 @@ SqlDrop SqlDropExtended(Span s, boolean replace) : <TEMPORARY> { isTemporary = true; } ] ( + drop = SqlDropCatalog(s, replace) Review comment: Do we have to put it under `SqlDropExtended`? I don't think it makes sense to support temporary catalogs. ########## File path: flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/catalog/CatalogManager.java ########## @@ -171,6 +171,24 @@ public void registerCatalog(String catalogName, Catalog catalog) { catalog.open(); } + /** + * Unregisters a catalog under the given name. The catalog name must be existed. + * + * @param catalogName name under which to unregister the given catalog + * @throws CatalogException if the unregistration of the catalog under the given name failed + */ + public void unregisterCatalog(String catalogName) { + checkArgument(!StringUtils.isNullOrWhitespaceOnly(catalogName), "Catalog name cannot be null or empty."); + + if (!catalogs.containsKey(catalogName)) { + throw new CatalogException(format("Catalog %s does not exist.", catalogName)); Review comment: If we enforce this check, I think we should support `DROP CATALOG IF EXSITS` ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
