[calcite] branch master updated: [CALCITE-3985] Simplify grouped window function in parser (Rui Wang)

[hy...@apache.org]

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

hyuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/calcite.git


The following commit(s) were added to refs/heads/master by this push:
     new 2ba5519  [CALCITE-3985] Simplify grouped window function in parser (Rui Wang)
2ba5519 is described below

commit 2ba551905c4ae99be2c68e0c75301d9287d7b61a
Author: amaliujia <am...@163.com>
AuthorDate: Wed May 13 10:38:49 2020 -0700

    [CALCITE-3985] Simplify grouped window function in parser (Rui Wang)
    
    "s = span()" can be promoted such that TUMBLE/HOP/SESSION can share the
    same code.
    
    Close #1974
---
 core/src/main/codegen/templates/Parser.jj | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/codegen/templates/Parser.jj b/core/src/main/codegen/templates/Parser.jj
index 18c3242..835fd4a 100644
--- a/core/src/main/codegen/templates/Parser.jj
+++ b/core/src/main/codegen/templates/Parser.jj
@@ -6056,22 +6056,22 @@ SqlCall GroupByWindowingCall():
     (
         <TUMBLE>
         {
-            s = span();
             op = SqlStdOperatorTable.TUMBLE_OLD;
         }
     |
         <HOP>
         {
-            s = span();
             op = SqlStdOperatorTable.HOP_OLD;
         }
     |
         <SESSION>
         {
-            s = span();
             op = SqlStdOperatorTable.SESSION_OLD;
         }
     )
+    {
+        s = span();
+    }
     args = UnquantifiedFunctionParameterList(ExprContext.ACCEPT_SUB_QUERY) {
         return op.createCall(s.end(this), args);
     }