This is an automated email from the ASF dual-hosted git repository.
morrysnow pushed a commit to branch 2.1_35863
in repository https://gitbox.apache.org/repos/asf/doris.git
commit 7e35f76f1f0dc6a4b1ed8139a363f0e1abff4c5f
Author: morrySnow <101034200+morrys...@users.noreply.github.com>
AuthorDate: Thu Jun 6 17:10:06 2024 +0800
[fix](DDL) not set table type as default comment when create table
pick from master #35855
---
.../main/java/org/apache/doris/catalog/Table.java | 2 +-
.../test/java/org/apache/doris/alter/AlterTest.java | 2 +-
.../doris/analysis/CreateTableAsSelectStmtTest.java | 20 --------------------
.../scalar_types/get_assignment_compatible_type.out | 6 +++---
regression-test/data/ddl_p0/test_create_view.out | 2 +-
.../data/ddl_p0/test_create_view_nereids.out | 20 ++++++++++----------
.../show_p0/test_show_create_table_and_views.out | 10 +++++-----
.../test_show_create_table_and_views_nereids.out | 10 +++++-----
.../create_view_star_except_and_cast_to_sql.out | 2 +-
9 files changed, 27 insertions(+), 47 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Table.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/Table.java
index 422f6593052..c9ce42dd5ec 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Table.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Table.java
@@ -540,7 +540,7 @@ public abstract class Table extends MetaObject implements
Writable, TableIf {
}
return SqlUtils.escapeQuota(comment);
}
- return type.name();
+ return "";
}
public void setComment(String comment) {
diff --git a/fe/fe-core/src/test/java/org/apache/doris/alter/AlterTest.java
b/fe/fe-core/src/test/java/org/apache/doris/alter/AlterTest.java
index f0c988607a2..cab0c2ba0f5 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/alter/AlterTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/alter/AlterTest.java
@@ -370,7 +370,7 @@ public class AlterTest {
// empty comment
stmt = "alter table test.tbl5 modify comment ''";
alterTable(stmt, false);
- Assert.assertEquals("OLAP", tbl.getComment());
+ Assert.assertEquals("", tbl.getComment());
// empty column comment
stmt = "alter table test.tbl5 modify column k1 comment '', modify
column v1 comment 'v111'";
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateTableAsSelectStmtTest.java
b/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateTableAsSelectStmtTest.java
index be1ddf7bc4a..498cea98533 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateTableAsSelectStmtTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateTableAsSelectStmtTest.java
@@ -88,7 +88,6 @@ public class CreateTableAsSelectStmtTest extends
TestWithFeService {
+ "DECIMAL" + "(10, 2) NOT NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`userId`)\n"
- + "COMMENT 'OLAP'\n"
+ "DISTRIBUTED BY HASH(`userId`) BUCKETS 10\n"
+ "PROPERTIES (\n"
+ "\"replication_allocation\" =
\"tag.location.default: 1\",\n"
@@ -114,7 +113,6 @@ public class CreateTableAsSelectStmtTest extends
TestWithFeService {
+ " `__sum_0` DECIMAL(38, 2) NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`__sum_0`)\n"
- + "COMMENT 'OLAP'\n"
+ "DISTRIBUTED BY HASH(`__sum_0`) BUCKETS 10\n"
+ "PROPERTIES (\n"
+ "\"replication_allocation\" =
\"tag.location.default: 1\",\n"
@@ -176,7 +174,6 @@ public class CreateTableAsSelectStmtTest extends
TestWithFeService {
+ " `username` VARCHAR(255) NOT NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`userId`)\n"
- + "COMMENT 'OLAP'\n"
+ "DISTRIBUTED BY HASH(`userId`) BUCKETS 10\n"
+ "PROPERTIES (\n"
+ "\"replication_allocation\" =
\"tag.location.default: 1\",\n"
@@ -205,7 +202,6 @@ public class CreateTableAsSelectStmtTest extends
TestWithFeService {
+ " `__count_0` BIGINT NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`__count_0`)\n"
- + "COMMENT 'OLAP'\n"
+ "DISTRIBUTED BY HASH(`__count_0`) BUCKETS 10\n"
+ "PROPERTIES (\n"
+ "\"replication_allocation\" =
\"tag.location.default: 1\",\n"
@@ -236,7 +232,6 @@ public class CreateTableAsSelectStmtTest extends
TestWithFeService {
+ " `__count_4` BIGINT NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`__sum_0`, `__sum_1`, `__sum_2`)\n"
- + "COMMENT 'OLAP'\n"
+ "DISTRIBUTED BY HASH(`__sum_0`) BUCKETS 10\n"
+ "PROPERTIES (\n"
+ "\"replication_allocation\" =
\"tag.location.default: 1\",\n"
@@ -264,7 +259,6 @@ public class CreateTableAsSelectStmtTest extends
TestWithFeService {
+ " `amount` BIGINT NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`amount`)\n"
- + "COMMENT 'OLAP'\n"
+ "DISTRIBUTED BY HASH(`amount`) BUCKETS 10\n"
+ "PROPERTIES (\n"
+ "\"replication_allocation\" = \"tag.location.default: 1\",\n"
@@ -288,7 +282,6 @@ public class CreateTableAsSelectStmtTest extends
TestWithFeService {
+ " `username` VARCHAR(255) NOT NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`alias_name`)\n"
- + "COMMENT 'OLAP'\n"
+ "DISTRIBUTED BY HASH(`alias_name`) BUCKETS 10\n"
+ "PROPERTIES (\n"
+ "\"replication_allocation\" =
\"tag.location.default: 1\",\n"
@@ -319,7 +312,6 @@ public class CreateTableAsSelectStmtTest extends
TestWithFeService {
+ " `status` INT NOT NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`userId`)\n"
- + "COMMENT 'OLAP'\n"
+ "DISTRIBUTED BY HASH(`userId`) BUCKETS 10\n"
+ "PROPERTIES (\n"
+ "\"replication_allocation\" =
\"tag.location.default: 1\",\n"
@@ -347,7 +339,6 @@ public class CreateTableAsSelectStmtTest extends
TestWithFeService {
+ " `status` INT NOT NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`userId1`)\n"
- + "COMMENT 'OLAP'\n"
+ "DISTRIBUTED BY HASH(`userId1`) BUCKETS 10\n"
+ "PROPERTIES (\n"
+ "\"replication_allocation\" =
\"tag.location.default: 1\",\n"
@@ -379,7 +370,6 @@ public class CreateTableAsSelectStmtTest extends
TestWithFeService {
+ " `userstatus` INT NOT NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`user`)\n"
- + "COMMENT 'OLAP'\n"
+ "DISTRIBUTED BY HASH(`user`) BUCKETS 10\n"
+ "PROPERTIES (\n"
+ "\"replication_allocation\" =
\"tag.location.default: 1\",\n"
@@ -408,7 +398,6 @@ public class CreateTableAsSelectStmtTest extends
TestWithFeService {
+ " `userId` VARCHAR(255) NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`userId`)\n"
- + "COMMENT 'OLAP'\n"
+ "DISTRIBUTED BY HASH(`userId`) BUCKETS 10\n"
+ "PROPERTIES (\n"
+ "\"replication_allocation\" =
\"tag.location.default: 1\",\n"
@@ -436,7 +425,6 @@ public class CreateTableAsSelectStmtTest extends
TestWithFeService {
+ " `userId` VARCHAR(255) NOT NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`userId`)\n"
- + "COMMENT 'OLAP'\n"
+ "DISTRIBUTED BY HASH(`userId`) BUCKETS 10\n"
+ "PROPERTIES (\n"
+ "\"replication_allocation\" =
\"tag.location.default: 1\",\n"
@@ -460,7 +448,6 @@ public class CreateTableAsSelectStmtTest extends
TestWithFeService {
+ " `id` TINYINT NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`id`)\n"
- + "COMMENT 'OLAP'\n"
+ "DISTRIBUTED BY HASH(`id`) BUCKETS 10\n"
+ "PROPERTIES (\n"
+ "\"replication_allocation\" = \"tag.location.default: 1\",\n"
@@ -489,7 +476,6 @@ public class CreateTableAsSelectStmtTest extends
TestWithFeService {
+ " `username` VARCHAR(255) NOT NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`userId`)\n"
- + "COMMENT 'OLAP'\n"
+ "PARTITION BY LIST(`userId`)\n"
+ "(PARTITION p1 VALUES IN
(\"CA\",\"GB\",\"US\",\"ZH\"))\n"
+ "DISTRIBUTED BY HASH(`userId`) BUCKETS 10\n"
@@ -521,7 +507,6 @@ public class CreateTableAsSelectStmtTest extends
TestWithFeService {
+ " NULL DEFAULT CURRENT_TIMESTAMP\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`userId`)\n"
- + "COMMENT 'OLAP'\n"
+ "DISTRIBUTED BY HASH(`userId`) BUCKETS 10\n"
+ "PROPERTIES (\n"
+ "\"replication_allocation\" =
\"tag.location.default: 1\",\n"
@@ -550,7 +535,6 @@ public class CreateTableAsSelectStmtTest extends
TestWithFeService {
+ " `username` VARCHAR(255) NOT NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`username`)\n"
- + "COMMENT 'OLAP'\n"
+ "DISTRIBUTED BY HASH(`username`) BUCKETS 10\n"
+ "PROPERTIES (\n"
+ "\"replication_allocation\" =
\"tag.location.default: 1\",\n"
@@ -580,7 +564,6 @@ public class CreateTableAsSelectStmtTest extends
TestWithFeService {
+ " `username` VARCHAR(255) NOT NULL\n"
+ ") ENGINE=OLAP\n"
+ "UNIQUE KEY(`userId`)\n"
- + "COMMENT 'OLAP'\n"
+ "DISTRIBUTED BY HASH(`userId`) BUCKETS 10\n"
+ "PROPERTIES (\n"
+ "\"replication_allocation\" =
\"tag.location.default: 1\",\n"
@@ -635,7 +618,6 @@ public class CreateTableAsSelectStmtTest extends
TestWithFeService {
+ " `k2` INT NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`k1`, `k2`)\n"
- + "COMMENT 'OLAP'\n"
+ "DISTRIBUTED BY HASH(`k1`) BUCKETS 1\n"
+ "PROPERTIES (\n"
+ "\"replication_allocation\" =
\"tag.location.default: 1\",\n"
@@ -657,7 +639,6 @@ public class CreateTableAsSelectStmtTest extends
TestWithFeService {
+ " `k2` INT NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`k1`, `k2`)\n"
- + "COMMENT 'OLAP'\n"
+ "DISTRIBUTED BY HASH(`k1`) BUCKETS 1\n"
+ "PROPERTIES (\n"
+ "\"replication_allocation\" =
\"tag.location.default: 1\",\n"
@@ -693,7 +674,6 @@ public class CreateTableAsSelectStmtTest extends
TestWithFeService {
+ " `userId` VARCHAR(255) NOT NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`__literal_0`)\n"
- + "COMMENT 'OLAP'\n"
+ "DISTRIBUTED BY HASH(`__literal_0`) BUCKETS 10\n"
+ "PROPERTIES (\n"
+ "\"replication_allocation\" =
\"tag.location.default: 1\",\n"
diff --git
a/regression-test/data/datatype_p0/scalar_types/get_assignment_compatible_type.out
b/regression-test/data/datatype_p0/scalar_types/get_assignment_compatible_type.out
index 9f8d9b546fc..723726cdc37 100644
---
a/regression-test/data/datatype_p0/scalar_types/get_assignment_compatible_type.out
+++
b/regression-test/data/datatype_p0/scalar_types/get_assignment_compatible_type.out
@@ -1,8 +1,8 @@
-- This file is automatically generated. You should know what you did if you
want to edit this
-- !test_sql --
-test_decimal_boolean_view CREATE VIEW `test_decimal_boolean_view` COMMENT
'VIEW' AS SELECT `id` AS `id`, `c1` AS `c1`, `c2` AS `c2` FROM
`regression_test_datatype_p0_scalar_types`.`test_decimal_boolean` WHERE (0.0 =
CAST(`c1` AS DECIMALV3(2, 1))) AND (CAST(`c2` AS DECIMALV3(6, 1)) = 1.0);
utf8mb4 utf8mb4_0900_bin
+test_decimal_boolean_view CREATE VIEW `test_decimal_boolean_view` AS
SELECT `id` AS `id`, `c1` AS `c1`, `c2` AS `c2` FROM
`regression_test_datatype_p0_scalar_types`.`test_decimal_boolean` WHERE (0.0 =
CAST(`c1` AS DECIMALV3(2, 1))) AND (CAST(`c2` AS DECIMALV3(6, 1)) = 1.0);
utf8mb4 utf8mb4_0900_bin
-- !test_union --
-0
-1
+0.0
+1.0
diff --git a/regression-test/data/ddl_p0/test_create_view.out
b/regression-test/data/ddl_p0/test_create_view.out
index 74b191abb26..7f2a6e44d4a 100644
--- a/regression-test/data/ddl_p0/test_create_view.out
+++ b/regression-test/data/ddl_p0/test_create_view.out
@@ -25,5 +25,5 @@
3 [-1, 20, 0] [0, 1, 0]
-- !test_view_6 --
-v1 CREATE VIEW `v1` COMMENT 'VIEW' AS SELECT\n error_code, \n 1,
\n 'string', \n now(), \n dayofyear(op_time), \n cast
(source AS BIGINT), \n min(`timestamp`) OVER (\n ORDER BY \n
op_time DESC ROWS BETWEEN UNBOUNDED PRECEDING\n AND 1 FOLLOWING\n
), \n 1 > 2,\n 2 + 3,\n 1 IN (1, 2, 3, 4), \n remark LIKE
'%like', \n CASE WHEN remark = 's' THEN 1 ELSE 2 END,\n TRUE | FALSE
\n FROM \n `inte [...]
+v1 CREATE VIEW `v1` AS SELECT\n error_code, \n 1, \n
'string', \n now(), \n dayofyear(op_time), \n cast (source AS
BIGINT), \n min(`timestamp`) OVER (\n ORDER BY \n op_time
DESC ROWS BETWEEN UNBOUNDED PRECEDING\n AND 1 FOLLOWING\n ), \n
1 > 2,\n 2 + 3,\n 1 IN (1, 2, 3, 4), \n remark LIKE '%like',
\n CASE WHEN remark = 's' THEN 1 ELSE 2 END,\n TRUE | FALSE \n
FROM \n `internal`.`regressi [...]
diff --git a/regression-test/data/ddl_p0/test_create_view_nereids.out
b/regression-test/data/ddl_p0/test_create_view_nereids.out
index 1fda4f63f57..efdc1553ca1 100644
--- a/regression-test/data/ddl_p0/test_create_view_nereids.out
+++ b/regression-test/data/ddl_p0/test_create_view_nereids.out
@@ -25,7 +25,7 @@
3 [-1, 20, 0] [0, 1, 0]
-- !test_view_6 --
-v1 CREATE VIEW `v1` COMMENT 'VIEW' AS SELECT\n error_code, \n 1,
\n 'string', \n now(), \n dayofyear(op_time), \n cast
(source AS BIGINT), \n min(`timestamp`) OVER (\n ORDER BY \n
op_time DESC ROWS BETWEEN UNBOUNDED PRECEDING\n AND 1 FOLLOWING\n
), \n 1 > 2,\n 2 + 3,\n 1 IN (1, 2, 3, 4), \n remark LIKE
'%like', \n CASE WHEN remark = 's' THEN 1 ELSE 2 END,\n TRUE | FALSE
\n FROM \n `inte [...]
+v1 CREATE VIEW `v1` AS SELECT\n error_code, \n 1, \n
'string', \n now(), \n dayofyear(op_time), \n cast (source AS
BIGINT), \n min(`timestamp`) OVER (\n ORDER BY \n op_time
DESC ROWS BETWEEN UNBOUNDED PRECEDING\n AND 1 FOLLOWING\n ), \n
1 > 2,\n 2 + 3,\n 1 IN (1, 2, 3, 4), \n remark LIKE '%like',
\n CASE WHEN remark = 's' THEN 1 ELSE 2 END,\n TRUE | FALSE \n
FROM \n `internal`.`regressi [...]
-- !test_with_as --
1 1 2
@@ -47,7 +47,7 @@ v1 CREATE VIEW `v1` COMMENT 'VIEW' AS SELECT\n
error_code, \n 1, \n
6 7 1
-- !test_with_as_sql --
-test_view_with_as CREATE VIEW `test_view_with_as` COMMENT 'VIEW' AS (\n
with t1 as (select
`internal`.`regression_test_ddl_p0`.`mal_test_view`.`pk`,
`internal`.`regression_test_ddl_p0`.`mal_test_view`.`a`,
`internal`.`regression_test_ddl_p0`.`mal_test_view`.`b` from
`internal`.`regression_test_ddl_p0`.`mal_test_view`), t2 as (select
`internal`.`regression_test_ddl_p0`.`mal_test_view`.`pk`,
`internal`.`regression_test_ddl_p0`.`mal_test_view`.`a`,
`internal`.`regression_test_dd [...]
+test_view_with_as CREATE VIEW `test_view_with_as` AS (\n with
t1 as (select `internal`.`regression_test_ddl_p0`.`mal_test_view`.`pk`,
`internal`.`regression_test_ddl_p0`.`mal_test_view`.`a`,
`internal`.`regression_test_ddl_p0`.`mal_test_view`.`b` from
`internal`.`regression_test_ddl_p0`.`mal_test_view`), t2 as (select
`internal`.`regression_test_ddl_p0`.`mal_test_view`.`pk`,
`internal`.`regression_test_ddl_p0`.`mal_test_view`.`a`,
`internal`.`regression_test_ddl_p0`.`mal_test [...]
-- !test_union --
1 1 2
@@ -86,13 +86,13 @@ test_view_with_as CREATE VIEW `test_view_with_as` COMMENT
'VIEW' AS (\n
6 7 1
-- !test_union_sql --
-test_view_union CREATE VIEW `test_view_union` COMMENT 'VIEW' AS (select
`internal`.`regression_test_ddl_p0`.`mal_test_view`.`pk` AS `c1`,
`internal`.`regression_test_ddl_p0`.`mal_test_view`.`a` AS `c2`,
`internal`.`regression_test_ddl_p0`.`mal_test_view`.`b` AS `c3` from
`internal`.`regression_test_ddl_p0`.`mal_test_view` Union all SELECT
`internal`.`regression_test_ddl_p0`.`mal_test_view`.`pk`,
`internal`.`regression_test_ddl_p0`.`mal_test_view`.`a`,
`internal`.`regression_test_ddl_p0`. [...]
+test_view_union CREATE VIEW `test_view_union` AS (select
`internal`.`regression_test_ddl_p0`.`mal_test_view`.`pk` AS `c1`,
`internal`.`regression_test_ddl_p0`.`mal_test_view`.`a` AS `c2`,
`internal`.`regression_test_ddl_p0`.`mal_test_view`.`b` AS `c3` from
`internal`.`regression_test_ddl_p0`.`mal_test_view` Union all SELECT
`internal`.`regression_test_ddl_p0`.`mal_test_view`.`pk`,
`internal`.`regression_test_ddl_p0`.`mal_test_view`.`a`,
`internal`.`regression_test_ddl_p0`.`mal_test_view` [...]
-- !test_count_star --
17
-- !test_count_star_sql --
-test_view_count_star CREATE VIEW `test_view_count_star` COMMENT 'VIEW' AS
(select count(*) AS `c1` from
`internal`.`regression_test_ddl_p0`.`mal_test_view` having count(*) > 0);
utf8mb4 utf8mb4_0900_bin
+test_view_count_star CREATE VIEW `test_view_count_star` AS (select count(*)
AS `c1` from `internal`.`regression_test_ddl_p0`.`mal_test_view` having
count(*) > 0); utf8mb4 utf8mb4_0900_bin
-- !test_expression --
\N \N 6
@@ -114,7 +114,7 @@ test_view_count_star CREATE VIEW
`test_view_count_star` COMMENT 'VIEW' AS (selec
8 10 1
-- !test_expression_sql --
-test_view_expression CREATE VIEW `test_view_expression` COMMENT 'VIEW' AS
(select a+1 AS `c1`, abs(a)+2+1 AS `c2`, cast(b as varchar(10)) AS `c3` from
`internal`.`regression_test_ddl_p0`.`mal_test_view`); utf8mb4 utf8mb4_0900_bin
+test_view_expression CREATE VIEW `test_view_expression` AS (select a+1 AS
`c1`, abs(a)+2+1 AS `c2`, cast(b as varchar(10)) AS `c3` from
`internal`.`regression_test_ddl_p0`.`mal_test_view`); utf8mb4
utf8mb4_0900_bin
-- !test_alias --
\N \N 6
@@ -136,7 +136,7 @@ test_view_expression CREATE VIEW
`test_view_expression` COMMENT 'VIEW' AS (selec
8 10 1
-- !test_alias_sql --
-test_view_alias CREATE VIEW `test_view_alias` COMMENT 'VIEW' AS (\n
select c8 AS `c1`, c2 AS `c2`, c1 AS `c3` from (select a+1 c8,abs(a)+2+1 as
c2, cast(b as varchar(10)) as c1 from
`internal`.`regression_test_ddl_p0`.`mal_test_view`) t); utf8mb4
utf8mb4_0900_bin
+test_view_alias CREATE VIEW `test_view_alias` AS (\n select c8
AS `c1`, c2 AS `c2`, c1 AS `c3` from (select a+1 c8,abs(a)+2+1 as c2, cast(b as
varchar(10)) as c1 from `internal`.`regression_test_ddl_p0`.`mal_test_view`)
t); utf8mb4 utf8mb4_0900_bin
-- !test_star_except --
\N 6
@@ -158,7 +158,7 @@ test_view_alias CREATE VIEW `test_view_alias` COMMENT
'VIEW' AS (\n selec
7 1
-- !test_star_except_sql --
-test_view_star_except CREATE VIEW `test_view_star_except` COMMENT 'VIEW' AS
select `internal`.`regression_test_ddl_p0`.`mal_test_view`.`a`,
`internal`.`regression_test_ddl_p0`.`mal_test_view`.`b` from
`internal`.`regression_test_ddl_p0`.`mal_test_view`; utf8mb4 utf8mb4_0900_bin
+test_view_star_except CREATE VIEW `test_view_star_except` AS select
`internal`.`regression_test_ddl_p0`.`mal_test_view`.`a`,
`internal`.`regression_test_ddl_p0`.`mal_test_view`.`b` from
`internal`.`regression_test_ddl_p0`.`mal_test_view`; utf8mb4
utf8mb4_0900_bin
-- !test_create_view_from_view --
1 1 2
@@ -180,7 +180,7 @@ test_view_star_except CREATE VIEW
`test_view_star_except` COMMENT 'VIEW' AS sele
6 7 1
-- !test_create_view_from_view_sql --
-test_view_from_view CREATE VIEW `test_view_from_view` COMMENT 'VIEW' AS
select `internal`.`regression_test_ddl_p0`.`test_view_with_as`.`pk` AS `c1`,
`internal`.`regression_test_ddl_p0`.`test_view_with_as`.`a` AS `c2`,
`internal`.`regression_test_ddl_p0`.`test_view_with_as`.`b` AS `c3` from
`internal`.`regression_test_ddl_p0`.`test_view_with_as`; utf8mb4
utf8mb4_0900_bin
+test_view_from_view CREATE VIEW `test_view_from_view` AS select
`internal`.`regression_test_ddl_p0`.`test_view_with_as`.`pk` AS `c1`,
`internal`.`regression_test_ddl_p0`.`test_view_with_as`.`a` AS `c2`,
`internal`.`regression_test_ddl_p0`.`test_view_with_as`.`b` AS `c3` from
`internal`.`regression_test_ddl_p0`.`test_view_with_as`; utf8mb4
utf8mb4_0900_bin
-- !test_backquote_in_view_define --
\N 6
@@ -202,7 +202,7 @@ test_view_from_view CREATE VIEW `test_view_from_view`
COMMENT 'VIEW' AS select `
7 1
-- !test_backquote_in_view_define_sql --
-test_backquote_in_view_define CREATE VIEW `test_backquote_in_view_define`
COMMENT 'VIEW' AS select a AS `ab``c`, b AS `c2` from
`internal`.`regression_test_ddl_p0`.`mal_test_view`; utf8mb4 utf8mb4_0900_bin
+test_backquote_in_view_define CREATE VIEW `test_backquote_in_view_define` AS
select a AS `ab``c`, b AS `c2` from
`internal`.`regression_test_ddl_p0`.`mal_test_view`; utf8mb4 utf8mb4_0900_bin
-- !test_backquote_in_table_alias --
\N 6
@@ -224,5 +224,5 @@ test_backquote_in_view_define CREATE VIEW
`test_backquote_in_view_define` COMMEN
7 1
-- !test_backquote_in_table_alias_sql --
-test_backquote_in_table_alias CREATE VIEW `test_backquote_in_table_alias`
COMMENT 'VIEW' AS select `ab``c`.`a` AS `c1`, `ab``c`.`b` AS `c2` from (select
a,b from `internal`.`regression_test_ddl_p0`.`mal_test_view`) `ab``c`;
utf8mb4 utf8mb4_0900_bin
+test_backquote_in_table_alias CREATE VIEW `test_backquote_in_table_alias` AS
select `ab``c`.`a` AS `c1`, `ab``c`.`b` AS `c2` from (select a,b from
`internal`.`regression_test_ddl_p0`.`mal_test_view`) `ab``c`; utf8mb4
utf8mb4_0900_bin
diff --git a/regression-test/data/show_p0/test_show_create_table_and_views.out
b/regression-test/data/show_p0/test_show_create_table_and_views.out
index e97b1864c27..f432bb0308b 100644
--- a/regression-test/data/show_p0/test_show_create_table_and_views.out
+++ b/regression-test/data/show_p0/test_show_create_table_and_views.out
@@ -1,6 +1,6 @@
-- This file is automatically generated. You should know what you did if you
want to edit this
-- !show --
-show_create_table_and_views_table CREATE TABLE
`show_create_table_and_views_table` (\n `user_id` LARGEINT NOT NULL,\n
`good_id` LARGEINT NOT NULL,\n `cost` BIGINT SUM NULL DEFAULT "0"\n)
ENGINE=OLAP\nAGGREGATE KEY(`user_id`, `good_id`)\nCOMMENT 'OLAP'\nPARTITION BY
RANGE(`good_id`)\n(PARTITION p1 VALUES
[("-170141183460469231731687303715884105728"), ("100")),\nPARTITION p2 VALUES
[("100"), ("200")),\nPARTITION p3 VALUES [("200"), ("300")),\nPARTITION p4
VALUES [("300"), ("400")),\nPAR [...]
+show_create_table_and_views_table CREATE TABLE
`show_create_table_and_views_table` (\n `user_id` LARGEINT NOT NULL,\n
`good_id` LARGEINT NOT NULL,\n `cost` BIGINT SUM NULL DEFAULT "0"\n)
ENGINE=OLAP\nAGGREGATE KEY(`user_id`, `good_id`)\nPARTITION BY
RANGE(`good_id`)\n(PARTITION p1 VALUES
[("-170141183460469231731687303715884105728"), ("100")),\nPARTITION p2 VALUES
[("100"), ("200")),\nPARTITION p3 VALUES [("200"), ("300")),\nPARTITION p4
VALUES [("300"), ("400")),\nPARTITION p5 VALUES [...]
-- !select --
1 1 30
@@ -24,7 +24,7 @@ show_create_table_and_views_table CREATE TABLE
`show_create_table_and_views_tabl
3 1
-- !show --
-show_create_table_and_views_view CREATE VIEW
`show_create_table_and_views_view` COMMENT 'VIEW' AS SELECT `user_id` AS
`user_id`, `cost` AS `cost` FROM
`show_create_table_and_views_db`.`show_create_table_and_views_table` WHERE
(`good_id` = 2); utf8mb4 utf8mb4_0900_bin
+show_create_table_and_views_view CREATE VIEW
`show_create_table_and_views_view` AS SELECT `user_id` AS `user_id`, `cost` AS
`cost` FROM
`show_create_table_and_views_db`.`show_create_table_and_views_table` WHERE
(`good_id` = 2); utf8mb4 utf8mb4_0900_bin
-- !select --
1 47
@@ -36,11 +36,11 @@ show_create_table_and_views_view CREATE VIEW
`show_create_table_and_views_view`
300 1
-- !show --
-show_create_table_and_views_table CREATE TABLE
`show_create_table_and_views_table` (\n `user_id` LARGEINT NOT NULL,\n
`good_id` LARGEINT NOT NULL,\n `cost` BIGINT SUM NULL DEFAULT "0"\n)
ENGINE=OLAP\nAGGREGATE KEY(`user_id`, `good_id`)\nCOMMENT 'OLAP'\nPARTITION BY
RANGE(`good_id`)\n(PARTITION p1 VALUES
[("-170141183460469231731687303715884105728"), ("100")),\nPARTITION p2 VALUES
[("100"), ("200")),\nPARTITION p3 VALUES [("200"), ("300")),\nPARTITION p4
VALUES [("300"), ("400")),\nPAR [...]
+show_create_table_and_views_table CREATE TABLE
`show_create_table_and_views_table` (\n `user_id` LARGEINT NOT NULL,\n
`good_id` LARGEINT NOT NULL,\n `cost` BIGINT SUM NULL DEFAULT "0"\n)
ENGINE=OLAP\nAGGREGATE KEY(`user_id`, `good_id`)\nPARTITION BY
RANGE(`good_id`)\n(PARTITION p1 VALUES
[("-170141183460469231731687303715884105728"), ("100")),\nPARTITION p2 VALUES
[("100"), ("200")),\nPARTITION p3 VALUES [("200"), ("300")),\nPARTITION p4
VALUES [("300"), ("400")),\nPARTITION p5 VALUES [...]
-- !show --
-show_create_table_and_views_like CREATE TABLE
`show_create_table_and_views_like` (\n `user_id` LARGEINT NOT NULL,\n
`good_id` LARGEINT NOT NULL,\n `cost` BIGINT SUM NULL DEFAULT "0"\n)
ENGINE=OLAP\nAGGREGATE KEY(`user_id`, `good_id`)\nCOMMENT 'OLAP'\nPARTITION BY
RANGE(`good_id`)\n(PARTITION p1 VALUES
[("-170141183460469231731687303715884105728"), ("100")),\nPARTITION p2 VALUES
[("100"), ("200")),\nPARTITION p3 VALUES [("200"), ("300")),\nPARTITION p4
VALUES [("300"), ("400")),\nPARTI [...]
+show_create_table_and_views_like CREATE TABLE
`show_create_table_and_views_like` (\n `user_id` LARGEINT NOT NULL,\n
`good_id` LARGEINT NOT NULL,\n `cost` BIGINT SUM NULL DEFAULT "0"\n)
ENGINE=OLAP\nAGGREGATE KEY(`user_id`, `good_id`)\nPARTITION BY
RANGE(`good_id`)\n(PARTITION p1 VALUES
[("-170141183460469231731687303715884105728"), ("100")),\nPARTITION p2 VALUES
[("100"), ("200")),\nPARTITION p3 VALUES [("200"), ("300")),\nPARTITION p4
VALUES [("300"), ("400")),\nPARTITION p5 VALUES [ [...]
-- !show --
-show_create_table_and_views_like_with_rollup CREATE TABLE
`show_create_table_and_views_like_with_rollup` (\n `user_id` LARGEINT NOT
NULL,\n `good_id` LARGEINT NOT NULL,\n `cost` BIGINT SUM NULL DEFAULT "0"\n)
ENGINE=OLAP\nAGGREGATE KEY(`user_id`, `good_id`)\nCOMMENT 'OLAP'\nPARTITION BY
RANGE(`good_id`)\n(PARTITION p1 VALUES
[("-170141183460469231731687303715884105728"), ("100")),\nPARTITION p2 VALUES
[("100"), ("200")),\nPARTITION p3 VALUES [("200"), ("300")),\nPARTITION p4
VALUES [( [...]
+show_create_table_and_views_like_with_rollup CREATE TABLE
`show_create_table_and_views_like_with_rollup` (\n `user_id` LARGEINT NOT
NULL,\n `good_id` LARGEINT NOT NULL,\n `cost` BIGINT SUM NULL DEFAULT "0"\n)
ENGINE=OLAP\nAGGREGATE KEY(`user_id`, `good_id`)\nPARTITION BY
RANGE(`good_id`)\n(PARTITION p1 VALUES
[("-170141183460469231731687303715884105728"), ("100")),\nPARTITION p2 VALUES
[("100"), ("200")),\nPARTITION p3 VALUES [("200"), ("300")),\nPARTITION p4
VALUES [("300"), ("400")) [...]
diff --git
a/regression-test/data/show_p0/test_show_create_table_and_views_nereids.out
b/regression-test/data/show_p0/test_show_create_table_and_views_nereids.out
index 3a5728d3d9e..2fe50f2427b 100644
--- a/regression-test/data/show_p0/test_show_create_table_and_views_nereids.out
+++ b/regression-test/data/show_p0/test_show_create_table_and_views_nereids.out
@@ -1,6 +1,6 @@
-- This file is automatically generated. You should know what you did if you
want to edit this
-- !show --
-show_create_table_and_views_nereids_table CREATE TABLE
`show_create_table_and_views_nereids_table` (\n `user_id` LARGEINT NOT NULL,\n
`good_id` LARGEINT NOT NULL,\n `cost` BIGINT SUM NULL DEFAULT "0"\n)
ENGINE=OLAP\nAGGREGATE KEY(`user_id`, `good_id`)\nCOMMENT 'OLAP'\nPARTITION BY
RANGE(`good_id`)\n(PARTITION p1 VALUES
[("-170141183460469231731687303715884105728"), ("100")),\nPARTITION p2 VALUES
[("100"), ("200")),\nPARTITION p3 VALUES [("200"), ("300")),\nPARTITION p4
VALUES [("300") [...]
+show_create_table_and_views_nereids_table CREATE TABLE
`show_create_table_and_views_nereids_table` (\n `user_id` LARGEINT NOT NULL,\n
`good_id` LARGEINT NOT NULL,\n `cost` BIGINT SUM NULL DEFAULT "0"\n)
ENGINE=OLAP\nAGGREGATE KEY(`user_id`, `good_id`)\nPARTITION BY
RANGE(`good_id`)\n(PARTITION p1 VALUES
[("-170141183460469231731687303715884105728"), ("100")),\nPARTITION p2 VALUES
[("100"), ("200")),\nPARTITION p3 VALUES [("200"), ("300")),\nPARTITION p4
VALUES [("300"), ("400")),\nPAR [...]
-- !select --
1 1 30
@@ -24,7 +24,7 @@ show_create_table_and_views_nereids_table CREATE TABLE
`show_create_table_and_vi
3 1
-- !show --
-show_create_table_and_views_nereids_view CREATE VIEW
`show_create_table_and_views_nereids_view` COMMENT 'VIEW' AS SELECT user_id AS
`user_id`, cost AS `cost` FROM
`internal`.`show_create_table_and_views_nereids_db`.`show_create_table_and_views_nereids_table`\n
WHERE good_id = 2; utf8mb4 utf8mb4_0900_bin
+show_create_table_and_views_nereids_view CREATE VIEW
`show_create_table_and_views_nereids_view` AS SELECT user_id AS `user_id`, cost
AS `cost` FROM
`internal`.`show_create_table_and_views_nereids_db`.`show_create_table_and_views_nereids_table`\n
WHERE good_id = 2; utf8mb4 utf8mb4_0900_bin
-- !select --
1 47
@@ -36,11 +36,11 @@ show_create_table_and_views_nereids_view CREATE VIEW
`show_create_table_and_view
300 1
-- !show --
-show_create_table_and_views_nereids_table CREATE TABLE
`show_create_table_and_views_nereids_table` (\n `user_id` LARGEINT NOT NULL,\n
`good_id` LARGEINT NOT NULL,\n `cost` BIGINT SUM NULL DEFAULT "0"\n)
ENGINE=OLAP\nAGGREGATE KEY(`user_id`, `good_id`)\nCOMMENT 'OLAP'\nPARTITION BY
RANGE(`good_id`)\n(PARTITION p1 VALUES
[("-170141183460469231731687303715884105728"), ("100")),\nPARTITION p2 VALUES
[("100"), ("200")),\nPARTITION p3 VALUES [("200"), ("300")),\nPARTITION p4
VALUES [("300") [...]
+show_create_table_and_views_nereids_table CREATE TABLE
`show_create_table_and_views_nereids_table` (\n `user_id` LARGEINT NOT NULL,\n
`good_id` LARGEINT NOT NULL,\n `cost` BIGINT SUM NULL DEFAULT "0"\n)
ENGINE=OLAP\nAGGREGATE KEY(`user_id`, `good_id`)\nPARTITION BY
RANGE(`good_id`)\n(PARTITION p1 VALUES
[("-170141183460469231731687303715884105728"), ("100")),\nPARTITION p2 VALUES
[("100"), ("200")),\nPARTITION p3 VALUES [("200"), ("300")),\nPARTITION p4
VALUES [("300"), ("400")),\nPAR [...]
-- !show --
-show_create_table_and_views_nereids_like CREATE TABLE
`show_create_table_and_views_nereids_like` (\n `user_id` LARGEINT NOT NULL,\n
`good_id` LARGEINT NOT NULL,\n `cost` BIGINT SUM NULL DEFAULT "0"\n)
ENGINE=OLAP\nAGGREGATE KEY(`user_id`, `good_id`)\nCOMMENT 'OLAP'\nPARTITION BY
RANGE(`good_id`)\n(PARTITION p1 VALUES
[("-170141183460469231731687303715884105728"), ("100")),\nPARTITION p2 VALUES
[("100"), ("200")),\nPARTITION p3 VALUES [("200"), ("300")),\nPARTITION p4
VALUES [("300"), [...]
+show_create_table_and_views_nereids_like CREATE TABLE
`show_create_table_and_views_nereids_like` (\n `user_id` LARGEINT NOT NULL,\n
`good_id` LARGEINT NOT NULL,\n `cost` BIGINT SUM NULL DEFAULT "0"\n)
ENGINE=OLAP\nAGGREGATE KEY(`user_id`, `good_id`)\nPARTITION BY
RANGE(`good_id`)\n(PARTITION p1 VALUES
[("-170141183460469231731687303715884105728"), ("100")),\nPARTITION p2 VALUES
[("100"), ("200")),\nPARTITION p3 VALUES [("200"), ("300")),\nPARTITION p4
VALUES [("300"), ("400")),\nPARTI [...]
-- !show --
-show_create_table_and_views_nereids_like_with_rollup CREATE TABLE
`show_create_table_and_views_nereids_like_with_rollup` (\n `user_id` LARGEINT
NOT NULL,\n `good_id` LARGEINT NOT NULL,\n `cost` BIGINT SUM NULL DEFAULT
"0"\n) ENGINE=OLAP\nAGGREGATE KEY(`user_id`, `good_id`)\nCOMMENT
'OLAP'\nPARTITION BY RANGE(`good_id`)\n(PARTITION p1 VALUES
[("-170141183460469231731687303715884105728"), ("100")),\nPARTITION p2 VALUES
[("100"), ("200")),\nPARTITION p3 VALUES [("200"), ("300")),\nPARTIT [...]
+show_create_table_and_views_nereids_like_with_rollup CREATE TABLE
`show_create_table_and_views_nereids_like_with_rollup` (\n `user_id` LARGEINT
NOT NULL,\n `good_id` LARGEINT NOT NULL,\n `cost` BIGINT SUM NULL DEFAULT
"0"\n) ENGINE=OLAP\nAGGREGATE KEY(`user_id`, `good_id`)\nPARTITION BY
RANGE(`good_id`)\n(PARTITION p1 VALUES
[("-170141183460469231731687303715884105728"), ("100")),\nPARTITION p2 VALUES
[("100"), ("200")),\nPARTITION p3 VALUES [("200"), ("300")),\nPARTITION p4
VALUES [( [...]
diff --git
a/regression-test/data/view_p0/create_view_star_except_and_cast_to_sql.out
b/regression-test/data/view_p0/create_view_star_except_and_cast_to_sql.out
index 86b7fd3a658..3e05c57230f 100644
--- a/regression-test/data/view_p0/create_view_star_except_and_cast_to_sql.out
+++ b/regression-test/data/view_p0/create_view_star_except_and_cast_to_sql.out
@@ -7,5 +7,5 @@
6 \N
-- !test_sql --
-v_mal_old_create_view2 CREATE VIEW `v_mal_old_create_view2` COMMENT 'VIEW' AS
SELECT CAST(CAST(`a` AS TEXT) AS TIME(0)) AS `__cast_expr_0` FROM
`regression_test_view_p0`.`mal_old_create_view`; utf8mb4 utf8mb4_0900_bin
+v_mal_old_create_view2 CREATE VIEW `v_mal_old_create_view2` AS SELECT
CAST(CAST(`a` AS TEXT) AS TIME(0)) AS `__cast_expr_0` FROM
`regression_test_view_p0`.`mal_old_create_view`; utf8mb4 utf8mb4_0900_bin
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
