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 5e33f31377f3d6b5c9a51c7359024b855bdb7ff3 Merge: 34b085d 092a639 Author: huzongtang <[email protected]> AuthorDate: Fri Aug 9 22:20:26 2019 +0800 Merge branch 'master' of https://github.com/apache/rocketmq .travis.yml | 2 + CONTRIBUTING.md | 5 +- README.md | 20 ++ acl/pom.xml | 2 +- .../org/apache/rocketmq/acl/common/AclUtils.java | 41 +++- .../rocketmq/acl/plain/PlainAccessValidator.java | 9 +- .../apache/rocketmq/acl/common/AclUtilsTest.java | 31 ++- .../acl/plain/PlainAccessValidatorTest.java | 15 +- .../test/resources/conf/plain_acl_format_error.yml | 13 +- .../test/resources/conf/plain_acl_incomplete.yml | 9 +- broker/pom.xml | 2 +- .../broker/mqtrace/ConsumeMessageContext.java | 9 + .../broker/mqtrace/SendMessageContext.java | 11 +- .../processor/AbstractSendMessageProcessor.java | 21 +- .../broker/processor/SendMessageProcessor.java | 11 +- client/pom.xml | 2 +- .../TraceConstants.java => AccessChannel.java} | 20 +- .../org/apache/rocketmq/client/ClientConfig.java | 82 +++++++- .../client/consumer/DefaultMQPullConsumer.java | 151 ++++++++++---- .../client/consumer/DefaultMQPushConsumer.java | 224 +++++++++++++++----- .../client/hook/ConsumeMessageContext.java | 9 + .../rocketmq/client/hook/SendMessageContext.java | 9 + .../client/impl/ClientRemotingProcessor.java | 11 +- .../apache/rocketmq/client/impl/MQAdminImpl.java | 21 +- .../rocketmq/client/impl/MQClientAPIImpl.java | 15 +- .../ConsumeMessageConcurrentlyService.java | 20 +- .../consumer/ConsumeMessageOrderlyService.java | 15 ++ .../impl/consumer/DefaultMQPullConsumerImpl.java | 45 +++- .../impl/consumer/DefaultMQPushConsumerImpl.java | 31 ++- .../client/impl/factory/MQClientInstance.java | 27 +++ .../impl/producer/DefaultMQProducerImpl.java | 36 +++- .../client/producer/DefaultMQProducer.java | 183 ++++++++++++---- .../client/producer/TransactionMQProducer.java | 14 +- .../client/trace/AsyncTraceDispatcher.java | 99 +++++---- .../rocketmq/client/trace/TraceConstants.java | 3 + .../rocketmq/client/trace/TraceDispatcher.java | 3 +- .../trace/hook/ConsumeMessageTraceHookImpl.java | 7 +- .../trace/hook/SendMessageTraceHookImpl.java | 9 +- common/pom.xml | 6 +- .../java/org/apache/rocketmq/common/MQVersion.java | 2 +- .../java/org/apache/rocketmq/common/MixAll.java | 1 + .../apache/rocketmq/common/message/Message.java | 4 + .../rocketmq/common/message/MessageConst.java | 2 + .../rocketmq/common/protocol/NamespaceUtil.java | 172 +++++++++++++++ .../common/utils/NameServerAddressUtils.java | 40 ++++ .../apache/rocketmq/common/ConfigManagerTest.java | 103 +++++++++ .../rocketmq/common/CountDownLatch2Test.java | 123 +++++++++++ .../apache/rocketmq/common/ServiceThreadTest.java | 138 +++++++++++++ .../common/protocol/NamespaceUtilTest.java | 91 ++++++++ .../protocol/QueryConsumeTimeSpanBodyTest.java | 114 ++++++++++ .../common/protocol/body/BrokerStatsDataTest.java | 71 +++++++ .../body/ConsumeMessageDirectlyResultTest.java | 52 +++++ .../body/QueryConsumeQueueResponseBodyTest.java | 70 +++++++ .../protocol/heartbeat/SubscriptionDataTest.java | 85 ++++++++ .../common/protocol/route/TopicRouteDataTest.java | 111 ++++++++++ .../protocol/topic/OffsetMovedEventTest.java | 68 ++++++ .../rocketmq/common/utils/IOTinyUtilsTest.java | 163 +++++++++++++++ distribution/conf/plain_acl.yml | 2 + distribution/conf/tools.yml | 2 +- distribution/pom.xml | 6 +- distribution/release-client.xml | 17 +- distribution/release.xml | 2 +- docs/cn/acl/user_guide.md | 10 +- docs/cn/features.md | 2 +- docs/en/Concept.md | 2 +- docs/en/Deployment.md | 8 +- docs/en/Feature.md | 32 +-- example/pom.xml | 6 +- .../example/namespace/ProducerWithNamespace.java | 39 ++++ .../namespace/PullConsumerWithNamespace.java | 88 ++++++++ .../namespace/PushConsumerWithNamespace.java | 37 ++++ 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 +- srvutil/pom.xml | 2 +- store/pom.xml | 2 +- .../apache/rocketmq/store/DefaultMessageStore.java | 12 +- test/pom.xml | 2 +- tools/pom.xml | 2 +- .../rocketmq/tools/command/MQAdminStartup.java | 32 +-- .../broker/BrokerConsumeStatsSubCommad.java | 23 ++- .../message/QueryMsgByUniqueKeySubCommand.java | 23 ++- .../broker/BrokerConsumeStatsSubCommadTest.java | 12 +- .../message/QueryMsgByUniqueKeySubCommandTest.java | 230 +++++++++++++++++++++ 88 files changed, 2919 insertions(+), 343 deletions(-)
