This is an automated email from the ASF dual-hosted git repository.
pingww pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/rocketmq-mqtt.git
commit 7b556f9c28ddc8b56190e2b5f7ab9220275e9e1b
Merge: be7fc89 736b7b2
Author: pingww <pingw...@gmail.com>
AuthorDate: Mon Nov 13 17:29:43 2023 +0800
Merge pull request #218 from apache/develop
Develop
README.md | 16 +-
distribution/bin/meta.sh | 2 +-
mqtt-common/pom.xml | 4 +
.../rocketmq/mqtt/common/facade/LmqQueueStore.java | 13 ++
.../mqtt/common/facade/RetainedPersistManager.java | 3 +-
.../mqtt/common/facade/WillMsgPersistManager.java | 3 +-
.../Constants.java => facade/WillMsgSender.java} | 13 +-
.../rocketmq/mqtt/common/meta/MetaConstants.java | 62 +++++++
.../apache/rocketmq/mqtt/common/meta/RaftUtil.java | 1 +
.../rocketmq/mqtt/common/model/Constants.java | 3 +
.../rocketmq/mqtt/common/model/PullResult.java | 1 +
.../apache/rocketmq/mqtt/common/model/Queue.java | 4 +
.../rocketmq/mqtt/common/model/Subscription.java | 11 ++
.../rocketmq/mqtt/common/util/TopicUtils.java | 23 +++
mqtt-cs/pom.xml | 4 +
.../mqtt/cs/channel/DefaultChannelManager.java | 87 +---------
.../rocketmq/mqtt/cs/config/WillLoopConf.java | 57 +++++++
.../protocol/mqtt/handler/MqttConnectHandler.java | 6 +-
.../mqtt/handler/MqttSubscribeHandler.java | 5 +-
.../apache/rocketmq/mqtt/cs/session/Session.java | 3 +
.../rocketmq/mqtt/cs/session/infly/PushAction.java | 7 +
.../rocketmq/mqtt/cs/session/loop/QueueCache.java | 9 +-
.../rocketmq/mqtt/cs/session/loop/SessionLoop.java | 2 -
.../mqtt/cs/session/loop/SessionLoopImpl.java | 32 +---
.../rocketmq/mqtt/cs/session/loop/WillLoop.java | 169 ++++++++++++------
.../apache/rocketmq/mqtt/cs/starter/Startup.java | 4 +-
.../rocketmq/mqtt/ds/config/ServiceConf.java | 12 +-
.../rocketmq/mqtt/ds/meta/FirstTopicManager.java | 8 +-
.../mqtt/ds/meta/MetaPersistManagerSample.java | 2 +-
.../rocketmq/mqtt/ds/meta/MetaRpcClient.java | 7 +-
.../rocketmq/mqtt/ds/meta/RetainedMsgClient.java | 70 ++++++--
.../mqtt/ds/meta/RetainedPersistManagerImpl.java | 11 +-
.../rocketmq/mqtt/ds/meta/WillMsgClient.java | 32 ++--
.../mqtt/ds/meta/WillMsgPersistManagerImpl.java | 4 +-
.../rocketmq/mqtt/ds/notify/NotifyManager.java | 2 +
.../mqtt/ds/store/LmqOffsetStoreManager.java | 6 +-
.../mqtt/ds/store/LmqQueueStoreManager.java | 189 ++++++++++++++++++++-
.../ds/upstream/processor/PublishProcessor.java | 21 ++-
.../mqtt/ds/test/meta/TestFirstTopicManager.java | 8 +-
.../test/meta/WillMsgPersistManagerImplTest.java | 2 +-
.../ds/test/store/TestLmqQueueStoreManager.java | 3 +-
mqtt-exporter/pom.xml | 4 +
.../exporter/collector/MqttMetricsCollector.java | 4 +
.../apache/rocketmq/mqtt/meta/config/MetaConf.java | 69 ++++----
.../mqtt/meta/config/MetaConfListener.java | 3 +
.../rocketmq/mqtt/meta/raft/MqttApplyListener.java | 18 +-
.../rocketmq/mqtt/meta/raft/MqttRaftServer.java | 49 +++++-
.../rocketmq/mqtt/meta/raft/MqttStateMachine.java | 85 +++++----
.../meta/raft/processor/HashKvStateProcessor.java | 188 ++++++++++++++++++++
.../raft/processor/RetainedMsgStateProcessor.java | 75 +++++---
.../mqtt/meta/raft/processor/StateProcessor.java | 9 +-
.../meta/raft/processor/WillMsgStateProcessor.java | 52 ++++--
.../mqtt/meta/raft/rpc/AbstractRpcProcessor.java | 2 +-
.../mqtt/meta/raft/rpc/MqttReadRpcProcessor.java | 31 +++-
.../mqtt/meta/raft/rpc/MqttWriteRpcProcessor.java | 2 +
.../starter/{Startup.java => MetaStartup.java} | 10 +-
.../mqtt/meta/raft/RetainedMsgClientTest.java | 8 +-
.../mqtt/meta/raft/WillMsgStateProcessorTest.java | 4 +-
pom.xml | 8 +-
59 files changed, 1137 insertions(+), 405 deletions(-)
