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
8a88c368
Commit
8a88c368
authored
Dec 06, 2010
by
Pieter Noordhuis
Browse files
Check other blocked clients when value could not be pushed
parent
ac06fc01
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/t_list.c
View file @
8a88c368
...
@@ -780,35 +780,53 @@ void unblockClientWaitingData(redisClient *c) {
...
@@ -780,35 +780,53 @@ void unblockClientWaitingData(redisClient *c) {
int
handleClientsWaitingListPush
(
redisClient
*
c
,
robj
*
key
,
robj
*
ele
)
{
int
handleClientsWaitingListPush
(
redisClient
*
c
,
robj
*
key
,
robj
*
ele
)
{
struct
dictEntry
*
de
;
struct
dictEntry
*
de
;
redisClient
*
receiver
;
redisClient
*
receiver
;
list
*
l
;
int
numclients
;
list
*
clients
;
listNode
*
ln
;
listNode
*
ln
;
robj
*
dstkey
,
*
dstobj
;
de
=
dictFind
(
c
->
db
->
blocking_keys
,
key
);
de
=
dictFind
(
c
->
db
->
blocking_keys
,
key
);
if
(
de
==
NULL
)
return
0
;
if
(
de
==
NULL
)
return
0
;
l
=
dictGetEntryVal
(
de
);
clients
=
dictGetEntryVal
(
de
);
ln
=
listFirst
(
l
);
numclients
=
listLength
(
clients
);
redisAssert
(
ln
!=
NULL
);
receiver
=
ln
->
value
;
/* Try to handle the push as long as there are clients waiting for a push.
* Note that "numclients" is used because the list of clients waiting for a
robj
*
target
=
receiver
->
bpop
.
target
;
* push on "key" is deleted by unblockClient() when empty.
*
unblockClientWaitingData
(
receiver
);
* This loop will have more than 1 iteration when there is a BRPOPLPUSH
* that cannot push the target list because it does not contain a list. If
if
(
target
==
NULL
)
{
* this happens, it simply tries the next client waiting for a push. */
/* BRPOP/BLPOP return a multi-bulk with the name
while
(
numclients
--
)
{
* of the popped list */
ln
=
listFirst
(
clients
);
addReplyMultiBulkLen
(
receiver
,
2
);
redisAssert
(
ln
!=
NULL
);
addReplyBulk
(
receiver
,
key
);
receiver
=
ln
->
value
;
addReplyBulk
(
receiver
,
ele
);
dstkey
=
receiver
->
bpop
.
target
;
}
else
{
/* BRPOPLPUSH */
/* This should remove the first element of the "clients" list. */
robj
*
dobj
=
lookupKeyWrite
(
receiver
->
db
,
target
);
unblockClientWaitingData
(
receiver
);
if
(
dobj
&&
checkType
(
receiver
,
dobj
,
REDIS_LIST
))
return
0
;
redisAssert
(
ln
!=
listFirst
(
clients
));
rpoplpushHandlePush
(
receiver
,
target
,
dobj
,
ele
);
decrRefCount
(
target
);
if
(
dstkey
==
NULL
)
{
/* BRPOP/BLPOP */
addReplyMultiBulkLen
(
receiver
,
2
);
addReplyBulk
(
receiver
,
key
);
addReplyBulk
(
receiver
,
ele
);
return
1
;
}
else
{
/* BRPOPLPUSH */
dstobj
=
lookupKeyWrite
(
receiver
->
db
,
dstkey
);
if
(
dstobj
&&
checkType
(
receiver
,
dstobj
,
REDIS_LIST
))
{
decrRefCount
(
dstkey
);
}
else
{
rpoplpushHandlePush
(
receiver
,
dstkey
,
dstobj
,
ele
);
decrRefCount
(
dstkey
);
return
1
;
}
}
}
}
return
1
;
return
0
;
}
}
int
getTimeoutFromObjectOrReply
(
redisClient
*
c
,
robj
*
object
,
time_t
*
timeout
)
{
int
getTimeoutFromObjectOrReply
(
redisClient
*
c
,
robj
*
object
,
time_t
*
timeout
)
{
...
...
tests/unit/type/list.tcl
View file @
8a88c368
...
@@ -191,6 +191,20 @@ start_server {
...
@@ -191,6 +191,20 @@ start_server {
assert_equal
{
foo
}
[
r lrange blist 0 -1
]
assert_equal
{
foo
}
[
r lrange blist 0 -1
]
}
}
test
"BRPOPLPUSH with multiple blocked clients"
{
set rd1
[
redis_deferring_client
]
set rd2
[
redis_deferring_client
]
r del blist target1 target2
r set target1 nolist
$rd1 brpoplpush blist target1 0
$rd2 brpoplpush blist target2 0
r lpush blist foo
assert_error
"ERR*wrong kind*"
{
$rd1
read
}
assert_equal
{
foo
}
[
$rd2
read
]
assert_equal
{
foo
}
[
r lrange target2 0 -1
]
}
test
"linked BRPOPLPUSH"
{
test
"linked BRPOPLPUSH"
{
set rd1
[
redis_deferring_client
]
set rd1
[
redis_deferring_client
]
set rd2
[
redis_deferring_client
]
set rd2
[
redis_deferring_client
]
...
...
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