(iotdb) branch master updated: Fix compaction with all null rows ut (#13610)

[haonan]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 1ed2023d01c Fix compaction with all null rows ut (#13610)
1ed2023d01c is described below

commit 1ed2023d01cb368984ef5cf080063c1b7461161f
Author: shuwenwei <55970239+shuwen...@users.noreply.github.com>
AuthorDate: Wed Sep 25 13:57:12 2024 +0800

    Fix compaction with all null rows ut (#13610)
---
 .../java/org/apache/iotdb/db/storageengine/StorageEngine.java     | 1 +
 .../compaction/tablemodel/CompactionWithAllNullRowsTest.java      | 2 ++
 .../dataregion/compaction/utils/CompactionTaskQueueTest.java      | 8 ++++++--
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/StorageEngine.java
 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/StorageEngine.java
index 2e607620fcd..9c1ef5c4f09 100644
--- 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/StorageEngine.java
+++ 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/StorageEngine.java
@@ -281,6 +281,7 @@ public class StorageEngine implements IService {
 
   @Override
   public void start() throws StartupException {
+    recoverDataRegionNum = 0;
     // build time Interval to divide time partition
     initTimePartition();
     // create systemDir
diff --git 
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/tablemodel/CompactionWithAllNullRowsTest.java
 
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/tablemodel/CompactionWithAllNullRowsTest.java
index 641933f70a5..651caadb150 100644
--- 
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/tablemodel/CompactionWithAllNullRowsTest.java
+++ 
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/tablemodel/CompactionWithAllNullRowsTest.java
@@ -73,6 +73,7 @@ public class CompactionWithAllNullRowsTest extends 
AbstractCompactionTest {
     IoTDBDescriptor.getInstance()
         .getConfig()
         
.setCompactionMaxAlignedSeriesNumInOneBatch(maxAlignedSeriesNumInOneBatch);
+    super.setUp();
   }
 
   @After
@@ -84,6 +85,7 @@ public class CompactionWithAllNullRowsTest extends 
AbstractCompactionTest {
     IoTDBDescriptor.getInstance()
         .getConfig()
         
.setCompactionMaxAlignedSeriesNumInOneBatch(defaultMaxAlignedSeriesNumInOneBatch);
+    super.tearDown();
   }
 
   @Parameterized.Parameters(name = "type={0} batch_size={1}")
diff --git 
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/utils/CompactionTaskQueueTest.java
 
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/utils/CompactionTaskQueueTest.java
index 2ed0ec5e837..d6d341acd40 100644
--- 
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/utils/CompactionTaskQueueTest.java
+++ 
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/utils/CompactionTaskQueueTest.java
@@ -20,6 +20,7 @@
 package org.apache.iotdb.db.storageengine.dataregion.compaction.utils;
 
 import org.apache.iotdb.commons.exception.MetadataException;
+import org.apache.iotdb.db.exception.StorageEngineException;
 import 
org.apache.iotdb.db.storageengine.dataregion.compaction.AbstractCompactionTest;
 import 
org.apache.iotdb.db.storageengine.dataregion.compaction.execute.performer.impl.ReadChunkCompactionPerformer;
 import 
org.apache.iotdb.db.storageengine.dataregion.compaction.execute.task.AbstractCompactionTask;
@@ -51,19 +52,22 @@ public class CompactionTaskQueueTest extends 
AbstractCompactionTest {
       SystemInfo.getInstance().getTotalFileLimitForCompaction();
 
   @Before
-  public void setup() {
+  public void setup()
+      throws IOException, InterruptedException, MetadataException, 
WriteProcessException {
     SystemInfo.getInstance().getCompactionMemoryCost().set(0);
     SystemInfo.getInstance().getCompactionFileNumCost().set(0);
     SystemInfo.getInstance().setMemorySizeForCompaction(2000);
     SystemInfo.getInstance().setTotalFileLimitForCompactionTask(50);
+    super.setUp();
   }
 
   @After
-  public void teardown() {
+  public void teardown() throws StorageEngineException, IOException {
     SystemInfo.getInstance().getCompactionMemoryCost().set(0);
     SystemInfo.getInstance().getCompactionFileNumCost().set(0);
     
SystemInfo.getInstance().setMemorySizeForCompaction(originalMemorySizeForCompaction);
     
SystemInfo.getInstance().setTotalFileLimitForCompactionTask(originalFileNumLimitForCompaction);
+    super.tearDown();
   }
 
   @Test