From fc224197044e044ebd576160a31c8e295a536dc0 Mon Sep 17 00:00:00 2001 From: zhangdong <493738387@qq.com> Date: Thu, 11 Jul 2024 14:31:38 +0800 Subject: [PATCH 01/11] 1 --- .../plans/commands/info/CreateMTMVInfo.java | 56 +++++++++++++++++-- 1 file changed, 52 insertions(+), 4 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/info/CreateMTMVInfo.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/info/CreateMTMVInfo.java index ab6637964f8660..564684c3519d2a 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/info/CreateMTMVInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/info/CreateMTMVInfo.java @@ -29,6 +29,7 @@ import org.apache.doris.catalog.Env; import org.apache.doris.catalog.KeysType; import org.apache.doris.catalog.PartitionType; +import org.apache.doris.catalog.ScalarType; import org.apache.doris.catalog.TableIf; import org.apache.doris.catalog.Type; import org.apache.doris.catalog.View; @@ -56,6 +57,7 @@ import org.apache.doris.nereids.rules.exploration.mv.MaterializedViewUtils; import org.apache.doris.nereids.trees.expressions.Expression; import org.apache.doris.nereids.trees.expressions.Slot; +import org.apache.doris.nereids.trees.expressions.SlotReference; import org.apache.doris.nereids.trees.plans.Plan; import org.apache.doris.nereids.trees.plans.algebra.OneRowRelation; import org.apache.doris.nereids.trees.plans.commands.ExplainCommand.ExplainLevel; @@ -63,7 +65,15 @@ import org.apache.doris.nereids.trees.plans.logical.LogicalSink; import org.apache.doris.nereids.trees.plans.logical.LogicalSubQueryAlias; import org.apache.doris.nereids.types.AggStateType; +import org.apache.doris.nereids.types.CharType; import org.apache.doris.nereids.types.DataType; +import org.apache.doris.nereids.types.DecimalV2Type; +import org.apache.doris.nereids.types.NullType; +import org.apache.doris.nereids.types.StringType; +import org.apache.doris.nereids.types.TinyIntType; +import org.apache.doris.nereids.types.VarcharType; +import org.apache.doris.nereids.types.coercion.CharacterType; +import org.apache.doris.nereids.util.TypeCoercionUtils; import org.apache.doris.nereids.util.Utils; import org.apache.doris.qe.ConnectContext; import org.apache.doris.qe.SessionVariable; @@ -218,11 +228,12 @@ public void analyzeQuery(ConnectContext ctx, Map mvProperties) { throw new AnalysisException("can not contain invalid expression"); } getRelation(planner); - getColumns(plan); - analyzeKeys(); this.mvPartitionInfo = mvPartitionDefinition .analyzeAndTransferToMTMVPartitionInfo(planner, ctx, logicalQuery); this.partitionDesc = generatePartitionDesc(ctx); + getColumns(plan, ctx, mvPartitionInfo.getPartitionCol(), distribution); + analyzeKeys(); + } private void analyzeKeys() { @@ -351,7 +362,7 @@ private void analyzeExpressions(Plan plan, Map mvProperties) { } } - private void getColumns(Plan plan) { + private void getColumns(Plan plan, ConnectContext ctx, String partitionCol, DistributionDescriptor distribution) { List slots = plan.getOutput(); if (slots.isEmpty()) { throw new AnalysisException("table should contain at least one column"); @@ -373,10 +384,11 @@ private void getColumns(Plan plan) { } else { colNames.add(colName); } + DataType dataType = getDataType(slots.get(i), i, ctx, partitionCol, distribution); // If datatype is AggStateType, AggregateType should be generic, or column definition check will fail columns.add(new ColumnDefinition( colName, - slots.get(i).getDataType(), + dataType, false, slots.get(i).getDataType() instanceof AggStateType ? AggregateType.GENERIC : null, slots.get(i).nullable(), @@ -398,6 +410,42 @@ private void getColumns(Plan plan) { } } + private DataType getDataType(Slot s, int i, ConnectContext ctx, String partitionCol, + DistributionDescriptor distribution) { + DataType dataType = s.getDataType().conversion(); + if (i == 0 && dataType.isStringType()) { + dataType = VarcharType.createVarcharType(ScalarType.MAX_VARCHAR_LENGTH); + } else { + dataType = TypeCoercionUtils.replaceSpecifiedType(dataType, + NullType.class, TinyIntType.INSTANCE); + dataType = TypeCoercionUtils.replaceSpecifiedType(dataType, + DecimalV2Type.class, DecimalV2Type.SYSTEM_DEFAULT); + if (s.isColumnFromTable()) { + if ((!((SlotReference) s).getTable().isPresent() + || !((SlotReference) s).getTable().get().isManagedTable())) { + if (s.getName().equals(partitionCol) || (distribution != null && distribution.inDistributionColumns( + s.getName()))) { + // String type can not be used in partition/distributed column + // so we replace it to varchar + dataType = TypeCoercionUtils.replaceSpecifiedType(dataType, + StringType.class, VarcharType.MAX_VARCHAR_TYPE); + } else { + dataType = TypeCoercionUtils.replaceSpecifiedType(dataType, + CharacterType.class, StringType.INSTANCE); + } + } + } else { + if (ctx.getSessionVariable().useMaxLengthOfVarcharInCtas) { + dataType = TypeCoercionUtils.replaceSpecifiedType(dataType, + VarcharType.class, VarcharType.MAX_VARCHAR_TYPE); + dataType = TypeCoercionUtils.replaceSpecifiedType(dataType, + CharType.class, VarcharType.MAX_VARCHAR_TYPE); + } + } + } + return dataType; + } + /** * translate to catalog CreateMultiTableMaterializedViewStmt */ From 95fa4898468d58a3143a053caa15dd4da0c19bc0 Mon Sep 17 00:00:00 2001 From: zhangdong <493738387@qq.com> Date: Thu, 11 Jul 2024 16:04:24 +0800 Subject: [PATCH 02/11] 1 --- .../doris/nereids/trees/plans/commands/CreateTableCommand.java | 2 ++ .../doris/nereids/trees/plans/commands/info/CreateMTMVInfo.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/CreateTableCommand.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/CreateTableCommand.java index f2dd92fe3284bf..2e28f477ce3c8e 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/CreateTableCommand.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/CreateTableCommand.java @@ -137,6 +137,8 @@ public void run(ConnectContext ctx, StmtExecutor executor) throws Exception { // so we replace it to varchar dataType = TypeCoercionUtils.replaceSpecifiedType(dataType, StringType.class, VarcharType.MAX_VARCHAR_TYPE); + dataType = TypeCoercionUtils.replaceSpecifiedType(dataType, + CharacterType.class, VarcharType.MAX_VARCHAR_TYPE); } else { dataType = TypeCoercionUtils.replaceSpecifiedType(dataType, CharacterType.class, StringType.INSTANCE); diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/info/CreateMTMVInfo.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/info/CreateMTMVInfo.java index 564684c3519d2a..9a290ef473848b 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/info/CreateMTMVInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/info/CreateMTMVInfo.java @@ -429,6 +429,8 @@ private DataType getDataType(Slot s, int i, ConnectContext ctx, String partition // so we replace it to varchar dataType = TypeCoercionUtils.replaceSpecifiedType(dataType, StringType.class, VarcharType.MAX_VARCHAR_TYPE); + dataType = TypeCoercionUtils.replaceSpecifiedType(dataType, + CharacterType.class, VarcharType.MAX_VARCHAR_TYPE); } else { dataType = TypeCoercionUtils.replaceSpecifiedType(dataType, CharacterType.class, StringType.INSTANCE); From 6db1a51d5f4f176bf1439c0cef88565dbd943996 Mon Sep 17 00:00:00 2001 From: zhangdong <493738387@qq.com> Date: Thu, 11 Jul 2024 17:01:44 +0800 Subject: [PATCH 03/11] 1 --- .../suites/mtmv_p0/test_mysql_mtmv.groovy | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/regression-test/suites/mtmv_p0/test_mysql_mtmv.groovy b/regression-test/suites/mtmv_p0/test_mysql_mtmv.groovy index 35874beb4d3340..653328ffc985c6 100644 --- a/regression-test/suites/mtmv_p0/test_mysql_mtmv.groovy +++ b/regression-test/suites/mtmv_p0/test_mysql_mtmv.groovy @@ -56,7 +56,7 @@ suite("test_mysql_mtmv", "p0,external,mysql,external_docker,external_docker_hive AS SELECT * FROM ${catalog_name}.${mysqlDb}.${mysqlTable}; """ - + order_qt_desc_random "desc ${mvName}" sql """ REFRESH MATERIALIZED VIEW ${mvName} AUTO """ @@ -64,6 +64,16 @@ suite("test_mysql_mtmv", "p0,external,mysql,external_docker,external_docker_hive waitingMTMVTaskFinished(jobName) order_qt_mtmv "SELECT * FROM ${mvName} order by id" + sql """drop materialized view if exists ${mvName};""" + sql """ + CREATE MATERIALIZED VIEW ${mvName} + BUILD DEFERRED REFRESH COMPLETE ON MANUAL + DISTRIBUTED BY hash(count_value) BUCKETS 2 + PROPERTIES ('replication_num' = '1') + AS + SELECT * FROM ${catalog_name}.${mysqlDb}.${mysqlTable}; + """ + order_qt_desc_hash "desc ${mvName}" sql """drop materialized view if exists ${mvName};""" sql """ drop catalog if exists ${catalog_name} """ } From 4cb4fa7d6392583db0c108472fe7683f79d80f90 Mon Sep 17 00:00:00 2001 From: zhangdong <493738387@qq.com> Date: Thu, 11 Jul 2024 17:13:34 +0800 Subject: [PATCH 04/11] 1 --- regression-test/suites/mtmv_p0/test_mysql_mtmv.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/regression-test/suites/mtmv_p0/test_mysql_mtmv.groovy b/regression-test/suites/mtmv_p0/test_mysql_mtmv.groovy index 653328ffc985c6..69c11ad3b03bb4 100644 --- a/regression-test/suites/mtmv_p0/test_mysql_mtmv.groovy +++ b/regression-test/suites/mtmv_p0/test_mysql_mtmv.groovy @@ -40,7 +40,7 @@ suite("test_mysql_mtmv", "p0,external,mysql,external_docker,external_docker_hive "type"="jdbc", "user"="root", "password"="123456", - "jdbc_url" = "jdbc:mysql://${externalEnvIp}:${mysql_port}/${mysqlDb}?useSSL=false&zeroDateTimeBehavior=convertToNull", + "jdbc_url" = "jdbc:mysql://${externalEnvIp}:${mysql_port}/${mysqlDb}?useSSL=false&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true", "driver_url" = "${driver_url}", "driver_class" = "com.mysql.cj.jdbc.Driver" );""" From 5d345372415e1913689c65f3c09c5641f30fe181 Mon Sep 17 00:00:00 2001 From: zhangdong <493738387@qq.com> Date: Thu, 11 Jul 2024 17:23:11 +0800 Subject: [PATCH 05/11] 1 --- regression-test/data/mtmv_p0/test_mysql_mtmv.out | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/regression-test/data/mtmv_p0/test_mysql_mtmv.out b/regression-test/data/mtmv_p0/test_mysql_mtmv.out index 27c2bc3bd8735d..664e7c5b58d3d6 100644 --- a/regression-test/data/mtmv_p0/test_mysql_mtmv.out +++ b/regression-test/data/mtmv_p0/test_mysql_mtmv.out @@ -4,8 +4,16 @@ 123 15 123 20 +-- !desc_random -- +count_value TEXT Yes false \N NONE +id INT Yes true \N + -- !mtmv -- 123 10 123 15 123 20 +-- !desc_hash -- +count_value VARCHAR(65533) Yes true \N +id INT Yes true \N + From 5b303a454b12089a9df12e6f1cd37e2f4bb8c00f Mon Sep 17 00:00:00 2001 From: zhangdong <493738387@qq.com> Date: Thu, 11 Jul 2024 19:25:56 +0800 Subject: [PATCH 06/11] 1 --- .../doris/nereids/trees/plans/commands/CreateTableCommand.java | 2 -- .../doris/nereids/trees/plans/commands/info/CreateMTMVInfo.java | 2 -- 2 files changed, 4 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/CreateTableCommand.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/CreateTableCommand.java index 5c9e5eecaeb0b2..ce0c962140bfc7 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/CreateTableCommand.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/CreateTableCommand.java @@ -137,8 +137,6 @@ public void run(ConnectContext ctx, StmtExecutor executor) throws Exception { && createTableInfo.getDistribution().inDistributionColumns(s.getName()))) { // String type can not be used in partition/distributed column // so we replace it to varchar - dataType = TypeCoercionUtils.replaceSpecifiedType(dataType, - StringType.class, VarcharType.MAX_VARCHAR_TYPE); dataType = TypeCoercionUtils.replaceSpecifiedType(dataType, CharacterType.class, VarcharType.MAX_VARCHAR_TYPE); } else { diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/info/CreateMTMVInfo.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/info/CreateMTMVInfo.java index d04e99ff6b8bf0..3d73243c7684b2 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/info/CreateMTMVInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/info/CreateMTMVInfo.java @@ -429,8 +429,6 @@ private DataType getDataType(Slot s, int i, ConnectContext ctx, String partition s.getName()))) { // String type can not be used in partition/distributed column // so we replace it to varchar - dataType = TypeCoercionUtils.replaceSpecifiedType(dataType, - StringType.class, VarcharType.MAX_VARCHAR_TYPE); dataType = TypeCoercionUtils.replaceSpecifiedType(dataType, CharacterType.class, VarcharType.MAX_VARCHAR_TYPE); } else { From 2c9d531a08ed9016014a97853e2484832e5eff7b Mon Sep 17 00:00:00 2001 From: zhangdong <493738387@qq.com> Date: Fri, 12 Jul 2024 19:07:54 +0800 Subject: [PATCH 07/11] 1 --- .../data/external_table_p0/tvf/test_ctas_with_hdfs.out | 2 +- regression-test/data/mtmv_p0/test_build_mtmv.out | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/regression-test/data/external_table_p0/tvf/test_ctas_with_hdfs.out b/regression-test/data/external_table_p0/tvf/test_ctas_with_hdfs.out index 953a99608ca7c1..2de584d900eb82 100644 --- a/regression-test/data/external_table_p0/tvf/test_ctas_with_hdfs.out +++ b/regression-test/data/external_table_p0/tvf/test_ctas_with_hdfs.out @@ -94,7 +94,7 @@ varchar_col TEXT Yes false \N NONE bigint_col BIGINT Yes false \N NONE binary_col TEXT Yes false \N NONE boolean_col BOOLEAN Yes false \N NONE -char_col CHAR(50) Yes false \N NONE +char_col VARCHAR(65533) Yes false \N NONE date_col DATE Yes false \N NONE decimal_col DECIMAL(12, 4) Yes false \N NONE double_col DOUBLE Yes false \N NONE diff --git a/regression-test/data/mtmv_p0/test_build_mtmv.out b/regression-test/data/mtmv_p0/test_build_mtmv.out index 5e5632511f42ce..2f47c7a2294dde 100644 --- a/regression-test/data/mtmv_p0/test_build_mtmv.out +++ b/regression-test/data/mtmv_p0/test_build_mtmv.out @@ -61,7 +61,7 @@ zhangsang 200 11 111 -- !desc_mv -- -field_1 VARCHAR(16) No true \N +field_1 VARCHAR(65533) No true \N -- !query_mv_with_cte -- 2 3 From 03f36798d8b88ff5fab09baf60689e5b7fdf7024 Mon Sep 17 00:00:00 2001 From: zhangdong <493738387@qq.com> Date: Fri, 19 Jul 2024 18:39:44 +0800 Subject: [PATCH 08/11] 1 --- regression-test/data/mtmv_p0/test_build_mtmv.out | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/regression-test/data/mtmv_p0/test_build_mtmv.out b/regression-test/data/mtmv_p0/test_build_mtmv.out index 2f47c7a2294dde..84df7a0e3657a6 100644 --- a/regression-test/data/mtmv_p0/test_build_mtmv.out +++ b/regression-test/data/mtmv_p0/test_build_mtmv.out @@ -61,7 +61,7 @@ zhangsang 200 11 111 -- !desc_mv -- -field_1 VARCHAR(65533) No true \N +field_1 VARCHAR(65533) No true \N -- !query_mv_with_cte -- 2 3 From f199f8b9e413316fc59597d404255cf4bf0bdd4b Mon Sep 17 00:00:00 2001 From: zhangdong <493738387@qq.com> Date: Fri, 16 Aug 2024 19:29:18 +0800 Subject: [PATCH 09/11] 1 --- regression-test/data/mtmv_p0/test_build_mtmv.out | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/regression-test/data/mtmv_p0/test_build_mtmv.out b/regression-test/data/mtmv_p0/test_build_mtmv.out index 84df7a0e3657a6..eddfc0529f8ec9 100644 --- a/regression-test/data/mtmv_p0/test_build_mtmv.out +++ b/regression-test/data/mtmv_p0/test_build_mtmv.out @@ -61,7 +61,7 @@ zhangsang 200 11 111 -- !desc_mv -- -field_1 VARCHAR(65533) No true \N +field_1 varchar(65533) No true \N -- !query_mv_with_cte -- 2 3 From 75d49a54de33e1f3552740667093bd5685b0427b Mon Sep 17 00:00:00 2001 From: zhangdong <493738387@qq.com> Date: Fri, 16 Aug 2024 19:37:06 +0800 Subject: [PATCH 10/11] 1 --- .../tvf/test_ctas_with_hdfs.out | 32 +++++++++---------- .../data/mtmv_p0/test_mysql_mtmv.out | 4 +-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/regression-test/data/external_table_p0/tvf/test_ctas_with_hdfs.out b/regression-test/data/external_table_p0/tvf/test_ctas_with_hdfs.out index ddb9fde40d678e..4a90165d06a1a1 100644 --- a/regression-test/data/external_table_p0/tvf/test_ctas_with_hdfs.out +++ b/regression-test/data/external_table_p0/tvf/test_ctas_with_hdfs.out @@ -91,22 +91,22 @@ varchar_col text Yes false \N NONE 3 99 778108157 61873080930551778 true 9.8627565E8 \N Technology gene shame stock grandfather initiate cluster. Sympathy including grind right. Colleague pour interference vanish eligible. Campaign fold poison various between. Formal proper prize ray do1. \N 2022-08-29T19:43:46 908171.0209 desktops bigint_col 2020-02-29 [8.289095771326624e+17, 1.9573475208108093e+17, 6.703456714526179e+17, 7.245677936816932e+17] ["zJldV", "BWhpggYvPlozXm", "bAbglLACbIPnJXpyjDIa"] desktops bigint_col -- !desc_2 -- -bigint_col BIGINT Yes false \N NONE -binary_col TEXT Yes false \N NONE -boolean_col BOOLEAN Yes false \N NONE -char_col VARCHAR(65533) Yes false \N NONE -date_col DATE Yes false \N NONE -decimal_col DECIMAL(12, 4) Yes false \N NONE -double_col DOUBLE Yes false \N NONE -float_col FLOAT Yes false \N NONE -int_col INT Yes true \N -list_double_col ARRAY Yes false \N NONE -list_string_col ARRAY Yes false \N NONE -smallint_col SMALLINT Yes true \N -string_col TEXT Yes false \N NONE -timestamp_col DATETIME(6) Yes false \N NONE -tinyint_col TINYINT Yes true \N -varchar_col TEXT Yes false \N NONE +bigint_col bigint Yes false \N NONE +binary_col text Yes false \N NONE +boolean_col boolean Yes false \N NONE +char_col varchar(65533) Yes false \N NONE +date_col date Yes false \N NONE +decimal_col decimal(12,4) Yes false \N NONE +double_col double Yes false \N NONE +float_col float Yes false \N NONE +int_col int Yes true \N +list_double_col array Yes false \N NONE +list_string_col array Yes false \N NONE +smallint_col smallint Yes true \N +string_col text Yes false \N NONE +timestamp_col datetime(6) Yes false \N NONE +tinyint_col tinyint Yes true \N +varchar_col text Yes false \N NONE -- !select_2 -- 1 \N \N 757403305318104467 false 3.26199968E8 1.0049111235672792E17 Consolidate iron breakfast inhibit obesity mount hearing. Limitation bite sibling creation between sound. Plus1 layer injury favourable detain. Learn pronounced entrepreneur personnel wool strive. Pose curiosity spite absolutely combination right. \N 2022-08-11T10:09:31 996888.8617 desktops bigint_col 2015-08-24 [5.084045411017597e+17, 3.942856911182207e+17, 8.38109720690003e+17, 5.0079271855467546e+17] ["NRcqedH", "JIkT", "JXw", "JLvj"] diff --git a/regression-test/data/mtmv_p0/test_mysql_mtmv.out b/regression-test/data/mtmv_p0/test_mysql_mtmv.out index 664e7c5b58d3d6..9fbb9fa86af5b1 100644 --- a/regression-test/data/mtmv_p0/test_mysql_mtmv.out +++ b/regression-test/data/mtmv_p0/test_mysql_mtmv.out @@ -5,7 +5,7 @@ 123 20 -- !desc_random -- -count_value TEXT Yes false \N NONE +count_value text Yes false \N NONE id INT Yes true \N -- !mtmv -- @@ -14,6 +14,6 @@ id INT Yes true \N 123 20 -- !desc_hash -- -count_value VARCHAR(65533) Yes true \N +count_value varchar(65533) Yes true \N id INT Yes true \N From 1298f2c6808f723bb5ce43b45751236febcc2b6e Mon Sep 17 00:00:00 2001 From: zhangdong <493738387@qq.com> Date: Mon, 19 Aug 2024 15:28:52 +0800 Subject: [PATCH 11/11] 1 --- .../data/external_table_p0/tvf/test_ctas_with_hdfs.out | 6 +++--- regression-test/data/mtmv_p0/test_mysql_mtmv.out | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/regression-test/data/external_table_p0/tvf/test_ctas_with_hdfs.out b/regression-test/data/external_table_p0/tvf/test_ctas_with_hdfs.out index 4a90165d06a1a1..979106ddccf781 100644 --- a/regression-test/data/external_table_p0/tvf/test_ctas_with_hdfs.out +++ b/regression-test/data/external_table_p0/tvf/test_ctas_with_hdfs.out @@ -99,13 +99,13 @@ date_col date Yes false \N NONE decimal_col decimal(12,4) Yes false \N NONE double_col double Yes false \N NONE float_col float Yes false \N NONE -int_col int Yes true \N +int_col int Yes true \N list_double_col array Yes false \N NONE list_string_col array Yes false \N NONE -smallint_col smallint Yes true \N +smallint_col smallint Yes true \N string_col text Yes false \N NONE timestamp_col datetime(6) Yes false \N NONE -tinyint_col tinyint Yes true \N +tinyint_col tinyint Yes true \N varchar_col text Yes false \N NONE -- !select_2 -- diff --git a/regression-test/data/mtmv_p0/test_mysql_mtmv.out b/regression-test/data/mtmv_p0/test_mysql_mtmv.out index 9fbb9fa86af5b1..da34383c290973 100644 --- a/regression-test/data/mtmv_p0/test_mysql_mtmv.out +++ b/regression-test/data/mtmv_p0/test_mysql_mtmv.out @@ -6,7 +6,7 @@ -- !desc_random -- count_value text Yes false \N NONE -id INT Yes true \N +id int Yes true \N -- !mtmv -- 123 10 @@ -14,6 +14,6 @@ id INT Yes true \N 123 20 -- !desc_hash -- -count_value varchar(65533) Yes true \N -id INT Yes true \N +count_value varchar(65533) Yes true \N +id int Yes true \N