[incubator-doris] branch master updated: [Syntax] Fix alter rollup stmt Shift/Reduce conflict (#2897)

[morningman]

This is an automated email from the ASF dual-hosted git repository.

morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git


The following commit(s) were added to refs/heads/master by this push:
     new 83d33ce  [Syntax] Fix alter rollup stmt Shift/Reduce conflict (#2897)
83d33ce is described below

commit 83d33cec25697f751695bad109fa6662bde09f44
Author: wangbo <506340...@qq.com>
AuthorDate: Fri Feb 14 11:49:14 2020 +0800

    [Syntax] Fix alter rollup stmt Shift/Reduce conflict (#2897)
---
 fe/src/main/cup/sql_parser.cup | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/fe/src/main/cup/sql_parser.cup b/fe/src/main/cup/sql_parser.cup
index bfc5bf3..a2e2de6 100644
--- a/fe/src/main/cup/sql_parser.cup
+++ b/fe/src/main/cup/sql_parser.cup
@@ -631,6 +631,14 @@ alter_stmt ::=
     {:
         RESULT = new AlterTableStmt(tbl, clauses);
     :}
+    | KW_ALTER KW_TABLE table_name:tbl KW_ADD KW_ROLLUP 
add_rollup_clause_list:clauses
+    {:
+        RESULT = new AlterTableStmt(tbl, clauses);
+    :}
+    | KW_ALTER KW_TABLE table_name:tbl KW_DROP KW_ROLLUP 
drop_rollup_clause_list:clauses
+    {:
+        RESULT = new AlterTableStmt(tbl, clauses);
+    :}
     | KW_ALTER KW_VIEW table_name:tbl
     opt_col_with_comment_list:columns KW_AS query_stmt:view_def
     {:
@@ -714,15 +722,7 @@ drop_rollup_clause_list ::=
     ;
 
 alter_table_clause_list ::=
-    KW_ADD KW_ROLLUP add_rollup_clause_list:list
-    {:
-        RESULT = list;
-    :}
-    | KW_DROP KW_ROLLUP drop_rollup_clause_list:list
-    {:
-        RESULT = list;
-    :}
-    | alter_table_clause:clause
+    alter_table_clause:clause
     {:
         RESULT = Lists.newArrayList(clause);
     :}


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org