[iotdb] branch QueryPerformace updated: Optimize

[jackietien]

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

jackietien pushed a commit to branch QueryPerformace
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/QueryPerformace by this push:
     new 99279b9420 Optimize
99279b9420 is described below

commit 99279b94209b9106bd778ce06d3ad6aaeeb8e114
Author: JackieTien97 <jackietie...@gmail.com>
AuthorDate: Thu Jun 23 16:58:55 2022 +0800

    Optimize
---
 .../execution/operator/source/SeriesAggregationScanOperator.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git 
a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/source/SeriesAggregationScanOperator.java
 
b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/source/SeriesAggregationScanOperator.java
index 35cf1390b6..3127a0d5f9 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/source/SeriesAggregationScanOperator.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/source/SeriesAggregationScanOperator.java
@@ -195,7 +195,11 @@ public class SeriesAggregationScanOperator implements 
DataSourceOperator {
             && curTimeRange.contains(fileStatistics.getStartTime(), 
fileStatistics.getEndTime())) {
           calcFromStatistics(fileStatistics);
           seriesScanUtil.skipCurrentFile();
-          continue;
+          if (isEndCalc(aggregators)) {
+            break;
+          } else {
+            continue;
+          }
         }
 
         // read chunk
@@ -371,6 +375,9 @@ public class SeriesAggregationScanOperator implements 
DataSourceOperator {
           && curTimeRange.contains(chunkStatistics.getStartTime(), 
chunkStatistics.getEndTime())) {
         calcFromStatistics(chunkStatistics);
         seriesScanUtil.skipCurrentChunk();
+        if (isEndCalc(aggregators)) {
+          return true;
+        }
         continue;
       }
       // read page