You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by du...@apache.org on 2019/05/07 08:03:22 UTC
[rocketmq] branch mqtt updated (b216965 -> 4f8cd91)
This is an automated email from the ASF dual-hosted git repository.
duhengforever pushed a change to branch mqtt
in repository https://gitbox.apache.org/repos/asf/rocketmq.git.
from b216965 Merge pull request #1116 from Aaron-He/mqtt
new 49769d0 move interface from snode to common
new 5624f1c Merge branch 'qos1' into mqtt
new b0e78bf add MqttRuntimeException.java;change dledger version to 0.2-SNAPSHOT
new 6a12998 add MqttRuntimeException.java;change dledger version to 0.2-SNAPSHOT
new 4547be6 Merge branch 'mqtt' of https://github.com/xiangwangcheng/rocketmq into mqtt
new 4f8cd91 Merge pull request #1197 from xiangwangcheng/mqtt
The 929 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/rocketmq/broker/out/BrokerOuterAPI.java | 2 +-
.../java/org/apache/rocketmq/client/MQAdmin.java | 4 +-
.../org/apache/rocketmq/client/Validators.java | 2 +-
.../client/consumer/DefaultMQPullConsumer.java | 4 +-
.../client/consumer/DefaultMQPushConsumer.java | 4 +-
.../client/consumer/DefaultMQRealPushConsumer.java | 4 +-
.../rocketmq/client/consumer/MQConsumer.java | 4 +-
.../rocketmq/client/consumer/MQPullConsumer.java | 4 +-
.../consumer/MQPullConsumerScheduleService.java | 2 +-
.../rocketmq/client/consumer/MQPushConsumer.java | 2 +-
.../consumer/store/LocalFileOffsetStore.java | 4 +-
.../client/consumer/store/OffsetStore.java | 4 +-
.../consumer/store/RemoteBrokerOffsetStore.java | 4 +-
.../rocketmq/client/hook/CheckForbiddenHook.java | 2 +-
.../apache/rocketmq/client/impl/MQAdminImpl.java | 4 +-
.../rocketmq/client/impl/MQClientAPIImpl.java | 6 +-
.../impl/consumer/DefaultMQPullConsumerImpl.java | 4 +-
.../impl/consumer/DefaultMQPushConsumerImpl.java | 4 +-
.../consumer/DefaultMQRealPushConsumerImpl.java | 4 +-
.../client/impl/consumer/MQPushConsumerInner.java | 4 +-
.../client/impl/consumer/PullAPIWrapper.java | 4 +-
.../client/impl/consumer/RebalancePushImpl.java | 2 +-
.../client/impl/factory/MQClientInstance.java | 4 +-
.../impl/producer/DefaultMQProducerImpl.java | 4 +-
.../client/producer/DefaultMQProducer.java | 4 +-
.../rocketmq/client/producer/MQProducer.java | 4 +-
.../client/producer/TransactionMQProducer.java | 2 +-
.../client/trace/AsyncTraceDispatcher.java | 2 +-
.../rocketmq/client/trace/TraceDispatcher.java | 2 +-
.../org/apache/rocketmq/client/ValidatorsTest.java | 2 +-
.../client/consumer/DefaultMQPushConsumerTest.java | 4 +-
.../store/RemoteBrokerOffsetStoreTest.java | 2 +-
.../rocketmq/client/impl/MQClientAPIImplTest.java | 2 +-
.../consumer/DefaultMQPushConsumerImplTest.java | 2 +-
.../impl/consumer/RebalancePushImplTest.java | 2 +-
.../client/impl/factory/MQClientInstanceTest.java | 2 +-
.../client/producer/DefaultMQProducerTest.java | 4 +-
.../trace/DefaultMQConsumerWithTraceTest.java | 4 +-
.../trace/DefaultMQProducerWithTraceTest.java | 4 +-
common/pom.xml | 15 ++-
.../common}/exception/MQBrokerException.java | 2 +-
.../common}/exception/MQClientException.java | 2 +-
.../common}/exception/MQSnodeException.java | 2 +-
.../rocketmq/common}/service/AdminService.java | 2 +-
.../rocketmq/common}/service/ClientService.java | 2 +-
.../rocketmq/common}/service/EnodeService.java | 4 +-
.../rocketmq/common}/service/MetricsService.java | 2 +-
.../rocketmq/common}/service/NnodeService.java | 4 +-
.../rocketmq/common}/service/PushService.java | 2 +-
.../rocketmq/common}/service/ScheduledService.java | 2 +-
.../rocketmq/example/benchmark/Consumer.java | 2 +-
.../rocketmq/example/benchmark/Producer.java | 4 +-
.../example/benchmark/TransactionProducer.java | 2 +-
.../rocketmq/example/broadcast/PushConsumer.java | 2 +-
.../rocketmq/example/filter/TagFilterConsumer.java | 2 +-
.../rocketmq/example/operation/Consumer.java | 2 +-
.../rocketmq/example/operation/Producer.java | 2 +-
.../rocketmq/example/ordermessage/Consumer.java | 2 +-
.../rocketmq/example/ordermessage/Producer.java | 4 +-
.../rocketmq/example/quickstart/Consumer.java | 2 +-
.../rocketmq/example/quickstart/Producer.java | 2 +-
.../apache/rocketmq/example/simple/AclClient.java | 2 +-
.../rocketmq/example/simple/AsyncProducer.java | 2 +-
.../apache/rocketmq/example/simple/Producer.java | 2 +-
.../rocketmq/example/simple/PullConsumer.java | 2 +-
.../rocketmq/example/simple/PullConsumerTest.java | 2 +-
.../example/simple/PullScheduleService.java | 2 +-
.../rocketmq/example/simple/PushConsumer.java | 2 +-
.../rocketmq/example/simple/TestProducer.java | 2 +-
.../example/tracemessage/TraceProducer.java | 2 +-
.../example/tracemessage/TracePushConsumer.java | 2 +-
.../example/transaction/TransactionProducer.java | 2 +-
.../logappender/common/ProducerInstance.java | 2 +-
.../apache/rocketmq/logappender/log4j2Test.java | 2 +-
...ectException.java => MqttRuntimeException.java} | 4 +-
.../rocketmq/mqtt/mqtthandler/MessageHandler.java | 6 +-
.../impl/MqttPublishMessageHandler.java | 108 ++++++++++++++++++++-
.../processor/DefaultMqttMessageProcessor.java | 47 ++++++++-
.../processor/ClusterTestRequestProcessor.java | 2 +-
.../processor/ClusterTestRequestProcessorTest.java | 2 +-
.../rocketmq/consumer/LocalMessageCache.java | 2 +-
.../rocketmq/consumer/PullConsumerImpl.java | 2 +-
.../rocketmq/consumer/PushConsumerImpl.java | 2 +-
.../rocketmq/producer/AbstractOMSProducer.java | 4 +-
.../rocketmq/producer/ProducerImplTest.java | 4 +-
.../mqtt/dispatcher/EncodeDecodeDispatcher.java | 2 +-
.../org/apache/rocketmq/snode/SnodeController.java | 14 +--
.../snode/processor/SendMessageProcessor.java | 2 +-
.../snode/service/impl/ClientServiceImpl.java | 2 +-
.../snode/service/impl/LocalEnodeServiceImpl.java | 2 +-
.../snode/service/impl/MetricsServiceImpl.java | 2 +-
.../snode/service/impl/NnodeServiceImpl.java | 4 +-
.../snode/service/impl/PushServiceImpl.java | 2 +-
.../snode/service/impl/RemoteEnodeServiceImpl.java | 4 +-
.../snode/service/impl/ScheduledServiceImpl.java | 2 +-
.../snode/processor/SendMessageProcessorTest.java | 4 +-
.../snode/service/NnodeServiceImplTest.java | 1 +
.../snode/service/RemoteEnodeServiceImplTest.java | 2 +
store/pom.xml | 2 +-
.../test/client/rmq/RMQAsyncSendProducer.java | 2 +-
.../test/client/rmq/RMQNormalConsumer.java | 2 +-
.../test/client/rmq/RMQNormalProducer.java | 2 +-
.../rocketmq/test/factory/ProducerFactory.java | 2 +-
.../rocketmq/tools/admin/DefaultMQAdminExt.java | 4 +-
.../tools/admin/DefaultMQAdminExtImpl.java | 4 +-
.../apache/rocketmq/tools/admin/MQAdminExt.java | 4 +-
.../apache/rocketmq/tools/command/CommandUtil.java | 2 +-
.../command/broker/BrokerStatusSubCommand.java | 2 +-
.../command/broker/GetBrokerConfigCommand.java | 2 +-
.../command/cluster/ClusterListSubCommand.java | 2 +-
.../command/message/QueryMsgByIdSubCommand.java | 4 +-
.../command/message/QueryMsgByKeySubCommand.java | 2 +-
.../message/QueryMsgByUniqueKeySubCommand.java | 4 +-
.../command/offset/ResetOffsetByTimeCommand.java | 2 +-
.../offset/ResetOffsetByTimeOldCommand.java | 4 +-
.../tools/command/stats/StatsAllSubCommand.java | 4 +-
.../tools/command/topic/DeleteTopicSubCommand.java | 4 +-
.../tools/command/topic/TopicListSubCommand.java | 2 +-
.../rocketmq/tools/monitor/MonitorService.java | 4 +-
.../tools/admin/DefaultMQAdminExtTest.java | 4 +-
.../rocketmq/tools/command/CommandUtilTest.java | 4 +-
.../broker/BrokerConsumeStatsSubCommadTest.java | 2 +-
.../command/broker/BrokerStatusSubCommandTest.java | 4 +-
.../broker/CleanExpiredCQSubCommandTest.java | 4 +-
.../broker/CleanUnusedTopicCommandTest.java | 4 +-
.../command/broker/GetBrokerConfigCommandTest.java | 4 +-
.../command/broker/SendMsgStatusCommandTest.java | 4 +-
.../broker/UpdateBrokerConfigSubCommandTest.java | 4 +-
.../ConsumerConnectionSubCommandTest.java | 4 +-
.../ProducerConnectionSubCommandTest.java | 4 +-
.../consumer/ConsumerProgressSubCommandTest.java | 4 +-
.../consumer/ConsumerStatusSubCommandTest.java | 4 +-
.../command/message/ConsumeMessageCommandTest.java | 4 +-
.../command/message/SendMessageCommandTest.java | 4 +-
.../namesrv/GetNamesrvConfigCommandTest.java | 4 +-
.../namesrv/WipeWritePermSubCommandTest.java | 4 +-
.../offset/GetConsumerStatusCommandTest.java | 4 +-
.../offset/ResetOffsetByTimeCommandTest.java | 4 +-
.../rocketmq/tools/monitor/MonitorServiceTest.java | 4 +-
139 files changed, 373 insertions(+), 210 deletions(-)
rename {client/src/main/java/org/apache/rocketmq/client => common/src/main/java/org/apache/rocketmq/common}/exception/MQBrokerException.java (97%)
rename {client/src/main/java/org/apache/rocketmq/client => common/src/main/java/org/apache/rocketmq/common}/exception/MQClientException.java (97%)
rename {client/src/main/java/org/apache/rocketmq/client => common/src/main/java/org/apache/rocketmq/common}/exception/MQSnodeException.java (95%)
rename {snode/src/main/java/org/apache/rocketmq/snode => common/src/main/java/org/apache/rocketmq/common}/service/AdminService.java (95%)
rename {snode/src/main/java/org/apache/rocketmq/snode => common/src/main/java/org/apache/rocketmq/common}/service/ClientService.java (95%)
rename {snode/src/main/java/org/apache/rocketmq/snode => common/src/main/java/org/apache/rocketmq/common}/service/EnodeService.java (98%)
rename {snode/src/main/java/org/apache/rocketmq/snode => common/src/main/java/org/apache/rocketmq/common}/service/MetricsService.java (96%)
rename {snode/src/main/java/org/apache/rocketmq/snode => common/src/main/java/org/apache/rocketmq/common}/service/NnodeService.java (95%)
rename {snode/src/main/java/org/apache/rocketmq/snode => common/src/main/java/org/apache/rocketmq/common}/service/PushService.java (97%)
rename {snode/src/main/java/org/apache/rocketmq/snode => common/src/main/java/org/apache/rocketmq/common}/service/ScheduledService.java (95%)
copy mqtt/src/main/java/org/apache/rocketmq/mqtt/exception/{MqttConnectException.java => MqttRuntimeException.java} (88%)