Skip to content

Commit b30530d

Browse files
authored
branch-2.1:[fix](view)Fix show create view not display column_definition (apache#55819) (apache#5147)
pick:apache#55819
1 parent aace70b commit b30530d

9 files changed

Lines changed: 44 additions & 42 deletions

File tree

‎fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3250,7 +3250,7 @@ public static String getMTMVDdl(MTMV mtmv) throws AnalysisException {
32503250
try {
32513251
StringBuilder sb = new StringBuilder("CREATE MATERIALIZED VIEW ");
32523252
sb.append(mtmv.getName());
3253-
addMTMVCols(mtmv, sb);
3253+
addColNameAndComment(mtmv, sb);
32543254
sb.append("\n");
32553255
sb.append(mtmv.getRefreshInfo());
32563256
addMTMVKeyInfo(mtmv, sb);
@@ -3299,9 +3299,9 @@ private static void addMTMVPartitionInfo(MTMV mtmv, StringBuilder sb) throws Ana
32993299
sb.append(")");
33003300
}
33013301

3302-
private static void addMTMVCols(MTMV mtmv, StringBuilder sb) {
3302+
private static void addColNameAndComment(TableIf tableIf, StringBuilder sb) {
33033303
sb.append("\n(");
3304-
List<Column> columns = mtmv.getBaseSchema();
3304+
List<Column> columns = tableIf.getBaseSchema();
33053305
for (int i = 0; i < columns.size(); i++) {
33063306
if (i != 0) {
33073307
sb.append(",");
@@ -3569,6 +3569,8 @@ public static void getDdlStmt(DdlStmt ddlStmt, String dbName, TableIf table, Lis
35693569
View view = (View) table;
35703570

35713571
sb.append("CREATE VIEW `").append(table.getName()).append("`");
3572+
addColNameAndComment(view, sb);
3573+
sb.append("\n");
35723574
if (StringUtils.isNotBlank(table.getComment())) {
35733575
sb.append(" COMMENT '").append(table.getComment()).append("'");
35743576
}

‎regression-test/data/datatype_p0/scalar_types/get_assignment_compatible_type.out‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
-- This file is automatically generated. You should know what you did if you want to edit this
22
-- !test_sql --
3-
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
3+
test_decimal_boolean_view CREATE VIEW `test_decimal_boolean_view`\n(id,c1,c2)\n 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
44

55
-- !test_union --
66
0.0

‎regression-test/data/ddl_p0/create_view_nereids/test_create_view_nereids.out‎

Lines changed: 23 additions & 23 deletions
Large diffs are not rendered by default.

‎regression-test/data/ddl_p0/test_alter_view_nereids.out‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
2 70
1111

1212
-- !sql --
13-
test_alter_view_view_nereids CREATE VIEW `test_alter_view_view_nereids` COMMENT 'test_view' AS SELECT `internal`.`regression_test_ddl_p0`.`test_alter_view_table_nereids`.`c1` AS `k1`, sum(`internal`.`regression_test_ddl_p0`.`test_alter_view_table_nereids`.`c3`) AS `k2` FROM `internal`.`regression_test_ddl_p0`.`test_alter_view_table_nereids` GROUP BY `internal`.`regression_test_ddl_p0`.`test_alter_view_table_nereids`.`c1`; utf8mb4 utf8mb4_0900_bin
13+
test_alter_view_view_nereids CREATE VIEW `test_alter_view_view_nereids`\n(k1,k2)\n COMMENT 'test_view' AS SELECT `internal`.`regression_test_ddl_p0`.`test_alter_view_table_nereids`.`c1` AS `k1`, sum(`internal`.`regression_test_ddl_p0`.`test_alter_view_table_nereids`.`c3`) AS `k2` FROM `internal`.`regression_test_ddl_p0`.`test_alter_view_table_nereids` GROUP BY `internal`.`regression_test_ddl_p0`.`test_alter_view_table_nereids`.`c1`; utf8mb4 utf8mb4_0900_bin
1414

1515
-- !sql --
16-
test_alter_view_view_nereids CREATE VIEW `test_alter_view_view_nereids` COMMENT 'test_view' AS (select `internal`.`regression_test_ddl_p0`.`test_alter_view_table_nereids`.`c1`, `internal`.`regression_test_ddl_p0`.`test_alter_view_table_nereids`.`c2`, `internal`.`regression_test_ddl_p0`.`test_alter_view_table_nereids`.`c3` from `internal`.`regression_test_ddl_p0`.`test_alter_view_table_nereids`); utf8mb4 utf8mb4_0900_bin
16+
test_alter_view_view_nereids CREATE VIEW `test_alter_view_view_nereids`\n(c1,c2,c3)\n COMMENT 'test_view' AS (select `internal`.`regression_test_ddl_p0`.`test_alter_view_table_nereids`.`c1`, `internal`.`regression_test_ddl_p0`.`test_alter_view_table_nereids`.`c2`, `internal`.`regression_test_ddl_p0`.`test_alter_view_table_nereids`.`c3` from `internal`.`regression_test_ddl_p0`.`test_alter_view_table_nereids`); utf8mb4 utf8mb4_0900_bin
1717

‎regression-test/data/ddl_p0/test_create_view.out‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@
2525
3 [-1, 20, 0] [0, 1, 0]
2626

2727
-- !test_view_6 --
28-
v1 CREATE VIEW `v1` AS SELECT `error_code` AS `error_code`, 1 AS `__literal_1`, 'string' AS `__literal_2`, now() AS `__now_3`, dayofyear(`op_time`) AS `__dayofyear_4`, CAST(`source` AS bigint) AS `__cast_expr_5`, min(`timestamp`) OVER (ORDER BY `op_time` DESC NULLS LAST ROWS BETWEEN UNBOUNDED PRECEDING AND 1 FOLLOWING) AS `__min_6`, (1 > 2) AS `__binary_predicate_7`, (2 + 3) AS `__arithmetic_expr_8`, 1 IN (1, 2, 3, 4) AS `__in_predicate_9`, `remark` LIKE '%like' AS `__like_predicate_10`, CASE WHEN (`remark` = 's') THEN 1 ELSE 2 END AS `__case_expr_11`, (TRUE | FALSE) AS `__arithmetic_expr_12` FROM `regression_test_ddl_p0`.`view_column_name_test`;
28+
v1 CREATE VIEW `v1`\n(error_code,__literal_1,__literal_2,__now_3,__dayofyear_4,__cast_expr_5,__min_6,__binary_predicate_7,__arithmetic_expr_8,__in_predicate_9,__like_predicate_10,__case_expr_11,__arithmetic_expr_12)\n AS SELECT `error_code` AS `error_code`, 1 AS `__literal_1`, 'string' AS `__literal_2`, now() AS `__now_3`, dayofyear(`op_time`) AS `__dayofyear_4`, CAST(`source` AS bigint) AS `__cast_expr_5`, min(`timestamp`) OVER (ORDER BY `op_time` DESC NULLS LAST ROWS BETWEEN UNBOUNDED PRECEDING AND 1 FOLLOWING) AS `__min_6`, (1 > 2) AS `__binary_predicate_7`, (2 + 3) AS `__arithmetic_expr_8`, 1 IN (1, 2, 3, 4) AS `__in_predicate_9`, `remark` LIKE '%like' AS `__like_predicate_10`, CASE WHEN (`remark` = 's') THEN 1 ELSE 2 END AS `__case_expr_11`, (TRUE | FALSE) AS `__arithmetic_expr_12` FROM `regression_test_ddl_p0`.`view_column_name_test`;
2929

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
-- This file is automatically generated. You should know what you did if you want to edit this
22
-- !cmd --
3-
ttv1 CREATE VIEW `ttv1` AS select `internal`.`test_show_view_db2`.`t1`.`c1`, `internal`.`test_show_view_db2`.`t2`.`c2` from `internal`.`test_show_view_db2`.`t1` join `internal`.`test_show_view_db2`.`t2` on `internal`.`test_show_view_db2`.`t1`.`c2` = `internal`.`test_show_view_db2`.`t2`.`c2`;
4-
ttv2 CREATE VIEW `ttv2` AS select `internal`.`test_show_view_db2`.`t1`.`c1` from `internal`.`test_show_view_db2`.`t1` where `internal`.`test_show_view_db2`.`t1`.`c2` = 1;
3+
ttv1 CREATE VIEW `ttv1`\n(c1,c2)\n AS select `internal`.`test_show_view_db2`.`t1`.`c1`, `internal`.`test_show_view_db2`.`t2`.`c2` from `internal`.`test_show_view_db2`.`t1` join `internal`.`test_show_view_db2`.`t2` on `internal`.`test_show_view_db2`.`t1`.`c2` = `internal`.`test_show_view_db2`.`t2`.`c2`;
4+
ttv2 CREATE VIEW `ttv2`\n(c1)\n AS select `internal`.`test_show_view_db2`.`t1`.`c1` from `internal`.`test_show_view_db2`.`t1` where `internal`.`test_show_view_db2`.`t1`.`c2` = 1;
55

66
-- !cmd --
7-
tv1 CREATE VIEW `tv1` AS select `internal`.`test_show_view_db1`.`t1`.`c1`, `internal`.`test_show_view_db1`.`t2`.`c2` from `internal`.`test_show_view_db1`.`t1` join `internal`.`test_show_view_db1`.`t2` on `internal`.`test_show_view_db1`.`t1`.`c2` = `internal`.`test_show_view_db1`.`t2`.`c2`;
8-
tv2 CREATE VIEW `tv2` AS select `internal`.`test_show_view_db1`.`t1`.`c1` from `internal`.`test_show_view_db1`.`t1` where `internal`.`test_show_view_db1`.`t1`.`c2` = 1;
7+
tv1 CREATE VIEW `tv1`\n(c1,c2)\n AS select `internal`.`test_show_view_db1`.`t1`.`c1`, `internal`.`test_show_view_db1`.`t2`.`c2` from `internal`.`test_show_view_db1`.`t1` join `internal`.`test_show_view_db1`.`t2` on `internal`.`test_show_view_db1`.`t1`.`c2` = `internal`.`test_show_view_db1`.`t2`.`c2`;
8+
tv2 CREATE VIEW `tv2`\n(c1)\n AS select `internal`.`test_show_view_db1`.`t1`.`c1` from `internal`.`test_show_view_db1`.`t1` where `internal`.`test_show_view_db1`.`t1`.`c2` = 1;
99

1010
-- !cmd --
11-
ttv1 CREATE VIEW `ttv1` AS select `internal`.`test_show_view_db2`.`t1`.`c1`, `internal`.`test_show_view_db2`.`t2`.`c2` from `internal`.`test_show_view_db2`.`t1` join `internal`.`test_show_view_db2`.`t2` on `internal`.`test_show_view_db2`.`t1`.`c2` = `internal`.`test_show_view_db2`.`t2`.`c2`;
12-
ttv2 CREATE VIEW `ttv2` AS select `internal`.`test_show_view_db2`.`t1`.`c1` from `internal`.`test_show_view_db2`.`t1` where `internal`.`test_show_view_db2`.`t1`.`c2` = 1;
11+
ttv1 CREATE VIEW `ttv1`\n(c1,c2)\n AS select `internal`.`test_show_view_db2`.`t1`.`c1`, `internal`.`test_show_view_db2`.`t2`.`c2` from `internal`.`test_show_view_db2`.`t1` join `internal`.`test_show_view_db2`.`t2` on `internal`.`test_show_view_db2`.`t1`.`c2` = `internal`.`test_show_view_db2`.`t2`.`c2`;
12+
ttv2 CREATE VIEW `ttv2`\n(c1)\n AS select `internal`.`test_show_view_db2`.`t1`.`c1` from `internal`.`test_show_view_db2`.`t1` where `internal`.`test_show_view_db2`.`t1`.`c2` = 1;
1313

1414
-- !cmd --
15-
ttv1 CREATE VIEW `ttv1` AS select `internal`.`test_show_view_db2`.`t1`.`c1`, `internal`.`test_show_view_db2`.`t2`.`c2` from `internal`.`test_show_view_db2`.`t1` join `internal`.`test_show_view_db2`.`t2` on `internal`.`test_show_view_db2`.`t1`.`c2` = `internal`.`test_show_view_db2`.`t2`.`c2`;
16-
ttv2 CREATE VIEW `ttv2` AS select `internal`.`test_show_view_db2`.`t1`.`c1` from `internal`.`test_show_view_db2`.`t1` where `internal`.`test_show_view_db2`.`t1`.`c2` = 1;
15+
ttv1 CREATE VIEW `ttv1`\n(c1,c2)\n AS select `internal`.`test_show_view_db2`.`t1`.`c1`, `internal`.`test_show_view_db2`.`t2`.`c2` from `internal`.`test_show_view_db2`.`t1` join `internal`.`test_show_view_db2`.`t2` on `internal`.`test_show_view_db2`.`t1`.`c2` = `internal`.`test_show_view_db2`.`t2`.`c2`;
16+
ttv2 CREATE VIEW `ttv2`\n(c1)\n AS select `internal`.`test_show_view_db2`.`t1`.`c1` from `internal`.`test_show_view_db2`.`t1` where `internal`.`test_show_view_db2`.`t1`.`c2` = 1;
1717

‎regression-test/data/show_p0/test_show_create_table_and_views.out‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ show_create_table_and_views_table CREATE TABLE `show_create_table_and_views_tabl
2424
3 1
2525

2626
-- !show --
27-
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
27+
show_create_table_and_views_view CREATE VIEW `show_create_table_and_views_view`\n(user_id,cost)\n 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
2828

2929
-- !select --
3030
1 47

‎regression-test/data/show_p0/test_show_create_table_and_views_nereids.out‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ show_create_table_and_views_nereids_table CREATE TABLE `show_create_table_and_vi
2424
3 1
2525

2626
-- !show --
27-
show_create_table_and_views_nereids_view CREATE VIEW `show_create_table_and_views_nereids_view` AS SELECT `internal`.`show_create_table_and_views_nereids_db`.`show_create_table_and_views_nereids_table`.`user_id` AS `user_id`, `internal`.`show_create_table_and_views_nereids_db`.`show_create_table_and_views_nereids_table`.`cost` AS `cost` FROM `internal`.`show_create_table_and_views_nereids_db`.`show_create_table_and_views_nereids_table`\n WHERE `internal`.`show_create_table_and_views_nereids_db`.`show_create_table_and_views_nereids_table`.`good_id` = 2; utf8mb4 utf8mb4_0900_bin
27+
show_create_table_and_views_nereids_view CREATE VIEW `show_create_table_and_views_nereids_view`\n(user_id,cost)\n AS SELECT `internal`.`show_create_table_and_views_nereids_db`.`show_create_table_and_views_nereids_table`.`user_id` AS `user_id`, `internal`.`show_create_table_and_views_nereids_db`.`show_create_table_and_views_nereids_table`.`cost` AS `cost` FROM `internal`.`show_create_table_and_views_nereids_db`.`show_create_table_and_views_nereids_table`\n WHERE `internal`.`show_create_table_and_views_nereids_db`.`show_create_table_and_views_nereids_table`.`good_id` = 2; utf8mb4 utf8mb4_0900_bin
2828

2929
-- !select --
3030
1 47

‎regression-test/data/view_p0/create_view_star_except_and_cast_to_sql.out‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
6 6
88

99
-- !test_select_star_except_sql --
10-
v_mal_old_create_view CREATE VIEW `v_mal_old_create_view` AS SELECT `regression_test_view_p0`.`mal_old_create_view`.`pk` AS `pk`, `regression_test_view_p0`.`mal_old_create_view`.`b` AS `b` FROM `regression_test_view_p0`.`mal_old_create_view`; utf8mb4 utf8mb4_0900_bin
10+
v_mal_old_create_view CREATE VIEW `v_mal_old_create_view`\n(pk,b)\n AS SELECT `regression_test_view_p0`.`mal_old_create_view`.`pk` AS `pk`, `regression_test_view_p0`.`mal_old_create_view`.`b` AS `b` FROM `regression_test_view_p0`.`mal_old_create_view`; utf8mb4 utf8mb4_0900_bin
1111

1212
-- !test_sql --
13-
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
13+
v_mal_old_create_view2 CREATE VIEW `v_mal_old_create_view2`\n(__cast_expr_0)\n 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
1414

0 commit comments

Comments
 (0)