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
fde5e737
Commit
fde5e737
authored
Jul 24, 2019
by
antirez
Browse files
Merge branch 'unstable' of github.com:/antirez/redis into unstable
parents
e53a26b5
dbee7ca0
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/cluster.c
View file @
fde5e737
...
@@ -4251,12 +4251,7 @@ NULL
...
@@ -4251,12 +4251,7 @@ NULL
}
}
}
else
if
(
!
strcasecmp
(
c
->
argv
[
1
]
->
ptr
,
"nodes"
)
&&
c
->
argc
==
2
)
{
}
else
if
(
!
strcasecmp
(
c
->
argv
[
1
]
->
ptr
,
"nodes"
)
&&
c
->
argc
==
2
)
{
/* CLUSTER NODES */
/* CLUSTER NODES */
robj
*
o
;
addReplyBulkSds
(
c
,
clusterGenNodesDescription
(
0
));
sds
ci
=
clusterGenNodesDescription
(
0
);
o
=
createObject
(
OBJ_STRING
,
ci
);
addReplyBulk
(
c
,
o
);
decrRefCount
(
o
);
}
else
if
(
!
strcasecmp
(
c
->
argv
[
1
]
->
ptr
,
"myid"
)
&&
c
->
argc
==
2
)
{
}
else
if
(
!
strcasecmp
(
c
->
argv
[
1
]
->
ptr
,
"myid"
)
&&
c
->
argc
==
2
)
{
/* CLUSTER MYID */
/* CLUSTER MYID */
addReplyBulkCBuffer
(
c
,
myself
->
name
,
CLUSTER_NAMELEN
);
addReplyBulkCBuffer
(
c
,
myself
->
name
,
CLUSTER_NAMELEN
);
...
@@ -4832,7 +4827,7 @@ int verifyDumpPayload(unsigned char *p, size_t len) {
...
@@ -4832,7 +4827,7 @@ int verifyDumpPayload(unsigned char *p, size_t len) {
* DUMP is actually not used by Redis Cluster but it is the obvious
* DUMP is actually not used by Redis Cluster but it is the obvious
* complement of RESTORE and can be useful for different applications. */
* complement of RESTORE and can be useful for different applications. */
void
dumpCommand
(
client
*
c
)
{
void
dumpCommand
(
client
*
c
)
{
robj
*
o
,
*
dumpobj
;
robj
*
o
;
rio
payload
;
rio
payload
;
/* Check if the key is here. */
/* Check if the key is here. */
...
@@ -4845,9 +4840,7 @@ void dumpCommand(client *c) {
...
@@ -4845,9 +4840,7 @@ void dumpCommand(client *c) {
createDumpPayload
(
&
payload
,
o
,
c
->
argv
[
1
]);
createDumpPayload
(
&
payload
,
o
,
c
->
argv
[
1
]);
/* Transfer to the client */
/* Transfer to the client */
dumpobj
=
createObject
(
OBJ_STRING
,
payload
.
io
.
buffer
.
ptr
);
addReplyBulkSds
(
c
,
payload
.
io
.
buffer
.
ptr
);
addReplyBulk
(
c
,
dumpobj
);
decrRefCount
(
dumpobj
);
return
;
return
;
}
}
...
...
src/config.c
View file @
fde5e737
...
@@ -1483,12 +1483,10 @@ void configGetCommand(client *c) {
...
@@ -1483,12 +1483,10 @@ void configGetCommand(client *c) {
matches
++
;
matches
++
;
}
}
if
(
stringmatch
(
pattern
,
"notify-keyspace-events"
,
1
))
{
if
(
stringmatch
(
pattern
,
"notify-keyspace-events"
,
1
))
{
robj
*
flagsobj
=
createObject
(
OBJ_STRING
,
sds
flags
=
keyspaceEventsFlagsToString
(
server
.
notify_keyspace_events
);
keyspaceEventsFlagsToString
(
server
.
notify_keyspace_events
));
addReplyBulkCString
(
c
,
"notify-keyspace-events"
);
addReplyBulkCString
(
c
,
"notify-keyspace-events"
);
addReplyBulk
(
c
,
flagsobj
);
addReplyBulkSds
(
c
,
flags
);
decrRefCount
(
flagsobj
);
matches
++
;
matches
++
;
}
}
if
(
stringmatch
(
pattern
,
"bind"
,
1
))
{
if
(
stringmatch
(
pattern
,
"bind"
,
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