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
f7d4c3ac
Commit
f7d4c3ac
authored
Feb 21, 2018
by
antirez
Browse files
Streams: trap more errors in stream loading + RDB check type name.
parent
8727b484
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/rdb.c
View file @
f7d4c3ac
...
...
@@ -1624,6 +1624,10 @@ robj *rdbLoadObject(int rdbtype, rio *rdb) {
* we read more data. */
streamID
cg_id
;
sds
cgname
=
rdbGenericLoadStringObject
(
rdb
,
RDB_LOAD_SDS
,
NULL
);
if
(
cgname
==
NULL
)
{
rdbExitReportCorruptRDB
(
"Error reading the consumer group name from Stream"
);
}
cg_id
.
ms
=
rdbLoadLen
(
rdb
,
NULL
);
cg_id
.
seq
=
rdbLoadLen
(
rdb
,
NULL
);
streamCG
*
cgroup
=
streamCreateCG
(
s
,
cgname
,
sdslen
(
cgname
),
&
cg_id
);
...
...
@@ -1654,6 +1658,10 @@ robj *rdbLoadObject(int rdbtype, rio *rdb) {
size_t
consumers_num
=
rdbLoadLen
(
rdb
,
NULL
);
while
(
consumers_num
--
)
{
sds
cname
=
rdbGenericLoadStringObject
(
rdb
,
RDB_LOAD_SDS
,
NULL
);
if
(
cname
==
NULL
)
{
rdbExitReportCorruptRDB
(
"Error reading the consumer name from Stream group"
);
}
streamConsumer
*
consumer
=
streamLookupConsumer
(
cgroup
,
cname
,
1
);
sdsfree
(
cname
);
...
...
src/redis-check-rdb.c
View file @
f7d4c3ac
...
...
@@ -85,7 +85,8 @@ char *rdb_type_string[] = {
"set-intset"
,
"zset-ziplist"
,
"hash-ziplist"
,
"quicklist"
"quicklist"
,
"stream"
};
/* Show a few stats collected into 'rdbstate' */
...
...
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