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
1677f422
Unverified
Commit
1677f422
authored
Oct 10, 2019
by
Salvatore Sanfilippo
Committed by
GitHub
Oct 10, 2019
Browse files
Merge pull request #6443 from guybe7/fix_stream_rax_node_limits
Fix usage of server.stream_node_max_*
parents
14a9da06
2fae0192
Changes
1
Show whitespace changes
Inline
Side-by-side
src/t_stream.c
View file @
1677f422
...
@@ -242,17 +242,17 @@ int streamAppendItem(stream *s, robj **argv, int64_t numfields, streamID *added_
...
@@ -242,17 +242,17 @@ int streamAppendItem(stream *s, robj **argv, int64_t numfields, streamID *added_
* the current node is full. */
* the current node is full. */
if
(
lp
!=
NULL
)
{
if
(
lp
!=
NULL
)
{
if
(
server
.
stream_node_max_bytes
&&
if
(
server
.
stream_node_max_bytes
&&
lp_bytes
>
server
.
stream_node_max_bytes
)
lp_bytes
>
=
server
.
stream_node_max_bytes
)
{
{
lp
=
NULL
;
lp
=
NULL
;
}
else
if
(
server
.
stream_node_max_entries
)
{
}
else
if
(
server
.
stream_node_max_entries
)
{
int64_t
count
=
lpGetInteger
(
lpFirst
(
lp
));
int64_t
count
=
lpGetInteger
(
lpFirst
(
lp
));
if
(
count
>
server
.
stream_node_max_entries
)
lp
=
NULL
;
if
(
count
>
=
server
.
stream_node_max_entries
)
lp
=
NULL
;
}
}
}
}
int
flags
=
STREAM_ITEM_FLAG_NONE
;
int
flags
=
STREAM_ITEM_FLAG_NONE
;
if
(
lp
==
NULL
||
lp_bytes
>
server
.
stream_node_max_bytes
)
{
if
(
lp
==
NULL
||
lp_bytes
>
=
server
.
stream_node_max_bytes
)
{
master_id
=
id
;
master_id
=
id
;
streamEncodeID
(
rax_key
,
&
id
);
streamEncodeID
(
rax_key
,
&
id
);
/* Create the listpack having the master entry ID and fields. */
/* Create the listpack having the master entry ID and fields. */
...
...
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