caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-23 08:38:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify duplicated NACK #5112 fix.

Browse Source 
We don't really need to distinguish between the case the consumer is the
same or is a different one.
This commit is contained in:
antirez 2018-07-12 13:15:54 +02:00
parent bf4def0fbc
commit a7c180e559
1 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/t_stream.c
View File

@ -905,29 +905,26 @@ size_t streamReplyWithRange(client *c, stream *s, streamID *start, streamID *end
* will not require extra lookups. We'll fix the problem later * will not require extra lookups. We'll fix the problem later
* if we find that there is already a entry for this ID. */ * if we find that there is already a entry for this ID. */
streamNACK *nack = streamCreateNACK(consumer); streamNACK *nack = streamCreateNACK(consumer);
int retval_group_tryins = 0, retval_consumer_tryins = 0; int group_inserted =
retval_group_tryins = raxTryInsert(group->pel,buf,sizeof(buf),nack,NULL); raxTryInsert(group->pel,buf,sizeof(buf),nack,NULL);
retval_consumer_tryins = raxTryInsert(consumer->pel,buf,sizeof(buf),nack,NULL); int consumer_inserted =
raxTryInsert(consumer->pel,buf,sizeof(buf),nack,NULL);
/* Now we can check if the entry was already busy, and /* Now we can check if the entry was already busy, and
* in that case reassign the entry to the new consumer. */ * in that case reassign the entry to the new consumer,
if (retval_group_tryins == 0) { * or update it if the consumer is the same as before. */
streamNACK *oldnack = raxFind(group->pel,buf,sizeof(buf)); if (group_inserted == 0) {
serverAssert(oldnack != raxNotFound);
if (retval_consumer_tryins == 0) {
/* In this case, only need to update old nack
* delivery_time and delivery_count. */
oldnack->delivery_time = mstime();
oldnack->delivery_count++;
streamFreeNACK(nack); streamFreeNACK(nack);
} else { nack = raxFind(group->pel,buf,sizeof(buf));
/* remove the old nack from original consumer */ serverAssert(nack != raxNotFound);
raxRemove(oldnack->consumer->pel,buf,sizeof(buf),NULL); raxRemove(nack->consumer->pel,buf,sizeof(buf),NULL);
/* Overwrite nack in group pel. */ /* Update the consumer and idle time. */
raxInsert(group->pel,buf,sizeof(buf),nack,NULL); nack->consumer = consumer;
streamFreeNACK(oldnack); nack->delivery_time = mstime();
} nack->delivery_count++;
} else if (retval_group_tryins == 1 && retval_consumer_tryins == 0) { /* Add the entry in the new consumer local PEL. */
raxInsert(consumer->pel,buf,sizeof(buf),nack,NULL);
} else if (group_inserted == 1 && consumer_inserted == 0) {
serverPanic("NACK half-created. Should not be possible."); serverPanic("NACK half-created. Should not be possible.");
} }