Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小五666\n哈哈
Rocketmq
提交
ba5e0e52
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看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
ba5e0e52
编写于
9月 04, 2020
作者:
Z
ZingBug
提交者:
GitHub
9月 04, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[ISSUE #2272] Fix spelling mistakes
上级
f07bc79d
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
5 addition
and
11 deletion
+5
-11
client/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageOrderlyService.java
...mq/client/impl/consumer/ConsumeMessageOrderlyService.java
+2
-2
client/src/main/java/org/apache/rocketmq/client/impl/consumer/DefaultMQPushConsumerImpl.java
...ketmq/client/impl/consumer/DefaultMQPushConsumerImpl.java
+0
-6
client/src/main/java/org/apache/rocketmq/client/impl/consumer/ProcessQueue.java
...rg/apache/rocketmq/client/impl/consumer/ProcessQueue.java
+1
-1
client/src/main/java/org/apache/rocketmq/client/impl/consumer/PullAPIWrapper.java
.../apache/rocketmq/client/impl/consumer/PullAPIWrapper.java
+2
-2
未找到文件。
client/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageOrderlyService.java
浏览文件 @
ba5e0e52
...
@@ -280,7 +280,7 @@ public class ConsumeMessageOrderlyService implements ConsumeMessageService {
...
@@ -280,7 +280,7 @@ public class ConsumeMessageOrderlyService implements ConsumeMessageService {
case
SUSPEND_CURRENT_QUEUE_A_MOMENT:
case
SUSPEND_CURRENT_QUEUE_A_MOMENT:
this
.
getConsumerStatsManager
().
incConsumeFailedTPS
(
consumerGroup
,
consumeRequest
.
getMessageQueue
().
getTopic
(),
msgs
.
size
());
this
.
getConsumerStatsManager
().
incConsumeFailedTPS
(
consumerGroup
,
consumeRequest
.
getMessageQueue
().
getTopic
(),
msgs
.
size
());
if
(
checkReconsumeTimes
(
msgs
))
{
if
(
checkReconsumeTimes
(
msgs
))
{
consumeRequest
.
getProcessQueue
().
makeMessageToCosumeAgain
(
msgs
);
consumeRequest
.
getProcessQueue
().
makeMessageToCo
n
sumeAgain
(
msgs
);
this
.
submitConsumeRequestLater
(
this
.
submitConsumeRequestLater
(
consumeRequest
.
getProcessQueue
(),
consumeRequest
.
getProcessQueue
(),
consumeRequest
.
getMessageQueue
(),
consumeRequest
.
getMessageQueue
(),
...
@@ -312,7 +312,7 @@ public class ConsumeMessageOrderlyService implements ConsumeMessageService {
...
@@ -312,7 +312,7 @@ public class ConsumeMessageOrderlyService implements ConsumeMessageService {
case
SUSPEND_CURRENT_QUEUE_A_MOMENT:
case
SUSPEND_CURRENT_QUEUE_A_MOMENT:
this
.
getConsumerStatsManager
().
incConsumeFailedTPS
(
consumerGroup
,
consumeRequest
.
getMessageQueue
().
getTopic
(),
msgs
.
size
());
this
.
getConsumerStatsManager
().
incConsumeFailedTPS
(
consumerGroup
,
consumeRequest
.
getMessageQueue
().
getTopic
(),
msgs
.
size
());
if
(
checkReconsumeTimes
(
msgs
))
{
if
(
checkReconsumeTimes
(
msgs
))
{
consumeRequest
.
getProcessQueue
().
makeMessageToCosumeAgain
(
msgs
);
consumeRequest
.
getProcessQueue
().
makeMessageToCo
n
sumeAgain
(
msgs
);
this
.
submitConsumeRequestLater
(
this
.
submitConsumeRequestLater
(
consumeRequest
.
getProcessQueue
(),
consumeRequest
.
getProcessQueue
(),
consumeRequest
.
getMessageQueue
(),
consumeRequest
.
getMessageQueue
(),
...
...
client/src/main/java/org/apache/rocketmq/client/impl/consumer/DefaultMQPushConsumerImpl.java
浏览文件 @
ba5e0e52
...
@@ -348,12 +348,6 @@ public class DefaultMQPushConsumerImpl implements MQConsumerInner {
...
@@ -348,12 +348,6 @@ public class DefaultMQPushConsumerImpl implements MQConsumerInner {
break
;
break
;
case
NO_NEW_MSG:
case
NO_NEW_MSG:
pullRequest
.
setNextOffset
(
pullResult
.
getNextBeginOffset
());
DefaultMQPushConsumerImpl
.
this
.
correctTagsOffset
(
pullRequest
);
DefaultMQPushConsumerImpl
.
this
.
executePullRequestImmediately
(
pullRequest
);
break
;
case
NO_MATCHED_MSG:
case
NO_MATCHED_MSG:
pullRequest
.
setNextOffset
(
pullResult
.
getNextBeginOffset
());
pullRequest
.
setNextOffset
(
pullResult
.
getNextBeginOffset
());
...
...
client/src/main/java/org/apache/rocketmq/client/impl/consumer/ProcessQueue.java
浏览文件 @
ba5e0e52
...
@@ -280,7 +280,7 @@ public class ProcessQueue {
...
@@ -280,7 +280,7 @@ public class ProcessQueue {
return
-
1
;
return
-
1
;
}
}
public
void
makeMessageToCosumeAgain
(
List
<
MessageExt
>
msgs
)
{
public
void
makeMessageToCo
n
sumeAgain
(
List
<
MessageExt
>
msgs
)
{
try
{
try
{
this
.
lockTreeMap
.
writeLock
().
lockInterruptibly
();
this
.
lockTreeMap
.
writeLock
().
lockInterruptibly
();
try
{
try
{
...
...
client/src/main/java/org/apache/rocketmq/client/impl/consumer/PullAPIWrapper.java
浏览文件 @
ba5e0e52
...
@@ -194,7 +194,7 @@ public class PullAPIWrapper {
...
@@ -194,7 +194,7 @@ public class PullAPIWrapper {
String
brokerAddr
=
findBrokerResult
.
getBrokerAddr
();
String
brokerAddr
=
findBrokerResult
.
getBrokerAddr
();
if
(
PullSysFlag
.
hasClassFilterFlag
(
sysFlagInner
))
{
if
(
PullSysFlag
.
hasClassFilterFlag
(
sysFlagInner
))
{
brokerAddr
=
computPullFromWhichFilterServer
(
mq
.
getTopic
(),
brokerAddr
);
brokerAddr
=
comput
e
PullFromWhichFilterServer
(
mq
.
getTopic
(),
brokerAddr
);
}
}
PullResult
pullResult
=
this
.
mQClientFactory
.
getMQClientAPIImpl
().
pullMessage
(
PullResult
pullResult
=
this
.
mQClientFactory
.
getMQClientAPIImpl
().
pullMessage
(
...
@@ -223,7 +223,7 @@ public class PullAPIWrapper {
...
@@ -223,7 +223,7 @@ public class PullAPIWrapper {
return
MixAll
.
MASTER_ID
;
return
MixAll
.
MASTER_ID
;
}
}
private
String
computPullFromWhichFilterServer
(
final
String
topic
,
final
String
brokerAddr
)
private
String
comput
e
PullFromWhichFilterServer
(
final
String
topic
,
final
String
brokerAddr
)
throws
MQClientException
{
throws
MQClientException
{
ConcurrentMap
<
String
,
TopicRouteData
>
topicRouteTable
=
this
.
mQClientFactory
.
getTopicRouteTable
();
ConcurrentMap
<
String
,
TopicRouteData
>
topicRouteTable
=
this
.
mQClientFactory
.
getTopicRouteTable
();
if
(
topicRouteTable
!=
null
)
{
if
(
topicRouteTable
!=
null
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录