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 695021f5e517a40f05e8248cfa7aca9805516a75 Merge: e923a35 9f95a97 Author: zhangxu16 <[email protected]> AuthorDate: Wed Dec 16 11:16:59 2020 +0800 update version to 4.7.1 .travis.yml | 1 + README.md | 1 + acl/pom.xml | 2 +- broker/pom.xml | 2 +- .../apache/rocketmq/broker/BrokerController.java | 5 +- .../rocketmq/broker/client/net/Broker2Client.java | 17 +- .../broker/filter/ConsumerFilterManager.java | 2 +- .../processor/AbstractSendMessageProcessor.java | 5 +- .../broker/processor/AdminBrokerProcessor.java | 72 ++- .../broker/processor/PullMessageProcessor.java | 3 +- .../broker/processor/SendMessageProcessor.java | 6 +- .../rocketmq/broker/topic/TopicConfigManager.java | 59 +- .../rocketmq/broker/topic/TopicValidator.java | 69 -- .../queue/TransactionalMessageServiceImpl.java | 4 +- .../queue/TransactionalMessageUtil.java | 5 +- .../broker/processor/AdminBrokerProcessorTest.java | 96 ++- .../processor/ReplyMessageProcessorTest.java | 5 +- .../broker/processor/SendMessageProcessorTest.java | 4 +- ...faultTransactionalMessageCheckListenerTest.java | 4 +- .../queue/TransactionalMessageBridgeTest.java | 4 +- .../queue/TransactionalMessageServiceImplTest.java | 18 +- client/pom.xml | 2 +- .../org/apache/rocketmq/client/Validators.java | 17 +- .../client/consumer/DefaultLitePullConsumer.java | 6 +- .../client/consumer/DefaultMQPushConsumer.java | 15 +- .../consumer/listener/MessageListenerOrderly.java | 3 +- .../apache/rocketmq/client/impl/MQAdminImpl.java | 1 + .../rocketmq/client/impl/MQClientAPIImpl.java | 110 ++-- .../ConsumeMessageConcurrentlyService.java | 5 +- .../consumer/ConsumeMessageOrderlyService.java | 7 +- .../impl/consumer/ConsumeMessageService.java | 2 +- .../impl/consumer/DefaultLitePullConsumerImpl.java | 4 +- .../impl/consumer/DefaultMQPushConsumerImpl.java | 10 +- .../client/impl/consumer/ProcessQueue.java | 2 +- .../client/impl/factory/MQClientInstance.java | 8 +- .../impl/producer/DefaultMQProducerImpl.java | 69 +- .../client/producer/DefaultMQProducer.java | 3 +- .../client/producer/RequestResponseFuture.java | 4 +- .../rocketmq/client/stat/ConsumerStatsManager.java | 4 +- .../client/trace/AsyncTraceDispatcher.java | 4 +- .../rocketmq/client/trace/TraceConstants.java | 4 +- .../org/apache/rocketmq/client/ValidatorsTest.java | 40 +- .../consumer/DefaultLitePullConsumerTest.java | 49 ++ .../client/consumer/DefaultMQPushConsumerTest.java | 29 + .../client/impl/consumer/ProcessQueueTest.java | 10 +- .../client/producer/DefaultMQProducerTest.java | 2 +- .../client/producer/RequestResponseFutureTest.java | 2 +- .../trace/DefaultMQConsumerWithTraceTest.java | 3 +- .../trace/DefaultMQProducerWithTraceTest.java | 4 +- common/pom.xml | 2 +- .../org/apache/rocketmq/common/BrokerConfig.java | 13 +- .../java/org/apache/rocketmq/common/MQVersion.java | 2 +- .../java/org/apache/rocketmq/common/MixAll.java | 13 - .../rocketmq/common/message/MessageDecoder.java | 3 + .../apache/rocketmq/common/message/MessageExt.java | 14 +- .../rocketmq/common/protocol/NamespaceUtil.java | 21 +- .../rocketmq/common/protocol/RequestCode.java | 2 +- .../rocketmq/common/stats/MomentStatsItemSet.java | 20 + .../stats/{StatsSnapshot.java => RTStatsItem.java} | 37 +- .../apache/rocketmq/common/stats/StatsItem.java | 33 +- .../apache/rocketmq/common/stats/StatsItemSet.java | 57 +- .../rocketmq/common/stats/StatsSnapshot.java | 10 + .../rocketmq/common/topic/TopicValidator.java | 135 ++++ .../apache/rocketmq/common/BrokerConfigTest.java | 2 + .../common/message/MessageDecoderTest.java | 21 +- .../rocketmq/common/stats/StatsItemSetTest.java | 40 +- .../rocketmq/common}/topic/TopicValidatorTest.java | 83 ++- distribution/bin/mqadmin | 2 +- distribution/bin/runbroker.sh | 2 +- distribution/bin/runserver.sh | 2 +- distribution/bin/tools.sh | 2 +- distribution/pom.xml | 2 +- docs/cn/RocketMQ_Example.md | 94 +-- docs/cn/image/consumer_reply.png | Bin 0 -> 52036 bytes docs/cn/image/producer_send_request.png | Bin 0 -> 87577 bytes docs/cn/operation.md | 6 +- docs/cn/rpc_request.md | 146 +++++ docs/en/CLITools.md | 6 +- docs/en/Example_Batch.md | 59 +- docs/en/Example_Transaction.md | 4 +- docs/en/README.md | 49 ++ docs/en/RocketMQ_Example.md | 15 + docs/en/dledger/deploy_guide.md | 78 +++ docs/en/dledger/quick_start.md | 63 ++ docs/en/msg_trace/user_guide.md | 105 +++ docs/{cn => en}/operation.md | 714 ++++++++++----------- example/pom.xml | 6 +- filter/pom.xml | 2 +- .../expression/BooleanConstantExpression.java | 37 +- .../filter/expression/ComparisonExpression.java | 4 +- .../filter/expression/ConstantExpression.java | 39 +- .../rocketmq/filter/parser/SelectorParser.java | 7 +- logappender/pom.xml | 2 +- logging/pom.xml | 2 +- namesrv/pom.xml | 2 +- .../namesrv/processor/DefaultRequestProcessor.java | 23 +- openmessaging/pom.xml | 2 +- pom.xml | 8 +- remoting/pom.xml | 2 +- .../remoting/netty/NettyRemotingAbstract.java | 1 - .../remoting/netty/NettyRemotingClient.java | 4 + srvutil/pom.xml | 2 +- store/pom.xml | 2 +- .../java/org/apache/rocketmq/store/CommitLog.java | 20 +- .../apache/rocketmq/store/DefaultMessageStore.java | 43 +- .../rocketmq/store/dledger/DLedgerCommitLog.java | 3 +- .../org/apache/rocketmq/store/ha/HAService.java | 7 +- .../apache/rocketmq/store/ha/WaitNotifyObject.java | 7 +- .../org/apache/rocketmq/store/index/IndexFile.java | 4 +- .../store/schedule/ScheduleMessageService.java | 9 +- .../rocketmq/store/stats/BrokerStatsManager.java | 20 + .../store/DefaultMessageStoreCleanFilesTest.java | 108 +++- .../test/java/stats/BrokerStatsManagerTest.java | 141 ++++ test/pom.xml | 2 +- .../test/listener/rmq/order/RMQOrderListener.java | 3 +- tools/pom.xml | 2 +- .../rocketmq/tools/admin/DefaultMQAdminExt.java | 4 +- .../rocketmq/tools/monitor/MonitorService.java | 3 +- 118 files changed, 2171 insertions(+), 1010 deletions(-)
