This is an automated email from the ASF dual-hosted git repository.
huzongtang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
commit fb8bc64e2a2551e76da24cb6af0fb3e5f986f8b3
Merge: a20f31b a7e71cb
Author: zongtanghu <zongtan...@gmail.com>
AuthorDate: Mon Aug 23 12:35:55 2021 +0800
Merge branch 'develop'
.travis.yml | 4 +-
acl/pom.xml | 2 +-
.../rocketmq/acl/plain/PlainPermissionManager.java | 30 +-
.../acl/plain/PlainAccessValidatorTest.java | 10 +
broker/pom.xml | 2 +-
.../broker/pagecache/ManyMessageTransfer.java | 27 +
.../broker/pagecache/OneMessageTransfer.java | 27 +
.../broker/pagecache/QueryMessageTransfer.java | 27 +
.../broker/plugin/AbstractPluginMessageStore.java | 4 +-
.../processor/AbstractSendMessageProcessor.java | 80 +-
.../broker/processor/AdminBrokerProcessor.java | 14 +-
.../broker/processor/SendMessageProcessor.java | 22 +-
.../AbstractSendMessageProcessorTest.java | 82 ++
client/pom.xml | 2 +-
.../org/apache/rocketmq/client/ClientConfig.java | 2 +-
.../client/consumer/DefaultMQPushConsumer.java | 8 +-
.../ConsumeMessageConcurrentlyService.java | 28 +-
.../consumer/ConsumeMessageOrderlyService.java | 4 +-
.../impl/consumer/DefaultLitePullConsumerImpl.java | 38 +-
.../impl/consumer/DefaultMQPushConsumerImpl.java | 2 +-
.../client/impl/consumer/RebalanceImpl.java | 2 +-
.../impl/consumer/RebalanceLitePullImpl.java | 3 +-
.../client/impl/factory/MQClientInstance.java | 30 +-
.../impl/producer/DefaultMQProducerImpl.java | 40 +-
.../client/producer/RequestFutureTable.java | 7 +
.../client/trace/AsyncTraceDispatcher.java | 74 +-
.../rocketmq/client/trace/TraceDataEncoder.java | 4 +-
.../client/trace/TraceDataEncoderTest.java | 104 ++-
common/pom.xml | 2 +-
.../org/apache/rocketmq/common/BrokerConfig.java | 8 +-
.../java/org/apache/rocketmq/common/MQVersion.java | 2 +-
.../rocketmq/common/message/MessageDecoder.java | 41 +-
.../common/utils/NameServerAddressUtils.java | 1 +
.../common/message/MessageDecoderTest.java | 108 +++
distribution/benchmark/batchproducer.sh | 18 +
distribution/bin/runbroker.cmd | 2 +-
distribution/bin/runbroker.sh | 2 +-
distribution/bin/runserver.cmd | 2 +-
distribution/bin/runserver.sh | 6 +-
distribution/pom.xml | 2 +-
distribution/release.xml | 4 +
docs/cn/Configuration_System.md | 70 ++
docs/cn/Deployment.md | 159 ++++
docs/cn/Example_Batch.md | 82 ++
docs/cn/Example_Delay.md | 85 +++
docs/cn/Example_Simple_cn.md | 136 ++++
docs/cn/FAQ.md | 110 +++
docs/cn/best_practice.md | 2 +-
docs/cn/design.md | 4 +-
docs/cn/image/rocketmq_architecture_1.png | Bin 89290 -> 62810 bytes
docs/cn/image/rocketmq_architecture_3.png | Bin 106758 -> 74884 bytes
docs/cn/msg_trace/user_guide.md | 19 +-
docs/en/Example_Transaction.md | 2 +-
docs/en/best_practice.md | 2 +-
.../client/java/API_Reference_DefaultMQProducer.md | 71 ++
docs/en/image/rocketmq_architecture_1.png | Bin 89290 -> 62810 bytes
docs/en/image/rocketmq_architecture_3.png | Bin 106758 -> 74884 bytes
docs/en/msg_trace/user_guide.md | 16 +
example/pom.xml | 2 +-
.../rocketmq/example/benchmark/BatchProducer.java | 411 ++++++++++
.../rocketmq/example/benchmark/Consumer.java | 3 +-
.../rocketmq/example/benchmark/Producer.java | 17 +-
.../example/benchmark/TransactionProducer.java | 14 +-
.../rocketmq/example/quickstart/Producer.java | 33 +
filter/pom.xml | 2 +-
logappender/pom.xml | 2 +-
logging/pom.xml | 2 +-
namesrv/pom.xml | 2 +-
openmessaging/pom.xml | 2 +-
pom.xml | 4 +-
remoting/pom.xml | 2 +-
.../rocketmq/remoting/netty/NettyClientConfig.java | 8 +-
.../rocketmq/remoting/netty/NettyLogger.java | 46 ++
.../remoting/netty/NettyRemotingAbstract.java | 2 +-
.../rocketmq/remoting/netty/NettySystemConfig.java | 16 +
.../remoting/netty/NettyClientConfigTest.java | 64 ++
srvutil/pom.xml | 2 +-
store/pom.xml | 2 +-
.../rocketmq/store/AppendMessageCallback.java | 5 +-
.../apache/rocketmq/store/AppendMessageResult.java | 17 +
.../java/org/apache/rocketmq/store/CommitLog.java | 827 ++++++++-------------
.../apache/rocketmq/store/DefaultMessageStore.java | 59 +-
.../java/org/apache/rocketmq/store/MappedFile.java | 26 +-
.../rocketmq/store/MessageExtBrokerInner.java | 12 +
.../org/apache/rocketmq/store/MessageStore.java | 4 +-
.../rocketmq/store/SelectMappedBufferResult.java | 7 -
.../apache/rocketmq/store/StoreStatsService.java | 7 +-
.../rocketmq/store/config/MessageStoreConfig.java | 7 +-
.../rocketmq/store/dledger/DLedgerCommitLog.java | 242 +-----
.../org/apache/rocketmq/store/ha/HAService.java | 63 +-
.../apache/rocketmq/store/ha/WaitNotifyObject.java | 64 +-
.../apache/rocketmq/store/AppendCallbackTest.java | 28 +-
.../apache/rocketmq/store/BatchPutMessageTest.java | 18 +-
test/pom.xml | 2 +-
tools/pom.xml | 2 +-
.../command/acl/DeleteAccessConfigSubCommand.java | 8 +-
.../command/acl/UpdateAccessConfigSubCommand.java | 8 +-
.../tools/command/message/SendMessageCommand.java | 17 +-
98 files changed, 2574 insertions(+), 1120 deletions(-)
