Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java
Original file line number Diff line number Diff line change
Expand Up @@ -3552,7 +3552,7 @@ public static String getMTMVDdl(MTMV mtmv) throws AnalysisException {
try {
StringBuilder sb = new StringBuilder("CREATE MATERIALIZED VIEW ");
sb.append(mtmv.getName());
addMTMVCols(mtmv, sb);
addColNameAndComment(mtmv, sb);
sb.append("\n");
sb.append(mtmv.getRefreshInfo());
addMTMVKeyInfo(mtmv, sb);
Expand Down Expand Up @@ -3601,9 +3601,9 @@ private static void addMTMVPartitionInfo(MTMV mtmv, StringBuilder sb) throws Ana
sb.append(")");
}

private static void addMTMVCols(MTMV mtmv, StringBuilder sb) {
private static void addColNameAndComment(TableIf tableIf, StringBuilder sb) {
sb.append("\n(");
List<Column> columns = mtmv.getBaseSchema();
List<Column> columns = tableIf.getBaseSchema();
for (int i = 0; i < columns.size(); i++) {
if (i != 0) {
sb.append(",");
Expand Down Expand Up @@ -3918,6 +3918,8 @@ public static void getDdlStmt(DdlStmt ddlStmt, String dbName, TableIf table, Lis
View view = (View) table;

sb.append("CREATE VIEW `").append(table.getName()).append("`");
addColNameAndComment(view, sb);
sb.append("\n");
if (StringUtils.isNotBlank(table.getComment())) {
sb.append(" COMMENT '").append(table.getComment()).append("'");
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
-- 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` AS select `internal`.`regression_test_datatype_p0_scalar_types`.`test_decimal_boolean`.`id`,`internal`.`regression_test_datatype_p0_scalar_types`.`test_decimal_boolean`.`c1`,`internal`.`regression_test_datatype_p0_scalar_types`.`test_decimal_boolean`.`c2` from `internal`.`regression_test_datatype_p0_scalar_types`.`test_decimal_boolean` where 0.0=`internal`.`regression_test_datatype_p0_scalar_types`.`test_decimal_boolean`.`c1` and `internal`.`regression_test_datatype_p0_scalar_types`.`test_decimal_boolean`.`c2` = 1.0; utf8mb4 utf8mb4_0900_bin
test_decimal_boolean_view CREATE VIEW `test_decimal_boolean_view`\n(id,c1,c2)\n AS select `internal`.`regression_test_datatype_p0_scalar_types`.`test_decimal_boolean`.`id`,`internal`.`regression_test_datatype_p0_scalar_types`.`test_decimal_boolean`.`c1`,`internal`.`regression_test_datatype_p0_scalar_types`.`test_decimal_boolean`.`c2` from `internal`.`regression_test_datatype_p0_scalar_types`.`test_decimal_boolean` where 0.0=`internal`.`regression_test_datatype_p0_scalar_types`.`test_decimal_boolean`.`c1` and `internal`.`regression_test_datatype_p0_scalar_types`.`test_decimal_boolean`.`c2` = 1.0; utf8mb4 utf8mb4_0900_bin

-- !test_union --
0.0
Expand Down

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions regression-test/data/ddl_p0/test_alter_view_nereids.out
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
2 70

-- !sql --
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
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

-- !sql --
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
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

16 changes: 8 additions & 8 deletions regression-test/data/nereids_p0/show/show_view_command.out
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
-- This file is automatically generated. You should know what you did if you want to edit this
-- !cmd --
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`;
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;
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`;
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;

-- !cmd --
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`;
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;
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`;
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;

-- !cmd --
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`;
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;
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`;
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;

-- !cmd --
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`;
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;
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`;
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;

Original file line number Diff line number Diff line change
Expand Up @@ -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` 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
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

-- !select --
1 47
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
6 6

-- !test_select_star_except_sql --
v_mal_old_create_view CREATE VIEW `v_mal_old_create_view` AS select `internal`.`regression_test_view_p0`.`mal_old_create_view`.`pk`, `internal`.`regression_test_view_p0`.`mal_old_create_view`.`b` from `internal`.`regression_test_view_p0`.`mal_old_create_view`; utf8mb4 utf8mb4_0900_bin
v_mal_old_create_view CREATE VIEW `v_mal_old_create_view`\n(pk,b)\n AS select `internal`.`regression_test_view_p0`.`mal_old_create_view`.`pk`, `internal`.`regression_test_view_p0`.`mal_old_create_view`.`b` from `internal`.`regression_test_view_p0`.`mal_old_create_view`; utf8mb4 utf8mb4_0900_bin

-- !test_sql --
v_mal_old_create_view2 CREATE VIEW `v_mal_old_create_view2` AS select cast(cast(`internal`.`regression_test_view_p0`.`mal_old_create_view`.`a` as string) as time) from `internal`.`regression_test_view_p0`.`mal_old_create_view`; utf8mb4 utf8mb4_0900_bin
v_mal_old_create_view2 CREATE VIEW `v_mal_old_create_view2`\n(__cast_0)\n AS select cast(cast(`internal`.`regression_test_view_p0`.`mal_old_create_view`.`a` as string) as time) from `internal`.`regression_test_view_p0`.`mal_old_create_view`; utf8mb4 utf8mb4_0900_bin

12 changes: 6 additions & 6 deletions regression-test/data/view_p0/view_p0.out
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ internal regression_test_view_p0 test_view select 1,to_base64(AES_ENCRYPT('doris
17777208882

-- !show_aes --
test_view_aes CREATE VIEW `test_view_aes` AS SELECT aes_decrypt(from_base64("EXp7k7M9Zv1mIwPpno28Hg=="), '17IMZrGdwWf2Piy8', 'II2HLtihr5TQpQgR', 'AES_128_CBC'); utf8mb4 utf8mb4_0900_bin
test_view_aes CREATE VIEW `test_view_aes`\n(__aes_decrypt_0)\n AS SELECT aes_decrypt(from_base64("EXp7k7M9Zv1mIwPpno28Hg=="), '17IMZrGdwWf2Piy8', 'II2HLtihr5TQpQgR', 'AES_128_CBC'); utf8mb4 utf8mb4_0900_bin

-- !desc_view_1 --
c_date varchar(50) Yes false \N
Expand All @@ -40,17 +40,17 @@ C_DatE varchar(50) Yes false \N
c_dATE varchar(65533) Yes false \N

-- !comment0 --
test_view_table2_view CREATE VIEW `test_view_table2_view` AS SELECT \n date_format(`internal`.`regression_test_view_p0`.`test_view_table2`.`c_date`,'%Y-%m-%d') AS `c_dATE`\n FROM \n `internal`.`regression_test_view_p0`.`test_view_table2`\n GROUP BY \n date_format(`internal`.`regression_test_view_p0`.`test_view_table2`.`c_date`, '%Y-%m-%d'); utf8mb4 utf8mb4_0900_bin
test_view_table2_view CREATE VIEW `test_view_table2_view`\n(c_dATE)\n AS SELECT \n date_format(`internal`.`regression_test_view_p0`.`test_view_table2`.`c_date`,'%Y-%m-%d') AS `c_dATE`\n FROM \n `internal`.`regression_test_view_p0`.`test_view_table2`\n GROUP BY \n date_format(`internal`.`regression_test_view_p0`.`test_view_table2`.`c_date`, '%Y-%m-%d'); utf8mb4 utf8mb4_0900_bin

-- !comment1 --
test_view_table2_view CREATE VIEW `test_view_table2_view` COMMENT 'comment1' AS SELECT \n date_format(`internal`.`regression_test_view_p0`.`test_view_table2`.`c_date`,'%Y-%m-%d') AS `c_dATE`\n FROM \n `internal`.`regression_test_view_p0`.`test_view_table2`\n GROUP BY \n date_format(`internal`.`regression_test_view_p0`.`test_view_table2`.`c_date`, '%Y-%m-%d'); utf8mb4 utf8mb4_0900_bin
test_view_table2_view CREATE VIEW `test_view_table2_view`\n(c_dATE)\n COMMENT 'comment1' AS SELECT \n date_format(`internal`.`regression_test_view_p0`.`test_view_table2`.`c_date`,'%Y-%m-%d') AS `c_dATE`\n FROM \n `internal`.`regression_test_view_p0`.`test_view_table2`\n GROUP BY \n date_format(`internal`.`regression_test_view_p0`.`test_view_table2`.`c_date`, '%Y-%m-%d'); utf8mb4 utf8mb4_0900_bin

-- !comment2 --
test_view_table2_view CREATE VIEW `test_view_table2_view` COMMENT 'comment1' AS SELECT\n date_format(`internal`.`regression_test_view_p0`.`test_view_table2`.`c_date`,'%Y-%m-%d') AS `CREATE_DATE`\n FROM\n `internal`.`regression_test_view_p0`.`test_view_table2`\n GROUP BY\n date_format(`internal`.`regression_test_view_p0`.`test_view_table2`.`c_date`, '%Y-%m-%d'); utf8mb4 utf8mb4_0900_bin
test_view_table2_view CREATE VIEW `test_view_table2_view`\n(CREATE_DATE)\n COMMENT 'comment1' AS SELECT\n date_format(`internal`.`regression_test_view_p0`.`test_view_table2`.`c_date`,'%Y-%m-%d') AS `CREATE_DATE`\n FROM\n `internal`.`regression_test_view_p0`.`test_view_table2`\n GROUP BY\n date_format(`internal`.`regression_test_view_p0`.`test_view_table2`.`c_date`, '%Y-%m-%d'); utf8mb4 utf8mb4_0900_bin

-- !comment4 --
test_view_table2_view CREATE VIEW `test_view_table2_view` COMMENT 'comment4' AS SELECT\n date_format(`internal`.`regression_test_view_p0`.`test_view_table2`.`c_date`,'%Y-%m-%d') AS `CREATE_DATE`\n FROM\n `internal`.`regression_test_view_p0`.`test_view_table2`\n GROUP BY\n date_format(`internal`.`regression_test_view_p0`.`test_view_table2`.`c_date`, '%Y-%m-%d'); utf8mb4 utf8mb4_0900_bin
test_view_table2_view CREATE VIEW `test_view_table2_view`\n(CREATE_DATE)\n COMMENT 'comment4' AS SELECT\n date_format(`internal`.`regression_test_view_p0`.`test_view_table2`.`c_date`,'%Y-%m-%d') AS `CREATE_DATE`\n FROM\n `internal`.`regression_test_view_p0`.`test_view_table2`\n GROUP BY\n date_format(`internal`.`regression_test_view_p0`.`test_view_table2`.`c_date`, '%Y-%m-%d'); utf8mb4 utf8mb4_0900_bin

-- !comment_empty --
test_view_table2_view CREATE VIEW `test_view_table2_view` AS SELECT\n date_format(`internal`.`regression_test_view_p0`.`test_view_table2`.`c_date`,'%Y-%m-%d') AS `CREATE_DATE`\n FROM\n `internal`.`regression_test_view_p0`.`test_view_table2`\n GROUP BY\n date_format(`internal`.`regression_test_view_p0`.`test_view_table2`.`c_date`, '%Y-%m-%d'); utf8mb4 utf8mb4_0900_bin
test_view_table2_view CREATE VIEW `test_view_table2_view`\n(CREATE_DATE)\n AS SELECT\n date_format(`internal`.`regression_test_view_p0`.`test_view_table2`.`c_date`,'%Y-%m-%d') AS `CREATE_DATE`\n FROM\n `internal`.`regression_test_view_p0`.`test_view_table2`\n GROUP BY\n date_format(`internal`.`regression_test_view_p0`.`test_view_table2`.`c_date`, '%Y-%m-%d'); utf8mb4 utf8mb4_0900_bin