(iotdb) 01/08: Fix the issue that the DeviceIteratorScanOperator.next() method throws NoSuchElementException

[jackietien]

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

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

commit 8381e63ea0d366fbe3bc685f1e0bbe0290da2d72
Author: shuwenwei <55970239+shuwen...@users.noreply.github.com>
AuthorDate: Sat Jul 12 14:44:26 2025 +0800

    Fix the issue that the DeviceIteratorScanOperator.next() method throws 
NoSuchElementException
    
    (cherry picked from commit f8e03f987f3817e58a959dfa166839d4b0e771fb)
---
 .../operator/source/relational/DeviceIteratorScanOperator.java         | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/DeviceIteratorScanOperator.java
 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/DeviceIteratorScanOperator.java
index 1689fd2fd84..f088e448fd7 100644
--- 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/DeviceIteratorScanOperator.java
+++ 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/DeviceIteratorScanOperator.java
@@ -34,7 +34,6 @@ import org.apache.tsfile.utils.RamUsageEstimator;
 import org.apache.tsfile.write.schema.IMeasurementSchema;
 
 import java.util.List;
-import java.util.NoSuchElementException;
 import java.util.Set;
 
 public class DeviceIteratorScanOperator extends AbstractDataSourceOperator {
@@ -134,7 +133,7 @@ public class DeviceIteratorScanOperator extends 
AbstractDataSourceOperator {
   @Override
   public TsBlock next() throws Exception {
     if (!hasNext()) {
-      throw new NoSuchElementException();
+      return null;
     }
     if (!currentDeviceInit) {
       return null;