This is an automated email from the ASF dual-hosted git repository. maixiaohai pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/rocketmq.git
commit efbf249ef8ca191f9b512b9f0cc0f2840768bdd6 Merge: 695021f 39bb938 Author: zhangxu16 <[email protected]> AuthorDate: Tue Dec 22 05:00:08 2020 +0800 Merge branch 'master' of github.com:apache/rocketmq .github/PULL_REQUEST_TEMPLATE.md | 3 + README.md | 4 +- acl/pom.xml | 11 +- .../org/apache/rocketmq/acl/common/AclUtils.java | 4 +- .../org/apache/rocketmq/acl/common/Permission.java | 1 - .../rocketmq/acl/plain/PlainPermissionManager.java | 13 +- .../acl/plain/RemoteAddressStrategyFactory.java | 14 +- .../apache/rocketmq/acl/common/AclUtilsTest.java | 18 +- .../acl/plain/RemoteAddressStrategyTest.java | 10 + broker/pom.xml | 6 +- .../rocketmq/broker/client/ProducerManager.java | 12 +- .../apache/rocketmq/broker/out/BrokerOuterAPI.java | 15 +- .../broker/processor/ReplyMessageProcessor.java | 17 +- .../broker/processor/SendMessageProcessor.java | 3 +- .../AbstractTransactionalMessageCheckListener.java | 2 +- .../broker/client/ProducerManagerTest.java | 8 +- client/pom.xml | 7 +- .../rocketmq/client/common/ThreadLocalIndex.java | 5 - .../client/consumer/DefaultLitePullConsumer.java | 21 + .../rocketmq/client/consumer/LitePullConsumer.java | 7 + .../AllocateMessageQueueByMachineRoom.java | 2 +- .../client/exception/MQBrokerException.java | 16 +- .../rocketmq/client/impl/MQClientAPIImpl.java | 74 +-- .../consumer/ConsumeMessageOrderlyService.java | 4 +- .../impl/consumer/DefaultLitePullConsumerImpl.java | 4 + .../impl/consumer/DefaultMQPushConsumerImpl.java | 6 - .../client/impl/consumer/ProcessQueue.java | 2 +- .../client/impl/consumer/PullAPIWrapper.java | 4 +- .../client/impl/factory/MQClientInstance.java | 18 +- .../impl/producer/DefaultMQProducerImpl.java | 2 +- .../client/impl/producer/TopicPublishInfo.java | 4 +- .../rocketmq/client/latency/MQFaultStrategy.java | 6 +- .../client/producer/DefaultMQProducer.java | 23 + .../rocketmq/client/producer/MQProducer.java | 14 +- .../selector/SelectMessageQueueByHash.java | 4 +- .../rocketmq/client/trace/TraceDataEncoder.java | 25 +- .../apache/rocketmq/client/trace/TraceView.java | 180 ++++++ .../trace/hook/ConsumeMessageTraceHookImpl.java | 2 + .../trace/hook/SendMessageTraceHookImpl.java | 1 + .../client/common/ThreadLocalIndexTest.java | 7 + .../consumer/DefaultLitePullConsumerTest.java | 33 +- .../store/RemoteBrokerOffsetStoreTest.java | 2 +- .../client/impl/factory/MQClientInstanceTest.java | 68 +++ .../client/producer/DefaultMQProducerTest.java | 45 ++ .../selector/SelectMessageQueueByHashTest.java | 8 + .../selector/SelectMessageQueueRetryTest.java | 66 +++ .../client/trace/TraceDataEncoderTest.java | 93 +++ .../rocketmq/client/trace/TraceViewTest.java | 57 ++ common/pom.xml | 7 +- .../java/org/apache/rocketmq/common/MQVersion.java | 2 +- .../java/org/apache/rocketmq/common/UtilAll.java | 41 +- .../rocketmq/common/message/MessageDecoder.java | 1 + .../common/message/MessageClientIDSetterTest.java | 6 +- distribution/benchmark/runclass.sh | 2 +- distribution/benchmark/shutdown.sh | 63 ++ distribution/benchmark/tproducer.sh | 2 +- distribution/bin/runserver.sh | 19 +- distribution/pom.xml | 2 +- docs/cn/RocketMQ_Example.md | 46 +- docs/cn/architecture.md | 10 +- docs/cn/best_practice.md | 4 +- docs/cn/msg_trace/user_guide.md | 2 +- docs/en/Example_Filter.md | 2 +- example/pom.xml | 26 +- .../rocketmq/example/benchmark/AclClient.java | 23 +- .../rocketmq/example/benchmark/Consumer.java | 30 +- .../rocketmq/example/benchmark/Producer.java | 31 +- .../example/benchmark/TransactionProducer.java | 13 +- filter/pom.xml | 2 +- logappender/pom.xml | 7 +- logging/pom.xml | 7 +- .../rocketmq/logging/inner/LoggingBuilder.java | 2 +- namesrv/pom.xml | 10 +- openmessaging/pom.xml | 6 +- pom.xml | 39 +- remoting/pom.xml | 7 +- srvutil/pom.xml | 2 +- store/pom.xml | 9 +- .../java/org/apache/rocketmq/store/CommitLog.java | 50 +- .../apache/rocketmq/store/DefaultMessageStore.java | 21 +- .../java/org/apache/rocketmq/store/MappedFile.java | 2 +- .../rocketmq/store/config/MessageStoreConfig.java | 20 + .../rocketmq/store/dledger/DLedgerCommitLog.java | 651 ++++++++++++++++++--- .../apache/rocketmq/store/BatchPutMessageTest.java | 10 +- .../org/apache/rocketmq/store/StoreTestBase.java | 68 ++- .../store/dledger/DLedgerCommitlogTest.java | 160 ++++- .../store/dledger/MessageStoreTestBase.java | 4 +- test/pom.xml | 3 +- tools/pom.xml | 6 +- .../rocketmq/tools/command/MQAdminStartup.java | 2 + .../command/broker/GetBrokerConfigCommand.java | 4 +- .../message/QueryMsgTraceByIdSubCommand.java | 148 +++++ .../message/QueryMsgTraceByIdSubCommandTest.java | 84 +++ 93 files changed, 2145 insertions(+), 462 deletions(-)
