This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch Fix_testLargeFileInLowerLevel in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit eab991ae511abdc2cd1e3cb18d67577abacb0aba Author: HTHou <[email protected]> AuthorDate: Fri Nov 17 16:26:26 2023 +0800 Fix UT testLargeFileInLowerLevel timeout --- .../storageengine/dataregion/compaction/CompactionSchedulerTest.java | 1 + .../dataregion/compaction/utils/CompactionConfigRestorer.java | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/CompactionSchedulerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/CompactionSchedulerTest.java index 198e865dd07..d417eab7f7f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/CompactionSchedulerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/CompactionSchedulerTest.java @@ -101,6 +101,7 @@ public class CompactionSchedulerTest { .getConfig() .setInnerUnseqCompactionPerformer(InnerUnseqCompactionPerformer.READ_POINT); IoTDBDescriptor.getInstance().getConfig().setMinCrossCompactionUnseqFileLevel(0); + IoTDBDescriptor.getInstance().getConfig().setEnableCompactionMemControl(false); CompactionTaskManager.getInstance().start(); while (CompactionTaskManager.getInstance().getExecutingTaskCount() > 0) { try { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/utils/CompactionConfigRestorer.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/utils/CompactionConfigRestorer.java index a7858b9dc6a..a280ae220f8 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/utils/CompactionConfigRestorer.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/utils/CompactionConfigRestorer.java @@ -58,6 +58,9 @@ public class CompactionConfigRestorer { private int oldMinCrossCompactionUnseqLevel = IoTDBDescriptor.getInstance().getConfig().getMinCrossCompactionUnseqFileLevel(); + private boolean oldEnableCompactionMemControl = + IoTDBDescriptor.getInstance().getConfig().isEnableCompactionMemControl(); + public CompactionConfigRestorer() {} public void restoreCompactionConfig() { @@ -83,5 +86,6 @@ public class CompactionConfigRestorer { config.setInnerSeqCompactionPerformer(oldInnerSeqPerformer); config.setInnerUnseqCompactionPerformer(oldInnerUnseqPerformer); config.setMinCrossCompactionUnseqFileLevel(oldMinCrossCompactionUnseqLevel); + config.setEnableCompactionMemControl(oldEnableCompactionMemControl); } }
