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/06/30 06:40:19 UTC
[rocketmq] branch 5.0.0-beta-dledger-controller updated (1b77be4d2 -> 505cb2af9)
This is an automated email from the ASF dual-hosted git repository.
jinrongtong pushed a change to branch 5.0.0-beta-dledger-controller
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
from 1b77be4d2 Add back haConnectionStateNotificationService to HAService
add 4abd12e75 Add -Xmn parameter when jdk version is less than 8 (#4262)
add 94f548351 Fix the issue that DeleteTopicSubCommand does't call the correct deleteTopicInNameServer method. (#4269)
add 19996a024 bugfix : Returning minOffset when timestamp is larger than queue-unit max tampstamp
add d8c9bd38c [ISSUE #4270]Log parameter error and optimize code (#4271)
add c6fbd7497 style: remove unused CleanFilesHook.java class (#4260)
add 499b7dbe8 [ISSUE #4171]Fix tryQueryAssignment() in RebalanceImpl
add 52e059e28 Merge pull request #4173 from zhangjidi2016/fix_tryQueryAssignment
add 3bddd5146 [ISSUE #4384] Expand RocketMQ Topic/Group attributes
add 42e5d734e [ISSUE #4384] Add RetryPolicy interface
add 33fd33089 Change PullMessageRequestHeader maxMsgNums to CFNullable
add cd24a2442 Fix bug for putting duplicated messsages while sending batch message (#4466)
add 441c3b775 Revert "[RIP-37] Add new APIs for consumer (#4019)"
add 96e9e4867 Revert "Add new APIs for producer (#3987)"
add 388cc2111 [ISSUE #4384] Remove TimeUnit in nextDelayDuration
add 05fee0d77 [ISSUE #4435] Code optimization for ConsumeQueue abstraction. (#4439)
add 505cb2af9 Merge branch '5.0.0-beta' into 5.0.0-beta-dledger-controller
No new revisions were added by this update.
Summary of changes:
apis/pom.xml | 39 ------
.../apache/rocketmq/apis/ClientConfiguration.java | 61 --------
.../rocketmq/apis/ClientConfigurationBuilder.java | 72 ----------
.../rocketmq/apis/ClientServiceProvider.java | 69 ---------
.../org/apache/rocketmq/apis/MessageQueue.java | 24 ----
.../apache/rocketmq/apis/SessionCredentials.java | 58 --------
.../apis/StaticSessionCredentialsProvider.java | 35 -----
.../rocketmq/apis/consumer/ConsumeResult.java | 31 -----
.../rocketmq/apis/consumer/FilterExpression.java | 56 --------
.../apis/consumer/FilterExpressionType.java | 32 -----
.../rocketmq/apis/consumer/MessageListener.java | 54 -------
.../rocketmq/apis/consumer/PushConsumer.java | 95 -------------
.../apis/consumer/PushConsumerBuilder.java | 88 ------------
.../rocketmq/apis/consumer/SimpleConsumer.java | 155 ---------------------
.../apis/consumer/SimpleConsumerBuilder.java | 67 ---------
.../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 ------
.../loadbalance/MessageRequestModeManager.java | 10 +-
.../broker/processor/QueryAssignmentProcessor.java | 13 +-
.../broker/processor/SendMessageProcessor.java | 1 -
.../client/impl/consumer/RebalanceImpl.java | 38 ++---
.../org/apache/rocketmq/common/BrokerConfig.java | 10 +-
.../apache/rocketmq/common/TopicAttributes.java | 13 +-
.../org/apache/rocketmq/common/TopicConfig.java | 79 +++++++++--
.../TopicMessageType.java} | 29 ++--
.../protocol/header/PullMessageRequestHeader.java | 5 +-
.../common/subscription/CustomizedRetryPolicy.java | 85 +++++++++++
.../subscription/ExponentialRetryPolicy.java | 74 ++++++++++
.../common/subscription/GroupRetryPolicy.java | 78 +++++++++++
.../common/subscription/GroupRetryPolicyType.java | 8 +-
.../rocketmq/common/subscription/RetryPolicy.java | 14 +-
.../subscription/SubscriptionGroupConfig.java | 50 ++++++-
.../apache/rocketmq/common/TopicConfigTest.java | 78 +++++++++++
.../CustomizedRetryPolicyTest.java} | 33 ++---
.../subscription/ExponentialRetryPolicyTest.java | 44 ++++++
.../common/subscription/GroupRetryPolicyTest.java | 49 +++++++
distribution/bin/runbroker.sh | 2 +-
pom.xml | 4 -
.../org/apache/rocketmq/store/CleanFilesHook.java | 23 ---
.../org/apache/rocketmq/store/ConsumeQueue.java | 50 +++----
.../apache/rocketmq/store/DefaultMessageStore.java | 123 +++++++++-------
.../org/apache/rocketmq/store/MessageStore.java | 9 +-
.../rocketmq/store/queue/BatchConsumeQueue.java | 30 ++--
.../store/queue/ConsumeQueueInterface.java | 22 +++
.../rocketmq/store/queue/ConsumeQueueStore.java | 10 +-
.../rocketmq/store/queue/FileQueueLifeCycle.java | 59 +++++++-
.../java/org/apache/rocketmq/store/HATest.java | 2 +-
.../store/dledger/MessageStoreTestBase.java | 2 +
.../store/queue/BatchConsumeQueueTest.java | 2 +-
.../command/consumer/UpdateSubGroupSubCommand.java | 26 ++++
.../tools/command/topic/DeleteTopicSubCommand.java | 2 +-
73 files changed, 830 insertions(+), 2434 deletions(-)
delete mode 100644 apis/pom.xml
delete mode 100644 apis/src/main/java/org/apache/rocketmq/apis/ClientConfiguration.java
delete mode 100644 apis/src/main/java/org/apache/rocketmq/apis/ClientConfigurationBuilder.java
delete mode 100644 apis/src/main/java/org/apache/rocketmq/apis/ClientServiceProvider.java
delete mode 100644 apis/src/main/java/org/apache/rocketmq/apis/MessageQueue.java
delete mode 100644 apis/src/main/java/org/apache/rocketmq/apis/SessionCredentials.java
delete mode 100644 apis/src/main/java/org/apache/rocketmq/apis/StaticSessionCredentialsProvider.java
delete mode 100644 apis/src/main/java/org/apache/rocketmq/apis/consumer/ConsumeResult.java
delete mode 100644 apis/src/main/java/org/apache/rocketmq/apis/consumer/FilterExpression.java
delete mode 100644 apis/src/main/java/org/apache/rocketmq/apis/consumer/FilterExpressionType.java
delete mode 100644 apis/src/main/java/org/apache/rocketmq/apis/consumer/MessageListener.java
delete mode 100644 apis/src/main/java/org/apache/rocketmq/apis/consumer/PushConsumer.java
delete mode 100644 apis/src/main/java/org/apache/rocketmq/apis/consumer/PushConsumerBuilder.java
delete mode 100644 apis/src/main/java/org/apache/rocketmq/apis/consumer/SimpleConsumer.java
delete mode 100644 apis/src/main/java/org/apache/rocketmq/apis/consumer/SimpleConsumerBuilder.java
delete mode 100644 apis/src/main/java/org/apache/rocketmq/apis/exception/AuthenticationException.java
delete mode 100644 apis/src/main/java/org/apache/rocketmq/apis/exception/AuthorisationException.java
delete mode 100644 apis/src/main/java/org/apache/rocketmq/apis/exception/ClientException.java
delete mode 100644 apis/src/main/java/org/apache/rocketmq/apis/exception/ErrorCode.java
delete mode 100644 apis/src/main/java/org/apache/rocketmq/apis/exception/FlowControlException.java
delete mode 100644 apis/src/main/java/org/apache/rocketmq/apis/exception/NetworkException.java
delete mode 100644 apis/src/main/java/org/apache/rocketmq/apis/exception/RemoteIllegalArgumentException.java
delete mode 100644 apis/src/main/java/org/apache/rocketmq/apis/exception/ResourceNotFoundException.java
delete mode 100644 apis/src/main/java/org/apache/rocketmq/apis/exception/ResourceNotMatchException.java
delete mode 100644 apis/src/main/java/org/apache/rocketmq/apis/exception/TimeoutException.java
delete mode 100644 apis/src/main/java/org/apache/rocketmq/apis/message/Message.java
delete mode 100644 apis/src/main/java/org/apache/rocketmq/apis/message/MessageBuilder.java
delete mode 100644 apis/src/main/java/org/apache/rocketmq/apis/message/MessageId.java
delete mode 100644 apis/src/main/java/org/apache/rocketmq/apis/message/MessageIdVersion.java
delete mode 100644 apis/src/main/java/org/apache/rocketmq/apis/message/MessageView.java
delete mode 100644 apis/src/main/java/org/apache/rocketmq/apis/producer/Producer.java
delete mode 100644 apis/src/main/java/org/apache/rocketmq/apis/producer/ProducerBuilder.java
delete mode 100644 apis/src/main/java/org/apache/rocketmq/apis/producer/SendReceipt.java
delete mode 100644 apis/src/main/java/org/apache/rocketmq/apis/producer/Transaction.java
delete mode 100644 apis/src/main/java/org/apache/rocketmq/apis/producer/TransactionChecker.java
delete mode 100644 apis/src/main/java/org/apache/rocketmq/apis/producer/TransactionResolution.java
delete mode 100644 apis/src/main/java/org/apache/rocketmq/apis/retry/BackOffRetryPolicyBuilder.java
delete mode 100644 apis/src/main/java/org/apache/rocketmq/apis/retry/BackoffRetryPolicy.java
delete mode 100644 apis/src/main/java/org/apache/rocketmq/apis/retry/RetryPolicy.java
copy common/src/main/java/org/apache/rocketmq/common/{protocol/header/namesrv/GetKVConfigResponseHeader.java => attribute/TopicMessageType.java} (64%)
create mode 100644 common/src/main/java/org/apache/rocketmq/common/subscription/CustomizedRetryPolicy.java
create mode 100644 common/src/main/java/org/apache/rocketmq/common/subscription/ExponentialRetryPolicy.java
create mode 100644 common/src/main/java/org/apache/rocketmq/common/subscription/GroupRetryPolicy.java
copy client/src/main/java/org/apache/rocketmq/client/admin/MQAdminExtInner.java => common/src/main/java/org/apache/rocketmq/common/subscription/GroupRetryPolicyType.java (81%)
rename apis/src/main/java/org/apache/rocketmq/apis/SessionCredentialsProvider.java => common/src/main/java/org/apache/rocketmq/common/subscription/RetryPolicy.java (72%)
create mode 100644 common/src/test/java/org/apache/rocketmq/common/TopicConfigTest.java
copy common/src/test/java/org/apache/rocketmq/common/{MQVersionTest.java => subscription/CustomizedRetryPolicyTest.java} (50%)
create mode 100644 common/src/test/java/org/apache/rocketmq/common/subscription/ExponentialRetryPolicyTest.java
create mode 100644 common/src/test/java/org/apache/rocketmq/common/subscription/GroupRetryPolicyTest.java
delete mode 100644 store/src/main/java/org/apache/rocketmq/store/CleanFilesHook.java