You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2020/07/16 10:19:10 UTC
[incubator-iotdb] 01/01: fix rowLimit and rowOffset bug
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch fix_rowLimit
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 0a891f642bf4341644b49f485edfdb1bcefc02d4
Author: HTHou <hh...@outlook.com>
AuthorDate: Thu Jul 16 18:17:54 2020 +0800
fix rowLimit and rowOffset bug
---
.../java/org/apache/iotdb/db/qp/executor/PlanExecutor.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java b/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java
index efa68f8..baf48b9 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java
@@ -304,10 +304,16 @@ public class PlanExecutor implements IPlanExecutor {
return new EmptyDataSet();
} else if (queryPlan instanceof GroupByFillPlan) {
GroupByFillPlan groupByFillPlan = (GroupByFillPlan) queryPlan;
- return queryRouter.groupByFill(groupByFillPlan, context);
+ queryDataSet = queryRouter.groupByFill(groupByFillPlan, context);
+ queryDataSet.setRowLimit(queryPlan.getRowLimit());
+ queryDataSet.setRowOffset(queryPlan.getRowOffset());
+ return queryDataSet;
} else if (queryPlan instanceof GroupByPlan) {
GroupByPlan groupByPlan = (GroupByPlan) queryPlan;
- return queryRouter.groupBy(groupByPlan, context);
+ queryDataSet = queryRouter.groupBy(groupByPlan, context);
+ queryDataSet.setRowLimit(queryPlan.getRowLimit());
+ queryDataSet.setRowOffset(queryPlan.getRowOffset());
+ return queryDataSet;
} else if (queryPlan instanceof AggregationPlan) {
AggregationPlan aggregationPlan = (AggregationPlan) queryPlan;
queryDataSet = queryRouter.aggregate(aggregationPlan, context);