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
6856c7b4
Commit
6856c7b4
authored
Oct 17, 2011
by
antirez
Browse files
First implementation of the ASKING command. Semantics still to verify.
parent
e0aab1fc
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/cluster.c
View file @
6856c7b4
...
...
@@ -1657,6 +1657,19 @@ void dumpCommand(redisClient *c) {
return
;
}
/* The ASKING command is required after a -ASK redirection.
* The client should issue ASKING before to actualy send the command to
* the target instance. See the Redis Cluster specification for more
* information. */
void
askingCommand
(
redisClient
*
c
)
{
if
(
server
.
cluster_enabled
==
0
)
{
addReplyError
(
c
,
"This instance has cluster support disabled"
);
return
;
}
c
->
flags
|=
REDIS_ASKING
;
addReply
(
c
,
shared
.
ok
);
}
/* -----------------------------------------------------------------------------
* Cluster functions related to serving / redirecting clients
* -------------------------------------------------------------------------- */
...
...
@@ -1750,9 +1763,12 @@ clusterNode *getNodeByQuery(redisClient *c, struct redisCommand *cmd, robj **arg
}
/* Handle the case in which we are receiving this hash slot from
* another instance, so we'll accept the query even if in the table
* it is assigned to a different node. */
if
(
server
.
cluster
.
importing_slots_from
[
slot
]
!=
NULL
)
* it is assigned to a different node, but only if the client
* issued an ASKING command before. */
if
(
server
.
cluster
.
importing_slots_from
[
slot
]
!=
NULL
&&
c
->
flags
&
REDIS_ASKING
)
{
return
server
.
cluster
.
myself
;
}
/* It's not a -ASK case. Base case: just return the right node. */
return
n
;
}
src/networking.c
View file @
6856c7b4
...
...
@@ -625,6 +625,8 @@ void resetClient(redisClient *c) {
c
->
reqtype
=
0
;
c
->
multibulklen
=
0
;
c
->
bulklen
=
-
1
;
/* We clear the ASKING flag as well if we are not inside a MULTI. */
if
(
!
(
c
->
flags
&
REDIS_MULTI
))
c
->
flags
&=
(
~
REDIS_ASKING
);
}
void
closeTimedoutClients
(
void
)
{
...
...
src/redis.c
View file @
6856c7b4
...
...
@@ -209,6 +209,7 @@ struct redisCommand redisCommandTable[] = {
{
"cluster"
,
clusterCommand
,
-
2
,
"ar"
,
0
,
NULL
,
0
,
0
,
0
,
0
,
0
},
{
"restore"
,
restoreCommand
,
4
,
"awm"
,
0
,
NULL
,
1
,
1
,
1
,
0
,
0
},
{
"migrate"
,
migrateCommand
,
6
,
"aw"
,
0
,
NULL
,
0
,
0
,
0
,
0
,
0
},
{
"asking"
,
askingCommand
,
1
,
"r"
,
0
,
NULL
,
0
,
0
,
0
,
0
,
0
},
{
"dump"
,
dumpCommand
,
2
,
"ar"
,
0
,
NULL
,
0
,
0
,
0
,
0
,
0
},
{
"object"
,
objectCommand
,
-
2
,
"r"
,
0
,
NULL
,
0
,
0
,
0
,
0
,
0
},
{
"client"
,
clientCommand
,
-
2
,
"ar"
,
0
,
NULL
,
0
,
0
,
0
,
0
,
0
},
...
...
src/redis.h
View file @
6856c7b4
...
...
@@ -133,6 +133,7 @@
#define REDIS_UNBLOCKED 256
/* This client was unblocked and is stored in
server.unblocked_clients */
#define REDIS_LUA_CLIENT 512
/* This is a non connected client used by Lua */
#define REDIS_ASKING 1024
/* Client issued the ASKING command */
/* Client request types */
#define REDIS_REQ_INLINE 1
...
...
@@ -1121,6 +1122,7 @@ void unwatchCommand(redisClient *c);
void
clusterCommand
(
redisClient
*
c
);
void
restoreCommand
(
redisClient
*
c
);
void
migrateCommand
(
redisClient
*
c
);
void
askingCommand
(
redisClient
*
c
);
void
dumpCommand
(
redisClient
*
c
);
void
objectCommand
(
redisClient
*
c
);
void
clientCommand
(
redisClient
*
c
);
...
...
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