[iotdb] branch beyyes/count_time_fe updated: fix conflict with master

[caogaofei]

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

caogaofei pushed a commit to branch beyyes/count_time_fe
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/beyyes/count_time_fe by this 
push:
     new f7d1b2d6009 fix conflict with master
f7d1b2d6009 is described below

commit f7d1b2d6009a792d0763d16ffe7f8a0ac4f7bf5b
Author: Beyyes <cgf1...@foxmail.com>
AuthorDate: Sat Aug 19 20:35:23 2023 +0800

    fix conflict with master
---
 .../org/apache/iotdb/db/utils/FileLoaderUtils.java | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/FileLoaderUtils.java
 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/FileLoaderUtils.java
index a0ccebbc9ed..2d6d53809da 100644
--- 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/FileLoaderUtils.java
+++ 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/FileLoaderUtils.java
@@ -47,6 +47,7 @@ import org.apache.iotdb.tsfile.read.reader.IPageReader;
 import org.apache.iotdb.tsfile.write.writer.TsFileIOWriter;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
@@ -292,6 +293,28 @@ public class FileLoaderUtils {
         alignedTimeSeriesMetadata.setChunkMetadataLoader(
             new DiskAlignedChunkMetadataLoader(
                 resource, alignedPath, context, filter, queryAllSensors));
+      } else {
+        List<TimeseriesMetadata> valueTimeSeriesMetadataList =
+            new ArrayList<>(valueMeasurementList.size());
+        // if all the queried aligned sensors does not exist, we will return 
null
+        boolean exist = false;
+        for (String valueMeasurement : valueMeasurementList) {
+          TimeseriesMetadata valueColumn =
+              cache.get(
+                  new TimeSeriesMetadataCacheKey(filePath, deviceId, 
valueMeasurement),
+                  allSensors,
+                  resource.getTimeIndexType() != 1,
+                  isDebug);
+          exist = (exist || (valueColumn != null));
+          valueTimeSeriesMetadataList.add(valueColumn);
+        }
+        if (exist) {
+          alignedTimeSeriesMetadata =
+              new AlignedTimeSeriesMetadata(timeColumn, 
valueTimeSeriesMetadataList);
+          alignedTimeSeriesMetadata.setChunkMetadataLoader(
+              new DiskAlignedChunkMetadataLoader(
+                  resource, alignedPath, context, filter, queryAllSensors));
+        }
       }
     }
     return alignedTimeSeriesMetadata;