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
e63bb7ec
You need to sign in or sign up before continuing.
Commit
e63bb7ec
authored
Apr 21, 2020
by
antirez
Browse files
Tracking: NOLOOP further implementation and fixes.
parent
6791ff05
Changes
2
Show whitespace changes
Inline
Side-by-side
src/networking.c
View file @
e63bb7ec
...
...
@@ -2289,6 +2289,8 @@ NULL
options
|=
CLIENT_TRACKING_OPTIN
;
}
else
if
(
!
strcasecmp
(
c
->
argv
[
j
]
->
ptr
,
"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
)
{
j
++
;
prefix
=
zrealloc
(
prefix
,
sizeof
(
robj
*
)
*
(
numprefix
+
1
));
...
...
src/tracking.c
View file @
e63bb7ec
...
...
@@ -94,7 +94,8 @@ void disableTracking(client *c) {
server
.
tracking_clients
--
;
c
->
flags
&=
~
(
CLIENT_TRACKING
|
CLIENT_TRACKING_BROKEN_REDIR
|
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
++
;
c
->
flags
|=
CLIENT_TRACKING
;
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
;
/* This may be the first client we ever enable. Crete the tracking
* table if it does not exist. */
if
(
TrackingTable
==
NULL
)
{
TrackingTable
=
raxNew
();
PrefixTable
=
raxNew
();
TrackingChannelName
=
createStringObject
(
"__redis__:invalidate"
,
20
);
}
/* For broadcasting, set the list of prefixes in the client. */
if
(
options
&
CLIENT_TRACKING_BCAST
)
{
c
->
flags
|=
CLIENT_TRACKING_BCAST
;
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
));
}
}
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
...
...
@@ -459,10 +468,12 @@ void trackingBroadcastInvalidationMessages(void) {
raxStart
(
&
ri
,
PrefixTable
);
raxSeek
(
&
ri
,
"^"
,
NULL
,
0
);
/* For each prefix... */
while
(
raxNext
(
&
ri
))
{
bcastState
*
bs
=
ri
.
data
;
if
(
raxSize
(
bs
->
keys
))
{
if
(
raxSize
(
bs
->
keys
))
{
/* Generate the common protocol for all the clients that are
* not using the NOLOOP option. */
sds
proto
=
trackingBuildBroadcastReply
(
NULL
,
bs
->
keys
);
...
...
@@ -476,8 +487,10 @@ void trackingBroadcastInvalidationMessages(void) {
if
(
c
->
flags
&
CLIENT_TRACKING_NOLOOP
)
{
/* This client may have certain keys excluded. */
sds
adhoc
=
trackingBuildBroadcastReply
(
c
,
bs
->
keys
);
if
(
adhoc
)
{
sendTrackingMessage
(
c
,
adhoc
,
sdslen
(
adhoc
),
1
);
sdsfree
(
adhoc
);
}
}
else
{
sendTrackingMessage
(
c
,
proto
,
sdslen
(
proto
),
1
);
}
...
...
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