From 039c7db8bd2a59e057b6d68f54a408c3ebf11222 Mon Sep 17 00:00:00 2001
From: luoluoyuyu <zhenyu@apache.org>
Date: Sun, 28 Sep 2025 10:47:29 +0800
Subject: [PATCH 1/3] Updated TSFile version to fix Load failure in creating
 aligned time series

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index dd35c7987f099..90585365d8ef6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -176,7 +176,7 @@
         <thrift.version>0.14.1</thrift.version>
         <xz.version>1.9</xz.version>
         <zstd-jni.version>1.5.6-3</zstd-jni.version>
-        <tsfile.version>2.2.0-250825-SNAPSHOT</tsfile.version>
+        <tsfile.version>2.2.0-250928-SNAPSHOT</tsfile.version>
     </properties>
     <!--
     if we claim dependencies in dependencyManagement, then we do not claim

From c90694242410e4aca359f6327cd6db77e766a4f9 Mon Sep 17 00:00:00 2001
From: luoluoyuyu <zhenyu@apache.org>
Date: Sun, 28 Sep 2025 11:33:56 +0800
Subject: [PATCH 2/3] add UT

---
 .../reader/chunk/MemAlignedPageReader.java    |   3 +
 .../read/reader/chunk/MemPageReader.java      |   3 +
 .../load/TimeseriesMetadataIteratorTest.java  | 173 ++++++++++++++++++
 3 files changed, 179 insertions(+)
 create mode 100644 iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/load/TimeseriesMetadataIteratorTest.java

diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/MemAlignedPageReader.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/MemAlignedPageReader.java
index 3586aface40ba..0e8927e0c8286 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/MemAlignedPageReader.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/MemAlignedPageReader.java
@@ -210,6 +210,9 @@ public boolean isModified() {
     return false;
   }
 
