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
e6c3bcf9
Unverified
Commit
e6c3bcf9
authored
Dec 04, 2017
by
Salvatore Sanfilippo
Committed by
GitHub
Dec 04, 2017
Browse files
Merge pull request #4506 from soloestoy/quicklist-int-problem
Quicklist int problem
parents
2869284e
b9491b65
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/debug.c
View file @
e6c3bcf9
...
...
@@ -393,13 +393,13 @@ void debugCommand(client *c) {
val
=
dictGetVal
(
de
);
strenc
=
strEncoding
(
val
->
encoding
);
char
extra
[
1
2
8
]
=
{
0
};
char
extra
[
1
3
8
]
=
{
0
};
if
(
val
->
encoding
==
OBJ_ENCODING_QUICKLIST
)
{
char
*
nextra
=
extra
;
int
remaining
=
sizeof
(
extra
);
quicklist
*
ql
=
val
->
ptr
;
/* Add number of quicklist nodes */
int
used
=
snprintf
(
nextra
,
remaining
,
" ql_nodes:%u"
,
ql
->
len
);
int
used
=
snprintf
(
nextra
,
remaining
,
" ql_nodes:%
l
u"
,
ql
->
len
);
nextra
+=
used
;
remaining
-=
used
;
/* Add average quicklist fill factor */
...
...
src/quicklist.c
View file @
e6c3bcf9
...
...
@@ -149,7 +149,7 @@ REDIS_STATIC quicklistNode *quicklistCreateNode(void) {
}
/* Return cached quicklist count */
unsigned
int
quicklistCount
(
const
quicklist
*
ql
)
{
return
ql
->
count
;
}
unsigned
long
quicklistCount
(
const
quicklist
*
ql
)
{
return
ql
->
count
;
}
/* Free entire quicklist. */
void
quicklistRelease
(
quicklist
*
quicklist
)
{
...
...
src/quicklist.h
View file @
e6c3bcf9
...
...
@@ -64,7 +64,7 @@ typedef struct quicklistLZF {
char
compressed
[];
}
quicklistLZF
;
/* quicklist is a
32
byte struct (on 64-bit systems) describing a quicklist.
/* quicklist is a
40
byte struct (on 64-bit systems) describing a quicklist.
* 'count' is the number of total entries.
* 'len' is the number of quicklist nodes.
* 'compress' is: -1 if compression disabled, otherwise it's the number
...
...
@@ -74,7 +74,7 @@ typedef struct quicklist {
quicklistNode
*
head
;
quicklistNode
*
tail
;
unsigned
long
count
;
/* total count of all entries in all ziplists */
unsigned
int
len
;
/* number of quicklistNodes */
unsigned
long
len
;
/* number of quicklistNodes */
int
fill
:
16
;
/* fill factor for individual nodes */
unsigned
int
compress
:
16
;
/* depth of end nodes not to compress;0=off */
}
quicklist
;
...
...
@@ -154,7 +154,7 @@ int quicklistPopCustom(quicklist *quicklist, int where, unsigned char **data,
void
*
(
*
saver
)(
unsigned
char
*
data
,
unsigned
int
sz
));
int
quicklistPop
(
quicklist
*
quicklist
,
int
where
,
unsigned
char
**
data
,
unsigned
int
*
sz
,
long
long
*
slong
);
unsigned
int
quicklistCount
(
const
quicklist
*
ql
);
unsigned
long
quicklistCount
(
const
quicklist
*
ql
);
int
quicklistCompare
(
unsigned
char
*
p1
,
unsigned
char
*
p2
,
int
p2_len
);
size_t
quicklistGetLzf
(
const
quicklistNode
*
node
,
void
**
data
);
...
...
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