[incubator-iotdb] branch reverse_reader updated: add g4 orderByTimeClause for querys

[liudw]

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

liudw pushed a commit to branch reverse_reader
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git


The following commit(s) were added to refs/heads/reverse_reader by this push:
     new d3d84ac  add g4 orderByTimeClause for querys
d3d84ac is described below

commit d3d84ac5e3d15d7064f096d665c484b4a302ac5f
Author: liudw <li...@apache.org>
AuthorDate: Fri Aug 21 15:48:00 2020 +0800

    add g4 orderByTimeClause for querys
---
 .../main/antlr4/org/apache/iotdb/db/qp/strategy/SqlBase.g4   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/antlr/src/main/antlr4/org/apache/iotdb/db/qp/strategy/SqlBase.g4 
b/antlr/src/main/antlr4/org/apache/iotdb/db/qp/strategy/SqlBase.g4
index 68fc548..3553232 100644
--- a/antlr/src/main/antlr4/org/apache/iotdb/db/qp/strategy/SqlBase.g4
+++ b/antlr/src/main/antlr4/org/apache/iotdb/db/qp/strategy/SqlBase.g4
@@ -102,7 +102,7 @@ selectElements
     : functionCall (COMMA functionCall)* #functionElement
     | suffixPath (COMMA suffixPath)* #selectElement
     | STRING_LITERAL (COMMA STRING_LITERAL)* #selectConstElement
-    | lastClause #lastElement
+    | lastClause orderByTimeClause?  #lastElement
     ;
 
 functionCall
@@ -207,12 +207,12 @@ fromClause
 
 specialClause
     : specialLimit
-    | groupByTimeClause specialLimit?
-    | groupByFillClause specialLimit?
+    | groupByTimeClause specialLimit? orderByTimeClause ?
+    | groupByFillClause specialLimit? orderByTimeClause ?
     | orderByTimeClause ?
     | fillClause slimitClause? alignByDeviceClauseOrDisableAlign?
     | alignByDeviceClauseOrDisableAlign
-    | groupByLevelClause specialLimit?
+    | groupByLevelClause specialLimit? orderByTimeClause ?
     ;
 
 specialLimit
@@ -254,8 +254,8 @@ disableAlign
     ;
 
 alignByDeviceClauseOrDisableAlign
-    : alignByDeviceClause
-    | disableAlign
+    : alignByDeviceClause orderByTimeClause ?
+    | disableAlign orderByTimeClause ?
     ;
 
 fillClause