(iotdb) branch master updated: Fix compaction ut dead lock (#12372)

[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 6af5ef1c395 Fix compaction ut dead lock (#12372)
6af5ef1c395 is described below

commit 6af5ef1c395713d4b0e052b24bfa9e7580e1bb32
Author: shuwenwei <55970239+shuwen...@users.noreply.github.com>
AuthorDate: Fri Apr 19 17:21:37 2024 +0800

    Fix compaction ut dead lock (#12372)
---
 .../dataregion/compaction/utils/CompactionTaskQueueTest.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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 e53d41bb576..db24107d18f 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
@@ -26,7 +26,6 @@ import 
org.apache.iotdb.db.storageengine.dataregion.compaction.execute.task.Abst
 import 
org.apache.iotdb.db.storageengine.dataregion.compaction.execute.task.InnerSpaceCompactionTask;
 import 
org.apache.iotdb.db.storageengine.dataregion.compaction.schedule.CompactionTaskQueue;
 import 
org.apache.iotdb.db.storageengine.dataregion.compaction.schedule.comparator.DefaultCompactionTaskComparatorImpl;
-import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource;
 import 
org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResourceStatus;
 import org.apache.iotdb.db.storageengine.rescon.memory.SystemInfo;
 import org.apache.iotdb.tsfile.exception.write.WriteProcessException;
@@ -39,6 +38,7 @@ import org.mockito.Mockito;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -168,14 +168,14 @@ public class CompactionTaskQueueTest extends 
AbstractCompactionTest {
   private AbstractCompactionTask prepareTask(long memCost, int fileNum, long 
timePartition)
       throws IOException, MetadataException, WriteProcessException {
     createFiles(1, 1, 1, 1, 1, 1, 1, 1, true, true);
-    for (TsFileResource seqResource : seqResources) {
-      seqResource.setStatusForTest(TsFileResourceStatus.COMPACTION_CANDIDATE);
-    }
+    seqResources
+        .get(seqResources.size() - 1)
+        .setStatusForTest(TsFileResourceStatus.COMPACTION_CANDIDATE);
     InnerSpaceCompactionTask task =
         new InnerSpaceCompactionTask(
             timePartition,
             tsFileManager,
-            seqResources,
+            Collections.singletonList(seqResources.get(seqResources.size() - 
1)),
             true,
             new ReadChunkCompactionPerformer(),
             0);