You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by pi...@apache.org on 2023/02/01 02:35:04 UTC
[rocketmq-mqtt] branch develop updated (f7cad0e -> e31fbf1)
This is an automated email from the ASF dual-hosted git repository.
pingww pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq-mqtt.git
from f7cad0e Merge pull request #175 from YYYYWD/develop
new 2b9a3e0 vuln-fix: Temporary File Information Disclosure
new 3d869af Merge pull request #169 from BulkSecurityGeneratorProjectV2/fix/JLL/temporary_file_local_information_disclosure
new 3c93fcb clean offset
new eadd10c Merge pull request #176 from pingww/main
new d348e95 Merge branch 'main' into develop
new b5b89a4 fix
new fbefc84 fix
new 6d0ce6d will, retain
new d8fbb31 will, retain
new edbfa39 Refactor：will, retain
new e31fbf1 Merge pull request #177 from pingww/develop
The 273 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:
distribution/release.xml | 1 +
.../rocketmq/mqtt/common/meta}/Constants.java | 7 +-
.../apache/rocketmq/mqtt/common/meta}/IpUtil.java | 8 +-
.../apache/rocketmq/mqtt/common/meta/RaftUtil.java | 50 ++++
mqtt-common/src/main/proto/request.proto | 2 +
.../mqtt/cs/channel/DefaultChannelManager.java | 2 +-
.../mqtt/cs/session/loop/SessionLoopImpl.java | 11 +-
mqtt-ds/pom.xml | 4 +-
.../rocketmq/mqtt/ds/config/ServiceConf.java | 1 +
.../rocketmq/mqtt/ds/meta/MetaRpcClient.java | 78 ++++---
.../rocketmq/mqtt/ds/meta/RetainedMsgClient.java | 109 ++++-----
.../mqtt/ds/meta/RetainedPersistManagerImpl.java | 10 +-
.../rocketmq/mqtt/ds/meta/WillMsgClient.java | 58 ++---
.../test/meta/WillMsgPersistManagerImplTest.java | 10 +-
.../apache/rocketmq/mqtt/example/MqttConsumer.java | 11 +-
.../apache/rocketmq/mqtt/example/MqttProducer.java | 9 +-
...llConsumer.java => MqttWillRetainConsumer.java} | 20 +-
...llProducer.java => MqttWillRetainProducer.java} | 26 ++-
.../mqtt/exporter/http/BackedFileOutputStream.java | 5 +-
mqtt-meta/pom.xml | 4 +
.../apache/rocketmq/mqtt/meta/config/MetaConf.java | 18 +-
.../rocketmq/mqtt/meta/raft/MqttRaftServer.java | 202 ++++++----------
.../rocketmq/mqtt/meta/raft/MqttStateMachine.java | 68 ++----
.../rocketmq/mqtt/meta/raft/RaftGroupHolder.java | 60 -----
.../meta/raft/processor/CounterStateProcessor.java | 96 --------
.../raft/processor/RetainedMsgStateProcessor.java | 128 +++++------
.../mqtt/meta/raft/processor/StateProcessor.java | 83 +++++--
.../meta/raft/processor/WillMsgStateProcessor.java | 256 +++------------------
.../mqtt/meta/raft/rpc/AbstractRpcProcessor.java | 32 +--
.../mqtt/meta/raft/rpc/MqttReadRpcProcessor.java | 2 +-
.../raft/snapshot/AbstractSnapshotOperation.java | 78 -------
.../mqtt/meta/raft/snapshot/SnapshotOperation.java | 42 ----
.../snapshot/impl/CounterSnapshotOperation.java | 80 -------
.../rocketmq/mqtt/meta/rocksdb/RocksDBEngine.java | 124 ++++++++++
.../mqtt/meta/rocksdb/RocksDBSnapshot.java | 160 +++++++++++++
.../rocketmq/mqtt/meta/util/RaftExecutor.java | 4 +-
.../rocketmq/mqtt/meta/raft/CounterClient.java | 134 -----------
.../mqtt/meta/raft/RetainedMsgClientTest.java | 4 +-
.../mqtt/meta/raft/WillMsgStateProcessorTest.java | 65 ++++--
.../apache/rocketmq/mqtt/meta/util/IpUtilTest.java | 1 +
pom.xml | 7 +-
41 files changed, 853 insertions(+), 1217 deletions(-)
rename {mqtt-meta/src/main/java/org/apache/rocketmq/mqtt/meta/raft/rpc => mqtt-common/src/main/java/org/apache/rocketmq/mqtt/common/meta}/Constants.java (81%)
rename {mqtt-meta/src/main/java/org/apache/rocketmq/mqtt/meta/util => mqtt-common/src/main/java/org/apache/rocketmq/mqtt/common/meta}/IpUtil.java (97%)
create mode 100644 mqtt-common/src/main/java/org/apache/rocketmq/mqtt/common/meta/RaftUtil.java
rename mqtt-example/src/main/java/org/apache/rocketmq/mqtt/example/{MqttWillConsumer.java => MqttWillRetainConsumer.java} (89%)
rename mqtt-example/src/main/java/org/apache/rocketmq/mqtt/example/{MqttWillProducer.java => MqttWillRetainProducer.java} (83%)
delete mode 100644 mqtt-meta/src/main/java/org/apache/rocketmq/mqtt/meta/raft/RaftGroupHolder.java
delete mode 100644 mqtt-meta/src/main/java/org/apache/rocketmq/mqtt/meta/raft/processor/CounterStateProcessor.java
delete mode 100644 mqtt-meta/src/main/java/org/apache/rocketmq/mqtt/meta/raft/snapshot/AbstractSnapshotOperation.java
delete mode 100644 mqtt-meta/src/main/java/org/apache/rocketmq/mqtt/meta/raft/snapshot/SnapshotOperation.java
delete mode 100644 mqtt-meta/src/main/java/org/apache/rocketmq/mqtt/meta/raft/snapshot/impl/CounterSnapshotOperation.java
create mode 100644 mqtt-meta/src/main/java/org/apache/rocketmq/mqtt/meta/rocksdb/RocksDBEngine.java
create mode 100644 mqtt-meta/src/main/java/org/apache/rocketmq/mqtt/meta/rocksdb/RocksDBSnapshot.java
delete mode 100644 mqtt-meta/src/test/java/org/apache/rocketmq/mqtt/meta/raft/CounterClient.java