LiBinfeng-01 commented on code in PR #43449:
URL: https://github.com/apache/doris/pull/43449#discussion_r1833639667
##########
fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java:
##########
@@ -4006,6 +4008,17 @@ public SetDefaultStorageVaultCommand
visitSetDefaultStorageVault(SetDefaultStora
return new
SetDefaultStorageVaultCommand(stripQuotes(ctx.identifier().getText()));
}
+ @Override
+ public Object visitRefreshCatalog(RefreshCatalogContext ctx) {
+
Review Comment:
remove this empty line
##########
regression-test/suites/external_table_p0/nereids_commands/test_nereids_refresh_catalog.groovy:
##########
@@ -0,0 +1,78 @@
+// 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.
+
+suite("test_nereids_refresh_catalog",
"p0,external,mysql,external_docker,external_docker_mysql") {
+ String enabled = context.config.otherConfigs.get("enableJdbcTest")
+ String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
+ String s3_endpoint = getS3Endpoint()
+ String bucket = getS3BucketName()
+ String driver_url =
"https://${bucket}.${s3_endpoint}/regression/jdbc_driver/mysql-connector-java-8.0.25.jar";
+ if (enabled != null && enabled.equalsIgnoreCase("true")) {
+ String catalog_name = "refresh_catalog_mysql_catalog_nereids";
+ String internal_db_name = "regression_test_jdbc_catalog_p0";
+ String ex_db_name = "doris_test";
+ String mysql_port = context.config.otherConfigs.get("mysql_57_port");
+ String inDorisTable = "doris_in_tb_nereids";
+ String ex_tb0 = "ex_tb0";
+ String new_mysql_db = "new_mysql_db";
+
+ sql """create database if not exists ${internal_db_name}; """
+
+ sql """drop catalog if exists ${catalog_name} """
+
+ sql """set enable_nereids_planner=true;"""
+ sql """set enable_fallback_to_original_planner=false;"""
+
+ sql """create catalog if not exists ${catalog_name} properties(
+ "type"="jdbc",
+ "user"="root",
+ "password"="123456",
+ "jdbc_url" =
"jdbc:mysql://${externalEnvIp}:${mysql_port}/doris_test?useSSL=false",
+ "driver_url" = "${driver_url}",
+ "driver_class" = "com.mysql.cj.jdbc.Driver"
+ );"""
+
+
+
+ sql """switch ${catalog_name}"""
+ sql """CALL EXECUTE_STMT("${catalog_name}", "drop database if exists
${new_mysql_db}");"""
+
+ qt_sql """show databases;"""
+ sql """ use ${ex_db_name}"""
+
+ qt_ex_tb0_where """select id from ${ex_tb0} where id = 111;"""
+ order_qt_ex_tb0 """ select id, name from ${ex_tb0} order by id; """
+ // create database in mysql
+ sql """CALL EXECUTE_STMT("${catalog_name}", "create database
${new_mysql_db} ;");"""
+ qt_sql """show databases;"""
+ checkNereidsExecute("refresh catalog ${catalog_name}")
+ sql "refresh catalog ${catalog_name} ;"
Review Comment:
can not do it again
##########
regression-test/suites/external_table_p0/nereids_commands/test_nereids_refresh_catalog.groovy:
##########
@@ -0,0 +1,78 @@
+// 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.
+
+suite("test_nereids_refresh_catalog",
"p0,external,mysql,external_docker,external_docker_mysql") {
+ String enabled = context.config.otherConfigs.get("enableJdbcTest")
+ String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
+ String s3_endpoint = getS3Endpoint()
+ String bucket = getS3BucketName()
+ String driver_url =
"https://${bucket}.${s3_endpoint}/regression/jdbc_driver/mysql-connector-java-8.0.25.jar";
+ if (enabled != null && enabled.equalsIgnoreCase("true")) {
+ String catalog_name = "refresh_catalog_mysql_catalog_nereids";
+ String internal_db_name = "regression_test_jdbc_catalog_p0";
+ String ex_db_name = "doris_test";
+ String mysql_port = context.config.otherConfigs.get("mysql_57_port");
+ String inDorisTable = "doris_in_tb_nereids";
+ String ex_tb0 = "ex_tb0";
+ String new_mysql_db = "new_mysql_db";
+
+ sql """create database if not exists ${internal_db_name}; """
+
+ sql """drop catalog if exists ${catalog_name} """
+
+ sql """set enable_nereids_planner=true;"""
+ sql """set enable_fallback_to_original_planner=false;"""
+
+ sql """create catalog if not exists ${catalog_name} properties(
+ "type"="jdbc",
+ "user"="root",
+ "password"="123456",
+ "jdbc_url" =
"jdbc:mysql://${externalEnvIp}:${mysql_port}/doris_test?useSSL=false",
+ "driver_url" = "${driver_url}",
+ "driver_class" = "com.mysql.cj.jdbc.Driver"
+ );"""
+
+
+
+ sql """switch ${catalog_name}"""
+ sql """CALL EXECUTE_STMT("${catalog_name}", "drop database if exists
${new_mysql_db}");"""
+
+ qt_sql """show databases;"""
+ sql """ use ${ex_db_name}"""
+
+ qt_ex_tb0_where """select id from ${ex_tb0} where id = 111;"""
+ order_qt_ex_tb0 """ select id, name from ${ex_tb0} order by id; """
+ // create database in mysql
+ sql """CALL EXECUTE_STMT("${catalog_name}", "create database
${new_mysql_db} ;");"""
+ qt_sql """show databases;"""
+ checkNereidsExecute("refresh catalog ${catalog_name}")
+ sql "refresh catalog ${catalog_name} ;"
+ qt_sql """show databases;"""
+
+ checkNereidsExecute("refresh catalog ${catalog_name} properties
('invalid_cache'='true');")
+ sql "refresh catalog ${catalog_name} properties
('invalid_cache'='true');"
+
+ sql """CALL EXECUTE_STMT("${catalog_name}", "drop database if exists
${new_mysql_db} ;");"""
+ qt_sql """show databases;"""
+
+ checkNereidsExecute("refresh catalog ${catalog_name} properties
('invalid_cache'='true');")
+ sql "refresh catalog ${catalog_name} properties
('invalid_cache'='true');"
Review Comment:
duplicate run
##########
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/refresh/RefreshCatalogCommand.java:
##########
@@ -0,0 +1,147 @@
+// 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.doris.nereids.trees.plans.commands.refresh;
+
+import org.apache.doris.analysis.StmtType;
+import org.apache.doris.catalog.Env;
+import org.apache.doris.common.AnalysisException;
+import org.apache.doris.common.ErrorCode;
+import org.apache.doris.common.ErrorReport;
+import org.apache.doris.common.util.Util;
+import org.apache.doris.datasource.CatalogIf;
+import org.apache.doris.datasource.CatalogLog;
+import org.apache.doris.datasource.ExternalCatalog;
+import org.apache.doris.datasource.InternalCatalog;
+import org.apache.doris.mysql.privilege.PrivPredicate;
+import org.apache.doris.nereids.trees.plans.PlanType;
+import org.apache.doris.nereids.trees.plans.commands.Command;
+import org.apache.doris.nereids.trees.plans.commands.ForwardWithSync;
+import org.apache.doris.nereids.trees.plans.visitor.PlanVisitor;
+import org.apache.doris.persist.OperationType;
+import org.apache.doris.qe.ConnectContext;
+import org.apache.doris.qe.StmtExecutor;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.util.Map;
+
+/**
+ * Manually refresh the catalog metadata.
+ */
+public class RefreshCatalogCommand extends Command implements ForwardWithSync {
+ private static final Logger LOG =
LogManager.getLogger(RefreshCatalogCommand.class);
+ private static final String INVALID_CACHE = "invalid_cache";
+ private final String catalogName;
+ private Map<String, String> properties;
+ private boolean invalidCache = true;
+
+ public RefreshCatalogCommand(String catalogName, Map<String, String>
properties) {
+ super(PlanType.REFRESH_CATALOG_COMMAND);
+ this.catalogName = catalogName;
+ this.properties = properties;
+ }
+
+ private void checkCatalogRules() throws AnalysisException {
+ Util.checkCatalogAllRules(catalogName);
+ if (catalogName.equals(InternalCatalog.INTERNAL_CATALOG_NAME)) {
+ throw new AnalysisException("Internal catalog name can't be
refresh.");
+ }
+ }
+
+ private void checkCatalogAccess() throws AnalysisException {
+ if (!Env.getCurrentEnv().getAccessManager().checkCtlPriv(
+ ConnectContext.get(), catalogName, PrivPredicate.SHOW)) {
+
ErrorReport.reportAnalysisException(ErrorCode.ERR_CATALOG_ACCESS_DENIED_ERROR,
+ PrivPredicate.SHOW.getPrivs().toString(), catalogName);
+ }
+ }
+
+ private void setInvalidCache() {
+ if (properties != null) {
+ // Set to false only if user set the property
"invalid_cache"="false"
+ invalidCache = !(properties.get(INVALID_CACHE) != null &&
properties.get(INVALID_CACHE)
+ .equalsIgnoreCase("false"));
+ }
+
+ }
+
+ private void refreshCatalogInternal(CatalogIf catalog) {
+
Review Comment:
empty line
##########
regression-test/suites/external_table_p0/nereids_commands/test_nereids_refresh_catalog.groovy:
##########
@@ -0,0 +1,78 @@
+// 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.
+
+suite("test_nereids_refresh_catalog",
"p0,external,mysql,external_docker,external_docker_mysql") {
+ String enabled = context.config.otherConfigs.get("enableJdbcTest")
+ String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
+ String s3_endpoint = getS3Endpoint()
+ String bucket = getS3BucketName()
+ String driver_url =
"https://${bucket}.${s3_endpoint}/regression/jdbc_driver/mysql-connector-java-8.0.25.jar";
+ if (enabled != null && enabled.equalsIgnoreCase("true")) {
+ String catalog_name = "refresh_catalog_mysql_catalog_nereids";
+ String internal_db_name = "regression_test_jdbc_catalog_p0";
+ String ex_db_name = "doris_test";
+ String mysql_port = context.config.otherConfigs.get("mysql_57_port");
+ String inDorisTable = "doris_in_tb_nereids";
+ String ex_tb0 = "ex_tb0";
+ String new_mysql_db = "new_mysql_db";
+
+ sql """create database if not exists ${internal_db_name}; """
+
+ sql """drop catalog if exists ${catalog_name} """
+
+ sql """set enable_nereids_planner=true;"""
+ sql """set enable_fallback_to_original_planner=false;"""
+
+ sql """create catalog if not exists ${catalog_name} properties(
+ "type"="jdbc",
+ "user"="root",
+ "password"="123456",
+ "jdbc_url" =
"jdbc:mysql://${externalEnvIp}:${mysql_port}/doris_test?useSSL=false",
+ "driver_url" = "${driver_url}",
+ "driver_class" = "com.mysql.cj.jdbc.Driver"
+ );"""
+
+
+
+ sql """switch ${catalog_name}"""
+ sql """CALL EXECUTE_STMT("${catalog_name}", "drop database if exists
${new_mysql_db}");"""
+
+ qt_sql """show databases;"""
+ sql """ use ${ex_db_name}"""
+
+ qt_ex_tb0_where """select id from ${ex_tb0} where id = 111;"""
+ order_qt_ex_tb0 """ select id, name from ${ex_tb0} order by id; """
+ // create database in mysql
+ sql """CALL EXECUTE_STMT("${catalog_name}", "create database
${new_mysql_db} ;");"""
+ qt_sql """show databases;"""
+ checkNereidsExecute("refresh catalog ${catalog_name}")
+ sql "refresh catalog ${catalog_name} ;"
+ qt_sql """show databases;"""
+
+ checkNereidsExecute("refresh catalog ${catalog_name} properties
('invalid_cache'='true');")
+ sql "refresh catalog ${catalog_name} properties
('invalid_cache'='true');"
Review Comment:
duplicated run
##########
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/visitor/CommandVisitor.java:
##########
@@ -235,11 +236,16 @@ default R
visitSetDefaultStorageVault(SetDefaultStorageVaultCommand setDefaultSt
return visitCommand(setDefaultStorageVaultCommand, context);
}
+ default R visitRefreshCatalogCommand(RefreshCatalogCommand
refreshCatalogCommand, C context) {
+ return visitCommand(refreshCatalogCommand, context);
+ }
+
default R visitShowVariablesCommand(ShowVariablesCommand
showVariablesCommand, C context) {
return visitCommand(showVariablesCommand, context);
}
default R visitShowViewCommand(ShowViewCommand showViewCommand, C context)
{
return visitCommand(showViewCommand, context);
+
Review Comment:
empty line
--
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.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
