Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
逝缘~
Rocketmq
提交
3ccd6f97
R
Rocketmq
项目概览
逝缘~
/
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,发现更多精彩内容 >>
提交
3ccd6f97
编写于
7月 14, 2018
作者:
D
duheng
提交者:
Zhanhui Li
7月 14, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix issues brought about while merging pull requests
上级
17648c67
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
5 addition
and
5 deletion
+5
-5
client/src/main/java/org/apache/rocketmq/client/consumer/rebalance/AllocateMachineRoomNearby.java
.../client/consumer/rebalance/AllocateMachineRoomNearby.java
+2
-2
remoting/src/test/java/org/apache/rocketmq/remoting/netty/NettyRemotingAbstractTest.java
...he/rocketmq/remoting/netty/NettyRemotingAbstractTest.java
+3
-3
未找到文件。
client/src/main/java/org/apache/rocketmq/client/consumer/rebalance/AllocateMachineRoomNearby.java
浏览文件 @
3ccd6f97
...
@@ -24,7 +24,7 @@ import org.apache.commons.lang3.StringUtils;
...
@@ -24,7 +24,7 @@ import org.apache.commons.lang3.StringUtils;
import
org.apache.rocketmq.client.consumer.AllocateMessageQueueStrategy
;
import
org.apache.rocketmq.client.consumer.AllocateMessageQueueStrategy
;
import
org.apache.rocketmq.client.log.ClientLogger
;
import
org.apache.rocketmq.client.log.ClientLogger
;
import
org.apache.rocketmq.common.message.MessageQueue
;
import
org.apache.rocketmq.common.message.MessageQueue
;
import
org.
slf4j.
Logger
;
import
org.
apache.rocketmq.logging.Internal
Logger
;
/**
/**
* An allocate strategy proxy for based on machine room nearside priority. An actual allocate strategy can be
* An allocate strategy proxy for based on machine room nearside priority. An actual allocate strategy can be
...
@@ -35,7 +35,7 @@ import org.slf4j.Logger;
...
@@ -35,7 +35,7 @@ import org.slf4j.Logger;
* no alive consumer to monopolize them.
* no alive consumer to monopolize them.
*/
*/
public
class
AllocateMachineRoomNearby
implements
AllocateMessageQueueStrategy
{
public
class
AllocateMachineRoomNearby
implements
AllocateMessageQueueStrategy
{
private
final
Logger
log
=
ClientLogger
.
getLog
();
private
final
Internal
Logger
log
=
ClientLogger
.
getLog
();
private
final
AllocateMessageQueueStrategy
allocateMessageQueueStrategy
;
//actual allocate strategy
private
final
AllocateMessageQueueStrategy
allocateMessageQueueStrategy
;
//actual allocate strategy
private
final
MachineRoomResolver
machineRoomResolver
;
private
final
MachineRoomResolver
machineRoomResolver
;
...
...
remoting/src/test/java/org/apache/rocketmq/remoting/netty/NettyRemotingAbstractTest.java
浏览文件 @
3ccd6f97
...
@@ -36,7 +36,7 @@ public class NettyRemotingAbstractTest {
...
@@ -36,7 +36,7 @@ public class NettyRemotingAbstractTest {
@Test
@Test
public
void
testProcessResponseCommand
()
throws
InterruptedException
{
public
void
testProcessResponseCommand
()
throws
InterruptedException
{
final
Semaphore
semaphore
=
new
Semaphore
(
0
);
final
Semaphore
semaphore
=
new
Semaphore
(
0
);
ResponseFuture
responseFuture
=
new
ResponseFuture
(
1
,
3000
,
new
InvokeCallback
()
{
ResponseFuture
responseFuture
=
new
ResponseFuture
(
null
,
1
,
3000
,
new
InvokeCallback
()
{
@Override
@Override
public
void
operationComplete
(
final
ResponseFuture
responseFuture
)
{
public
void
operationComplete
(
final
ResponseFuture
responseFuture
)
{
assertThat
(
semaphore
.
availablePermits
()).
isEqualTo
(
0
);
assertThat
(
semaphore
.
availablePermits
()).
isEqualTo
(
0
);
...
@@ -57,7 +57,7 @@ public class NettyRemotingAbstractTest {
...
@@ -57,7 +57,7 @@ public class NettyRemotingAbstractTest {
@Test
@Test
public
void
testProcessResponseCommand_NullCallBack
()
throws
InterruptedException
{
public
void
testProcessResponseCommand_NullCallBack
()
throws
InterruptedException
{
final
Semaphore
semaphore
=
new
Semaphore
(
0
);
final
Semaphore
semaphore
=
new
Semaphore
(
0
);
ResponseFuture
responseFuture
=
new
ResponseFuture
(
1
,
3000
,
null
,
ResponseFuture
responseFuture
=
new
ResponseFuture
(
null
,
1
,
3000
,
null
,
new
SemaphoreReleaseOnlyOnce
(
semaphore
));
new
SemaphoreReleaseOnlyOnce
(
semaphore
));
remotingAbstract
.
responseTable
.
putIfAbsent
(
1
,
responseFuture
);
remotingAbstract
.
responseTable
.
putIfAbsent
(
1
,
responseFuture
);
...
@@ -72,7 +72,7 @@ public class NettyRemotingAbstractTest {
...
@@ -72,7 +72,7 @@ public class NettyRemotingAbstractTest {
@Test
@Test
public
void
testProcessResponseCommand_RunCallBackInCurrentThread
()
throws
InterruptedException
{
public
void
testProcessResponseCommand_RunCallBackInCurrentThread
()
throws
InterruptedException
{
final
Semaphore
semaphore
=
new
Semaphore
(
0
);
final
Semaphore
semaphore
=
new
Semaphore
(
0
);
ResponseFuture
responseFuture
=
new
ResponseFuture
(
1
,
3000
,
new
InvokeCallback
()
{
ResponseFuture
responseFuture
=
new
ResponseFuture
(
null
,
1
,
3000
,
new
InvokeCallback
()
{
@Override
@Override
public
void
operationComplete
(
final
ResponseFuture
responseFuture
)
{
public
void
operationComplete
(
final
ResponseFuture
responseFuture
)
{
assertThat
(
semaphore
.
availablePermits
()).
isEqualTo
(
0
);
assertThat
(
semaphore
.
availablePermits
()).
isEqualTo
(
0
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录