You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ge...@apache.org on 2020/02/14 14:12:43 UTC
[incubator-iotdb] branch change_sql created (now 1d779e3)
This is an automated email from the ASF dual-hosted git repository.
geniuspig pushed a change to branch change_sql
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
at 1d779e3 change sql.
This branch includes the following new commits:
new 1d779e3 change sql.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-iotdb] 01/01: change sql.
Posted by ge...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
geniuspig pushed a commit to branch change_sql
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 1d779e33800c0da8fbc7f7703908fe14c643b8ba
Author: zhutianci <zh...@gmail.com>
AuthorDate: Fri Feb 14 22:12:09 2020 +0800
change sql.
---
.../antlr4/org/apache/iotdb/db/qp/strategy/SqlBase.g4 | 18 +++++++++---------
.../src/main/java/org/apache/iotdb/db/qp/Planner.java | 1 -
.../apache/iotdb/db/qp/strategy/LogicalGenerator.java | 6 +++---
3 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/server/src/main/antlr4/org/apache/iotdb/db/qp/strategy/SqlBase.g4 b/server/src/main/antlr4/org/apache/iotdb/db/qp/strategy/SqlBase.g4
index 0964d7f..65c5bf2 100644
--- a/server/src/main/antlr4/org/apache/iotdb/db/qp/strategy/SqlBase.g4
+++ b/server/src/main/antlr4/org/apache/iotdb/db/qp/strategy/SqlBase.g4
@@ -153,13 +153,13 @@ fromClause
specialClause
: specialLimit
| groupByClause specialLimit?
- | fillClause slimitClause? groupByDeviceClauseOrDisableAlign?
+ | fillClause slimitClause? alignByDeviceClauseOrDisableAlign?
;
specialLimit
- : limitClause slimitClause? groupByDeviceClauseOrDisableAlign?
- | slimitClause limitClause? groupByDeviceClauseOrDisableAlign?
- | groupByDeviceClauseOrDisableAlign
+ : limitClause slimitClause? alignByDeviceClauseOrDisableAlign?
+ | slimitClause limitClause? alignByDeviceClauseOrDisableAlign?
+ | alignByDeviceClauseOrDisableAlign
;
limitClause
@@ -178,17 +178,17 @@ soffsetClause
: SOFFSET INT
;
-groupByDeviceClause
+alignByDeviceClause
:
- GROUP BY DEVICE
+ ALIGN BY DEVICE
;
disableAlign
: DISABLE ALIGN
;
-groupByDeviceClauseOrDisableAlign
- : groupByDeviceClause
+alignByDeviceClauseOrDisableAlign
+ : alignByDeviceClause
| disableAlign
;
@@ -258,7 +258,7 @@ rootOrId
;
timeInterval
- : LS_BRACKET startTime=timeValue COMMA endTime=timeValue RS_BRACKET
+ : LS_BRACKET startTime=timeValue COMMA endTime=timeValue RR_BRACKET
;
timeValue
diff --git a/server/src/main/java/org/apache/iotdb/db/qp/Planner.java b/server/src/main/java/org/apache/iotdb/db/qp/Planner.java
index 4f6455f..666d40f 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/Planner.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/Planner.java
@@ -24,7 +24,6 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.exception.query.LogicalOperatorException;
import org.apache.iotdb.db.exception.query.LogicalOptimizeException;
import org.apache.iotdb.db.exception.query.QueryProcessException;
-import org.apache.iotdb.db.qp.executor.IPlanExecutor;
import org.apache.iotdb.db.qp.logical.Operator;
import org.apache.iotdb.db.qp.logical.crud.FilterOperator;
import org.apache.iotdb.db.qp.logical.crud.SFWOperator;
diff --git a/server/src/main/java/org/apache/iotdb/db/qp/strategy/LogicalGenerator.java b/server/src/main/java/org/apache/iotdb/db/qp/strategy/LogicalGenerator.java
index 14ff339..e6ec3af 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/strategy/LogicalGenerator.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/strategy/LogicalGenerator.java
@@ -63,6 +63,7 @@ import org.apache.iotdb.db.qp.logical.sys.ShowOperator;
import org.apache.iotdb.db.qp.logical.sys.ShowTTLOperator;
import org.apache.iotdb.db.qp.logical.sys.ShowTimeSeriesOperator;
import org.apache.iotdb.db.qp.strategy.SqlBaseParser.AddLabelContext;
+import org.apache.iotdb.db.qp.strategy.SqlBaseParser.AlignByDeviceClauseContext;
import org.apache.iotdb.db.qp.strategy.SqlBaseParser.AlterUserContext;
import org.apache.iotdb.db.qp.strategy.SqlBaseParser.AndExpressionContext;
import org.apache.iotdb.db.qp.strategy.SqlBaseParser.AttributeClausesContext;
@@ -90,7 +91,6 @@ import org.apache.iotdb.db.qp.strategy.SqlBaseParser.GrantRoleToUserContext;
import org.apache.iotdb.db.qp.strategy.SqlBaseParser.GrantUserContext;
import org.apache.iotdb.db.qp.strategy.SqlBaseParser.GrantWatermarkEmbeddingContext;
import org.apache.iotdb.db.qp.strategy.SqlBaseParser.GroupByClauseContext;
-import org.apache.iotdb.db.qp.strategy.SqlBaseParser.GroupByDeviceClauseContext;
import org.apache.iotdb.db.qp.strategy.SqlBaseParser.InClauseContext;
import org.apache.iotdb.db.qp.strategy.SqlBaseParser.InsertColumnSpecContext;
import org.apache.iotdb.db.qp.strategy.SqlBaseParser.InsertStatementContext;
@@ -808,8 +808,8 @@ public class LogicalGenerator extends SqlBaseBaseListener {
}
@Override
- public void enterGroupByDeviceClause(GroupByDeviceClauseContext ctx) {
- super.enterGroupByDeviceClause(ctx);
+ public void enterAlignByDeviceClause(AlignByDeviceClauseContext ctx) {
+ super.enterAlignByDeviceClause(ctx);
queryOp.setAlignByDevice(true);
}