(iotdb) 02/02: fix conflict

[shuwenwei]

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

shuwenwei pushed a commit to branch fixMemTableQueryBug-1.3
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit b6c895a55a59548e31f6e940c39b794402a4353a
Author: shuwenwei <s13979062...@gmail.com>
AuthorDate: Tue Dec 30 15:25:42 2025 +0800

    fix conflict
---
 .../test/java/org/apache/iotdb/db/it/IoTDBFlushQueryIT.java    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBFlushQueryIT.java 
b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBFlushQueryIT.java
index 896f23248c5..ba6f4fc272f 100644
--- 
a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBFlushQueryIT.java
+++ 
b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBFlushQueryIT.java
@@ -30,7 +30,6 @@ import org.apache.iotdb.rpc.StatementExecutionException;
 
 import org.apache.tsfile.enums.TSDataType;
 import org.apache.tsfile.write.record.Tablet;
-import org.apache.tsfile.write.schema.IMeasurementSchema;
 import org.apache.tsfile.write.schema.MeasurementSchema;
 import org.junit.AfterClass;
 import org.junit.Assert;
@@ -249,20 +248,21 @@ public class IoTDBFlushQueryIT {
   private static void generateTimeRangeWithTimestamp(
       ISession session, String device, long start, long end)
       throws IoTDBConnectionException, StatementExecutionException {
-    List<IMeasurementSchema> measurementSchemas =
+    List<MeasurementSchema> measurementSchemas =
         Collections.singletonList(new MeasurementSchema("s1", 
TSDataType.INT64));
     Tablet tablet = new Tablet(device, measurementSchemas);
     for (long currentTime = start; currentTime <= end; currentTime++) {
-      int rowIndex = tablet.getRowSize();
+      int rowIndex = tablet.rowSize;
       if (rowIndex == tablet.getMaxRowNumber()) {
         session.insertTablet(tablet);
         tablet.reset();
         rowIndex = 0;
       }
       tablet.addTimestamp(rowIndex, currentTime);
-      tablet.addValue(rowIndex, 0, currentTime);
+      tablet.addValue("s1", 0, currentTime);
+      tablet.rowSize++;
     }
-    if (tablet.getRowSize() > 0) {
+    if (tablet.rowSize > 0) {
       session.insertTablet(tablet);
     }
   }