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
c1db214e
Commit
c1db214e
authored
Feb 29, 2012
by
antirez
Browse files
Better implementation for BRPOP/BLPOP in the non blocking case.
parent
cd8bdea3
Changes
3
Show whitespace changes
Inline
Side-by-side
src/redis.c
View file @
c1db214e
...
@@ -852,6 +852,8 @@ void createSharedObjects(void) {
...
@@ -852,6 +852,8 @@ void createSharedObjects(void) {
shared
.
psubscribebulk
=
createStringObject
(
"$10
\r\n
psubscribe
\r\n
"
,
17
);
shared
.
psubscribebulk
=
createStringObject
(
"$10
\r\n
psubscribe
\r\n
"
,
17
);
shared
.
punsubscribebulk
=
createStringObject
(
"$12
\r\n
punsubscribe
\r\n
"
,
19
);
shared
.
punsubscribebulk
=
createStringObject
(
"$12
\r\n
punsubscribe
\r\n
"
,
19
);
shared
.
del
=
createStringObject
(
"DEL"
,
3
);
shared
.
del
=
createStringObject
(
"DEL"
,
3
);
shared
.
rpop
=
createStringObject
(
"RPOP"
,
4
);
shared
.
lpop
=
createStringObject
(
"LPOP"
,
4
);
for
(
j
=
0
;
j
<
REDIS_SHARED_INTEGERS
;
j
++
)
{
for
(
j
=
0
;
j
<
REDIS_SHARED_INTEGERS
;
j
++
)
{
shared
.
integers
[
j
]
=
createObject
(
REDIS_STRING
,(
void
*
)(
long
)
j
);
shared
.
integers
[
j
]
=
createObject
(
REDIS_STRING
,(
void
*
)(
long
)
j
);
shared
.
integers
[
j
]
->
encoding
=
REDIS_ENCODING_INT
;
shared
.
integers
[
j
]
->
encoding
=
REDIS_ENCODING_INT
;
...
...
src/redis.h
View file @
c1db214e
...
@@ -365,7 +365,7 @@ struct sharedObjectsStruct {
...
@@ -365,7 +365,7 @@ struct sharedObjectsStruct {
*
select0
,
*
select1
,
*
select2
,
*
select3
,
*
select4
,
*
select0
,
*
select1
,
*
select2
,
*
select3
,
*
select4
,
*
select5
,
*
select6
,
*
select7
,
*
select8
,
*
select9
,
*
select5
,
*
select6
,
*
select7
,
*
select8
,
*
select9
,
*
messagebulk
,
*
pmessagebulk
,
*
subscribebulk
,
*
unsubscribebulk
,
*
messagebulk
,
*
pmessagebulk
,
*
subscribebulk
,
*
unsubscribebulk
,
*
psubscribebulk
,
*
punsubscribebulk
,
*
del
,
*
psubscribebulk
,
*
punsubscribebulk
,
*
del
,
*
rpop
,
*
lpop
,
*
integers
[
REDIS_SHARED_INTEGERS
],
*
integers
[
REDIS_SHARED_INTEGERS
],
*
mbulkhdr
[
REDIS_SHARED_BULKHDR_LEN
],
/* "*<value>\r\n" */
*
mbulkhdr
[
REDIS_SHARED_BULKHDR_LEN
],
/* "*<value>\r\n" */
*
bulkhdr
[
REDIS_SHARED_BULKHDR_LEN
];
/* "$<value>\r\n" */
*
bulkhdr
[
REDIS_SHARED_BULKHDR_LEN
];
/* "$<value>\r\n" */
...
...
src/t_list.c
View file @
c1db214e
...
@@ -933,36 +933,22 @@ void blockingPopGenericCommand(redisClient *c, int where) {
...
@@ -933,36 +933,22 @@ void blockingPopGenericCommand(redisClient *c, int where) {
return
;
return
;
}
else
{
}
else
{
if
(
listTypeLength
(
o
)
!=
0
)
{
if
(
listTypeLength
(
o
)
!=
0
)
{
/* If the list contains elements fall back to the usual
/* Non empty list, this is like a non normal [LR]POP. */
* non-blocking POP operation */
robj
*
value
=
listTypePop
(
o
,
where
);
struct
redisCommand
*
orig_cmd
;
redisAssert
(
value
!=
NULL
);
robj
*
argv
[
2
],
**
orig_argv
;
int
orig_argc
;
/* We need to alter the command arguments before to call
* popGenericCommand() as the command takes a single key. */
orig_argv
=
c
->
argv
;
orig_argc
=
c
->
argc
;
orig_cmd
=
c
->
cmd
;
argv
[
1
]
=
c
->
argv
[
j
];
c
->
argv
=
argv
;
c
->
argc
=
2
;
/* Also the return value is different, we need to output
* the multi bulk reply header and the key name. The
* "real" command will add the last element (the value)
* for us. If this souds like an hack to you it's just
* because it is... */
addReplyMultiBulkLen
(
c
,
2
);
addReplyBulk
(
c
,
argv
[
1
]);
popGenericCommand
(
c
,
where
);
/* Fix the client structure with the original stuff */
addReplyMultiBulkLen
(
c
,
2
);
c
->
argv
=
orig_argv
;
addReplyBulk
(
c
,
c
->
argv
[
j
]);
c
->
argc
=
orig_argc
;
addReplyBulk
(
c
,
value
);
c
->
cmd
=
orig_cmd
;
decrRefCount
(
value
);
if
(
listTypeLength
(
o
)
==
0
)
dbDelete
(
c
->
db
,
c
->
argv
[
j
]);
signalModifiedKey
(
c
->
db
,
c
->
argv
[
j
]);
server
.
dirty
++
;
/* Replicate it as an [LR]POP instead of B[LR]POP. */
rewriteClientCommandVector
(
c
,
2
,
(
where
==
REDIS_HEAD
)
?
shared
.
lpop
:
shared
.
rpop
,
c
->
argv
[
j
]);
return
;
return
;
}
}
}
}
...
...
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