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:52 UTC
[rocketmq] branch 5.0.0-beta-tmp updated (a44699a -> 3cd0ec9)
This is an automated email from the ASF dual-hosted git repository.
jinrongtong pushed a change to branch 5.0.0-beta-tmp
in repository https://gitbox.apache.org/repos/asf/rocketmq.git.
from a44699a Ignore all container tests because they cost too much time and are unstable
add 0b7291b [ISSUE #3503] bugfix: the consumeOffset will be set as 0 when getMessage returns null (#3504)
add 8fc952d Add new APIs for producer (#3987)
new 3cd0ec9 Merge remote-tracking branch 'apache/5.0.0-beta' into 5.0.0-beta-tmp
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
{container => apis}/pom.xml | 19 ++--
.../apache/rocketmq/apis/ClientConfiguration.java | 61 +++++++++++
.../rocketmq/apis/ClientConfigurationBuilder.java | 72 ++++++++++++
.../rocketmq/apis/ClientServiceProvider.java | 52 +++++++++
.../org/apache/rocketmq/apis/MessageQueue.java | 11 +-
.../apache/rocketmq/apis/SessionCredentials.java | 58 ++++++++++
.../rocketmq/apis/SessionCredentialsProvider.java | 15 ++-
.../apis/StaticSessionCredentialsProvider.java | 24 ++--
.../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 | 11 +-
.../rocketmq/apis/exception/NetworkException.java | 14 +--
.../exception/RemoteIllegalArgumentException.java | 12 +-
.../apis/exception/ResourceNotFoundException.java | 11 +-
.../apis/exception/ResourceNotMatchException.java | 10 +-
.../rocketmq/apis/exception/TimeoutException.java | 14 +--
.../org/apache/rocketmq/apis/message/Message.java | 77 +++++++++++++
.../rocketmq/apis/message/MessageBuilder.java | 91 ++++++++++++++++
.../apache/rocketmq/apis/message/MessageId.java | 33 +++---
.../rocketmq/apis/message/MessageIdVersion.java | 13 ++-
.../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 | 16 ++-
.../apache/rocketmq/apis/producer/Transaction.java | 47 ++++++++
.../rocketmq/apis/producer/TransactionChecker.java | 41 +++++++
.../apis/producer/TransactionResolution.java | 22 ++--
.../apis/retry/BackOffRetryPolicyBuilder.java | 59 ++++++++++
.../rocketmq/apis/retry/BackoffRetryPolicy.java | 86 +++++++++++++++
.../apache/rocketmq/apis/retry/RetryPolicy.java | 23 ++--
.../broker/processor/PopMessageProcessor.java | 18 +--
pom.xml | 4 +
34 files changed, 1254 insertions(+), 185 deletions(-)
copy {container => apis}/pom.xml (76%)
create mode 100644 apis/src/main/java/org/apache/rocketmq/apis/ClientConfiguration.java
create mode 100644 apis/src/main/java/org/apache/rocketmq/apis/ClientConfigurationBuilder.java
create mode 100644 apis/src/main/java/org/apache/rocketmq/apis/ClientServiceProvider.java
copy common/src/main/java/org/apache/rocketmq/common/TopicFilterType.java => apis/src/main/java/org/apache/rocketmq/apis/MessageQueue.java (87%)
create mode 100644 apis/src/main/java/org/apache/rocketmq/apis/SessionCredentials.java
copy common/src/main/java/org/apache/rocketmq/common/statistics/Interceptor.java => apis/src/main/java/org/apache/rocketmq/apis/SessionCredentialsProvider.java (76%)
copy common/src/main/java/org/apache/rocketmq/common/protocol/header/GetConsumerListByGroupRequestHeader.java => apis/src/main/java/org/apache/rocketmq/apis/StaticSessionCredentialsProvider.java (58%)
copy client/src/main/java/org/apache/rocketmq/client/trace/TraceTransferBean.java => apis/src/main/java/org/apache/rocketmq/apis/exception/AuthenticationException.java (59%)
copy client/src/main/java/org/apache/rocketmq/client/trace/TraceTransferBean.java => apis/src/main/java/org/apache/rocketmq/apis/exception/AuthorisationException.java (52%)
create mode 100644 apis/src/main/java/org/apache/rocketmq/apis/exception/ClientException.java
create mode 100644 apis/src/main/java/org/apache/rocketmq/apis/exception/ErrorCode.java
copy common/src/main/java/org/apache/rocketmq/common/filter/impl/Operand.java => apis/src/main/java/org/apache/rocketmq/apis/exception/FlowControlException.java (75%)
copy common/src/main/java/org/apache/rocketmq/common/filter/FilterContext.java => apis/src/main/java/org/apache/rocketmq/apis/exception/NetworkException.java (72%)
copy remoting/src/main/java/org/apache/rocketmq/remoting/exception/RemotingTooMuchRequestException.java => apis/src/main/java/org/apache/rocketmq/apis/exception/RemoteIllegalArgumentException.java (73%)
copy common/src/main/java/org/apache/rocketmq/common/filter/impl/Operand.java => apis/src/main/java/org/apache/rocketmq/apis/exception/ResourceNotFoundException.java (74%)
copy common/src/main/java/org/apache/rocketmq/common/filter/impl/Operand.java => apis/src/main/java/org/apache/rocketmq/apis/exception/ResourceNotMatchException.java (79%)
copy common/src/main/java/org/apache/rocketmq/common/filter/FilterContext.java => apis/src/main/java/org/apache/rocketmq/apis/exception/TimeoutException.java (72%)
create mode 100644 apis/src/main/java/org/apache/rocketmq/apis/message/Message.java
create mode 100644 apis/src/main/java/org/apache/rocketmq/apis/message/MessageBuilder.java
copy common/src/main/java/org/apache/rocketmq/common/protocol/heartbeat/MessageModel.java => apis/src/main/java/org/apache/rocketmq/apis/message/MessageId.java (62%)
copy client/src/main/java/org/apache/rocketmq/client/consumer/AckStatus.java => apis/src/main/java/org/apache/rocketmq/apis/message/MessageIdVersion.java (81%)
create mode 100644 apis/src/main/java/org/apache/rocketmq/apis/message/MessageView.java
create mode 100644 apis/src/main/java/org/apache/rocketmq/apis/producer/Producer.java
create mode 100644 apis/src/main/java/org/apache/rocketmq/apis/producer/ProducerBuilder.java
copy remoting/src/main/java/org/apache/rocketmq/remoting/RemotingService.java => apis/src/main/java/org/apache/rocketmq/apis/producer/SendReceipt.java (75%)
create mode 100644 apis/src/main/java/org/apache/rocketmq/apis/producer/Transaction.java
create mode 100644 apis/src/main/java/org/apache/rocketmq/apis/producer/TransactionChecker.java
copy client/src/main/java/org/apache/rocketmq/client/consumer/listener/ConsumeOrderlyStatus.java => apis/src/main/java/org/apache/rocketmq/apis/producer/TransactionResolution.java (67%)
create mode 100644 apis/src/main/java/org/apache/rocketmq/apis/retry/BackOffRetryPolicyBuilder.java
create mode 100644 apis/src/main/java/org/apache/rocketmq/apis/retry/BackoffRetryPolicy.java
copy filter/src/main/java/org/apache/rocketmq/filter/FilterSpi.java => apis/src/main/java/org/apache/rocketmq/apis/retry/RetryPolicy.java (65%)
[rocketmq] 01/01: Merge remote-tracking branch 'apache/5.0.0-beta' into 5.0.0-beta-tmp
Posted by ji...@apache.org.
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);
}