Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小五666\n哈哈
Rocketmq
提交
2f46644e
R
Rocketmq
项目概览
小五666\n哈哈
/
Rocketmq
与 Fork 源项目一致
Fork自
Apache RocketMQ / Rocketmq
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
Rocketmq
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
提交
2f46644e
编写于
2月 18, 2019
作者:
C
chengxiangwang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
reformat code to rmq_codestyle
上级
5f72d0d3
变更
22
显示空白变更内容
内联
并排
Showing
22 changed file
with
221 addition
and
231 deletion
+221
-231
common/src/main/java/org/apache/rocketmq/common/message/mqtt/WillMessage.java
.../org/apache/rocketmq/common/message/mqtt/WillMessage.java
+2
-1
common/src/main/java/org/apache/rocketmq/common/protocol/heartbeat/MqttSubscriptionData.java
...ketmq/common/protocol/heartbeat/MqttSubscriptionData.java
+1
-1
remoting/src/main/java/org/apache/rocketmq/remoting/transport/mqtt/MqttRemotingServer.java
.../rocketmq/remoting/transport/mqtt/MqttRemotingServer.java
+79
-78
remoting/src/main/java/org/apache/rocketmq/remoting/transport/mqtt/RocketMQMqttSubAckPayload.java
...mq/remoting/transport/mqtt/RocketMQMqttSubAckPayload.java
+1
-0
remoting/src/main/java/org/apache/rocketmq/remoting/transport/mqtt/RocketMQMqttSubscribePayload.java
...remoting/transport/mqtt/RocketMQMqttSubscribePayload.java
+3
-1
remoting/src/main/java/org/apache/rocketmq/remoting/transport/mqtt/RocketMQMqttUnSubscribePayload.java
...moting/transport/mqtt/RocketMQMqttUnSubscribePayload.java
+3
-1
remoting/src/main/java/org/apache/rocketmq/remoting/transport/mqtt/dispatcher/MqttConnectackEncodeDecode.java
...transport/mqtt/dispatcher/MqttConnectackEncodeDecode.java
+6
-6
remoting/src/main/java/org/apache/rocketmq/remoting/transport/mqtt/dispatcher/MqttPubackEncodeDecode.java
...ing/transport/mqtt/dispatcher/MqttPubackEncodeDecode.java
+5
-5
remoting/src/main/java/org/apache/rocketmq/remoting/transport/mqtt/dispatcher/MqttPublishEncodeDecode.java
...ng/transport/mqtt/dispatcher/MqttPublishEncodeDecode.java
+2
-2
remoting/src/main/java/org/apache/rocketmq/remoting/transport/mqtt/dispatcher/MqttSubackEncodeDecode.java
...ing/transport/mqtt/dispatcher/MqttSubackEncodeDecode.java
+5
-5
remoting/src/main/java/org/apache/rocketmq/remoting/transport/mqtt/dispatcher/MqttSubscribeEncodeDecode.java
.../transport/mqtt/dispatcher/MqttSubscribeEncodeDecode.java
+3
-3
remoting/src/main/java/org/apache/rocketmq/remoting/transport/mqtt/dispatcher/MqttUnSubackEncodeDecode.java
...g/transport/mqtt/dispatcher/MqttUnSubackEncodeDecode.java
+5
-5
remoting/src/main/java/org/apache/rocketmq/remoting/transport/mqtt/dispatcher/MqttUnSubscribeEncodeDecode.java
...ransport/mqtt/dispatcher/MqttUnSubscribeEncodeDecode.java
+3
-3
snode/src/main/java/org/apache/rocketmq/snode/SnodeController.java
.../main/java/org/apache/rocketmq/snode/SnodeController.java
+75
-75
snode/src/main/java/org/apache/rocketmq/snode/processor/DefaultMqttMessageProcessor.java
...rocketmq/snode/processor/DefaultMqttMessageProcessor.java
+14
-14
snode/src/main/java/org/apache/rocketmq/snode/processor/mqtthandler/MqttDisconnectMessageHandler.java
...e/processor/mqtthandler/MqttDisconnectMessageHandler.java
+7
-13
snode/src/test/java/org/apache/rocketmq/snode/processor/DefaultMqttMessageProcessorTest.java
...etmq/snode/processor/DefaultMqttMessageProcessorTest.java
+1
-0
snode/src/test/java/org/apache/rocketmq/snode/processor/MqttDisconnectMessageHandlerTest.java
...tmq/snode/processor/MqttDisconnectMessageHandlerTest.java
+3
-3
snode/src/test/java/org/apache/rocketmq/snode/service/WillMessageServiceImplTest.java
...he/rocketmq/snode/service/WillMessageServiceImplTest.java
+1
-1
store/src/test/java/org/apache/rocketmq/store/DefaultMessageStoreTest.java
...va/org/apache/rocketmq/store/DefaultMessageStoreTest.java
+2
-5
store/src/test/java/org/apache/rocketmq/store/dledger/DLedgerCommitlogTest.java
...g/apache/rocketmq/store/dledger/DLedgerCommitlogTest.java
+0
-5
store/src/test/java/org/apache/rocketmq/store/dledger/MixCommitlogTest.java
...a/org/apache/rocketmq/store/dledger/MixCommitlogTest.java
+0
-4
未找到文件。
common/src/main/java/org/apache/rocketmq/common/message/mqtt/WillMessage.java
浏览文件 @
2f46644e
...
...
@@ -58,6 +58,7 @@ public class WillMessage {
public
void
setQos
(
int
qos
)
{
this
.
qos
=
qos
;
}
public
String
getString
()
{
return
new
String
(
body
);
}
...
...
common/src/main/java/org/apache/rocketmq/common/protocol/heartbeat/MqttSubscriptionData.java
浏览文件 @
2f46644e
...
...
@@ -29,7 +29,7 @@ public class MqttSubscriptionData extends SubscriptionData {
}
public
MqttSubscriptionData
(
int
qos
,
String
clientId
,
String
topicFilter
)
{
super
(
topicFilter
,
null
);
super
(
topicFilter
,
null
);
this
.
qos
=
qos
;
this
.
clientId
=
clientId
;
}
...
...
remoting/src/main/java/org/apache/rocketmq/remoting/transport/mqtt/MqttRemotingServer.java
浏览文件 @
2f46644e
...
...
@@ -216,6 +216,7 @@ public class MqttRemotingServer extends NettyRemotingServerAbstract implements R
private
void
registerMessageHandler
()
{
}
@Override
public
void
shutdown
()
{
try
{
...
...
remoting/src/main/java/org/apache/rocketmq/remoting/transport/mqtt/RocketMQMqttSubAckPayload.java
浏览文件 @
2f46644e
...
...
@@ -51,6 +51,7 @@ public final class RocketMQMqttSubAckPayload extends RemotingSerializable {
public
MqttSubAckPayload
toMqttSubAckPayload
()
throws
UnsupportedEncodingException
{
return
new
MqttSubAckPayload
(
this
.
grantedQoSLevels
);
}
@Override
public
String
toString
()
{
return
StringUtil
.
simpleClassName
(
this
)
+
'['
+
"grantedQoSLevels="
+
this
.
grantedQoSLevels
+
']'
;
...
...
remoting/src/main/java/org/apache/rocketmq/remoting/transport/mqtt/RocketMQMqttSubscribePayload.java
浏览文件 @
2f46644e
...
...
@@ -45,6 +45,7 @@ public final class RocketMQMqttSubscribePayload extends RemotingSerializable {
List
<
MqttTopicSubscription
>
topicSubscriptions
)
{
this
.
topicSubscriptions
=
topicSubscriptions
;
}
public
static
RocketMQMqttSubscribePayload
fromMqttSubscribePayload
(
MqttSubscribePayload
payload
)
{
return
new
RocketMQMqttSubscribePayload
(
payload
.
topicSubscriptions
());
}
...
...
@@ -52,6 +53,7 @@ public final class RocketMQMqttSubscribePayload extends RemotingSerializable {
public
MqttSubscribePayload
toMqttSubscribePayload
()
throws
UnsupportedEncodingException
{
return
new
MqttSubscribePayload
(
this
.
topicSubscriptions
);
}
@Override
public
String
toString
()
{
StringBuilder
builder
=
new
StringBuilder
(
StringUtil
.
simpleClassName
(
this
)).
append
(
'['
);
...
...
remoting/src/main/java/org/apache/rocketmq/remoting/transport/mqtt/RocketMQMqttUnSubscribePayload.java
浏览文件 @
2f46644e
...
...
@@ -41,6 +41,7 @@ public class RocketMQMqttUnSubscribePayload extends RemotingSerializable {
public
void
setTopics
(
List
<
String
>
topics
)
{
this
.
topics
=
Collections
.
unmodifiableList
(
topics
);
}
public
static
RocketMQMqttUnSubscribePayload
fromMqttUnSubscribePayload
(
MqttUnsubscribePayload
payload
)
{
return
new
RocketMQMqttUnSubscribePayload
(
payload
.
topics
());
}
...
...
@@ -48,6 +49,7 @@ public class RocketMQMqttUnSubscribePayload extends RemotingSerializable {
public
MqttUnsubscribePayload
toMqttUnsubscribePayload
()
throws
UnsupportedEncodingException
{
return
new
MqttUnsubscribePayload
(
this
.
topics
);
}
@Override
public
String
toString
()
{
StringBuilder
builder
=
new
StringBuilder
(
StringUtil
.
simpleClassName
(
this
)).
append
(
'['
);
...
...
remoting/src/main/java/org/apache/rocketmq/remoting/transport/mqtt/dispatcher/MqttConnectackEncodeDecode.java
浏览文件 @
2f46644e
remoting/src/main/java/org/apache/rocketmq/remoting/transport/mqtt/dispatcher/MqttPubackEncodeDecode.java
浏览文件 @
2f46644e
remoting/src/main/java/org/apache/rocketmq/remoting/transport/mqtt/dispatcher/MqttPublishEncodeDecode.java
浏览文件 @
2f46644e
remoting/src/main/java/org/apache/rocketmq/remoting/transport/mqtt/dispatcher/MqttSubackEncodeDecode.java
浏览文件 @
2f46644e
...
...
@@ -44,6 +44,6 @@ public class MqttSubackEncodeDecode implements Message2MessageEncodeDecode {
new
MqttFixedHeader
(
MqttMessageType
.
SUBACK
,
mqttHeader
.
isDup
(),
MqttQoS
.
valueOf
(
mqttHeader
.
getQosLevel
()),
mqttHeader
.
isRetain
(),
mqttHeader
.
getRemainingLength
()),
MqttMessageIdVariableHeader
.
from
(
mqttHeader
.
getMessageId
()),
new
MqttSubAckPayload
());
MqttMessageIdVariableHeader
.
from
(
mqttHeader
.
getMessageId
()),
new
MqttSubAckPayload
());
}
}
remoting/src/main/java/org/apache/rocketmq/remoting/transport/mqtt/dispatcher/MqttSubscribeEncodeDecode.java
浏览文件 @
2f46644e
remoting/src/main/java/org/apache/rocketmq/remoting/transport/mqtt/dispatcher/MqttUnSubackEncodeDecode.java
浏览文件 @
2f46644e
remoting/src/main/java/org/apache/rocketmq/remoting/transport/mqtt/dispatcher/MqttUnSubscribeEncodeDecode.java
浏览文件 @
2f46644e
snode/src/main/java/org/apache/rocketmq/snode/SnodeController.java
浏览文件 @
2f46644e
snode/src/main/java/org/apache/rocketmq/snode/processor/DefaultMqttMessageProcessor.java
浏览文件 @
2f46644e
snode/src/main/java/org/apache/rocketmq/snode/processor/mqtthandler/MqttDisconnectMessageHandler.java
浏览文件 @
2f46644e
...
...
@@ -31,22 +31,16 @@ import org.apache.rocketmq.snode.client.impl.IOTClientManagerImpl;
public
class
MqttDisconnectMessageHandler
implements
MessageHandler
{
private
static
final
InternalLogger
log
=
InternalLoggerFactory
.
getLogger
(
LoggerName
.
SNODE_LOGGER_NAME
);
private
static
final
InternalLogger
log
=
InternalLoggerFactory
.
getLogger
(
LoggerName
.
SNODE_LOGGER_NAME
);
private
final
SnodeController
snodeController
;
public
MqttDisconnectMessageHandler
(
SnodeController
snodeController
)
{
this
.
snodeController
=
snodeController
;
}
/**
* handle the DISCONNECT message from the client
* <ol>
* <li>discard the Will Message and Will Topic</li>
* <li>remove the client from the IOTClientManager</li>
* <li>disconnect the connection</li>
* </ol>
* handle the DISCONNECT message from the client <ol> <li>discard the Will Message and Will Topic</li> <li>remove
* the client from the IOTClientManager</li> <li>disconnect the connection</li> </ol>
*/
@Override
public
RemotingCommand
handleMessage
(
MqttMessage
message
,
RemotingChannel
remotingChannel
)
{
...
...
snode/src/test/java/org/apache/rocketmq/snode/processor/DefaultMqttMessageProcessorTest.java
浏览文件 @
2f46644e
...
...
@@ -97,6 +97,7 @@ public class DefaultMqttMessageProcessorTest {
CodecHelper
.
makeCustomHeaderToNet
(
request
);
return
request
;
}
private
byte
[]
encode
(
Object
obj
)
{
String
json
=
JSON
.
toJSONString
(
obj
,
false
);
if
(
json
!=
null
)
{
...
...
snode/src/test/java/org/apache/rocketmq/snode/processor/MqttDisconnectMessageHandlerTest.java
浏览文件 @
2f46644e
snode/src/test/java/org/apache/rocketmq/snode/service/WillMessageServiceImplTest.java
浏览文件 @
2f46644e
store/src/test/java/org/apache/rocketmq/store/DefaultMessageStoreTest.java
浏览文件 @
2f46644e
...
...
@@ -27,16 +27,14 @@ import java.nio.channels.FileChannel;
import
java.nio.channels.OverlappingFileLockException
;
import
java.util.Map
;
import
java.util.concurrent.atomic.AtomicInteger
;
import
org.apache.rocketmq.common.BrokerConfig
;
import
org.apache.rocketmq.common.UtilAll
;
import
org.apache.rocketmq.store.config.FlushDiskType
;
import
org.apache.rocketmq.store.config.MessageStoreConfig
;
import
org.apache.rocketmq.store.config.StorePathConfigHelper
;
import
org.junit.After
;
import
org.apache.rocketmq.store.stats.BrokerStatsManager
;
import
org.junit.After
;
import
org.junit.Before
;
import
org.junit.Ignore
;
import
org.junit.Test
;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
...
...
@@ -62,7 +60,6 @@ public class DefaultMessageStoreTest {
messageStore
.
start
();
}
@Ignore
@Test
(
expected
=
OverlappingFileLockException
.
class
)
public
void
test_repate_restart
()
throws
Exception
{
QUEUE_TOTAL
=
1
;
...
...
store/src/test/java/org/apache/rocketmq/store/dledger/DLedgerCommitlogTest.java
浏览文件 @
2f46644e
...
...
@@ -16,12 +16,10 @@ import org.apache.rocketmq.store.MessageExtBrokerInner;
import
org.apache.rocketmq.store.PutMessageResult
;
import
org.apache.rocketmq.store.PutMessageStatus
;
import
org.junit.Assert
;
import
org.junit.Ignore
;
import
org.junit.Test
;
public
class
DLedgerCommitlogTest
extends
MessageStoreTestBase
{
@Ignore
@Test
public
void
testTruncateCQ
()
throws
Exception
{
String
base
=
createBaseDir
();
...
...
@@ -77,7 +75,6 @@ public class DLedgerCommitlogTest extends MessageStoreTestBase {
}
@Ignore
@Test
public
void
testRecover
()
throws
Exception
{
String
base
=
createBaseDir
();
...
...
@@ -118,7 +115,6 @@ public class DLedgerCommitlogTest extends MessageStoreTestBase {
}
@Ignore
@Test
public
void
testPutAndGetMessage
()
throws
Exception
{
String
base
=
createBaseDir
();
...
...
@@ -159,7 +155,6 @@ public class DLedgerCommitlogTest extends MessageStoreTestBase {
messageStore
.
shutdown
();
}
@Ignore
@Test
public
void
testCommittedPos
()
throws
Exception
{
String
peers
=
String
.
format
(
"n0-localhost:%d;n1-localhost:%d"
,
nextPort
(),
nextPort
());
...
...
store/src/test/java/org/apache/rocketmq/store/dledger/MixCommitlogTest.java
浏览文件 @
2f46644e
...
...
@@ -5,13 +5,11 @@ import org.apache.rocketmq.store.DefaultMessageStore;
import
org.apache.rocketmq.store.StoreTestBase
;
import
org.apache.rocketmq.store.config.StorePathConfigHelper
;
import
org.junit.Assert
;
import
org.junit.Ignore
;
import
org.junit.Test
;
public
class
MixCommitlogTest
extends
MessageStoreTestBase
{
@Ignore
@Test
public
void
testFallBehindCQ
()
throws
Exception
{
String
base
=
createBaseDir
();
...
...
@@ -51,7 +49,6 @@ public class MixCommitlogTest extends MessageStoreTestBase {
}
@Ignore
@Test
public
void
testPutAndGet
()
throws
Exception
{
String
base
=
createBaseDir
();
...
...
@@ -112,7 +109,6 @@ public class MixCommitlogTest extends MessageStoreTestBase {
recoverDledgerStore
.
shutdown
();
}
}
@Ignore
@Test
public
void
testDeleteExpiredFiles
()
throws
Exception
{
String
base
=
createBaseDir
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录