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
2e3c90dc
Commit
2e3c90dc
authored
Jan 17, 2023
by
Vitaly Arbuzov
Browse files
Fix compiler warnings
parent
383737a9
Changes
4
Show whitespace changes
Inline
Side-by-side
src/cluster.c
View file @
2e3c90dc
...
@@ -90,7 +90,6 @@ int auxShardIdSetter(clusterNode *n, void *value, int length);
...
@@ -90,7 +90,6 @@ int auxShardIdSetter(clusterNode *n, void *value, int length);
sds
auxShardIdGetter
(
clusterNode
*
n
,
sds
s
);
sds
auxShardIdGetter
(
clusterNode
*
n
,
sds
s
);
int
auxShardIdPresent
(
clusterNode
*
n
);
int
auxShardIdPresent
(
clusterNode
*
n
);
static
void
clusterBuildMessageHdr
(
clusterMsg
*
hdr
,
int
type
,
size_t
msglen
);
static
void
clusterBuildMessageHdr
(
clusterMsg
*
hdr
,
int
type
,
size_t
msglen
);
unsigned long long int dbSize(const redisDb *db);
/* Links to the next and previous entries for keys in the same slot are stored
/* Links to the next and previous entries for keys in the same slot are stored
* in the dict entry metadata. See Slot to Key API below. */
* in the dict entry metadata. See Slot to Key API below. */
...
...
src/db.c
View file @
2e3c90dc
...
@@ -1148,7 +1148,7 @@ void dbsizeCommand(client *c) {
...
@@ -1148,7 +1148,7 @@ void dbsizeCommand(client *c) {
addReplyLongLong
(
c
,
size
);
addReplyLongLong
(
c
,
size
);
}
}
unsigned
long
long
int
dbSize
(
const
redisDb
*
db
)
{
unsigned
long
long
int
dbSize
(
redisDb
*
db
)
{
unsigned
long
long
size
=
0
;
unsigned
long
long
size
=
0
;
dict
*
d
;
dict
*
d
;
dbIterator
*
dbit
=
dbGetIterator
(
db
);
dbIterator
*
dbit
=
dbGetIterator
(
db
);
...
@@ -1159,7 +1159,7 @@ unsigned long long int dbSize(const redisDb *db) {
...
@@ -1159,7 +1159,7 @@ unsigned long long int dbSize(const redisDb *db) {
return
size
;
return
size
;
}
}
unsigned
long
dbSlots
(
const
redisDb
*
db
)
{
unsigned
long
dbSlots
(
redisDb
*
db
)
{
unsigned
long
slots
=
0
;
unsigned
long
slots
=
0
;
dict
*
d
;
dict
*
d
;
dbIterator
*
dbit
=
dbGetIterator
(
db
);
dbIterator
*
dbit
=
dbGetIterator
(
db
);
...
@@ -1840,7 +1840,7 @@ int expireIfNeeded(redisDb *db, robj *key, int flags) {
...
@@ -1840,7 +1840,7 @@ int expireIfNeeded(redisDb *db, robj *key, int flags) {
void
expandDb
(
const
redisDb
*
db
,
uint64_t
db_size
)
{
void
expandDb
(
const
redisDb
*
db
,
uint64_t
db_size
)
{
if
(
server
.
cluster_enabled
)
{
if
(
server
.
cluster_enabled
)
{
dict
*
d
;
dict
*
d
;
dbIterator
*
dbit
=
dbGetIterator
(
db
);
dbIterator
*
dbit
=
dbGetIterator
(
(
redisDb
*
)
db
);
while
((
d
=
dbNextDict
(
dbit
)))
{
while
((
d
=
dbNextDict
(
dbit
)))
{
/* We don't exact number of keys that would fall into each slot, but we can approximate it, assuming even distribution. */
/* We don't exact number of keys that would fall into each slot, but we can approximate it, assuming even distribution. */
dictExpand
(
d
,
(
db_size
/
server
.
cluster
->
myself
->
numslots
));
dictExpand
(
d
,
(
db_size
/
server
.
cluster
->
myself
->
numslots
));
...
...
src/dict.c
View file @
2e3c90dc
...
@@ -1294,7 +1294,7 @@ unsigned long dictScanDefrag(dict *d,
...
@@ -1294,7 +1294,7 @@ unsigned long dictScanDefrag(dict *d,
/* Emit entries at cursor */
/* Emit entries at cursor */
if
(
defragfns
)
{
if
(
defragfns
)
{
dictDefragBucket
(
d
,
&
d
->
ht_table
[
htidx0
][
v
&
m0
],
defragfns
);
dictDefragBucket
(
&
d
->
ht_table
[
htidx0
][
v
&
m0
],
defragfns
);
}
}
de
=
d
->
ht_table
[
htidx0
][
v
&
m0
];
de
=
d
->
ht_table
[
htidx0
][
v
&
m0
];
while
(
de
)
{
while
(
de
)
{
...
@@ -1327,7 +1327,7 @@ unsigned long dictScanDefrag(dict *d,
...
@@ -1327,7 +1327,7 @@ unsigned long dictScanDefrag(dict *d,
/* Emit entries at cursor */
/* Emit entries at cursor */
if
(
defragfns
)
{
if
(
defragfns
)
{
dictDefragBucket
(
d
,
&
d
->
ht_table
[
htidx0
][
v
&
m0
],
defragfns
);
dictDefragBucket
(
&
d
->
ht_table
[
htidx0
][
v
&
m0
],
defragfns
);
}
}
de
=
d
->
ht_table
[
htidx0
][
v
&
m0
];
de
=
d
->
ht_table
[
htidx0
][
v
&
m0
];
while
(
de
)
{
while
(
de
)
{
...
@@ -1341,7 +1341,7 @@ unsigned long dictScanDefrag(dict *d,
...
@@ -1341,7 +1341,7 @@ unsigned long dictScanDefrag(dict *d,
do
{
do
{
/* Emit entries at cursor */
/* Emit entries at cursor */
if
(
defragfns
)
{
if
(
defragfns
)
{
dictDefragBucket
(
d
,
&
d
->
ht_table
[
htidx1
][
v
&
m1
],
defragfns
);
dictDefragBucket
(
&
d
->
ht_table
[
htidx1
][
v
&
m1
],
defragfns
);
}
}
de
=
d
->
ht_table
[
htidx1
][
v
&
m1
];
de
=
d
->
ht_table
[
htidx1
][
v
&
m1
];
while
(
de
)
{
while
(
de
)
{
...
...
src/server.h
View file @
2e3c90dc
...
@@ -3024,10 +3024,10 @@ void dismissMemoryInChild(void);
...
@@ -3024,10 +3024,10 @@ void dismissMemoryInChild(void);
#define RESTART_SERVER_GRACEFULLY (1<<0)
/* Do proper shutdown. */
#define RESTART_SERVER_GRACEFULLY (1<<0)
/* Do proper shutdown. */
#define RESTART_SERVER_CONFIG_REWRITE (1<<1)
/* CONFIG REWRITE before restart.*/
#define RESTART_SERVER_CONFIG_REWRITE (1<<1)
/* CONFIG REWRITE before restart.*/
int
restartServer
(
int
flags
,
mstime_t
delay
);
int
restartServer
(
int
flags
,
mstime_t
delay
);
unsigned
long
long
int
dbSize
(
const
redisDb
*
db
);
unsigned
long
long
int
dbSize
(
redisDb
*
db
);
dict
*
getDict
(
redisDb
*
db
,
sds
key
);
dict
*
getDict
(
redisDb
*
db
,
sds
key
);
dict
*
getRandomDict
(
redisDb
*
db
);
dict
*
getRandomDict
(
redisDb
*
db
);
unsigned
long
dbSlots
(
const
redisDb
*
db
);
unsigned
long
dbSlots
(
redisDb
*
db
);
void
expandDb
(
const
redisDb
*
db
,
uint64_t
db_size
);
void
expandDb
(
const
redisDb
*
db
,
uint64_t
db_size
);
/* Set data type */
/* Set data type */
...
...
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