You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by lh...@apache.org on 2025/06/19 18:42:17 UTC
(pulsar) 03/07: [fix][ml] Cursor ignores the position that has an empty ack-set if disabled deletionAtBatchIndexLevelEnabled (#24406)
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch branch-4.0
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit e10fce89a8debb987f70f516b92a37a57301f692
Author: fengyubiao <yu...@streamnative.io>
AuthorDate: Fri Jun 13 13:52:56 2025 +0800
[fix][ml] Cursor ignores the position that has an empty ack-set if disabled deletionAtBatchIndexLevelEnabled (#24406)
(cherry picked from commit 3bd70fd74fd2586724d4830c140a42517e028959)
---
.../apache/bookkeeper/mledger/impl/ManagedCursorImpl.java | 2 +-
.../apache/bookkeeper/mledger/impl/ManagedCursorTest.java | 15 +++++++++++++++
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java
index e73699564a2..5088ff6cead 100644
--- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java
+++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java
@@ -2390,7 +2390,7 @@ public class ManagedCursorImpl implements ManagedCursor {
continue;
}
long[] ackSet = AckSetStateUtil.getAckSetArrayOrNull(position);
- if (ackSet == null) {
+ if (ackSet == null || ackSet.length == 0) {
if (batchDeletedIndexes != null) {
batchDeletedIndexes.remove(position);
}
diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorTest.java
index ce8b0334226..43755510964 100644
--- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorTest.java
+++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorTest.java
@@ -5191,6 +5191,21 @@ public class ManagedCursorTest extends MockedBookKeeperTestCase {
assertEquals(positionRef4.get(), position4);
}
+ @Test
+ public void testDeleteBatchedMessageWithEmptyAckSet() throws Exception {
+ ManagedLedgerConfig managedLedgerConfig = new ManagedLedgerConfig();
+ managedLedgerConfig.setDeletionAtBatchIndexLevelEnabled(false);
+ ManagedLedgerImpl ml = (ManagedLedgerImpl) factory.open("testDeleteBatchedMessageWithEmptyAckSet",
+ managedLedgerConfig);
+ ManagedCursorImpl cursor = (ManagedCursorImpl) ml.openCursor("c1");
+ Position position = ml.addEntry(new byte[1]);
+ Position positionWithEmptyAckSet =
+ AckSetStateUtil.createPositionWithAckSet(position.getLedgerId(), position.getEntryId(), new long[]{});
+ cursor.delete(positionWithEmptyAckSet);
+ assertEquals(cursor.markDeletePosition, position);
+ ml.delete();
+ }
+
@Test
public void testEstimateEntryCountBySize() throws Exception {
final String mlName = "ml-" + UUID.randomUUID().toString().replaceAll("-", "");