Commit 25b36f8d authored by antirez's avatar antirez
Browse files

Merge branch 'unstable' of github.com:/antirez/redis into unstable

parents 441cd971 14045adf
...@@ -239,7 +239,7 @@ typedef long long ustime_t; /* microsecond time type. */ ...@@ -239,7 +239,7 @@ typedef long long ustime_t; /* microsecond time type. */
we return single threaded that the we return single threaded that the
client has already pending commands client has already pending commands
to be executed. */ to be executed. */
#define CLIENT_TRACKING (1<<31) /* Client enabled keys tracking in order to #define CLIENT_TRACKING (1ULL<<31) /* Client enabled keys tracking in order to
perform client side caching. */ perform client side caching. */
#define CLIENT_TRACKING_BROKEN_REDIR (1ULL<<32) /* Target client is invalid. */ #define CLIENT_TRACKING_BROKEN_REDIR (1ULL<<32) /* Target client is invalid. */
......
...@@ -164,7 +164,7 @@ void trackingInvalidateSlot(uint64_t slot) { ...@@ -164,7 +164,7 @@ void trackingInvalidateSlot(uint64_t slot) {
raxSeek(&ri,"^",NULL,0); raxSeek(&ri,"^",NULL,0);
while(raxNext(&ri)) { while(raxNext(&ri)) {
uint64_t id; uint64_t id;
memcpy(&id,ri.key,ri.key_len); memcpy(&id,ri.key,sizeof(id));
client *c = lookupClientByID(id); client *c = lookupClientByID(id);
if (c == NULL || !(c->flags & CLIENT_TRACKING)) continue; if (c == NULL || !(c->flags & CLIENT_TRACKING)) continue;
sendTrackingMessage(c,slot); sendTrackingMessage(c,slot);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment