Skip to content

[ISSUE #10582] Fix POP revive offset comparator overflow #10583

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

Open
Aias00 wants to merge 1 commit into
base: develop
Choose a base branch
from
+16 −1
Open

[ISSUE #10582] Fix POP revive offset comparator overflow #10583

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion broker/src/main/java/org/apache/rocketmq/broker/processor/PopReviveService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -725,7 +726,7 @@ ArrayList<PopCheckPoint> genSortList() {
return sortList;
}
sortList = new ArrayList<>(map.values());
sortList.sort((o1, o2) -> (int) (o1.getReviveOffset() - o2.getReviveOffset()));
sortList.sort(Comparator.comparingLong(PopCheckPoint::getReviveOffset));
return sortList;
}
}
Expand Down
14 changes: 14 additions & 0 deletions broker/src/test/java/org/apache/rocketmq/broker/processor/PopReviveServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,20 @@ public void testReviveMsgFromBatchAck() throws Throwable {
assertEquals(1, commitOffsetCaptor.getValue().longValue());
}

@Test
public void testGenSortListShouldSortLargeReviveOffsets() {
PopReviveService.ConsumeReviveObj consumeReviveObj = new PopReviveService.ConsumeReviveObj();
PopCheckPoint lowOffsetCk = buildPopCheckPoint(0, 0, 1);
PopCheckPoint highOffsetCk = buildPopCheckPoint(1, 0, (long) Integer.MAX_VALUE + 2);
consumeReviveObj.map.put("high", highOffsetCk);
consumeReviveObj.map.put("low", lowOffsetCk);

List<PopCheckPoint> sortList = consumeReviveObj.genSortList();

assertEquals(lowOffsetCk, sortList.get(0));
assertEquals(highOffsetCk, sortList.get(1));
}

public static MessageExtBrokerInner buildBatchAckMsg(BatchAckMsg batchAckMsg, long deliverMs, long reviveOffset, long deliverTime) {
MessageExtBrokerInner result = buildBatchAckInnerMessage(REVIVE_TOPIC, batchAckMsg, REVIVE_QUEUE_ID, STORE_HOST, deliverMs, PopMessageProcessor.genAckUniqueId(batchAckMsg));
result.setQueueOffset(reviveOffset);
Expand Down
Loading