This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new bf26f49505e [bugfix](external)add check of engine and catalog types
for 2.1 #39343 (#39643)
bf26f49505e is described below
commit bf26f49505eeadeea48f87a45deea1b38bcddc22
Author: wuwenchi <[email protected]>
AuthorDate: Wed Aug 21 09:50:17 2024 +0800
[bugfix](external)add check of engine and catalog types for 2.1 #39343
(#39643)
bp #39343
---
.../trees/plans/commands/info/CreateTableInfo.java | 22 +++++--
.../hive/ddl/test_hive_ddl.groovy | 19 ++++++
.../iceberg/write/test_iceberg_create_table.groovy | 76 ++++++++++++++++++++++
3 files changed, 111 insertions(+), 6 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/info/CreateTableInfo.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/info/CreateTableInfo.java
index 716284e0ca9..2572cf09879 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/info/CreateTableInfo.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/info/CreateTableInfo.java
@@ -194,6 +194,21 @@ public class CreateTableInfo {
return ImmutableList.of(tableName);
}
+ private void checkEngineWithCatalog() {
+ if (engineName.equals(ENGINE_OLAP)) {
+ if (!ctlName.equals(InternalCatalog.INTERNAL_CATALOG_NAME)) {
+ throw new AnalysisException("Cannot create olap table out of
internal catalog."
+ + " Make sure 'engine' type is specified when use the
catalog: " + ctlName);
+ }
+ }
+ CatalogIf catalog =
Env.getCurrentEnv().getCatalogMgr().getCatalog(ctlName);
+ if (catalog instanceof HMSExternalCatalog &&
!engineName.equals(ENGINE_HIVE)) {
+ throw new AnalysisException("Hms type catalog can only use `hive`
engine.");
+ } else if (catalog instanceof IcebergExternalCatalog &&
!engineName.equals(ENGINE_ICEBERG)) {
+ throw new AnalysisException("Iceberg type catalog can only use
`iceberg` engine.");
+ }
+ }
+
/**
* analyze create table info
*/
@@ -231,12 +246,7 @@ public class CreateTableInfo {
throw new AnalysisException(e.getMessage(), e);
}
- if (engineName.equals(ENGINE_OLAP)) {
- if (!ctlName.equals(InternalCatalog.INTERNAL_CATALOG_NAME)) {
- throw new AnalysisException("Cannot create olap table out of
internal catalog."
- + " Make sure 'engine' type is specified when use the
catalog: " + ctlName);
- }
- }
+ checkEngineWithCatalog();
// analyze table name
if (Strings.isNullOrEmpty(dbName)) {
diff --git
a/regression-test/suites/external_table_p0/hive/ddl/test_hive_ddl.groovy
b/regression-test/suites/external_table_p0/hive/ddl/test_hive_ddl.groovy
index f17ea23cefe..082698d0a51 100644
--- a/regression-test/suites/external_table_p0/hive/ddl/test_hive_ddl.groovy
+++ b/regression-test/suites/external_table_p0/hive/ddl/test_hive_ddl.groovy
@@ -682,6 +682,24 @@ suite("test_hive_ddl",
"p0,external,hive,external_docker,external_docker_hive")
sql """ drop database if exists `test_hive_db_tbl` """;
}
+ def test_error_create = { String catalog_name ->
+ sql """switch `${catalog_name}`"""
+ sql """ drop database if exists test_hive_db_error_tbl """
+ sql """ create database `test_hive_db_error_tbl` """;
+
+ test {
+ sql """ create table err_tb (id int) engine = iceberg """
+ exception "java.sql.SQLException: errCode = 2, detailMessage =
Hms type catalog can only use `hive` engine."
+ }
+
+ test {
+ sql """ create table err_tb (id int) engine = jdbc """
+ exception "java.sql.SQLException: errCode = 2, detailMessage =
Hms type catalog can only use `hive` engine."
+ }
+
+ sql """ drop database test_hive_db_error_tbl """
+ }
+
try {
String hms_port = context.config.otherConfigs.get("hive2HmsPort")
@@ -716,6 +734,7 @@ suite("test_hive_ddl",
"p0,external,hive,external_docker,external_docker_hive")
}
test_create_tbl_cross_catalog(file_format, catalog_name)
}
+ test_error_create(catalog_name)
sql """drop catalog if exists ${catalog_name}"""
} finally {
}
diff --git
a/regression-test/suites/external_table_p0/iceberg/write/test_iceberg_create_table.groovy
b/regression-test/suites/external_table_p0/iceberg/write/test_iceberg_create_table.groovy
new file mode 100644
index 00000000000..d76c6a4b052
--- /dev/null
+++
b/regression-test/suites/external_table_p0/iceberg/write/test_iceberg_create_table.groovy
@@ -0,0 +1,76 @@
+// 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_iceberg_create_table",
"p0,external,doris,external_docker,external_docker_doris") {
+ String enabled = context.config.otherConfigs.get("enableIcebergTest")
+ if (enabled == null || !enabled.equalsIgnoreCase("true")) {
+ logger.info("disable iceberg test.")
+ return
+ }
+
+ String rest_port = context.config.otherConfigs.get("iceberg_rest_uri_port")
+ String minio_port = context.config.otherConfigs.get("iceberg_minio_port")
+ String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
+ String catalog_name = "test_iceberg_create_table"
+
+ sql """drop catalog if exists ${catalog_name}"""
+ sql """
+ CREATE CATALOG ${catalog_name} PROPERTIES (
+ 'type'='iceberg',
+ 'iceberg.catalog.type'='rest',
+ 'uri' = 'http://${externalEnvIp}:${rest_port}',
+ "s3.access_key" = "admin",
+ "s3.secret_key" = "password",
+ "s3.endpoint" = "http://${externalEnvIp}:${minio_port}";,
+ "s3.region" = "us-east-1"
+ );"""
+
+ sql """ switch ${catalog_name} """
+
+ String db1 = catalog_name + "_db1"
+ String tb1 = db1 + "_tb1"
+ String tb2 = db1 + "_tb2"
+
+ sql """ drop table if exists ${db1}.${tb1} """
+ sql """ drop table if exists ${db1}.${tb2} """
+ sql """ drop database if exists ${db1} """
+
+ sql """ create database ${db1} """
+
+ test {
+ sql """ create table ${db1}.${tb1} (id int) engine = olap """
+ exception "Cannot create olap table out of internal catalog. Make sure
'engine' type is specified when use the catalog: ${catalog_name}"
+ }
+
+ test {
+ sql """ create table ${db1}.${tb1} (id int) engine = hive """
+ exception "java.sql.SQLException: errCode = 2, detailMessage = Iceberg
type catalog can only use `iceberg` engine."
+ }
+
+ test {
+ sql """ create table ${db1}.${tb1} (id int) engine = jdbc """
+ exception "java.sql.SQLException: errCode = 2, detailMessage = Iceberg
type catalog can only use `iceberg` engine."
+ }
+
+ sql """ create table ${db1}.${tb1} (id int) engine = iceberg """
+ sql """ create table ${db1}.${tb2} (id int) """
+
+ sql """ drop table ${db1}.${tb1} """
+ sql """ drop table ${db1}.${tb2} """
+ sql """ drop database ${db1} """
+
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
