Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
0b4bb502
Commit
0b4bb502
authored
Apr 18, 2016
by
Damian Janowski
Browse files
Fix ZINCRBY return value.
parent
dda0f37f
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/t_zset.c
View file @
0b4bb502
...
@@ -1308,6 +1308,7 @@ int zsetAdd(robj *zobj, double score, sds ele, int *flags, double *newscore) {
...
@@ -1308,6 +1308,7 @@ int zsetAdd(robj *zobj, double score, sds ele, int *flags, double *newscore) {
zsetConvert
(
zobj
,
OBJ_ENCODING_SKIPLIST
);
zsetConvert
(
zobj
,
OBJ_ENCODING_SKIPLIST
);
if
(
sdslen
(
ele
)
>
server
.
zset_max_ziplist_value
)
if
(
sdslen
(
ele
)
>
server
.
zset_max_ziplist_value
)
zsetConvert
(
zobj
,
OBJ_ENCODING_SKIPLIST
);
zsetConvert
(
zobj
,
OBJ_ENCODING_SKIPLIST
);
if
(
newscore
)
*
newscore
=
score
;
*
flags
|=
ZADD_ADDED
;
*
flags
|=
ZADD_ADDED
;
return
1
;
return
1
;
}
else
{
}
else
{
...
@@ -1359,6 +1360,7 @@ int zsetAdd(robj *zobj, double score, sds ele, int *flags, double *newscore) {
...
@@ -1359,6 +1360,7 @@ int zsetAdd(robj *zobj, double score, sds ele, int *flags, double *newscore) {
znode
=
zslInsert
(
zs
->
zsl
,
score
,
ele
);
znode
=
zslInsert
(
zs
->
zsl
,
score
,
ele
);
serverAssert
(
dictAdd
(
zs
->
dict
,
ele
,
&
znode
->
score
)
==
DICT_OK
);
serverAssert
(
dictAdd
(
zs
->
dict
,
ele
,
&
znode
->
score
)
==
DICT_OK
);
*
flags
|=
ZADD_ADDED
;
*
flags
|=
ZADD_ADDED
;
if
(
newscore
)
*
newscore
=
score
;
return
1
;
return
1
;
}
else
{
}
else
{
*
flags
|=
ZADD_NOP
;
*
flags
|=
ZADD_NOP
;
...
...
tests/unit/type/zset.tcl
View file @
0b4bb502
...
@@ -290,6 +290,12 @@ start_server {tags {"zset"}} {
...
@@ -290,6 +290,12 @@ start_server {tags {"zset"}} {
assert_equal 6
[
r zscore zset bar
]
assert_equal 6
[
r zscore zset bar
]
}
}
test
"ZINCRBY return value"
{
r del ztmp
set retval
[
r zincrby ztmp 1.0 x
]
assert
{
$retval
== 1.0
}
}
proc create_default_zset
{}
{
proc create_default_zset
{}
{
create_zset zset
{
-inf a 1 b 2 c 3 d 4 e 5 f +inf g
}
create_zset zset
{
-inf a 1 b 2 c 3 d 4 e 5 f +inf g
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment