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
0adb43b6
Commit
0adb43b6
authored
Sep 08, 2017
by
antirez
Browse files
Streams: XREAD ability to block fixed.
parent
6a1c92d5
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/blocked.c
View file @
0adb43b6
...
...
@@ -134,7 +134,7 @@ void processUnblockedClients(void) {
/* Unblock a client calling the right function depending on the kind
* of operation the client is blocking for. */
void
unblockClient
(
client
*
c
)
{
if
(
c
->
btype
==
BLOCKED_LIST
)
{
if
(
c
->
btype
==
BLOCKED_LIST
||
c
->
btype
==
BLOCKED_STREAM
)
{
unblockClientWaitingData
(
c
);
}
else
if
(
c
->
btype
==
BLOCKED_WAIT
)
{
unblockClientWaitingReplicas
(
c
);
...
...
@@ -160,7 +160,7 @@ void unblockClient(client *c) {
* send it a reply of some kind. After this function is called,
* unblockClient() will be called with the same client as argument. */
void
replyToBlockedClientTimedOut
(
client
*
c
)
{
if
(
c
->
btype
==
BLOCKED_LIST
)
{
if
(
c
->
btype
==
BLOCKED_LIST
||
c
->
btype
==
BLOCKED_STREAM
)
{
addReply
(
c
,
shared
.
nullmultibulk
);
}
else
if
(
c
->
btype
==
BLOCKED_WAIT
)
{
addReplyLongLong
(
c
,
replicationCountAcksByOffset
(
c
->
bpop
.
reploffset
));
...
...
src/t_stream.c
View file @
0adb43b6
...
...
@@ -412,9 +412,8 @@ void xreadCommand(client *c) {
char
*
o
=
c
->
argv
[
i
]
->
ptr
;
if
(
!
strcasecmp
(
o
,
"BLOCK"
)
&&
moreargs
)
{
i
++
;
if
(
getLongLongFromObjectOrReply
(
c
,
c
->
argv
[
i
],
&
timeout
,
NULL
)
!=
C_OK
)
return
;
if
(
timeout
<
0
)
timeout
=
0
;
if
(
getTimeoutFromObjectOrReply
(
c
,
c
->
argv
[
i
],
&
timeout
,
UNIT_MILLISECONDS
)
!=
C_OK
)
return
;
}
else
if
(
!
strcasecmp
(
o
,
"COUNT"
)
&&
moreargs
)
{
i
++
;
if
(
getLongLongFromObjectOrReply
(
c
,
c
->
argv
[
i
],
&
count
,
NULL
)
!=
C_OK
)
...
...
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