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
77b4a0eb
Unverified
Commit
77b4a0eb
authored
Jan 31, 2019
by
Salvatore Sanfilippo
Committed by
GitHub
Jan 31, 2019
Browse files
Merge pull request #5822 from soloestoy/rewrite-brpoplpush-4.0
rewrite BRPOPLPUSH as RPOPLPUSH to propagate
parents
afc4b36c
60b2537f
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/server.c
View file @
77b4a0eb
...
...
@@ -1320,6 +1320,7 @@ void createSharedObjects(void) {
shared
.
rpop
=
createStringObject
(
"RPOP"
,
4
);
shared
.
lpop
=
createStringObject
(
"LPOP"
,
4
);
shared
.
lpush
=
createStringObject
(
"LPUSH"
,
5
);
shared
.
rpoplpush
=
createStringObject
(
"RPOPLPUSH"
,
9
);
for
(
j
=
0
;
j
<
OBJ_SHARED_INTEGERS
;
j
++
)
{
shared
.
integers
[
j
]
=
makeObjectShared
(
createObject
(
OBJ_STRING
,(
void
*
)(
long
)
j
));
...
...
src/server.h
View file @
77b4a0eb
...
...
@@ -749,7 +749,7 @@ struct sharedObjectsStruct {
*
masterdownerr
,
*
roslaveerr
,
*
execaborterr
,
*
noautherr
,
*
noreplicaserr
,
*
busykeyerr
,
*
oomerr
,
*
plus
,
*
messagebulk
,
*
pmessagebulk
,
*
subscribebulk
,
*
unsubscribebulk
,
*
psubscribebulk
,
*
punsubscribebulk
,
*
del
,
*
unlink
,
*
rpop
,
*
lpop
,
*
lpush
,
*
emptyscan
,
*
rpop
,
*
lpop
,
*
lpush
,
*
rpoplpush
,
*
emptyscan
,
*
select
[
PROTO_SHARED_SELECT_CMDS
],
*
integers
[
OBJ_SHARED_INTEGERS
],
*
mbulkhdr
[
OBJ_SHARED_BULKHDR_LEN
],
/* "*<value>\r\n" */
...
...
src/t_list.c
View file @
77b4a0eb
...
...
@@ -596,6 +596,9 @@ void rpoplpushCommand(client *c) {
signalModifiedKey
(
c
->
db
,
touchedkey
);
decrRefCount
(
touchedkey
);
server
.
dirty
++
;
if
(
c
->
cmd
->
proc
==
brpoplpushCommand
)
{
rewriteClientCommandVector
(
c
,
3
,
shared
.
rpoplpush
,
c
->
argv
[
1
],
c
->
argv
[
2
]);
}
}
}
...
...
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