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
13ff7bc3
Commit
13ff7bc3
authored
Feb 18, 2018
by
antirez
Browse files
CG: fix RDB saving when there are no consumer groups.
parent
267f7f2c
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/rdb.c
View file @
13ff7bc3
...
...
@@ -894,34 +894,38 @@ ssize_t rdbSaveObject(rio *rdb, robj *o) {
* type, so serialize every consumer group. */
/* Save the number of groups. */
if
((
n
=
rdbSaveLen
(
rdb
,
raxSize
(
s
->
cgroups
)))
==
-
1
)
return
-
1
;
size_t
num_cgroups
=
s
->
cgroups
?
raxSize
(
s
->
cgroups
)
:
0
;
if
((
n
=
rdbSaveLen
(
rdb
,
num_cgroups
))
==
-
1
)
return
-
1
;
nwritten
+=
n
;
/* Serialize each consumer group. */
raxStart
(
&
ri
,
s
->
cgroups
);
raxSeek
(
&
ri
,
"^"
,
NULL
,
0
);
while
(
raxNext
(
&
ri
))
{
streamCG
*
cg
=
ri
.
data
;
if
(
num_cgroups
)
{
/* Serialize each consumer group. */
raxStart
(
&
ri
,
s
->
cgroups
);
raxSeek
(
&
ri
,
"^"
,
NULL
,
0
);
while
(
raxNext
(
&
ri
))
{
streamCG
*
cg
=
ri
.
data
;
/* Save the group name. */
if
((
n
=
rdbSaveRawString
(
rdb
,
ri
.
key
,
ri
.
key_len
))
==
-
1
)
return
-
1
;
nwritten
+=
n
;
/* Save the group name. */
if
((
n
=
rdbSaveRawString
(
rdb
,
ri
.
key
,
ri
.
key_len
))
==
-
1
)
return
-
1
;
nwritten
+=
n
;
/* Last ID. */
if
((
n
=
rdbSaveLen
(
rdb
,
cg
->
last_id
.
ms
))
==
-
1
)
return
-
1
;
nwritten
+=
n
;
if
((
n
=
rdbSaveLen
(
rdb
,
cg
->
last_id
.
seq
))
==
-
1
)
return
-
1
;
nwritten
+=
n
;
/* Last ID. */
if
((
n
=
rdbSaveLen
(
rdb
,
cg
->
last_id
.
ms
))
==
-
1
)
return
-
1
;
nwritten
+=
n
;
if
((
n
=
rdbSaveLen
(
rdb
,
cg
->
last_id
.
seq
))
==
-
1
)
return
-
1
;
nwritten
+=
n
;
/* Save the global PEL. */
if
((
n
=
rdbSaveStreamPEL
(
rdb
,
cg
->
pel
,
1
))
==
-
1
)
return
-
1
;
nwritten
+=
n
;
/* Save the global PEL. */
if
((
n
=
rdbSaveStreamPEL
(
rdb
,
cg
->
pel
,
1
))
==
-
1
)
return
-
1
;
nwritten
+=
n
;
/* Save the consumers of this group. */
if
((
n
=
rdbSaveStreamConsumers
(
rdb
,
cg
))
==
-
1
)
return
-
1
;
nwritten
+=
n
;
/* Save the consumers of this group. */
if
((
n
=
rdbSaveStreamConsumers
(
rdb
,
cg
))
==
-
1
)
return
-
1
;
nwritten
+=
n
;
}
raxStop
(
&
ri
);
}
raxStop
(
&
ri
);
}
else
if
(
o
->
type
==
OBJ_MODULE
)
{
/* Save a module-specific value. */
RedisModuleIO
io
;
...
...
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