This is an automated email from the ASF dual-hosted git repository. yiguolei pushed a commit to branch branch-2.1 in repository https://gitbox.apache.org/repos/asf/doris.git
commit b5a19147406480accd4c09d7e58b202bff006c1b Author: feiniaofeiafei <[email protected]> AuthorDate: Tue Mar 26 16:02:20 2024 +0800 [Fix](nereids) Fix deletestmt getting catalog (#32701) --- .../java/org/apache/doris/analysis/DeleteStmt.java | 14 +++++- .../test_switch_catalog_and_delete_internal.out | 2 + .../test_switch_catalog_and_delete_internal.groovy | 58 ++++++++++++++++++++++ 3 files changed, 72 insertions(+), 2 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/DeleteStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/DeleteStmt.java index 6ad2c1285e8..fd7a50ea6ca 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/DeleteStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/DeleteStmt.java @@ -34,6 +34,7 @@ import org.apache.doris.common.ErrorCode; import org.apache.doris.common.ErrorReport; import org.apache.doris.common.UserException; import org.apache.doris.common.util.Util; +import org.apache.doris.datasource.CatalogIf; import org.apache.doris.mysql.privilege.PrivPredicate; import org.apache.doris.qe.ConnectContext; import org.apache.doris.qe.SessionVariable; @@ -307,9 +308,9 @@ public class DeleteStmt extends DdlStmt { private void checkDeleteConditions() throws AnalysisException { // check condition column is key column and condition value // Here we use "getFullSchema()" to get all columns including VISIBLE and SHADOW columns - + CatalogIf catalog = getCatalog(); // we ensure the db and table exists. - Database db = (Database) Env.getCurrentEnv().getCurrentCatalog().getDb(getDbName()).get(); + Database db = (Database) catalog.getDb(getDbName()).get(); OlapTable table = ((OlapTable) db.getTable(getTableName()).get()); Map<String, Column> nameToColumn = Maps.newTreeMap(String.CASE_INSENSITIVE_ORDER); @@ -438,6 +439,15 @@ public class DeleteStmt extends DdlStmt { return slotRef; } + private CatalogIf getCatalog() { + Env env = Env.getCurrentEnv(); + if (null == tableName.getCtl()) { + return env.getCurrentCatalog(); + } else { + return env.getCatalogMgr().getCatalog(tableName.getCtl()); + } + } + @Override public String toSql() { StringBuilder sb = new StringBuilder(); diff --git a/regression-test/data/external_table_p0/jdbc/test_switch_catalog_and_delete_internal.out b/regression-test/data/external_table_p0/jdbc/test_switch_catalog_and_delete_internal.out new file mode 100644 index 00000000000..cda9c9293b3 --- /dev/null +++ b/regression-test/data/external_table_p0/jdbc/test_switch_catalog_and_delete_internal.out @@ -0,0 +1,2 @@ +-- This file is automatically generated. You should know what you did if you want to edit this +-- !test -- diff --git a/regression-test/suites/external_table_p0/jdbc/test_switch_catalog_and_delete_internal.groovy b/regression-test/suites/external_table_p0/jdbc/test_switch_catalog_and_delete_internal.groovy new file mode 100644 index 00000000000..1e9e2ffdf48 --- /dev/null +++ b/regression-test/suites/external_table_p0/jdbc/test_switch_catalog_and_delete_internal.groovy @@ -0,0 +1,58 @@ +// 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_switch_catalog_and_delete_internal") { + String enabled = context.config.otherConfigs.get("enableJdbcTest") + String externalEnvIp = context.config.otherConfigs.get("externalEnvIp") + String mysql_port = context.config.otherConfigs.get("mysql_57_port"); + 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")) { + // 0.create internal db and table + String db = context.config.getDbNameByFile(new File(context.file)) + sql "drop table if exists test_switch_catalog_and_delete_internal" + sql """ + create table test_switch_catalog_and_delete_internal(pk int, a int, b int) distributed by hash(pk) buckets 10 + properties('replication_num' = '1'); + """ + + sql """ + insert into test_switch_catalog_and_delete_internal values(2,1,3),(1,1,2),(3,5,6),(6,null,6),(4,5,6); + """ + // 1.create catalog + String catalog_name = "test_switch_catalog_and_delete_internal_catalog" + sql """drop catalog if exists ${catalog_name} """ + + 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&zeroDateTimeBehavior=convertToNull", + "driver_url" = "${driver_url}", + "driver_class" = "com.mysql.cj.jdbc.Driver" + );""" + // 2.switch catalog/ refresh + sql "switch test_switch_catalog_and_delete_internal_catalog" + sql "refresh catalog test_switch_catalog_and_delete_internal_catalog" + // 3.delete table + sql "delete from internal.${db}.test_switch_catalog_and_delete_internal;" + // 4.select table + qt_test "select * from internal.maldb.test_switch_catalog_and_delete_internal;" + } + +} \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
