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
97aeda98
Commit
97aeda98
authored
Feb 16, 2011
by
Pieter Noordhuis
Browse files
Morph SPOP to SREM for correct behavior on log replay/replication
parent
ca9d9610
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/t_set.c
View file @
97aeda98
...
@@ -334,12 +334,25 @@ void spopCommand(redisClient *c) {
...
@@ -334,12 +334,25 @@ void spopCommand(redisClient *c) {
encoding
=
setTypeRandomElement
(
set
,
&
ele
,
&
llele
);
encoding
=
setTypeRandomElement
(
set
,
&
ele
,
&
llele
);
if
(
encoding
==
REDIS_ENCODING_INTSET
)
{
if
(
encoding
==
REDIS_ENCODING_INTSET
)
{
addReplyBulk
LongLong
(
c
,
llele
);
ele
=
createStringObjectFrom
LongLong
(
llele
);
set
->
ptr
=
intsetRemove
(
set
->
ptr
,
llele
,
NULL
);
set
->
ptr
=
intsetRemove
(
set
->
ptr
,
llele
,
NULL
);
}
else
{
}
else
{
addReplyBulk
(
c
,
ele
);
incrRefCount
(
ele
);
setTypeRemove
(
set
,
ele
);
setTypeRemove
(
set
,
ele
);
}
}
/* Change argv to replicate as SREM */
c
->
argc
=
3
;
c
->
argv
=
zrealloc
(
c
->
argv
,
sizeof
(
robj
*
)
*
(
c
->
argc
));
/* Overwrite SREM with SPOP (same length) */
redisAssert
(
sdslen
(
c
->
argv
[
0
]
->
ptr
)
==
4
);
memcpy
(
c
->
argv
[
0
]
->
ptr
,
"SREM"
,
4
);
/* Popped element already has incremented refcount */
c
->
argv
[
2
]
=
ele
;
addReplyBulk
(
c
,
ele
);
if
(
setTypeSize
(
set
)
==
0
)
dbDelete
(
c
->
db
,
c
->
argv
[
1
]);
if
(
setTypeSize
(
set
)
==
0
)
dbDelete
(
c
->
db
,
c
->
argv
[
1
]);
touchWatchedKey
(
c
->
db
,
c
->
argv
[
1
]);
touchWatchedKey
(
c
->
db
,
c
->
argv
[
1
]);
server
.
dirty
++
;
server
.
dirty
++
;
...
...
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