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
eebb0258
Commit
eebb0258
authored
Nov 14, 2023
by
Josh Hershberg
Browse files
Cluster refactor: Some code convention fixes
Signed-off-by:
Josh Hershberg
<
yehoshua@redis.com
>
parent
290f3764
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/cluster.h
View file @
eebb0258
...
@@ -77,28 +77,29 @@ sds clusterGenNodeDescription(client *c, clusterNode *node, int tls_primary);
...
@@ -77,28 +77,29 @@ sds clusterGenNodeDescription(client *c, clusterNode *node, int tls_primary);
int
clusterNodeCoversSlot
(
clusterNode
*
n
,
int
slot
);
int
clusterNodeCoversSlot
(
clusterNode
*
n
,
int
slot
);
int
getNodeDefaultClientPort
(
clusterNode
*
n
);
int
getNodeDefaultClientPort
(
clusterNode
*
n
);
int
clusterNodeIsMyself
(
clusterNode
*
n
);
int
clusterNodeIsMyself
(
clusterNode
*
n
);
clusterNode
*
getMyClusterNode
(
void
);
clusterNode
*
getMyClusterNode
(
void
);
char
*
getMyClusterId
(
void
);
char
*
getMyClusterId
(
void
);
int
getClusterSize
(
void
);
int
getClusterSize
(
void
);
char
**
getClusterNodesList
(
size_t
*
numnodes
);
int
handleDebugClusterCommand
(
client
*
c
);
int
handleDebugClusterCommand
(
client
*
c
);
int
clusterNodePending
(
clusterNode
*
node
);
int
clusterNodePending
(
clusterNode
*
node
);
int
clusterNodeIsMaster
(
clusterNode
*
n
);
int
clusterNodeIsMaster
(
clusterNode
*
n
);
char
*
clusterNodeIp
(
clusterNode
*
node
);
char
**
getClusterNodesList
(
size_t
*
numnodes
);
int
clusterNodeIsMaster
(
clusterNode
*
n
);
char
*
clusterNodeIp
(
clusterNode
*
node
);
int
clusterNodeIsSlave
(
clusterNode
*
node
);
int
clusterNodeIsSlave
(
clusterNode
*
node
);
clusterNode
*
clusterNodeGetSlaveof
(
clusterNode
*
node
);
clusterNode
*
clusterNodeGetSlaveof
(
clusterNode
*
node
);
char
*
clusterNodeGetName
(
clusterNode
*
node
);
char
*
clusterNodeGetName
(
clusterNode
*
node
);
int
clusterNodeTimedOut
(
clusterNode
*
node
);
int
clusterNodeTimedOut
(
clusterNode
*
node
);
int
clusterNodeIsFailing
(
clusterNode
*
node
);
int
clusterNodeIsFailing
(
clusterNode
*
node
);
int
clusterNodeIsNoFailover
(
clusterNode
*
node
);
int
clusterNodeIsNoFailover
(
clusterNode
*
node
);
char
*
clusterNodeGetShardId
(
clusterNode
*
node
);
char
*
clusterNodeGetShardId
(
clusterNode
*
node
);
int
clusterNodeNumSlaves
(
clusterNode
*
node
);
int
clusterNodeNumSlaves
(
clusterNode
*
node
);
clusterNode
*
clusterNodeGetSlave
(
clusterNode
*
node
,
int
slave_idx
);
clusterNode
*
clusterNodeGetSlave
(
clusterNode
*
node
,
int
slave_idx
);
clusterNode
*
getMigratingSlotDest
(
int
slot
);
clusterNode
*
getMigratingSlotDest
(
int
slot
);
clusterNode
*
getImportingSlotSource
(
int
slot
);
clusterNode
*
getImportingSlotSource
(
int
slot
);
clusterNode
*
getNodeBySlot
(
int
slot
);
clusterNode
*
getNodeBySlot
(
int
slot
);
int
clusterNodeClientPort
(
clusterNode
*
n
,
int
use_tls
);
int
clusterNodeClientPort
(
clusterNode
*
n
,
int
use_tls
);
char
*
clusterNodeHostname
(
clusterNode
*
node
);
char
*
clusterNodeHostname
(
clusterNode
*
node
);
const
char
*
clusterNodePreferredEndpoint
(
clusterNode
*
n
);
const
char
*
clusterNodePreferredEndpoint
(
clusterNode
*
n
);
long
long
clusterNodeReplOffset
(
clusterNode
*
node
);
long
long
clusterNodeReplOffset
(
clusterNode
*
node
);
clusterNode
*
clusterLookupNode
(
const
char
*
name
,
int
length
);
clusterNode
*
clusterLookupNode
(
const
char
*
name
,
int
length
);
...
...
src/cluster_legacy.c
View file @
eebb0258
...
@@ -5761,7 +5761,7 @@ int clusterNodeIsMyself(clusterNode *n) {
...
@@ -5761,7 +5761,7 @@ int clusterNodeIsMyself(clusterNode *n) {
return
n
==
server
.
cluster
->
myself
;
return
n
==
server
.
cluster
->
myself
;
}
}
clusterNode
*
getMyClusterNode
(
void
)
{
clusterNode
*
getMyClusterNode
(
void
)
{
return
server
.
cluster
->
myself
;
return
server
.
cluster
->
myself
;
}
}
...
@@ -5773,7 +5773,7 @@ int getClusterSize(void) {
...
@@ -5773,7 +5773,7 @@ int getClusterSize(void) {
return
dictSize
(
server
.
cluster
->
nodes
);
return
dictSize
(
server
.
cluster
->
nodes
);
}
}
char
**
getClusterNodesList
(
size_t
*
numnodes
)
{
char
**
getClusterNodesList
(
size_t
*
numnodes
)
{
size_t
count
=
dictSize
(
server
.
cluster
->
nodes
);
size_t
count
=
dictSize
(
server
.
cluster
->
nodes
);
char
**
ids
=
zmalloc
((
count
+
1
)
*
CLUSTER_NAMELEN
);
char
**
ids
=
zmalloc
((
count
+
1
)
*
CLUSTER_NAMELEN
);
dictIterator
*
di
=
dictGetIterator
(
server
.
cluster
->
nodes
);
dictIterator
*
di
=
dictGetIterator
(
server
.
cluster
->
nodes
);
...
@@ -5836,7 +5836,7 @@ int clusterNodePending(clusterNode *node) {
...
@@ -5836,7 +5836,7 @@ int clusterNodePending(clusterNode *node) {
return
node
->
flags
&
(
CLUSTER_NODE_NOADDR
|
CLUSTER_NODE_HANDSHAKE
);
return
node
->
flags
&
(
CLUSTER_NODE_NOADDR
|
CLUSTER_NODE_HANDSHAKE
);
}
}
char
*
clusterNodeIp
(
clusterNode
*
node
)
{
char
*
clusterNodeIp
(
clusterNode
*
node
)
{
return
node
->
ip
;
return
node
->
ip
;
}
}
...
@@ -5848,7 +5848,7 @@ clusterNode *clusterNodeGetSlaveof(clusterNode *node) {
...
@@ -5848,7 +5848,7 @@ clusterNode *clusterNodeGetSlaveof(clusterNode *node) {
return
node
->
slaveof
;
return
node
->
slaveof
;
}
}
char
*
clusterNodeGetName
(
clusterNode
*
node
)
{
char
*
clusterNodeGetName
(
clusterNode
*
node
)
{
return
node
->
name
;
return
node
->
name
;
}
}
...
@@ -5874,7 +5874,7 @@ const char **clusterDebugCommandExtendedHelp(void) {
...
@@ -5874,7 +5874,7 @@ const char **clusterDebugCommandExtendedHelp(void) {
return
help
;
return
help
;
}
}
char
*
clusterNodeGetShardId
(
clusterNode
*
node
)
{
char
*
clusterNodeGetShardId
(
clusterNode
*
node
)
{
return
node
->
shard_id
;
return
node
->
shard_id
;
}
}
...
@@ -6326,7 +6326,7 @@ int clusterCommandSpecial(client *c) {
...
@@ -6326,7 +6326,7 @@ int clusterCommandSpecial(client *c) {
return
1
;
return
1
;
}
}
const
char
**
clusterCommandExtendedHelp
(
void
)
{
const
char
**
clusterCommandExtendedHelp
(
void
)
{
static
const
char
*
help
[]
=
{
static
const
char
*
help
[]
=
{
"ADDSLOTS <slot> [<slot> ...]"
,
"ADDSLOTS <slot> [<slot> ...]"
,
" Assign slots to current node."
,
" Assign slots to current node."
,
...
@@ -6391,7 +6391,7 @@ clusterNode *getNodeBySlot(int slot) {
...
@@ -6391,7 +6391,7 @@ clusterNode *getNodeBySlot(int slot) {
return
server
.
cluster
->
slots
[
slot
];
return
server
.
cluster
->
slots
[
slot
];
}
}
char
*
clusterNodeHostname
(
clusterNode
*
node
)
{
char
*
clusterNodeHostname
(
clusterNode
*
node
)
{
return
node
->
hostname
;
return
node
->
hostname
;
}
}
...
...
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