+  @Override
+  public void setModified(boolean b) {}
+
   @Override
   public void initTsBlockBuilder(List<TSDataType> dataTypes) {
     builder = new TsBlockBuilder(dataTypes);
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/MemPageReader.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/MemPageReader.java
index 90231d1bedfb5..752b55d33eca4 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/MemPageReader.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/MemPageReader.java
@@ -225,6 +225,9 @@ public boolean isModified() {
     return false;
   }
 
+  @Override
+  public void setModified(boolean b) {}
+
   @Override
   public void initTsBlockBuilder(List<TSDataType> dataTypes) {
     // non-aligned page reader don't need to init TsBlockBuilder at the very beginning
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/load/TimeseriesMetadataIteratorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/load/TimeseriesMetadataIteratorTest.java
new file mode 100644
index 0000000000000..b368f18732837
--- /dev/null
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/load/TimeseriesMetadataIteratorTest.java
@@ -0,0 +1,173 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.iotdb.db.queryengine.plan.analyze.load;
+
+import org.apache.tsfile.enums.TSDataType;
+import org.apache.tsfile.file.metadata.IDeviceID;
+import org.apache.tsfile.file.metadata.TimeseriesMetadata;
+import org.apache.tsfile.read.TsFileSequenceReader;
+import org.apache.tsfile.read.TsFileSequenceReaderTimeseriesMetadataIterator;
+import org.apache.tsfile.write.TsFileWriter;
+import org.apache.tsfile.write.record.Tablet;
+import org.apache.tsfile.write.schema.IMeasurementSchema;
+import org.apache.tsfile.write.schema.MeasurementSchema;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.io.File;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public class TimeseriesMetadataIteratorTest {
+
+  private static final int DEVICE_COUNT = 1000;
+
+  private static final int COLUMN_COUNT = 3;
+
+  private static final long FIXED_TIMESTAMP = 1L;
+
+  @Test
+  public void testTimeseriesMetadataIterator() throws Exception {
+    String outputPath = "testTsFile.tsfile";
+    File file = createTsFile(outputPath);
+
+    IDeviceID iDeviceID = null;
+    Set<IDeviceID> set = new HashSet<>();
+    try (TsFileSequenceReader reader = new TsFileSequenceReader(file.getAbsolutePath())) {
+      TsFileSequenceReaderTimeseriesMetadataIterator iterator =
+          new TsFileSequenceReaderTimeseriesMetadataIterator(reader, true, 2);
+      while (iterator.hasNext()) {
+        Map<IDeviceID, List<TimeseriesMetadata>> map = iterator.next();
+        for (Map.Entry<IDeviceID, List<TimeseriesMetadata>> entry : map.entrySet()) {
+          if (iDeviceID != null) {
+            if (!iDeviceID.equals(entry.getKey())) {
+              if (set.contains(iDeviceID)) {
+                Assert.fail("time series metadata iterator needs to be ordered by device id");
+              }
+              set.add(iDeviceID);
+            }
+          }
+          iDeviceID = entry.getKey();
+        }
+      }
+    } finally {
+      if (file.exists()) {
+        file.delete();
+      }
+    }
+  }
+
+  public static File createTsFile(String outputPath) throws Exception {
+    File file = new File(outputPath);
+    if (file.exists()) {
+      file.delete();
+    }
+
+    try (TsFileWriter tsFileWriter = new TsFileWriter(file)) {
+      createSchema(tsFileWriter);
+      for (int deviceIndex = 0; deviceIndex < DEVICE_COUNT; deviceIndex++) {
+        String deviceId = "root.d." + "device" + deviceIndex;
+        Tablet tablet = createTablet(deviceId);
+
+        tsFileWriter.writeAligned(tablet);
+        tsFileWriter.flush();
+      }
+    }
+
+    return file;
+  }
+
+  private static void createSchema(TsFileWriter tsFileWriter) throws Exception {
+    List<IMeasurementSchema> schemaList = new ArrayList<>();
+    for (int colIndex = 0; colIndex < COLUMN_COUNT; colIndex++) {
+      String measurementName = "s" + colIndex;
+      TSDataType dataType = getDataType(colIndex);
+      schemaList.add(new MeasurementSchema(measurementName, dataType));
+    }
+    for (int deviceIndex = 0; deviceIndex < DEVICE_COUNT; deviceIndex++) {
+      tsFileWriter.registerAlignedTimeseries("root.d." + "device" + deviceIndex, schemaList);
+    }
+  }
+
+  private static TSDataType getDataType(int colIndex) {
+    TSDataType[] types = {
+      TSDataType.INT32,
+      TSDataType.INT64,
+      TSDataType.FLOAT,
+      TSDataType.DOUBLE,
+      TSDataType.BOOLEAN,
+      TSDataType.TEXT
+    };
+    return types[colIndex % types.length];
+  }
+
+  private static Tablet createTablet(String deviceId) {
+    List<IMeasurementSchema> schemaList = new ArrayList<>();
+
+    for (int colIndex = 0; colIndex < COLUMN_COUNT; colIndex++) {
+      String measurementName = "s" + colIndex;
+      TSDataType dataType = getDataType(colIndex);
+
+      schemaList.add(new MeasurementSchema(measurementName, dataType));
+    }
+
+    Tablet tablet = new Tablet(deviceId, schemaList, 1);
+
+    tablet.initBitMaps();
+
+    tablet.addTimestamp(0, FIXED_TIMESTAMP);
+
+    for (int colIndex = 0; colIndex < COLUMN_COUNT; colIndex++) {
+      String measurementName = "s" + colIndex;
+      TSDataType dataType = getDataType(colIndex);
+
+      Object value = generateValue(dataType, colIndex);
+      tablet.addValue(measurementName, 0, value);
+    }
+
+    tablet.setRowSize(1);
+
+    return tablet;
+  }
+
+  private static Object generateValue(TSDataType dataType, int colIndex) {
+    switch (dataType) {
+      case INT32:
+        return colIndex % 1000;
+      case INT64:
+        return (long) (colIndex * 1000);
+      case FLOAT:
+        return (float) (colIndex * 0.1);
+      case DOUBLE:
+        return (double) (colIndex * 0.01);
+      case BOOLEAN:
+        return colIndex % 2 == 0;
+      case TEXT:
+        return new org.apache.tsfile.utils.Binary(
+            ("value_" + colIndex).getBytes(StandardCharsets.UTF_8));
+      default:
+        return colIndex;
+    }
+  }
+}

From 523af77a48409925aaf7f541b315ae7bf41832a1 Mon Sep 17 00:00:00 2001
From: luoluoyuyu <zhenyu@apache.org>
Date: Mon, 13 Oct 2025 09:58:14 +0800
Subject: [PATCH 3/3] update

---
 .../dataregion/read/reader/chunk/MemAlignedPageReader.java       | 1 -
 pom.xml                                                          | 1 -
 2 files changed, 2 deletions(-)

diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/MemAlignedPageReader.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/MemAlignedPageReader.java
index 690323a87e363..7ee43a93aea8d 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/MemAlignedPageReader.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/MemAlignedPageReader.java
@@ -213,7 +213,6 @@ public boolean isModified() {
   @Override
   public void setModified(boolean modified) {}
 
-
   @Override
   public void initTsBlockBuilder(List<TSDataType> dataTypes) {
     builder = new TsBlockBuilder(dataTypes);
diff --git a/pom.xml b/pom.xml
index bdd2a365e94a0..c86df5f482d93 100644
--- a/pom.xml
+++ b/pom.xml
@@ -178,7 +178,6 @@
         <xz.version>1.9</xz.version>
         <zstd-jni.version>1.5.6-3</zstd-jni.version>
         <tsfile.version>2.2.0-251010-SNAPSHOT</tsfile.version>
-
     </properties>
     <!--
     if we claim dependencies in dependencyManagement, then we do not claim