mirror of
https://github.com/fluencelabs/redis
synced 2025-06-20 04:26:31 +00:00
CG: RDB loading first implementation.
This commit is contained in:
@ -41,7 +41,6 @@
|
||||
#define STREAM_ITEM_FLAG_SAMEFIELDS (1<<1) /* Same fields as master entry. */
|
||||
|
||||
void streamFreeCG(streamCG *cg);
|
||||
streamNACK *streamCreateNACK(streamConsumer *consumer);
|
||||
size_t streamReplyWithRangeFromConsumerPEL(client *c, stream *s, streamID *start, streamID *end, size_t count, streamCG *group, streamConsumer *consumer);
|
||||
|
||||
/* -----------------------------------------------------------------------
|
||||
@ -1304,7 +1303,7 @@ void streamFreeConsumer(streamConsumer *sc) {
|
||||
* specified name and last server ID. If a consumer group with the same name
|
||||
* already existed NULL is returned, otherwise the pointer to the consumer
|
||||
* group is returned. */
|
||||
streamCG *streamCreateCG(stream *s, char *name, size_t namelen, streamID id) {
|
||||
streamCG *streamCreateCG(stream *s, char *name, size_t namelen, streamID *id) {
|
||||
if (s->cgroups == NULL) s->cgroups = raxNew();
|
||||
if (raxFind(s->cgroups,(unsigned char*)name,namelen) != raxNotFound)
|
||||
return NULL;
|
||||
@ -1312,7 +1311,7 @@ streamCG *streamCreateCG(stream *s, char *name, size_t namelen, streamID id) {
|
||||
streamCG *cg = zmalloc(sizeof(*cg));
|
||||
cg->pel = raxNew();
|
||||
cg->consumers = raxNew();
|
||||
cg->last_id = id;
|
||||
cg->last_id = *id;
|
||||
raxInsert(s->cgroups,(unsigned char*)name,namelen,cg,NULL);
|
||||
return cg;
|
||||
}
|
||||
@ -1388,7 +1387,7 @@ NULL
|
||||
} else if (streamParseIDOrReply(c,c->argv[4],&id,0) != C_OK) {
|
||||
return;
|
||||
}
|
||||
streamCG *cg = streamCreateCG(s,grpname,sdslen(grpname),id);
|
||||
streamCG *cg = streamCreateCG(s,grpname,sdslen(grpname),&id);
|
||||
if (cg) {
|
||||
addReply(c,shared.ok);
|
||||
} else {
|
||||
|
Reference in New Issue
Block a user