fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-05-03 14:32:14 +00:00
Code Issues Projects Releases Wiki Activity

Fix merge errors.

Browse Source 
For some reason I made a merge fiasco between 5.0 and unstable.
This fixes the error introduced by merging unstable.
This commit is contained in:
antirez 2018-07-23 18:35:24 +02:00
parent 77a7ec7200
commit 49841a54db
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/config.c
View File

@ -1107,10 +1107,6 @@ void configSetCommand(client *c) {
"stream-node-max-bytes",server.stream_node_max_bytes,0,LONG_MAX) { "stream-node-max-bytes",server.stream_node_max_bytes,0,LONG_MAX) {
} config_set_numerical_field( } config_set_numerical_field(
"stream-node-max-entries",server.stream_node_max_entries,0,LLONG_MAX) { "stream-node-max-entries",server.stream_node_max_entries,0,LLONG_MAX) {
} config_set_numerical_field(
"stream-node-max-bytes",server.stream_node_max_bytes,0,LLONG_MAX) {
} config_set_numerical_field(
"stream-node-max-entries",server.stream_node_max_entries,0,LLONG_MAX) {
} config_set_numerical_field( } config_set_numerical_field(
"list-max-ziplist-size",server.list_max_ziplist_size,INT_MIN,INT_MAX) { "list-max-ziplist-size",server.list_max_ziplist_size,INT_MIN,INT_MAX) {
} config_set_numerical_field( } config_set_numerical_field(

3
src/t_stream.c
View File

@ -722,9 +722,6 @@ void streamIteratorRemoveEntry(streamIterator *si, streamID *current) {
/* Update the number of entries counter. */ /* Update the number of entries counter. */
si->stream->length--; si->stream->length--;
/* Update the number of entries counter. */
si->stream->length--;
/* Re-seek the iterator to fix the now messed up state. */ /* Re-seek the iterator to fix the now messed up state. */
streamID start, end; streamID start, end;
if (si->rev) { if (si->rev) {