This is an automated email from the ASF dual-hosted git repository. yiguolei pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push: new 3d0f952934 [FIX](complex-type)delete enable_map/struct_type switch #21957 3d0f952934 is described below commit 3d0f95293472d91765ed7a01d4e86506e140f51a Author: amory <wangqian...@selectdb.com> AuthorDate: Sat Jul 22 15:29:32 2023 +0800 [FIX](complex-type)delete enable_map/struct_type switch #21957 --- .../docs/sql-manual/sql-reference/Data-Types/MAP.md | 4 ---- .../sql-manual/sql-reference/Data-Types/STRUCT.md | 4 ---- .../main/java/org/apache/doris/common/Config.java | 12 ------------ .../org/apache/doris/analysis/CreateTableStmt.java | 8 -------- .../analysis/IsNullPredicateWithComplexTypeTest.java | 3 --- .../org/apache/doris/catalog/CreateTableTest.java | 20 ++++++++++---------- .../apache/doris/nereids/UnsupportedTypeTest.java | 3 --- .../suites/bloom_filter_p0/test_bloom_filter.groovy | 4 ++-- .../datatype_p2/complex_types/test_big_kv_map.groovy | 2 +- .../suites/delete_p0/test_map_column_delete.groovy | 2 +- .../delete_p0/test_struct_column_delete.groovy | 1 - regression-test/suites/export/test_map_export.groovy | 2 +- .../suites/export/test_struct_export.groovy | 2 +- .../suites/insert_p0/test_struct_insert.groovy | 1 - .../suites/load/insert/test_map_dml.groovy | 2 -- .../stream_load/test_map_load_and_compaction.groovy | 1 - .../stream_load/test_map_load_and_function.groovy | 1 - .../load_p0/stream_load/test_stream_load.groovy | 2 +- .../test_create_mv_complex_type.groovy | 2 -- .../aggregate/aggregate_group_by_metric_type.groovy | 2 +- .../show/test_complex_type_unique_key.groovy | 2 -- .../suites/query_p0/show/test_map_show_create.groovy | 1 - .../query_p0/show/test_nested_complex_switch.groovy | 4 ---- .../query_p0/show/test_struct_show_create.groovy | 1 - .../struct_functions/test_struct_functions.groovy | 2 +- .../rollup_p0/test_materialized_view_struct.groovy | 2 +- 26 files changed, 20 insertions(+), 70 deletions(-) diff --git a/docs/zh-CN/docs/sql-manual/sql-reference/Data-Types/MAP.md b/docs/zh-CN/docs/sql-manual/sql-reference/Data-Types/MAP.md index b5c87884c2..4af18e7956 100644 --- a/docs/zh-CN/docs/sql-manual/sql-reference/Data-Types/MAP.md +++ b/docs/zh-CN/docs/sql-manual/sql-reference/Data-Types/MAP.md @@ -40,10 +40,6 @@ MAP 由K, V类型元素组成的map,不能作为key列使用。目前支持在Duplicate,Unique 模型的表中使用。 -需要手动开启支持,默认关闭. -``` -admin set frontend config("enable_map_type" = "true"); -``` K,V 支持的类型有: ``` diff --git a/docs/zh-CN/docs/sql-manual/sql-reference/Data-Types/STRUCT.md b/docs/zh-CN/docs/sql-manual/sql-reference/Data-Types/STRUCT.md index a88fdb56eb..f534cf500a 100644 --- a/docs/zh-CN/docs/sql-manual/sql-reference/Data-Types/STRUCT.md +++ b/docs/zh-CN/docs/sql-manual/sql-reference/Data-Types/STRUCT.md @@ -40,10 +40,6 @@ STRUCT 由多个 Field 组成的结构体,也可被理解为多个列的集合。不能作为 Key 使用,目前 STRUCT 仅支持在 Duplicate 模型的表中使用。 -需要手动开启支持,默认关闭. -``` -admin set frontend config("enable_struct_type" = "true"); -``` 一个 Struct 中的 Field 的名字和数量固定,总是为 Nullable,一个 Field 通常由下面部分组成。 diff --git a/fe/fe-common/src/main/java/org/apache/doris/common/Config.java b/fe/fe-common/src/main/java/org/apache/doris/common/Config.java index 424736bead..f336579a38 100644 --- a/fe/fe-common/src/main/java/org/apache/doris/common/Config.java +++ b/fe/fe-common/src/main/java/org/apache/doris/common/Config.java @@ -1556,18 +1556,6 @@ public class Config extends ConfigBase { @ConfField(mutable = true, masterOnly = true) public static boolean enable_array_type = false; - /** - * Support complex data type MAP. - */ - @ConfField(mutable = true, masterOnly = true) - public static boolean enable_map_type = false; - - /** - * Support complex data type STRUCT. - */ - @ConfField(mutable = true, masterOnly = true) - public static boolean enable_struct_type = false; - /** * The timeout of executing async remote fragment. * In normal case, the async remote fragment will be executed in a short time. If system are under high load diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateTableStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateTableStmt.java index cdf1a3ffa0..64409d3b4a 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateTableStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateTableStmt.java @@ -495,14 +495,6 @@ public class CreateTableStmt extends DdlStmt { columnDef.analyze(engineName.equals("olap")); if (columnDef.getType().isComplexType() && engineName.equals("olap")) { - if (columnDef.getType().isMapType() && !Config.enable_map_type) { - throw new AnalysisException("Please open enable_map_type config before use Map."); - } - - if (columnDef.getType().isStructType() && !Config.enable_struct_type) { - throw new AnalysisException("Please open enable_struct_type config before use Struct."); - } - if (columnDef.getAggregateType() == AggregateType.REPLACE && keysDesc.getKeysType() == KeysType.AGG_KEYS) { throw new AnalysisException("Aggregate table can't support replace array/map/struct value now"); diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/IsNullPredicateWithComplexTypeTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/IsNullPredicateWithComplexTypeTest.java index 6897b1ec82..17c38b9a62 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/analysis/IsNullPredicateWithComplexTypeTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/IsNullPredicateWithComplexTypeTest.java @@ -17,7 +17,6 @@ package org.apache.doris.analysis; -import org.apache.doris.common.Config; import org.apache.doris.utframe.TestWithFeService; import org.junit.jupiter.api.Assertions; @@ -27,8 +26,6 @@ public class IsNullPredicateWithComplexTypeTest extends TestWithFeService { @Override protected void runBeforeAll() throws Exception { - Config.enable_map_type = true; - Config.enable_struct_type = true; // create database createDatabase("test"); diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/CreateTableTest.java b/fe/fe-core/src/test/java/org/apache/doris/catalog/CreateTableTest.java index 195405f9e9..3e98d8e285 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/catalog/CreateTableTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/CreateTableTest.java @@ -708,20 +708,20 @@ public class CreateTableTest { @Test public void testCreateTableWithMapType() throws Exception { - ExceptionChecker.expectThrowsWithMsg(AnalysisException.class, "Please open enable_map_type config before use Map.", - () -> { - createTable("create table test.test_map(k1 INT, k2 Map<int, VARCHAR(20)>) duplicate key (k1) " - + "distributed by hash(k1) buckets 1 properties('replication_num' = '1');"); - }); + ExceptionChecker.expectThrowsNoException(() -> { + createTable("create table test.test_map(k1 INT, k2 Map<int, VARCHAR(20)>) " + + "duplicate key (k1) " + + "distributed by hash(k1) buckets 1 properties('replication_num' = '1');"); + }); } @Test public void testCreateTableWithStructType() throws Exception { - ExceptionChecker.expectThrowsWithMsg(AnalysisException.class, "Please open enable_struct_type config before use Struct.", - () -> { - createTable("create table test.test_struct(k1 INT, k2 Struct<f1:int, f2:VARCHAR(20)>) duplicate key (k1) " - + "distributed by hash(k1) buckets 1 properties('replication_num' = '1');"); - }); + ExceptionChecker.expectThrowsNoException(() -> { + createTable("create table test.test_struct(k1 INT, k2 Struct<f1:int, f2:VARCHAR(20)>) " + + "duplicate key (k1) " + + "distributed by hash(k1) buckets 1 properties('replication_num' = '1');"); + }); } @Test diff --git a/fe/fe-core/src/test/java/org/apache/doris/nereids/UnsupportedTypeTest.java b/fe/fe-core/src/test/java/org/apache/doris/nereids/UnsupportedTypeTest.java index b7f163c3f9..0fc632f226 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/nereids/UnsupportedTypeTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/nereids/UnsupportedTypeTest.java @@ -17,7 +17,6 @@ package org.apache.doris.nereids; -import org.apache.doris.common.Config; import org.apache.doris.nereids.exceptions.AnalysisException; import org.apache.doris.nereids.parser.NereidsParser; import org.apache.doris.nereids.properties.PhysicalProperties; @@ -30,8 +29,6 @@ import org.junit.jupiter.api.Test; public class UnsupportedTypeTest extends TestWithFeService { @Override protected void runBeforeAll() throws Exception { - Config.enable_map_type = true; - Config.enable_struct_type = true; createDatabase("test"); connectContext.setDatabase("default_cluster:test"); createTables( diff --git a/regression-test/suites/bloom_filter_p0/test_bloom_filter.groovy b/regression-test/suites/bloom_filter_p0/test_bloom_filter.groovy index c719eb0f64..89140593d0 100644 --- a/regression-test/suites/bloom_filter_p0/test_bloom_filter.groovy +++ b/regression-test/suites/bloom_filter_p0/test_bloom_filter.groovy @@ -53,7 +53,7 @@ suite("test_bloom_filter") { // bloom filter index for STRUCT column def test_struct_tb = "test_struct_bloom_filter_tb" sql """DROP TABLE IF EXISTS ${test_struct_tb}""" - sql "ADMIN SET FRONTEND CONFIG ('enable_struct_type' = 'true')" + test { sql """CREATE TABLE IF NOT EXISTS ${test_struct_tb} ( `k1` int(11) NOT NULL, @@ -86,7 +86,7 @@ suite("test_bloom_filter") { // bloom filter index for MAP column def test_map_tb = "test_map_bloom_filter_tb" sql """DROP TABLE IF EXISTS ${test_map_tb}""" - sql "ADMIN SET FRONTEND CONFIG ('enable_map_type' = 'true')" + test { sql """CREATE TABLE IF NOT EXISTS ${test_map_tb} ( `k1` int(11) NOT NULL, diff --git a/regression-test/suites/datatype_p2/complex_types/test_big_kv_map.groovy b/regression-test/suites/datatype_p2/complex_types/test_big_kv_map.groovy index f765512034..8017363de5 100644 --- a/regression-test/suites/datatype_p2/complex_types/test_big_kv_map.groovy +++ b/regression-test/suites/datatype_p2/complex_types/test_big_kv_map.groovy @@ -17,7 +17,7 @@ suite("test_big_kv_map", "p2") { def testTable = "test_big_kv_map" - sql "ADMIN SET FRONTEND CONFIG ('enable_map_type' = 'true')" + sql "DROP TABLE IF EXISTS ${testTable}" sql """ CREATE TABLE IF NOT EXISTS ${testTable} ( diff --git a/regression-test/suites/delete_p0/test_map_column_delete.groovy b/regression-test/suites/delete_p0/test_map_column_delete.groovy index 129bf0a6cc..cb3a36e60e 100644 --- a/regression-test/suites/delete_p0/test_map_column_delete.groovy +++ b/regression-test/suites/delete_p0/test_map_column_delete.groovy @@ -19,7 +19,7 @@ suite("test_map_column_delete") { def tableName = "test_map_column_delete" sql """ DROP TABLE IF EXISTS ${tableName}; """ - sql "ADMIN SET FRONTEND CONFIG ('enable_map_type' = 'true')" + sql """ CREATE TABLE IF NOT EXISTS ${tableName} (id INT NULL, m_map MAP<INT, VARCHAR(30)> NULL) ENGINE=OLAP DUPLICATE KEY(id) DISTRIBUTED BY HASH(id) BUCKETS 4 PROPERTIES ( "replication_allocation" = "tag.location.default: 1","in_memory" = "false","storage_format" = "V2") """ sql """ insert into ${tableName} values(1, {1:'a', 2:"doris"}),(2,{}),(3,NULL),(4,NULL),(5,NULL) """ sql """ DELETE FROM ${tableName} WHERE m_map is NULL """ diff --git a/regression-test/suites/delete_p0/test_struct_column_delete.groovy b/regression-test/suites/delete_p0/test_struct_column_delete.groovy index e3c129a5eb..baaf60161c 100644 --- a/regression-test/suites/delete_p0/test_struct_column_delete.groovy +++ b/regression-test/suites/delete_p0/test_struct_column_delete.groovy @@ -19,7 +19,6 @@ suite("test_struct_column_delete") { def tableName = "test_struct_column_delete" sql """ DROP TABLE IF EXISTS ${tableName}; """ - sql "ADMIN SET FRONTEND CONFIG ('enable_struct_type' = 'true')" sql """ CREATE TABLE IF NOT EXISTS ${tableName} (id INT NULL, s_struct STRUCT<f1:INT, f2:VARCHAR(30)> NULL) ENGINE=OLAP DUPLICATE KEY(id) DISTRIBUTED BY HASH(id) BUCKETS 4 PROPERTIES ( "replication_allocation" = "tag.location.default: 1","in_memory" = "false","storage_format" = "V2") """ sql """ insert into ${tableName} values(1, {1, 'a'}),(2,NULL),(3,NULL),(4,NULL),(5,NULL) """ sql """ DELETE FROM ${tableName} WHERE s_struct is NULL """ diff --git a/regression-test/suites/export/test_map_export.groovy b/regression-test/suites/export/test_map_export.groovy index d6e3a2e197..c2bcb4661a 100644 --- a/regression-test/suites/export/test_map_export.groovy +++ b/regression-test/suites/export/test_map_export.groovy @@ -54,7 +54,7 @@ suite("test_map_export", "export") { def testTable = "tbl_test_map_export" sql "DROP TABLE IF EXISTS ${testTable}" - sql "ADMIN SET FRONTEND CONFIG ('enable_map_type' = 'true')" + sql """ CREATE TABLE IF NOT EXISTS ${testTable} ( diff --git a/regression-test/suites/export/test_struct_export.groovy b/regression-test/suites/export/test_struct_export.groovy index 485270ccbf..e709bd7254 100644 --- a/regression-test/suites/export/test_struct_export.groovy +++ b/regression-test/suites/export/test_struct_export.groovy @@ -54,7 +54,7 @@ suite("test_struct_export", "export") { def testTable = "tbl_test_struct_export" sql "DROP TABLE IF EXISTS ${testTable}" - sql "ADMIN SET FRONTEND CONFIG ('enable_struct_type' = 'true')" + sql """ CREATE TABLE IF NOT EXISTS ${testTable} ( diff --git a/regression-test/suites/insert_p0/test_struct_insert.groovy b/regression-test/suites/insert_p0/test_struct_insert.groovy index 17d5ac9ab4..f6448d02ae 100644 --- a/regression-test/suites/insert_p0/test_struct_insert.groovy +++ b/regression-test/suites/insert_p0/test_struct_insert.groovy @@ -41,7 +41,6 @@ suite("test_struct_insert") { assertTrue(result1[0][0] == 0, "Create table should update 0 rows") } - sql "ADMIN SET FRONTEND CONFIG ('enable_struct_type' = 'true')" sql "DROP TABLE IF EXISTS ${testTable}" create_test_table.call(testTable) diff --git a/regression-test/suites/load/insert/test_map_dml.groovy b/regression-test/suites/load/insert/test_map_dml.groovy index 5f626fe833..106af66b19 100644 --- a/regression-test/suites/load/insert/test_map_dml.groovy +++ b/regression-test/suites/load/insert/test_map_dml.groovy @@ -20,8 +20,6 @@ suite("test_map_dml", "load") { def testTable = "tbl_test_map_string_int" def testTable01 = "tbl_test_map_normal" - sql "ADMIN SET FRONTEND CONFIG ('enable_map_type' = 'true')" - def create_test_table = {testTablex -> def result1 = sql """ CREATE TABLE IF NOT EXISTS ${testTable} ( diff --git a/regression-test/suites/load_p0/stream_load/test_map_load_and_compaction.groovy b/regression-test/suites/load_p0/stream_load/test_map_load_and_compaction.groovy index ebcbd4ba79..c5eb2689bd 100644 --- a/regression-test/suites/load_p0/stream_load/test_map_load_and_compaction.groovy +++ b/regression-test/suites/load_p0/stream_load/test_map_load_and_compaction.groovy @@ -28,7 +28,6 @@ suite("test_map_load_and_compaction", "p0") { def dataFile1 = "map_4093_rows.json" sql "DROP TABLE IF EXISTS ${testTable}" - sql "ADMIN SET FRONTEND CONFIG ('enable_map_type' = 'true')" sql """ CREATE TABLE IF NOT EXISTS ${testTable} ( diff --git a/regression-test/suites/load_p0/stream_load/test_map_load_and_function.groovy b/regression-test/suites/load_p0/stream_load/test_map_load_and_function.groovy index a83946fbef..5ef0208bb2 100644 --- a/regression-test/suites/load_p0/stream_load/test_map_load_and_function.groovy +++ b/regression-test/suites/load_p0/stream_load/test_map_load_and_function.groovy @@ -27,7 +27,6 @@ suite("test_map_load_and_function", "p0") { def dataFile = "test_map.csv" sql "DROP TABLE IF EXISTS ${testTable}" - sql "ADMIN SET FRONTEND CONFIG ('enable_map_type' = 'true')" sql """ CREATE TABLE IF NOT EXISTS ${testTable} ( diff --git a/regression-test/suites/load_p0/stream_load/test_stream_load.groovy b/regression-test/suites/load_p0/stream_load/test_stream_load.groovy index 8ec3514b8f..90e9c750bc 100644 --- a/regression-test/suites/load_p0/stream_load/test_stream_load.groovy +++ b/regression-test/suites/load_p0/stream_load/test_stream_load.groovy @@ -293,7 +293,7 @@ suite("test_stream_load", "p0") { "replication_allocation" = "tag.location.default: 1" ); """ - sql """ADMIN SET FRONTEND CONFIG ('enable_struct_type' = 'true');""" + sql """ CREATE TABLE IF NOT EXISTS ${tableName10} ( `k1` INT(11) NULL COMMENT "", diff --git a/regression-test/suites/mv_p0/test_create_mv_complex_type/test_create_mv_complex_type.groovy b/regression-test/suites/mv_p0/test_create_mv_complex_type/test_create_mv_complex_type.groovy index 3a28ef1559..12790500d2 100644 --- a/regression-test/suites/mv_p0/test_create_mv_complex_type/test_create_mv_complex_type.groovy +++ b/regression-test/suites/mv_p0/test_create_mv_complex_type/test_create_mv_complex_type.groovy @@ -18,8 +18,6 @@ import org.codehaus.groovy.runtime.IOGroovyMethods suite ("create_mv_complex_type") { - sql "ADMIN SET FRONTEND CONFIG ('enable_struct_type' = 'true')" - sql "ADMIN SET FRONTEND CONFIG ('enable_map_type' = 'true')" sql """ DROP TABLE IF EXISTS base_table; """ sql """ diff --git a/regression-test/suites/query_p0/aggregate/aggregate_group_by_metric_type.groovy b/regression-test/suites/query_p0/aggregate/aggregate_group_by_metric_type.groovy index 23c1cecf57..795e8a3cee 100644 --- a/regression-test/suites/query_p0/aggregate/aggregate_group_by_metric_type.groovy +++ b/regression-test/suites/query_p0/aggregate/aggregate_group_by_metric_type.groovy @@ -95,7 +95,7 @@ suite("aggregate_group_by_metric_type") { sql "DROP TABLE test_group_by_array" sql "DROP TABLE IF EXISTS test_group_by_struct" - sql "ADMIN SET FRONTEND CONFIG ('enable_struct_type' = 'true')" + sql """ CREATE TABLE IF NOT EXISTS test_group_by_struct (id int, s_struct struct<f1:tinyint, f2:char(5)>) ENGINE=OLAP DUPLICATE KEY(`id`) DISTRIBUTED BY HASH(`id`) BUCKETS 1 properties("replication_num" = "1"); diff --git a/regression-test/suites/query_p0/show/test_complex_type_unique_key.groovy b/regression-test/suites/query_p0/show/test_complex_type_unique_key.groovy index 8417fc4865..b4e02d50c5 100644 --- a/regression-test/suites/query_p0/show/test_complex_type_unique_key.groovy +++ b/regression-test/suites/query_p0/show/test_complex_type_unique_key.groovy @@ -22,8 +22,6 @@ suite("test_complex_type_unique_key", "p0") { def dataFile1 = "complex_unique_2.csv" sql "DROP TABLE IF EXISTS ${testTable}" - sql "ADMIN SET FRONTEND CONFIG ('enable_struct_type' = 'true')" - sql "ADMIN SET FRONTEND CONFIG ('enable_map_type' = 'true')" sql """ CREATE TABLE IF NOT EXISTS tbl_test_complex_unique ( diff --git a/regression-test/suites/query_p0/show/test_map_show_create.groovy b/regression-test/suites/query_p0/show/test_map_show_create.groovy index 12607c0f85..6188083bce 100644 --- a/regression-test/suites/query_p0/show/test_map_show_create.groovy +++ b/regression-test/suites/query_p0/show/test_map_show_create.groovy @@ -57,7 +57,6 @@ suite("test_map_show_create", "query") { try { sql "DROP TABLE IF EXISTS ${testTable}" - sql "ADMIN SET FRONTEND CONFIG ('enable_map_type' = 'true')" create_test_table.call(testTable) diff --git a/regression-test/suites/query_p0/show/test_nested_complex_switch.groovy b/regression-test/suites/query_p0/show/test_nested_complex_switch.groovy index 7728cef50f..2051635d76 100644 --- a/regression-test/suites/query_p0/show/test_nested_complex_switch.groovy +++ b/regression-test/suites/query_p0/show/test_nested_complex_switch.groovy @@ -137,8 +137,6 @@ suite("test_nested_complex_switch", "query") { sql "DROP TABLE IF EXISTS ${testTable_m}" sql "DROP TABLE IF EXISTS ${testTable_a}" sql "DROP TABLE IF EXISTS ${testTable_s}" - sql "ADMIN SET FRONTEND CONFIG ('enable_map_type' = 'true')" - sql "ADMIN SET FRONTEND CONFIG ('enable_struct_type' = 'true')" sql "ADMIN SET FRONTEND CONFIG ('disable_nested_complex_type' = 'true')" // map @@ -195,8 +193,6 @@ suite("test_nested_complex_switch", "query") { sql "DROP TABLE IF EXISTS ${testTable_m}" sql "DROP TABLE IF EXISTS ${testTable_a}" sql "DROP TABLE IF EXISTS ${testTable_s}" - sql "ADMIN SET FRONTEND CONFIG ('enable_map_type' = 'true')" - sql "ADMIN SET FRONTEND CONFIG ('enable_struct_type' = 'true')" sql "ADMIN SET FRONTEND CONFIG ('disable_nested_complex_type' = 'false')" diff --git a/regression-test/suites/query_p0/show/test_struct_show_create.groovy b/regression-test/suites/query_p0/show/test_struct_show_create.groovy index 7bc9f0b047..02718cfb9e 100644 --- a/regression-test/suites/query_p0/show/test_struct_show_create.groovy +++ b/regression-test/suites/query_p0/show/test_struct_show_create.groovy @@ -19,7 +19,6 @@ suite("test_struct_show_create", "query") { // define a sql table def testTable = "test_struct_show_create" - sql "ADMIN SET FRONTEND CONFIG ('enable_struct_type' = 'true')" def create_test_table = {testTablex -> def result1 = sql """ diff --git a/regression-test/suites/query_p0/sql_functions/struct_functions/test_struct_functions.groovy b/regression-test/suites/query_p0/sql_functions/struct_functions/test_struct_functions.groovy index aa519ca7f1..fefa7a6aa0 100644 --- a/regression-test/suites/query_p0/sql_functions/struct_functions/test_struct_functions.groovy +++ b/regression-test/suites/query_p0/sql_functions/struct_functions/test_struct_functions.groovy @@ -17,7 +17,7 @@ suite("test_struct_functions") { def tableName = "tbl_test_struct_functions" - sql """ADMIN SET FRONTEND CONFIG('enable_struct_type'='true')""" + sql """DROP TABLE IF EXISTS ${tableName}""" sql """ CREATE TABLE IF NOT EXISTS ${tableName} ( diff --git a/regression-test/suites/rollup_p0/test_materialized_view_struct.groovy b/regression-test/suites/rollup_p0/test_materialized_view_struct.groovy index 1cebccc974..5ae06a6c26 100644 --- a/regression-test/suites/rollup_p0/test_materialized_view_struct.groovy +++ b/regression-test/suites/rollup_p0/test_materialized_view_struct.groovy @@ -16,7 +16,7 @@ // under the License. suite("test_materialized_view_struct", "rollup") { def tableName = "tbl_test_materialized_view_struct" - sql "ADMIN SET FRONTEND CONFIG ('enable_struct_type' = 'true');" + def create_test_table = {testTable -> def result1 = sql """ --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org