You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by ji...@apache.org on 2022/03/19 01:42:53 UTC
[rocketmq] 01/01: Merge remote-tracking branch 'apache/5.0.0-beta' into 5.0.0-beta-tmp
This is an automated email from the ASF dual-hosted git repository.
jinrongtong pushed a commit to branch 5.0.0-beta-tmp
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
commit 3cd0ec9a8349a3a89a135b581ed1b2e2bc10a167
Merge: a44699a 8fc952d
Author: RongtongJin <ji...@mails.ucas.ac.cn>
AuthorDate: Sat Mar 19 09:41:42 2022 +0800
Merge remote-tracking branch 'apache/5.0.0-beta' into 5.0.0-beta-tmp
# Conflicts:
# broker/src/main/java/org/apache/rocketmq/broker/processor/PopMessageProcessor.java
apis/pom.xml | 39 +++++++
.../apache/rocketmq/apis/ClientConfiguration.java | 61 +++++++++++
.../rocketmq/apis/ClientConfigurationBuilder.java | 72 ++++++++++++
.../rocketmq/apis/ClientServiceProvider.java | 52 +++++++++
.../org/apache/rocketmq/apis/MessageQueue.java | 24 ++++
.../apache/rocketmq/apis/SessionCredentials.java | 58 ++++++++++
.../rocketmq/apis/SessionCredentialsProvider.java | 30 +++++
.../apis/StaticSessionCredentialsProvider.java | 35 ++++++
.../apis/exception/AuthenticationException.java | 31 ++++++
.../apis/exception/AuthorisationException.java | 35 ++++++
.../rocketmq/apis/exception/ClientException.java | 72 ++++++++++++
.../apache/rocketmq/apis/exception/ErrorCode.java | 84 ++++++++++++++
.../apis/exception/FlowControlException.java | 25 +++++
.../rocketmq/apis/exception/NetworkException.java | 28 +++++
.../exception/RemoteIllegalArgumentException.java | 25 +++++
.../apis/exception/ResourceNotFoundException.java | 25 +++++
.../apis/exception/ResourceNotMatchException.java | 24 ++++
.../rocketmq/apis/exception/TimeoutException.java | 28 +++++
.../org/apache/rocketmq/apis/message/Message.java | 77 +++++++++++++
.../rocketmq/apis/message/MessageBuilder.java | 91 ++++++++++++++++
.../apache/rocketmq/apis/message/MessageId.java | 38 +++++++
.../rocketmq/apis/message/MessageIdVersion.java | 29 +++++
.../apache/rocketmq/apis/message/MessageView.java | 121 +++++++++++++++++++++
.../apache/rocketmq/apis/producer/Producer.java | 100 +++++++++++++++++
.../rocketmq/apis/producer/ProducerBuilder.java | 82 ++++++++++++++
.../apache/rocketmq/apis/producer/SendReceipt.java | 29 +++++
.../apache/rocketmq/apis/producer/Transaction.java | 47 ++++++++
.../rocketmq/apis/producer/TransactionChecker.java | 41 +++++++
.../apis/producer/TransactionResolution.java | 34 ++++++
.../apis/retry/BackOffRetryPolicyBuilder.java | 59 ++++++++++
.../rocketmq/apis/retry/BackoffRetryPolicy.java | 86 +++++++++++++++
.../apache/rocketmq/apis/retry/RetryPolicy.java | 40 +++++++
.../broker/processor/PopMessageProcessor.java | 18 +--
pom.xml | 4 +
34 files changed, 1636 insertions(+), 8 deletions(-)
diff --cc broker/src/main/java/org/apache/rocketmq/broker/processor/PopMessageProcessor.java
index c9f4485,371628d..ef2cf15
--- a/broker/src/main/java/org/apache/rocketmq/broker/processor/PopMessageProcessor.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/processor/PopMessageProcessor.java
@@@ -508,13 -509,13 +510,13 @@@ public class PopMessageProcessor implem
// If offset in store is greater than cq offset, it will cause duplicate messages,
// because offset in PopBuffer is not committed.
POP_LOGGER.warn("Pop initial offset, because store is no correct, {}, {}->{}",
- lockKey, offset, getMessageTmpResult != null ? getMessageTmpResult.getNextBeginOffset() : "null");
- offset = getMessageTmpResult != null ? getMessageTmpResult.getNextBeginOffset() : 0;
+ lockKey, offset, getMessageTmpResult.getNextBeginOffset());
+ offset = getMessageTmpResult.getNextBeginOffset();
this.brokerController.getConsumerOffsetManager().commitOffset(channel.remoteAddress().toString(), requestHeader.getConsumerGroup(), topic,
- queueId, offset);
+ queueId, offset);
getMessageTmpResult =
- this.brokerController.getMessageStore().getMessage(requestHeader.getConsumerGroup(), topic,
- queueId, offset,
+ this.brokerController.getMessageStore().getMessage(requestHeader.getConsumerGroup(), topic,
+ queueId, offset,
requestHeader.getMaxMsgNums() - getMessageResult.getMessageMapedList().size(), messageFilter);
}