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 f400b2b2bf453b00d32b4835d926a14b5a99e1d2 Merge: bd5a3a2 21faa68 Author: zhangxu16 <[email protected]> AuthorDate: Wed Oct 27 05:00:11 2021 +0800 Merge branch 'master' of github.com:apache/rocketmq .travis.yml | 1 + README.md | 2 +- acl/pom.xml | 2 +- .../org/apache/rocketmq/acl/common/AclUtils.java | 68 ++--- .../rocketmq/acl/plain/PlainPermissionManager.java | 23 +- .../acl/plain/RemoteAddressStrategyFactory.java | 2 +- .../apache/rocketmq/acl/common/AclUtilsTest.java | 1 + .../acl/plain/PlainAccessValidatorTest.java | 43 +++- broker/pom.xml | 2 +- .../processor/AbstractSendMessageProcessor.java | 6 +- .../broker/processor/AdminBrokerProcessor.java | 6 +- .../broker/processor/ReplyMessageProcessor.java | 4 +- .../broker/processor/SendMessageProcessor.java | 41 ++- .../AbstractTransactionalMessageCheckListener.java | 2 - .../DefaultTransactionalMessageCheckListener.java | 4 +- client/pom.xml | 6 +- .../org/apache/rocketmq/client/ClientConfig.java | 11 +- .../client/consumer/DefaultLitePullConsumer.java | 4 +- .../client/consumer/DefaultMQPushConsumer.java | 10 +- .../rocketmq/client/consumer/MessageSelector.java | 2 +- .../rocketmq/client/impl/MQClientAPIImpl.java | 28 +- .../impl/consumer/DefaultLitePullConsumerImpl.java | 28 +- .../client/impl/factory/MQClientInstance.java | 12 +- .../impl/producer/DefaultMQProducerImpl.java | 21 +- .../client/producer/DefaultMQProducer.java | 54 ++-- .../rocketmq/client/trace/TraceDataEncoder.java | 5 +- .../apache/rocketmq/client/trace/TraceView.java | 4 +- .../rocketmq/client/impl/MQClientAPIImplTest.java | 28 +- .../ConsumeMessageConcurrentlyServiceTest.java | 2 +- .../trace/DefaultMQConsumerWithTraceTest.java | 9 + .../DefaultMQLitePullConsumerWithTraceTest.java | 12 +- .../trace/DefaultMQProducerWithTraceTest.java | 10 + .../client/trace/TraceDataEncoderTest.java | 4 +- .../rocketmq/client/trace/TraceViewTest.java | 4 +- common/pom.xml | 2 +- .../java/org/apache/rocketmq/common/MQVersion.java | 2 +- .../java/org/apache/rocketmq/common/MixAll.java | 1 + .../java/org/apache/rocketmq/common/UtilAll.java | 44 ++-- .../apache/rocketmq/common/message/Message.java | 11 +- .../rocketmq/common/protocol/NamespaceUtil.java | 2 +- .../rocketmq/common/protocol/RequestCode.java | 2 + .../AddWritePermOfBrokerRequestHeader.java} | 28 +- .../AddWritePermOfBrokerResponseHeader.java} | 27 +- .../apache/rocketmq/common/stats/StatsItem.java | 23 +- .../apache/rocketmq/common/stats/StatsItemSet.java | 8 +- .../apache/rocketmq/common/RemotingUtilTest.java | 12 + .../org/apache/rocketmq/common/UtilAllTest.java | 13 + .../rocketmq/common/stats/StatsItemSetTest.java | 4 +- .../rocketmq/common/utils/IOTinyUtilsTest.java | 4 +- distribution/bin/export.sh | 89 +++++++ distribution/pom.xml | 2 +- docs/cn/RocketMQ_Example.md | 10 +- docs/cn/operation.md | 10 +- docs/en/CLITools.md | 8 + docs/en/Example_Batch.md | 4 +- docs/en/operation.md | 2 +- example/pom.xml | 2 +- .../rocketmq/example/benchmark/BatchProducer.java | 106 ++++---- .../rocketmq/example/benchmark/Consumer.java | 63 ++--- .../rocketmq/example/benchmark/Producer.java | 140 +++++----- .../example/benchmark/TransactionProducer.java | 103 ++++---- .../rocketmq/example/simple/PullConsumer.java | 150 ++++++++--- filter/pom.xml | 2 +- .../filter/expression/UnaryExpression.java | 16 +- .../rocketmq/filter/parser/ParseException.java | 7 +- .../rocketmq/filter/parser/TokenMgrError.java | 3 +- .../org/apache/rocketmq/filter/ParserTest.java | 2 +- logappender/pom.xml | 2 +- logging/pom.xml | 2 +- namesrv/pom.xml | 2 +- .../namesrv/processor/DefaultRequestProcessor.java | 22 ++ .../namesrv/routeinfo/RouteInfoManager.java | 39 ++- .../namesrv/routeinfo/RouteInfoManagerTest.java | 52 +++- openmessaging/pom.xml | 2 +- pom.xml | 2 +- remoting/pom.xml | 2 +- .../rocketmq/remoting/common/RemotingHelper.java | 2 +- .../rocketmq/remoting/common/RemotingUtil.java | 4 + .../remoting/netty/NettyRemotingAbstract.java | 5 +- srvutil/pom.xml | 2 +- store/pom.xml | 2 +- .../java/org/apache/rocketmq/store/CommitLog.java | 34 ++- .../apache/rocketmq/store/DefaultMessageStore.java | 115 +++++++-- .../apache/rocketmq/store/GetMessageResult.java | 13 +- .../org/apache/rocketmq/store/MappedFileQueue.java | 108 ++++---- .../rocketmq/store/MultiPathMappedFileQueue.java | 127 ++++++++++ .../apache/rocketmq/store/StoreStatsService.java | 106 ++++---- .../rocketmq/store/config/MessageStoreConfig.java | 13 + .../rocketmq/store/dledger/DLedgerCommitLog.java | 8 +- .../store/schedule/ScheduleMessageService.java | 69 ++++- .../apache/rocketmq/store/stats/BrokerStats.java | 4 +- .../rocketmq/store/stats/BrokerStatsManager.java | 50 +++- .../store/DefaultMessageStoreCleanFilesTest.java | 42 +++ .../rocketmq/store/DefaultMessageStoreTest.java | 16 ++ .../store/MultiPathMappedFileQueueTest.java | 154 +++++++++++ .../rocketmq/store/ScheduleMessageServiceTest.java | 84 ++++++ .../rocketmq/store/StoreStatsServiceTest.java | 18 +- .../store/schedule/ScheduleMessageServiceTest.java | 6 +- .../test/java/stats/BrokerStatsManagerTest.java | 47 ++++ test/pom.xml | 2 +- tools/pom.xml | 2 +- .../rocketmq/tools/admin/DefaultMQAdminExt.java | 28 +- .../tools/admin/DefaultMQAdminExtImpl.java | 76 +++++- .../apache/rocketmq/tools/admin/MQAdminExt.java | 17 +- .../apache/rocketmq/tools/command/CommandUtil.java | 1 - .../rocketmq/tools/command/MQAdminStartup.java | 11 + .../command/acl/DeleteAccessConfigSubCommand.java | 6 +- .../acl/UpdateGlobalWhiteAddrSubCommand.java | 6 +- .../consumer/GetConsumerConfigSubCommand.java | 146 +++++++++++ .../tools/command/export/ExportConfigsCommand.java | 128 ++++++++++ .../command/export/ExportMetadataCommand.java | 184 ++++++++++++++ .../tools/command/export/ExportMetricsCommand.java | 282 +++++++++++++++++++++ .../message/QueryMsgByUniqueKeySubCommand.java | 5 +- ...SubCommand.java => AddWritePermSubCommand.java} | 29 +-- .../command/namesrv/WipeWritePermSubCommand.java | 2 +- .../tools/admin/DefaultMQAdminExtTest.java | 23 ++ .../consumer/GetConsumerConfigSubCommandTest.java | 83 ++++++ .../namesrv/AddWritePermSubCommandTest.java | 22 +- 118 files changed, 2847 insertions(+), 723 deletions(-)
