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
5ca2f0c4
Commit
5ca2f0c4
authored
Sep 22, 2010
by
antirez
Browse files
preventive conflict resolution to merge pietern/zset-mem
parent
5171777b
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/t_zset.c
View file @
5ca2f0c4
...
@@ -355,7 +355,8 @@ void zaddGenericCommand(redisClient *c, robj *key, robj *ele, double scoreval, i
...
@@ -355,7 +355,8 @@ void zaddGenericCommand(redisClient *c, robj *key, robj *ele, double scoreval, i
*
score
=
scoreval
;
*
score
=
scoreval
;
}
}
if
(
isnan
(
*
score
))
{
if
(
isnan
(
*
score
))
{
addReplyError
(
c
,
"resulting score is not a number (NaN)"
);
addReplySds
(
c
,
sdsnew
(
"-ERR resulting score is not a number (NaN)
\r\n
"
));
zfree
(
score
);
zfree
(
score
);
/* Note that we don't need to check if the zset may be empty and
/* Note that we don't need to check if the zset may be empty and
* should be removed here, as we can only obtain Nan as score if
* should be removed here, as we can only obtain Nan as score if
...
...
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