This is an automated email from the ASF dual-hosted git repository.
jiangtian 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 d1d5f7fc6ac Do not add new compaction mod file in deletion (#15281)
d1d5f7fc6ac is described below
commit d1d5f7fc6acedb4db0c259a119f426c78169df29
Author: Jiang Tian <[email protected]>
AuthorDate: Fri Apr 11 14:41:01 2025 +0800
Do not add new compaction mod file in deletion (#15281)
* Do not add new compaction mod file in deletion
* gix test
* fix test
* fix tests
---
.../iotdb/db/storageengine/dataregion/DataRegion.java | 6 ------
.../RewriteCrossSpaceCompactionWithFastPerformerTest.java | 14 ++------------
...riteCrossSpaceCompactionWithReadPointPerformerTest.java | 12 ------------
.../inner/InnerSeqCompactionWithFastPerformerTest.java | 7 +------
.../InnerSeqCompactionWithReadChunkPerformerTest.java | 7 +------
5 files changed, 4 insertions(+), 42 deletions(-)
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 6fb11196d71..59e179fcff1 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
@@ -2606,9 +2606,6 @@ public class DataRegion implements IDataRegionForQuery {
continue;
}
- if (sealedTsFile.isCompacting()) {
- involvedModificationFiles.add(sealedTsFile.getCompactionModFile());
- }
involvedModificationFiles.add(sealedTsFile.getModFileForWrite());
}
@@ -2658,9 +2655,6 @@ public class DataRegion implements IDataRegionForQuery {
for (TsFileResource tsFileResource : deletedByMods) {
if (tsFileResource.isClosed()
|| !tsFileResource.getProcessor().deleteDataInMemory(modEntry)) {
- if (tsFileResource.isCompacting()) {
- involvedModificationFiles.add(tsFileResource.getCompactionModFile());
- }
involvedModificationFiles.add(tsFileResource.getModFileForWrite());
} // else do nothing
}
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/RewriteCrossSpaceCompactionWithFastPerformerTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/RewriteCrossSpaceCompactionWithFastPerformerTest.java
index a4ef26ea58a..ead500524e5 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/RewriteCrossSpaceCompactionWithFastPerformerTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/RewriteCrossSpaceCompactionWithFastPerformerTest.java
@@ -641,15 +641,11 @@ public class
RewriteCrossSpaceCompactionWithFastPerformerTest extends AbstractCo
Assert.assertFalse(resource.getCompactionModFile().exists());
Assert.assertFalse(resource.anyModFileExists());
} else if (i == 2) {
- Assert.assertTrue(resource.getCompactionModFile().exists());
Assert.assertTrue(resource.anyModFileExists());
Assert.assertEquals(2, resource.getAllModEntries().size());
- Assert.assertEquals(1,
resource.getCompactionModFile().getAllMods().size());
} else {
- Assert.assertTrue(resource.getCompactionModFile().exists());
Assert.assertTrue(resource.anyModFileExists());
Assert.assertEquals(1, resource.getAllModEntries().size());
- Assert.assertEquals(1,
resource.getCompactionModFile().getAllMods().size());
}
}
for (TsFileResource resource : unseqResources) {
@@ -678,8 +674,7 @@ public class
RewriteCrossSpaceCompactionWithFastPerformerTest extends AbstractCo
Assert.assertFalse(resource.anyModFileExists());
} else {
Assert.assertFalse(resource.getCompactionModFile().exists());
- Assert.assertTrue(resource.anyModFileExists());
- Assert.assertEquals(1, resource.getAllModEntries().size());
+ Assert.assertFalse(resource.anyModFileExists());
}
}
}
@@ -784,15 +779,11 @@ public class
RewriteCrossSpaceCompactionWithFastPerformerTest extends AbstractCo
Assert.assertFalse(resource.getCompactionModFile().exists());
Assert.assertFalse(resource.anyModFileExists());
} else if (i == 2) {
- Assert.assertTrue(resource.getCompactionModFile().exists());
Assert.assertTrue(resource.anyModFileExists());
Assert.assertEquals(3, resource.getAllModEntries().size());
- Assert.assertEquals(2,
resource.getCompactionModFile().getAllMods().size());
} else {
- Assert.assertTrue(resource.getCompactionModFile().exists());
Assert.assertTrue(resource.anyModFileExists());
Assert.assertEquals(2, resource.getAllModEntries().size());
- Assert.assertEquals(2,
resource.getCompactionModFile().getAllMods().size());
}
}
for (TsFileResource resource : unseqResources) {
@@ -821,8 +812,7 @@ public class
RewriteCrossSpaceCompactionWithFastPerformerTest extends AbstractCo
Assert.assertFalse(resource.anyModFileExists());
} else {
Assert.assertFalse(resource.getCompactionModFile().exists());
- Assert.assertTrue(resource.anyModFileExists());
- Assert.assertEquals(2, resource.getAllModEntries().size());
+ Assert.assertFalse(resource.anyModFileExists());
}
}
}
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/RewriteCrossSpaceCompactionWithReadPointPerformerTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/RewriteCrossSpaceCompactionWithReadPointPerformerTest.java
index 306b418c209..d6540014413 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/RewriteCrossSpaceCompactionWithReadPointPerformerTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/RewriteCrossSpaceCompactionWithReadPointPerformerTest.java
@@ -636,15 +636,11 @@ public class
RewriteCrossSpaceCompactionWithReadPointPerformerTest extends Abstr
Assert.assertFalse(resource.getCompactionModFile().exists());
Assert.assertFalse(resource.anyModFileExists());
} else if (i == 2) {
- Assert.assertTrue(resource.getCompactionModFile().exists());
Assert.assertTrue(resource.anyModFileExists());
Assert.assertEquals(2, resource.getAllModEntries().size());
- Assert.assertEquals(1,
resource.getCompactionModFile().getAllMods().size());
} else {
- Assert.assertTrue(resource.getCompactionModFile().exists());
Assert.assertTrue(resource.anyModFileExists());
Assert.assertEquals(1, resource.getAllModEntries().size());
- Assert.assertEquals(1,
resource.getCompactionModFile().getAllMods().size());
}
}
for (TsFileResource resource : unseqResources) {
@@ -673,8 +669,6 @@ public class
RewriteCrossSpaceCompactionWithReadPointPerformerTest extends Abstr
Assert.assertFalse(resource.anyModFileExists());
} else {
Assert.assertFalse(resource.getCompactionModFile().exists());
- Assert.assertTrue(resource.anyModFileExists());
- Assert.assertEquals(1, resource.getAllModEntries().size());
}
}
}
@@ -779,15 +773,11 @@ public class
RewriteCrossSpaceCompactionWithReadPointPerformerTest extends Abstr
Assert.assertFalse(resource.getCompactionModFile().exists());
Assert.assertFalse(resource.anyModFileExists());
} else if (i == 2) {
- Assert.assertTrue(resource.getCompactionModFile().exists());
Assert.assertTrue(resource.anyModFileExists());
Assert.assertEquals(3, resource.getAllModEntries().size());
- Assert.assertEquals(2,
resource.getCompactionModFile().getAllMods().size());
} else {
- Assert.assertTrue(resource.getCompactionModFile().exists());
Assert.assertTrue(resource.anyModFileExists());
Assert.assertEquals(2, resource.getAllModEntries().size());
- Assert.assertEquals(2,
resource.getCompactionModFile().getAllMods().size());
}
}
for (TsFileResource resource : unseqResources) {
@@ -816,8 +806,6 @@ public class
RewriteCrossSpaceCompactionWithReadPointPerformerTest extends Abstr
Assert.assertFalse(resource.anyModFileExists());
} else {
Assert.assertFalse(resource.getCompactionModFile().exists());
- Assert.assertTrue(resource.anyModFileExists());
- Assert.assertEquals(2, resource.getAllModEntries().size());
}
}
}
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSeqCompactionWithFastPerformerTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSeqCompactionWithFastPerformerTest.java
index 60d996cc0da..f3eac89e502 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSeqCompactionWithFastPerformerTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSeqCompactionWithFastPerformerTest.java
@@ -1167,17 +1167,13 @@ public class InnerSeqCompactionWithFastPerformerTest {
for (int i = 0; i < sourceResources.size() - 1; i++) {
TsFileResource resource = sourceResources.get(i);
resource.resetModFile();
- Assert.assertTrue(resource.getCompactionModFile().exists());
Assert.assertTrue(resource.anyModFileExists());
if (i < 2) {
Assert.assertEquals(3, resource.getAllModEntries().size());
- Assert.assertEquals(2,
resource.getCompactionModFile().getAllMods().size());
} else if (i < 3) {
Assert.assertEquals(2, resource.getAllModEntries().size());
- Assert.assertEquals(2,
resource.getCompactionModFile().getAllMods().size());
} else {
Assert.assertEquals(1, resource.getAllModEntries().size());
- Assert.assertEquals(1,
resource.getCompactionModFile().getAllMods().size());
}
}
task.start();
@@ -1190,8 +1186,7 @@ public class InnerSeqCompactionWithFastPerformerTest {
TsFileResource resource =
TsFileNameGenerator.increaseInnerCompactionCnt(sourceResources.get(0));
resource.resetModFile();
- Assert.assertTrue(resource.anyModFileExists());
- Assert.assertEquals(2, resource.getAllModEntries().size());
+ Assert.assertFalse(resource.anyModFileExists());
Assert.assertFalse(resource.getCompactionModFile().exists());
}
}
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSeqCompactionWithReadChunkPerformerTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSeqCompactionWithReadChunkPerformerTest.java
index c8ec0c3420a..2c9a87a4465 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSeqCompactionWithReadChunkPerformerTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSeqCompactionWithReadChunkPerformerTest.java
@@ -1134,17 +1134,13 @@ public class
InnerSeqCompactionWithReadChunkPerformerTest {
for (int i = 0; i < sourceResources.size() - 1; i++) {
TsFileResource resource = sourceResources.get(i);
resource.resetModFile();
- Assert.assertTrue(resource.getCompactionModFile().exists());
Assert.assertTrue(resource.anyModFileExists());
if (i < 2) {
Assert.assertEquals(3, resource.getAllModEntries().size());
- Assert.assertEquals(2,
resource.getCompactionModFile().getAllMods().size());
} else if (i < 3) {
Assert.assertEquals(2, resource.getAllModEntries().size());
- Assert.assertEquals(2,
resource.getCompactionModFile().getAllMods().size());
} else {
Assert.assertEquals(1, resource.getAllModEntries().size());
- Assert.assertEquals(1,
resource.getCompactionModFile().getAllMods().size());
}
}
task.start();
@@ -1157,8 +1153,7 @@ public class InnerSeqCompactionWithReadChunkPerformerTest
{
TsFileResource resource =
TsFileNameGenerator.increaseInnerCompactionCnt(sourceResources.get(0));
resource.resetModFile();
- Assert.assertTrue(resource.anyModFileExists());
- Assert.assertEquals(2, resource.getAllModEntries().size());
+ Assert.assertFalse(resource.anyModFileExists());
Assert.assertFalse(resource.getCompactionModFile().exists());
}
}
