(iotdb) branch ty/TableModelGrammar updated: Fix table model compaction ut

[jackietien]

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

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


The following commit(s) were added to refs/heads/ty/TableModelGrammar by this 
push:
     new 9cd3258c5c0 Fix table model compaction ut
9cd3258c5c0 is described below

commit 9cd3258c5c03e7903c5e11499ff78299c20ea27a
Author: shuwenwei <55970239+shuwen...@users.noreply.github.com>
AuthorDate: Tue Jul 2 09:33:44 2024 +0800

    Fix table model compaction ut
---
 .../dataregion/compaction/io/CompactionTsFileWriter.java            | 1 +
 .../dataregion/compaction/CompactionValidationTest.java             | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/io/CompactionTsFileWriter.java
 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/io/CompactionTsFileWriter.java
index 789d4dbdf69..c1e7a79cf2b 100644
--- 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/io/CompactionTsFileWriter.java
+++ 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/io/CompactionTsFileWriter.java
@@ -56,6 +56,7 @@ public class CompactionTsFileWriter extends TsFileIOWriter {
     super.out =
         new CompactionTsFileOutput(
             super.out, 
CompactionTaskManager.getInstance().getMergeWriteRateLimiter());
+    setGenerateTableSchema(true);
   }
 
   public void markStartingWritingAligned() {
diff --git 
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/CompactionValidationTest.java
 
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/CompactionValidationTest.java
index 596a0230dcd..c066aef0fa6 100644
--- 
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/CompactionValidationTest.java
+++ 
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/CompactionValidationTest.java
@@ -208,7 +208,11 @@ public class CompactionValidationTest {
         randomAccessFile.close();
       }
       TsFileResource mockTsFile = new TsFileResource(new File(path));
-      TsFileResourceUtils.validateTsFileDataCorrectness(mockTsFile);
+      try {
+        boolean dataCorrect = 
TsFileResourceUtils.validateTsFileDataCorrectness(mockTsFile);
+        Assert.assertEquals(i != 5, dataCorrect);
+      } catch (Exception ignored) {
+      }
     }
   }