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:09 UTC
[incubator-iotdb] branch fix_rowLimit created (now 0a891f6)
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a change to branch fix_rowLimit
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
at 0a891f6 fix rowLimit and rowOffset bug
This branch includes the following new commits:
new 0a891f6 fix rowLimit and rowOffset bug
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: fix rowLimit and rowOffset bug
Posted by ha...@apache.org.
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);