Skip to content

[ISSUE #10870] fix(client): preserve maximum process queue offset #10880

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
yuluo-yx wants to merge 1 commit into
base: develop
Choose a base branch
from
+13 −1
Open

[ISSUE #10870] fix(client): preserve maximum process queue offset #10880

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
2 changes: 1 addition & 1 deletion client/src/main/java/org/apache/rocketmq/client/impl/consumer/ProcessQueue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ public boolean putMessage(final List<MessageExt> msgs) {
MessageExt old = msgTreeMap.put(msg.getQueueOffset(), msg);
if (null == old) {
validMsgCnt++;
this.queueOffsetMax = msg.getQueueOffset();
this.queueOffsetMax = Math.max(this.queueOffsetMax, msg.getQueueOffset());
msgSize.addAndGet(null == msg.getBody() ? 0 : msg.getBody().length);
}
}
Expand Down
12 changes: 12 additions & 0 deletions client/src/test/java/org/apache/rocketmq/client/impl/consumer/ProcessQueueTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,18 @@ public void testCachedMessageSize() {
assertThat(pq.getMsgSize().get()).isEqualTo(89 * 123);
}

@Test
public void testRemoveMessagesReturnsOffsetAfterHighestOutOfOrderMessage() {
ProcessQueue pq = new ProcessQueue();
List<MessageExt> messages = createMessageList(2);
messages.get(0).setQueueOffset(10);
messages.get(1).setQueueOffset(5);

pq.putMessage(messages);

assertThat(pq.removeMessage(messages)).isEqualTo(11);
}

@Test
public void testContainsMessage() {
ProcessQueue pq = new ProcessQueue();
Expand Down
Loading