Skip to content

[Test] Fix deletion regression test flush control #18888

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jt2594838 merged 1 commit into from
Oct 15, 2026
Merged

[Test] Fix deletion regression test flush control #18888

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions .../test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/TsFileProcessorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,14 +229,16 @@ public void testDeletionDuringFlushCompletionIsPersisted() throws Exception {
SystemFileFactory.INSTANCE.getFile(filePath),
sgInfo,
this::closeTsFileProcessor,
(tsFileProcessor, updateMap, systemFlushTime) -> {},
(tsFileProcessor, updateMap, systemFlushTime) -> {
// Take over flushing after asyncClose's guard, before FlushManager registration.
tsFileProcessor.setManagedByFlushManager(true);
},
true);
processor.setTsFileProcessorInfo(new TsFileProcessorInfo(sgInfo));
sgInfo.initTsFileProcessorInfo(processor);
TSRecord record = new TSRecord(deviceId, 1);
record.addTuple(DataPoint.getDataPoint(dataType, measurementId, "1"));
processor.insert(buildInsertRowNodeByTSRecord(record), new long[5]);
processor.setManagedByFlushManager(true);
processor.asyncClose();
Assert.assertNull(processor.getWorkMemTable());

Expand Down Expand Up @@ -312,7 +314,10 @@ private void testDeletionWALWithoutWorkingMemTable(boolean tableModel) throws Ex
SystemFileFactory.INSTANCE.getFile(filePath),
sgInfo,
this::closeTsFileProcessor,
(tsFileProcessor, updateMap, systemFlushTime) -> {},
(tsFileProcessor, updateMap, systemFlushTime) -> {
// Take over flushing after asyncClose's guard, before FlushManager registration.
tsFileProcessor.setManagedByFlushManager(true);
},
true);
processor.setTsFileProcessorInfo(new TsFileProcessorInfo(sgInfo));
sgInfo.initTsFileProcessorInfo(processor);
Expand All @@ -331,7 +336,6 @@ private void testDeletionWALWithoutWorkingMemTable(boolean tableModel) throws Ex
logDeletionForTest(tableModel, 2);

// Use the production close path, while keeping flush execution under test control.
processor.setManagedByFlushManager(true);
try {
processor.asyncClose();
Assert.assertNull(processor.getWorkMemTable());
Expand Down
Loading