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
e4903ce5
Unverified
Commit
e4903ce5
authored
Dec 05, 2017
by
Salvatore Sanfilippo
Committed by
GitHub
Dec 05, 2017
Browse files
Merge pull request #4509 from soloestoy/set-int-problem
Set int problem
parents
e6c3bcf9
42387d6c
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/t_set.c
View file @
e4903ce5
...
...
@@ -407,7 +407,7 @@ void spopWithCountCommand(client *c) {
/* Get the count argument */
if
(
getLongFromObjectOrReply
(
c
,
c
->
argv
[
2
],
&
l
,
NULL
)
!=
C_OK
)
return
;
if
(
l
>=
0
)
{
count
=
(
unsigned
)
l
;
count
=
(
unsigned
long
)
l
;
}
else
{
addReply
(
c
,
shared
.
outofrangeerr
);
return
;
...
...
@@ -626,7 +626,7 @@ void srandmemberWithCountCommand(client *c) {
if
(
getLongFromObjectOrReply
(
c
,
c
->
argv
[
2
],
&
l
,
NULL
)
!=
C_OK
)
return
;
if
(
l
>=
0
)
{
count
=
(
unsigned
)
l
;
count
=
(
unsigned
long
)
l
;
}
else
{
/* A negative count means: return the same elements multiple times
* (i.e. don't remove the extracted element after every extraction). */
...
...
@@ -774,15 +774,21 @@ void srandmemberCommand(client *c) {
}
int
qsortCompareSetsByCardinality
(
const
void
*
s1
,
const
void
*
s2
)
{
return
setTypeSize
(
*
(
robj
**
)
s1
)
-
setTypeSize
(
*
(
robj
**
)
s2
);
if
(
setTypeSize
(
*
(
robj
**
)
s1
)
>
setTypeSize
(
*
(
robj
**
)
s2
))
return
1
;
if
(
setTypeSize
(
*
(
robj
**
)
s1
)
<
setTypeSize
(
*
(
robj
**
)
s2
))
return
-
1
;
return
0
;
}
/* This is used by SDIFF and in this case we can receive NULL that should
* be handled as empty sets. */
int
qsortCompareSetsByRevCardinality
(
const
void
*
s1
,
const
void
*
s2
)
{
robj
*
o1
=
*
(
robj
**
)
s1
,
*
o2
=
*
(
robj
**
)
s2
;
unsigned
long
first
=
o1
?
setTypeSize
(
o1
)
:
0
;
unsigned
long
second
=
o2
?
setTypeSize
(
o2
)
:
0
;
return
(
o2
?
setTypeSize
(
o2
)
:
0
)
-
(
o1
?
setTypeSize
(
o1
)
:
0
);
if
(
first
<
second
)
return
1
;
if
(
first
>
second
)
return
-
1
;
return
0
;
}
void
sinterGenericCommand
(
client
*
c
,
robj
**
setkeys
,
...
...
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