gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tracking: NOLOOP further implementation and fixes.

Browse Source
This commit is contained in:
antirez 2020-04-21 17:29:18 +02:00
parent 94f2e7f9f9
commit c6ccc2f690
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/networking.c
View File

@ -2289,6 +2289,8 @@ NULL
options |= CLIENT_TRACKING_OPTIN; options |= CLIENT_TRACKING_OPTIN;
} else if (!strcasecmp(c->argv[j]->ptr,"optout")) { } else if (!strcasecmp(c->argv[j]->ptr,"optout")) {
options |= CLIENT_TRACKING_OPTOUT; options |= CLIENT_TRACKING_OPTOUT;
} else if (!strcasecmp(c->argv[j]->ptr,"noloop")) {
options |= CLIENT_TRACKING_NOLOOP;
} else if (!strcasecmp(c->argv[j]->ptr,"prefix") && moreargs) { } else if (!strcasecmp(c->argv[j]->ptr,"prefix") && moreargs) {
j++; j++;
prefix = zrealloc(prefix,sizeof(robj*)*(numprefix+1)); prefix = zrealloc(prefix,sizeof(robj*)*(numprefix+1));

21
src/tracking.c
View File

@ -94,7 +94,8 @@ void disableTracking(client *c) {
server.tracking_clients--; server.tracking_clients--;
c->flags &= ~(CLIENT_TRACKING|CLIENT_TRACKING_BROKEN_REDIR| c->flags &= ~(CLIENT_TRACKING|CLIENT_TRACKING_BROKEN_REDIR|
CLIENT_TRACKING_BCAST|CLIENT_TRACKING_OPTIN| CLIENT_TRACKING_BCAST|CLIENT_TRACKING_OPTIN|
CLIENT_TRACKING_OPTOUT|CLIENT_TRACKING_CACHING); CLIENT_TRACKING_OPTOUT|CLIENT_TRACKING_CACHING|
CLIENT_TRACKING_NOLOOP);
} }
} }
@ -129,14 +130,19 @@ void enableTracking(client *c, uint64_t redirect_to, uint64_t options, robj **pr
if (!(c->flags & CLIENT_TRACKING)) server.tracking_clients++; if (!(c->flags & CLIENT_TRACKING)) server.tracking_clients++;
c->flags |= CLIENT_TRACKING; c->flags |= CLIENT_TRACKING;
c->flags &= ~(CLIENT_TRACKING_BROKEN_REDIR|CLIENT_TRACKING_BCAST| c->flags &= ~(CLIENT_TRACKING_BROKEN_REDIR|CLIENT_TRACKING_BCAST|
CLIENT_TRACKING_OPTIN|CLIENT_TRACKING_OPTOUT); CLIENT_TRACKING_OPTIN|CLIENT_TRACKING_OPTOUT|
CLIENT_TRACKING_NOLOOP);
c->client_tracking_redirection = redirect_to; c->client_tracking_redirection = redirect_to;
/* This may be the first client we ever enable. Crete the tracking
* table if it does not exist. */
if (TrackingTable == NULL) { if (TrackingTable == NULL) {
TrackingTable = raxNew(); TrackingTable = raxNew();
PrefixTable = raxNew(); PrefixTable = raxNew();
TrackingChannelName = createStringObject("__redis__:invalidate",20); TrackingChannelName = createStringObject("__redis__:invalidate",20);
} }
/* For broadcasting, set the list of prefixes in the client. */
if (options & CLIENT_TRACKING_BCAST) { if (options & CLIENT_TRACKING_BCAST) {
c->flags |= CLIENT_TRACKING_BCAST; c->flags |= CLIENT_TRACKING_BCAST;
if (numprefix == 0) enableBcastTrackingForPrefix(c,"",0); if (numprefix == 0) enableBcastTrackingForPrefix(c,"",0);
@ -145,7 +151,10 @@ void enableTracking(client *c, uint64_t redirect_to, uint64_t options, robj **pr
enableBcastTrackingForPrefix(c,sdsprefix,sdslen(sdsprefix)); enableBcastTrackingForPrefix(c,sdsprefix,sdslen(sdsprefix));
} }
} }
c->flags |= options & (CLIENT_TRACKING_OPTIN|CLIENT_TRACKING_OPTOUT);
/* Set the remaining flags that don't need any special handling. */
c->flags |= options & (CLIENT_TRACKING_OPTIN|CLIENT_TRACKING_OPTOUT|
CLIENT_TRACKING_NOLOOP);
} }
/* This function is called after the execution of a readonly command in the /* This function is called after the execution of a readonly command in the
@ -459,10 +468,12 @@ void trackingBroadcastInvalidationMessages(void) {
raxStart(&ri,PrefixTable); raxStart(&ri,PrefixTable);
raxSeek(&ri,"^",NULL,0); raxSeek(&ri,"^",NULL,0);
/* For each prefix... */
while(raxNext(&ri)) { while(raxNext(&ri)) {
bcastState *bs = ri.data; bcastState *bs = ri.data;
if (raxSize(bs->keys)) {
if (raxSize(bs->keys)) {
/* Generate the common protocol for all the clients that are /* Generate the common protocol for all the clients that are
* not using the NOLOOP option. */ * not using the NOLOOP option. */
sds proto = trackingBuildBroadcastReply(NULL,bs->keys); sds proto = trackingBuildBroadcastReply(NULL,bs->keys);
@ -476,8 +487,10 @@ void trackingBroadcastInvalidationMessages(void) {
if (c->flags & CLIENT_TRACKING_NOLOOP) { if (c->flags & CLIENT_TRACKING_NOLOOP) {
/* This client may have certain keys excluded. */ /* This client may have certain keys excluded. */
sds adhoc = trackingBuildBroadcastReply(c,bs->keys); sds adhoc = trackingBuildBroadcastReply(c,bs->keys);
if (adhoc) {
sendTrackingMessage(c,adhoc,sdslen(adhoc),1); sendTrackingMessage(c,adhoc,sdslen(adhoc),1);
sdsfree(adhoc); sdsfree(adhoc);
}
} else { } else {
sendTrackingMessage(c,proto,sdslen(proto),1); sendTrackingMessage(c,proto,sdslen(proto),1);
} }