This is an automated email from the ASF dual-hosted git repository. geniuspig pushed a commit to branch change_listener_to_visitor_0.11 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit e2803be1f519b181a622ace8483280db7f9256d8 Author: Boris <[email protected]> AuthorDate: Sat Dec 5 10:42:54 2020 +0800 update --- .../main/java/org/apache/iotdb/db/qp/Planner.java | 22 ++++++++-------------- .../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 2 +- 2 files changed, 9 insertions(+), 15 deletions(-) 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 4b6e79c..1fa57c4 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 @@ -18,14 +18,6 @@ */ package org.apache.iotdb.db.qp; -import static org.apache.iotdb.db.conf.IoTDBConstant.TIME; - -import java.time.ZoneId; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import org.apache.iotdb.db.conf.IoTDBConfig; -import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.metadata.IllegalPathException; import org.apache.iotdb.db.exception.query.LogicalOperatorException; import org.apache.iotdb.db.exception.query.LogicalOptimizeException; @@ -34,12 +26,7 @@ import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.metadata.PartialPath; import org.apache.iotdb.db.qp.constant.SQLConstant; import org.apache.iotdb.db.qp.logical.Operator; -import org.apache.iotdb.db.qp.logical.crud.BasicFunctionOperator; -import org.apache.iotdb.db.qp.logical.crud.FilterOperator; -import org.apache.iotdb.db.qp.logical.crud.FromOperator; -import org.apache.iotdb.db.qp.logical.crud.QueryOperator; -import org.apache.iotdb.db.qp.logical.crud.SFWOperator; -import org.apache.iotdb.db.qp.logical.crud.SelectOperator; +import org.apache.iotdb.db.qp.logical.crud.*; import org.apache.iotdb.db.qp.physical.PhysicalPlan; import org.apache.iotdb.db.qp.strategy.LogicalGenerator; import org.apache.iotdb.db.qp.strategy.PhysicalGenerator; @@ -51,6 +38,13 @@ import org.apache.iotdb.db.query.control.QueryResourceManager; import org.apache.iotdb.db.utils.TestOnly; import org.apache.iotdb.service.rpc.thrift.TSRawDataQueryReq; +import java.time.ZoneId; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import static org.apache.iotdb.db.conf.IoTDBConstant.TIME; + /** * provide a integration method for other user. */ diff --git a/server/src/main/java/org/apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java b/server/src/main/java/org/apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java index 4938ba3..d87ea82 100644 --- a/server/src/main/java/org/apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java +++ b/server/src/main/java/org/apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java @@ -922,7 +922,7 @@ public class IoTDBSqlVisitor extends SqlBaseBaseVisitor<Operator> { public Operator visitFillStatement(FillStatementContext ctx) { parseFillClause(ctx.fillClause(), queryOp); if(ctx.slimitClause() != null) { - queryOp = (QueryOperator) visit(ctx.slimitClause()); + parseSlimitClause(ctx.slimitClause(), queryOp); } if(ctx.alignByDeviceClauseOrDisableAlign() != null) { if(ctx.alignByDeviceClauseOrDisableAlign().alignByDeviceClause() != null) {
