[iotdb] 09/13: merge master

[hu...@apache.org]

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

hui pushed a commit to branch lmh/fileScan
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit cfbe60c9204517c725878a30ead4c344c076eaed
Author: Minghui Liu <li...@foxmail.com>
AuthorDate: Tue Mar 21 09:58:49 2023 +0800

    merge master
---
 .../mpp/execution/operator/source/FileAggregationScanOperator.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/source/FileAggregationScanOperator.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/source/FileAggregationScanOperator.java
index 083332ad9c..5250031f42 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/source/FileAggregationScanOperator.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/source/FileAggregationScanOperator.java
@@ -70,12 +70,12 @@ public class FileAggregationScanOperator extends AbstractSourceOperator
   }
 
   @Override
-  public boolean hasNext() {
+  public boolean hasNext() throws Exception {
     return aggregationScanUtil.hasNextFile();
   }
 
   @Override
-  public TsBlock next() {
+  public TsBlock next() throws Exception {
     tsBlockBuilder.reset();
     try {
       aggregationScanUtil.consume();
@@ -86,7 +86,7 @@ public class FileAggregationScanOperator extends AbstractSourceOperator
   }
 
   @Override
-  public boolean isFinished() {
+  public boolean isFinished() throws Exception {
     return !hasNextWithTimer();
   }