Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
74a64049
Commit
74a64049
authored
May 01, 2011
by
antirez
Browse files
Merge branch 'unstable' of github.com:antirez/redis into unstable
parents
5cbe90db
2f52dac9
Changes
4
Show whitespace changes
Inline
Side-by-side
src/cluster.c
View file @
74a64049
...
@@ -1168,6 +1168,44 @@ void clusterCommand(redisClient *c) {
...
@@ -1168,6 +1168,44 @@ void clusterCommand(redisClient *c) {
clusterUpdateState
();
clusterUpdateState
();
clusterSaveConfigOrDie
();
clusterSaveConfigOrDie
();
addReply
(
c
,
shared
.
ok
);
addReply
(
c
,
shared
.
ok
);
}
else
if
(
!
strcasecmp
(
c
->
argv
[
1
]
->
ptr
,
"setslot"
)
&&
c
->
argc
>=
4
)
{
/* SETSLOT 10 MIGRATING <instance ID> */
/* SETSLOT 10 IMPORTING <instance ID> */
/* SETSLOT 10 STABLE */
long
long
aux
;
unsigned
int
slot
;
clusterNode
*
n
;
if
(
getLongLongFromObjectOrReply
(
c
,
c
->
argv
[
2
],
&
aux
,
NULL
)
!=
REDIS_OK
)
return
;
if
(
aux
<
0
||
aux
>=
REDIS_CLUSTER_SLOTS
)
{
addReplyError
(
c
,
"Slot out of range"
);
return
;
}
slot
=
(
unsigned
int
)
aux
;
if
(
server
.
cluster
.
slots
[
slot
]
!=
server
.
cluster
.
myself
)
{
addReplyErrorFormat
(
c
,
"I'm not the owner of hash slot %u"
,
slot
);
return
;
}
if
(
!
strcasecmp
(
c
->
argv
[
3
]
->
ptr
,
"migrating"
)
&&
c
->
argc
==
5
)
{
if
((
n
=
clusterLookupNode
(
c
->
argv
[
4
]
->
ptr
))
==
NULL
)
{
addReplyErrorFormat
(
c
,
"I don't know about node %s"
,
(
char
*
)
c
->
argv
[
4
]
->
ptr
);
return
;
}
server
.
cluster
.
migrating_slots_to
[
slot
]
=
n
;
}
else
if
(
!
strcasecmp
(
c
->
argv
[
3
]
->
ptr
,
"importing"
)
&&
c
->
argc
==
5
)
{
if
((
n
=
clusterLookupNode
(
c
->
argv
[
4
]
->
ptr
))
==
NULL
)
{
addReplyErrorFormat
(
c
,
"I don't know about node %s"
,
(
char
*
)
c
->
argv
[
3
]
->
ptr
);
return
;
}
server
.
cluster
.
importing_slots_from
[
slot
]
=
n
;
}
else
if
(
!
strcasecmp
(
c
->
argv
[
3
]
->
ptr
,
"stable"
)
&&
c
->
argc
==
4
)
{
server
.
cluster
.
importing_slots_from
[
slot
]
=
NULL
;
}
else
{
addReplyError
(
c
,
"Invalid CLUSTER SETSLOT action or number of arguments"
);
}
}
else
if
(
!
strcasecmp
(
c
->
argv
[
1
]
->
ptr
,
"info"
)
&&
c
->
argc
==
2
)
{
}
else
if
(
!
strcasecmp
(
c
->
argv
[
1
]
->
ptr
,
"info"
)
&&
c
->
argc
==
2
)
{
char
*
statestr
[]
=
{
"ok"
,
"fail"
,
"needhelp"
};
char
*
statestr
[]
=
{
"ok"
,
"fail"
,
"needhelp"
};
int
slots_assigned
=
0
,
slots_ok
=
0
,
slots_pfail
=
0
,
slots_fail
=
0
;
int
slots_assigned
=
0
,
slots_ok
=
0
,
slots_pfail
=
0
,
slots_fail
=
0
;
...
@@ -1205,6 +1243,30 @@ void clusterCommand(redisClient *c) {
...
@@ -1205,6 +1243,30 @@ void clusterCommand(redisClient *c) {
(
unsigned
long
)
sdslen
(
info
)));
(
unsigned
long
)
sdslen
(
info
)));
addReplySds
(
c
,
info
);
addReplySds
(
c
,
info
);
addReply
(
c
,
shared
.
crlf
);
addReply
(
c
,
shared
.
crlf
);
}
else
if
(
!
strcasecmp
(
c
->
argv
[
1
]
->
ptr
,
"keyslot"
)
&&
c
->
argc
==
3
)
{
sds
key
=
c
->
argv
[
2
]
->
ptr
;
addReplyLongLong
(
c
,
keyHashSlot
(
key
,
sdslen
(
key
)));
}
else
if
(
!
strcasecmp
(
c
->
argv
[
1
]
->
ptr
,
"getkeysinslot"
)
&&
c
->
argc
==
4
)
{
long
long
maxkeys
,
slot
;
unsigned
int
numkeys
,
j
;
robj
**
keys
;
if
(
getLongLongFromObjectOrReply
(
c
,
c
->
argv
[
2
],
&
slot
,
NULL
)
!=
REDIS_OK
)
return
;
if
(
getLongLongFromObjectOrReply
(
c
,
c
->
argv
[
3
],
&
maxkeys
,
NULL
)
!=
REDIS_OK
)
return
;
if
(
slot
<
0
||
slot
>=
REDIS_CLUSTER_SLOTS
||
maxkeys
<
0
||
maxkeys
>
1024
*
1024
)
{
addReplyError
(
c
,
"Invalid slot or number of keys"
);
return
;
}
keys
=
zmalloc
(
sizeof
(
robj
*
)
*
maxkeys
);
numkeys
=
GetKeysInSlot
(
slot
,
keys
,
maxkeys
);
addReplyMultiBulkLen
(
c
,
numkeys
);
for
(
j
=
0
;
j
<
numkeys
;
j
++
)
addReplyBulk
(
c
,
keys
[
j
]);
zfree
(
keys
);
}
else
{
}
else
{
addReplyError
(
c
,
"Wrong CLUSTER subcommand or number of arguments"
);
addReplyError
(
c
,
"Wrong CLUSTER subcommand or number of arguments"
);
}
}
...
...
src/db.c
View file @
74a64049
...
@@ -725,14 +725,18 @@ void SlotToKeyDel(robj *key) {
...
@@ -725,14 +725,18 @@ void SlotToKeyDel(robj *key) {
zslDelete
(
server
.
cluster
.
slots_to_keys
,
hashslot
,
key
);
zslDelete
(
server
.
cluster
.
slots_to_keys
,
hashslot
,
key
);
}
}
robj
*
GetKeyInSlot
(
unsigned
int
hashslot
)
{
unsigned
int
GetKey
s
InSlot
(
unsigned
int
hashslot
,
robj
**
keys
,
unsigned
int
count
)
{
zskiplistNode
*
n
;
zskiplistNode
*
n
;
zrangespec
range
;
zrangespec
range
;
int
j
=
0
;
range
.
min
=
range
.
max
=
hashslot
;
range
.
min
=
range
.
max
=
hashslot
;
range
.
minex
=
range
.
maxex
=
0
;
range
.
minex
=
range
.
maxex
=
0
;
n
=
zslFirstInRange
(
server
.
cluster
.
slots_to_keys
,
range
);
n
=
zslFirstInRange
(
server
.
cluster
.
slots_to_keys
,
range
);
if
(
!
n
)
return
NULL
;
while
(
n
&&
n
->
score
==
hashslot
&&
count
--
)
{
return
n
->
obj
;
keys
[
j
++
]
=
n
->
obj
;
n
=
n
->
level
[
0
].
forward
;
}
return
j
;
}
}
src/networking.c
View file @
74a64049
...
@@ -526,12 +526,18 @@ void freeClient(redisClient *c) {
...
@@ -526,12 +526,18 @@ void freeClient(redisClient *c) {
* close the connection with all our slaves if we have any, so
* close the connection with all our slaves if we have any, so
* when we'll resync with the master the other slaves will sync again
* when we'll resync with the master the other slaves will sync again
* with us as well. Note that also when the slave is not connected
* with us as well. Note that also when the slave is not connected
* to the master it will keep refusing connections by other slaves. */
* to the master it will keep refusing connections by other slaves.
*
* We do this only if server.masterhost != NULL. If it is NULL this
* means the user called SLAVEOF NO ONE and we are freeing our
* link with the master, so no need to close link with slaves. */
if
(
server
.
masterhost
!=
NULL
)
{
while
(
listLength
(
server
.
slaves
))
{
while
(
listLength
(
server
.
slaves
))
{
ln
=
listFirst
(
server
.
slaves
);
ln
=
listFirst
(
server
.
slaves
);
freeClient
((
redisClient
*
)
ln
->
value
);
freeClient
((
redisClient
*
)
ln
->
value
);
}
}
}
}
}
/* Release memory */
/* Release memory */
zfree
(
c
->
argv
);
zfree
(
c
->
argv
);
freeClientMultiState
(
c
);
freeClientMultiState
(
c
);
...
...
src/redis.h
View file @
74a64049
...
@@ -1065,6 +1065,7 @@ long long emptyDb();
...
@@ -1065,6 +1065,7 @@ long long emptyDb();
int
selectDb
(
redisClient
*
c
,
int
id
);
int
selectDb
(
redisClient
*
c
,
int
id
);
void
signalModifiedKey
(
redisDb
*
db
,
robj
*
key
);
void
signalModifiedKey
(
redisDb
*
db
,
robj
*
key
);
void
signalFlushedDb
(
int
dbid
);
void
signalFlushedDb
(
int
dbid
);
unsigned
int
GetKeysInSlot
(
unsigned
int
hashslot
,
robj
**
keys
,
unsigned
int
count
);
/* API to get key arguments from commands */
/* API to get key arguments from commands */
#define REDIS_GETKEYS_ALL 0
#define REDIS_GETKEYS_ALL 0
...
...
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