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 bc3c9f43669 remove insert cross compaction config v1 (#11912)
bc3c9f43669 is described below
commit bc3c9f436693b56f39280cd54b247c3fadcc94c9
Author: Zhijia Cao <[email protected]>
AuthorDate: Wed Jan 17 14:33:45 2024 +0800
remove insert cross compaction config v1 (#11912)
---
.../main/java/org/apache/iotdb/db/conf/IoTDBConfig.java | 11 -----------
.../java/org/apache/iotdb/db/conf/IoTDBDescriptor.java | 17 +----------------
.../iotdb/db/storageengine/dataregion/DataRegion.java | 5 ++---
.../execute/task/InsertionCrossSpaceCompactionTask.java | 2 +-
.../compaction/schedule/CompactionScheduler.java | 2 +-
.../compaction/schedule/CompactionTaskManager.java | 3 +--
.../db/storageengine/dataregion/DataRegionTest.java | 6 ------
.../InsertionCrossSpaceCompactionSelectorTest.java | 4 ++--
.../cross/InsertionCrossSpaceCompactionTest.java | 6 +++---
9 files changed, 11 insertions(+), 45 deletions(-)
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
index fed153c9b7b..ce5c4e5796a 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
@@ -425,9 +425,6 @@ public class IoTDBConfig {
/** Compact the unsequence files into the overlapped sequence files */
private boolean enableCrossSpaceCompaction = true;
- /** Insert the non overlapped unsequence files into sequence space */
- private boolean enableInsertionCrossSpaceCompaction = true;
-
/** The buffer for sort operation */
private long sortBufferSize = 1024 * 1024L;
@@ -2700,14 +2697,6 @@ public class IoTDBConfig {
this.enableCrossSpaceCompaction = enableCrossSpaceCompaction;
}
- public boolean isEnableInsertionCrossSpaceCompaction() {
- return enableInsertionCrossSpaceCompaction;
- }
-
- public void setEnableInsertionCrossSpaceCompaction(boolean
enableInsertionCrossSpaceCompaction) {
- this.enableInsertionCrossSpaceCompaction =
enableInsertionCrossSpaceCompaction;
- }
-
public InnerSequenceCompactionSelector getInnerSequenceCompactionSelector() {
return innerSequenceCompactionSelector;
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
index d876439db6a..5f0616bc08c 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
@@ -437,12 +437,6 @@ public class IoTDBDescriptor {
"compaction_submission_interval_in_ms",
Long.toString(conf.getCompactionSubmissionIntervalInMs()))));
- conf.setEnableInsertionCrossSpaceCompaction(
- Boolean.parseBoolean(
- properties.getProperty(
- "enable_insertion_cross_space_compaction",
-
Boolean.toString(conf.isEnableInsertionCrossSpaceCompaction()))));
-
conf.setEnableCrossSpaceCompaction(
Boolean.parseBoolean(
properties.getProperty(
@@ -1167,14 +1161,7 @@ public class IoTDBDescriptor {
boolean isCompactionEnabled =
conf.isEnableSeqSpaceCompaction()
|| conf.isEnableUnseqSpaceCompaction()
- || conf.isEnableCrossSpaceCompaction()
- || conf.isEnableInsertionCrossSpaceCompaction();
-
- boolean newConfigEnableInsertionCrossSpaceCompaction =
- Boolean.parseBoolean(
- properties.getProperty(
- "enable_insertion_cross_space_compaction",
-
Boolean.toString(conf.isEnableInsertionCrossSpaceCompaction())));
+ || conf.isEnableCrossSpaceCompaction();
boolean newConfigEnableCrossSpaceCompaction =
Boolean.parseBoolean(
properties.getProperty(
@@ -1192,7 +1179,6 @@ public class IoTDBDescriptor {
Boolean.toString(conf.isEnableUnseqSpaceCompaction())));
boolean compactionEnabledInNewConfig =
newConfigEnableCrossSpaceCompaction
- || newConfigEnableInsertionCrossSpaceCompaction
|| newConfigEnableSeqSpaceCompaction
|| newConfigEnableUnseqSpaceCompaction;
@@ -1201,7 +1187,6 @@ public class IoTDBDescriptor {
return;
}
-
conf.setEnableInsertionCrossSpaceCompaction(newConfigEnableInsertionCrossSpaceCompaction);
conf.setEnableCrossSpaceCompaction(newConfigEnableCrossSpaceCompaction);
conf.setEnableSeqSpaceCompaction(newConfigEnableSeqSpaceCompaction);
conf.setEnableUnseqSpaceCompaction(newConfigEnableUnseqSpaceCompaction);
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java
index e3b03e31eb4..e74c99c762c 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java
@@ -612,8 +612,7 @@ public class DataRegion implements IDataRegionForQuery {
public void initCompactionSchedule() {
if (!config.isEnableSeqSpaceCompaction()
&& !config.isEnableUnseqSpaceCompaction()
- && !config.isEnableCrossSpaceCompaction()
- && !config.isEnableInsertionCrossSpaceCompaction()) {
+ && !config.isEnableCrossSpaceCompaction()) {
return;
}
timedCompactionScheduleTask =
@@ -2437,7 +2436,7 @@ public class DataRegion implements IDataRegionForQuery {
timePartitions.sort(Comparator.reverseOrder());
CompactionScheduleSummary summary = new CompactionScheduleSummary();
- if
(IoTDBDescriptor.getInstance().getConfig().isEnableInsertionCrossSpaceCompaction())
{
+ if
(IoTDBDescriptor.getInstance().getConfig().isEnableCrossSpaceCompaction()) {
trySubmitCount += executeInsertionCompaction(timePartitions);
summary.incrementSubmitTaskNum(CompactionTaskType.INSERTION,
trySubmitCount);
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/InsertionCrossSpaceCompactionTask.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/InsertionCrossSpaceCompactionTask.java
index 44b09cd661d..4ba30ceb3f7 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/InsertionCrossSpaceCompactionTask.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/InsertionCrossSpaceCompactionTask.java
@@ -123,7 +123,7 @@ public class InsertionCrossSpaceCompactionTask extends
AbstractCompactionTask {
unseqFileToInsert.getTsFileSize() / 1024 / 1024);
boolean isSuccess = true;
if (!tsFileManager.isAllowCompaction()
- ||
!IoTDBDescriptor.getInstance().getConfig().isEnableInsertionCrossSpaceCompaction())
{
+ ||
!IoTDBDescriptor.getInstance().getConfig().isEnableCrossSpaceCompaction()) {
return true;
}
try {
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/schedule/CompactionScheduler.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/schedule/CompactionScheduler.java
index d2534a427e7..e8ee18fd5fa 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/schedule/CompactionScheduler.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/schedule/CompactionScheduler.java
@@ -174,7 +174,7 @@ public class CompactionScheduler {
private static int tryToSubmitInsertionCompactionTask(
TsFileManager tsFileManager, long timePartition, Phaser
insertionTaskPhaser)
throws InterruptedException {
- if (!config.isEnableInsertionCrossSpaceCompaction()) {
+ if (!config.isEnableCrossSpaceCompaction()) {
return 0;
}
String logicalStorageGroupName = tsFileManager.getStorageGroupName();
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/schedule/CompactionTaskManager.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/schedule/CompactionTaskManager.java
index 62641d334fc..97c5caa50ec 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/schedule/CompactionTaskManager.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/schedule/CompactionTaskManager.java
@@ -96,8 +96,7 @@ public class CompactionTaskManager implements IService {
&&
IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount() > 0
&& (config.isEnableSeqSpaceCompaction()
|| config.isEnableUnseqSpaceCompaction()
- || config.isEnableCrossSpaceCompaction()
- || config.isEnableInsertionCrossSpaceCompaction())) {
+ || config.isEnableCrossSpaceCompaction())) {
initThreadPool();
candidateCompactionTaskQueue.regsitPollLastHook(
AbstractCompactionTask::resetCompactionCandidateStatusForAllSourceFiles);
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/DataRegionTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/DataRegionTest.java
index a0429827360..46707569e56 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/DataRegionTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/DataRegionTest.java
@@ -949,12 +949,9 @@ public class DataRegionTest {
IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
boolean originEnableCrossSpaceCompaction =
IoTDBDescriptor.getInstance().getConfig().isEnableCrossSpaceCompaction();
- boolean originEnableInsertionCompaction =
-
IoTDBDescriptor.getInstance().getConfig().isEnableInsertionCrossSpaceCompaction();
IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(true);
IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(true);
IoTDBDescriptor.getInstance().getConfig().setEnableCrossSpaceCompaction(false);
-
IoTDBDescriptor.getInstance().getConfig().setEnableInsertionCrossSpaceCompaction(false);
long finishedCompactionTaskNumWhenTestStart =
CompactionTaskManager.getInstance().getFinishedTaskNum();
for (int j = 21; j <= 30; j++) {
@@ -1014,9 +1011,6 @@ public class DataRegionTest {
IoTDBDescriptor.getInstance()
.getConfig()
.setEnableCrossSpaceCompaction(originEnableCrossSpaceCompaction);
- IoTDBDescriptor.getInstance()
- .getConfig()
-
.setEnableInsertionCrossSpaceCompaction(originEnableInsertionCompaction);
IoTDBDescriptor.getInstance()
.getConfig()
.setEnableUnseqSpaceCompaction(originEnableUnseqSpaceCompaction);
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/InsertionCrossSpaceCompactionSelectorTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/InsertionCrossSpaceCompactionSelectorTest.java
index 8bdea88b2dd..66671b2265f 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/InsertionCrossSpaceCompactionSelectorTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/InsertionCrossSpaceCompactionSelectorTest.java
@@ -58,13 +58,13 @@ public class InsertionCrossSpaceCompactionSelectorTest
extends AbstractCompactio
@Before
public void setUp()
throws IOException, WriteProcessException, MetadataException,
InterruptedException {
-
IoTDBDescriptor.getInstance().getConfig().setEnableInsertionCrossSpaceCompaction(true);
+
IoTDBDescriptor.getInstance().getConfig().setEnableCrossSpaceCompaction(true);
super.setUp();
}
@After
public void tearDown() throws IOException, StorageEngineException {
-
IoTDBDescriptor.getInstance().getConfig().setEnableInsertionCrossSpaceCompaction(false);
+
IoTDBDescriptor.getInstance().getConfig().setEnableCrossSpaceCompaction(false);
super.tearDown();
}
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/InsertionCrossSpaceCompactionTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/InsertionCrossSpaceCompactionTest.java
index 5a9b1058839..48ecfe214b0 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/InsertionCrossSpaceCompactionTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/InsertionCrossSpaceCompactionTest.java
@@ -66,15 +66,15 @@ public class InsertionCrossSpaceCompactionTest extends
AbstractCompactionTest {
throws IOException, WriteProcessException, MetadataException,
InterruptedException {
super.setUp();
enableInsertionCrossSpaceCompaction =
-
IoTDBDescriptor.getInstance().getConfig().isEnableInsertionCrossSpaceCompaction();
-
IoTDBDescriptor.getInstance().getConfig().setEnableInsertionCrossSpaceCompaction(true);
+
IoTDBDescriptor.getInstance().getConfig().isEnableCrossSpaceCompaction();
+
IoTDBDescriptor.getInstance().getConfig().setEnableCrossSpaceCompaction(true);
}
@After
public void tearDown() throws IOException, StorageEngineException {
IoTDBDescriptor.getInstance()
.getConfig()
-
.setEnableInsertionCrossSpaceCompaction(enableInsertionCrossSpaceCompaction);
+ .setEnableCrossSpaceCompaction(enableInsertionCrossSpaceCompaction);
super.tearDown();
}
