Skip to content

Commit 6402cd9

Browse files
committed
Revert "[Test] Fix deletion regression test flush control"
This reverts commit 264053f.
1 parent 532d6c1 commit 6402cd9

1 file changed

Lines changed: 4 additions & 8 deletions

File tree

‎iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/TsFileProcessorTest.java‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -229,16 +229,14 @@ public void testDeletionDuringFlushCompletionIsPersisted() throws Exception {
229229
SystemFileFactory.INSTANCE.getFile(filePath),
230230
sgInfo,
231231
this::closeTsFileProcessor,
232-
(tsFileProcessor, updateMap, systemFlushTime) -> {
233-
// Take over flushing after asyncClose's guard, before FlushManager registration.
234-
tsFileProcessor.setManagedByFlushManager(true);
235-
},
232+
(tsFileProcessor, updateMap, systemFlushTime) -> {},
236233
true);
237234
processor.setTsFileProcessorInfo(new TsFileProcessorInfo(sgInfo));
238235
sgInfo.initTsFileProcessorInfo(processor);
239236
TSRecord record = new TSRecord(deviceId, 1);
240237
record.addTuple(DataPoint.getDataPoint(dataType, measurementId, "1"));
241238
processor.insert(buildInsertRowNodeByTSRecord(record), new long[5]);
239+
processor.setManagedByFlushManager(true);
242240
processor.asyncClose();
243241
Assert.assertNull(processor.getWorkMemTable());
244242

@@ -314,10 +312,7 @@ private void testDeletionWALWithoutWorkingMemTable(boolean tableModel) throws Ex
314312
SystemFileFactory.INSTANCE.getFile(filePath),
315313
sgInfo,
316314
this::closeTsFileProcessor,
317-
(tsFileProcessor, updateMap, systemFlushTime) -> {
318-
// Take over flushing after asyncClose's guard, before FlushManager registration.
319-
tsFileProcessor.setManagedByFlushManager(true);
320-
},
315+
(tsFileProcessor, updateMap, systemFlushTime) -> {},
321316
true);
322317
processor.setTsFileProcessorInfo(new TsFileProcessorInfo(sgInfo));
323318
sgInfo.initTsFileProcessorInfo(processor);
@@ -336,6 +331,7 @@ private void testDeletionWALWithoutWorkingMemTable(boolean tableModel) throws Ex
336331
logDeletionForTest(tableModel, 2);
337332

338333
// Use the production close path, while keeping flush execution under test control.
334+
processor.setManagedByFlushManager(true);
339335
try {
340336
processor.asyncClose();
341337
Assert.assertNull(processor.getWorkMemTable());

0 commit comments

Comments
 (0)