From 33d0b8f3f332b92ea2f959929427bd8fba828382 Mon Sep 17 00:00:00 2001 From: "Xu Han@AutoMQ" Date: Wed, 26 Nov 2025 21:03:36 +0800 Subject: [PATCH] Revert "fix(s3wal): handle hollow after trim (#3057)" This reverts commit 478b49400b13f881381a7fa66caa0d6fcaec12ba. --- .../automq/stream/s3/wal/impl/object/RecoverIterator.java | 8 -------- .../stream/s3/wal/impl/object/ObjectWALServiceTest.java | 7 ------- 2 files changed, 15 deletions(-) diff --git a/s3stream/src/main/java/com/automq/stream/s3/wal/impl/object/RecoverIterator.java b/s3stream/src/main/java/com/automq/stream/s3/wal/impl/object/RecoverIterator.java index c743f8be72..6c6d5f9da1 100644 --- a/s3stream/src/main/java/com/automq/stream/s3/wal/impl/object/RecoverIterator.java +++ b/s3stream/src/main/java/com/automq/stream/s3/wal/impl/object/RecoverIterator.java @@ -49,7 +49,6 @@ import static com.automq.stream.s3.wal.common.RecordHeader.RECORD_HEADER_SIZE; import static com.automq.stream.s3.wal.common.RecordHeader.RECORD_HEADER_WITHOUT_CRC_SIZE; -@SuppressWarnings("NPathComplexity") public class RecoverIterator implements Iterator { private static final Logger LOGGER = LoggerFactory.getLogger(RecoverIterator.class); private final ObjectStorage objectStorage; @@ -126,13 +125,6 @@ static List getContinuousFromTrimOffset(List objectList, l return Collections.emptyList(); } - if (trimOffset != -1 && objectList.get(startIndex).startOffset() > trimOffset) { - for (int i = startIndex; i < objectList.size(); i++) { - LOGGER.warn("There is hollow before trim offset, drop discontinuous object: {}", objectList.get(i)); - } - return Collections.emptyList(); - } - int endIndex = startIndex + 1; for (int i = startIndex + 1; i < objectList.size(); i++) { if (objectList.get(i).startOffset() != objectList.get(i - 1).endOffset()) { diff --git a/s3stream/src/test/java/com/automq/stream/s3/wal/impl/object/ObjectWALServiceTest.java b/s3stream/src/test/java/com/automq/stream/s3/wal/impl/object/ObjectWALServiceTest.java index 5be9d6f479..4733faaad1 100644 --- a/s3stream/src/test/java/com/automq/stream/s3/wal/impl/object/ObjectWALServiceTest.java +++ b/s3stream/src/test/java/com/automq/stream/s3/wal/impl/object/ObjectWALServiceTest.java @@ -295,13 +295,6 @@ public static Stream testRecoverIteratorGetContinuousFromTrimOffsetDa List.of(mockWALObject(0, 10), mockWALObject(10, 20), mockWALObject(30, 40)), 10L, List.of(mockWALObject(10, 20)) - ), - Arguments.of( - "trimmed and hollow", - // When the object-10-20 doesn't write successfully and the broker halt, the hollow happens. - List.of(mockWALObject(0, 10), mockWALObject(30, 40)), - 10L, - List.of() ) ); }