Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_57962205
redisson
提交
c00905a9
R
redisson
项目概览
weixin_57962205
/
redisson
与 Fork 源项目一致
从无法访问的项目Fork
通知
10
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
redisson
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
c00905a9
编写于
2月 22, 2021
作者:
N
Nikita Koksharov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixed - RStream.claim() method throws NPE if given id does not exist #3422
上级
1dcce68d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
35 addition
and
6 deletion
+35
-6
redisson/src/main/java/org/redisson/client/protocol/decoder/ObjectMapReplayDecoder2.java
...sson/client/protocol/decoder/ObjectMapReplayDecoder2.java
+6
-5
redisson/src/test/java/org/redisson/RedissonStreamTest.java
redisson/src/test/java/org/redisson/RedissonStreamTest.java
+29
-1
未找到文件。
redisson/src/main/java/org/redisson/client/protocol/decoder/ObjectMapReplayDecoder2.java
浏览文件 @
c00905a9
...
...
@@ -20,6 +20,8 @@ import org.redisson.client.handler.State;
import
java.util.LinkedHashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Objects
;
import
java.util.stream.Collectors
;
/**
*
...
...
@@ -31,11 +33,10 @@ public class ObjectMapReplayDecoder2 implements MultiDecoder<Map<Object, Object>
@Override
public
Map
<
Object
,
Object
>
decode
(
List
<
Object
>
parts
,
State
state
)
{
List
<
List
<
Object
>>
list
=
(
List
<
List
<
Object
>>)
(
Object
)
parts
;
Map
<
Object
,
Object
>
result
=
new
LinkedHashMap
<
Object
,
Object
>(
parts
.
size
()/
2
);
for
(
List
<
Object
>
entry
:
list
)
{
result
.
put
(
entry
.
get
(
0
),
entry
.
get
(
1
));
}
return
result
;
return
list
.
stream
()
.
filter
(
Objects:
:
nonNull
)
.
collect
(
Collectors
.
toMap
(
e
->
e
.
get
(
0
),
e
->
e
.
get
(
1
),
(
a
,
b
)
->
a
,
LinkedHashMap:
:
new
));
}
}
redisson/src/test/java/org/redisson/RedissonStreamTest.java
浏览文件 @
c00905a9
...
...
@@ -9,6 +9,7 @@ import java.util.List;
import
java.util.Map
;
import
java.util.concurrent.TimeUnit
;
import
org.assertj.core.api.Assertions
;
import
org.junit.Test
;
import
org.redisson.api.*
;
import
org.redisson.client.RedisException
;
...
...
@@ -169,7 +170,34 @@ public class RedissonStreamTest extends BaseTest {
assertThat
(
stream
.
remove
(
id1
,
id2
)).
isEqualTo
(
2
);
assertThat
(
stream
.
size
()).
isZero
();
}
@Test
public
void
testClaimRemove
()
{
RStream
<
String
,
String
>
stream
=
redisson
.
getStream
(
"test"
);
stream
.
add
(
"0"
,
"0"
);
stream
.
createGroup
(
"testGroup"
);
StreamMessageId
id1
=
stream
.
add
(
"1"
,
"1"
);
StreamMessageId
id2
=
stream
.
add
(
"2"
,
"2"
);
Map
<
StreamMessageId
,
Map
<
String
,
String
>>
s
=
stream
.
readGroup
(
"testGroup"
,
"consumer1"
);
assertThat
(
s
.
size
()).
isEqualTo
(
2
);
StreamMessageId
id3
=
stream
.
add
(
"3"
,
"33"
);
StreamMessageId
id4
=
stream
.
add
(
"4"
,
"44"
);
Map
<
StreamMessageId
,
Map
<
String
,
String
>>
s2
=
stream
.
readGroup
(
"testGroup"
,
"consumer2"
);
assertThat
(
s2
.
size
()).
isEqualTo
(
2
);
stream
.
remove
(
id3
);
Map
<
StreamMessageId
,
Map
<
String
,
String
>>
res
=
stream
.
claim
(
"testGroup"
,
"consumer1"
,
1
,
TimeUnit
.
MILLISECONDS
,
id3
,
id4
);
assertThat
(
res
.
size
()).
isEqualTo
(
1
);
assertThat
(
res
.
keySet
()).
containsExactly
(
id4
);
}
@Test
public
void
testClaim
()
{
RStream
<
String
,
String
>
stream
=
redisson
.
getStream
(
"test"
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录