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
75d8978e
Commit
75d8978e
authored
May 22, 2010
by
Pieter Noordhuis
Browse files
updated iteration code to work well with different encodings
parent
37fff074
Changes
1
Hide whitespace changes
Inline
Side-by-side
ziplist.c
View file @
75d8978e
...
@@ -296,18 +296,31 @@ unsigned char *ziplistIndex(unsigned char *zl, unsigned int index) {
...
@@ -296,18 +296,31 @@ unsigned char *ziplistIndex(unsigned char *zl, unsigned int index) {
return
p
;
return
p
;
}
}
/* Store entry at current position in sds *value and return pointer
/* Return pointer to next entry in ziplist. */
* to the next entry. */
unsigned
char
*
ziplistNext
(
unsigned
char
*
p
)
{
unsigned
char
*
ziplistNext
(
unsigned
char
*
p
,
unsigned
char
**
q
,
unsigned
char
**
entry
,
unsigned
int
*
elen
)
{
return
*
p
==
ZIP_END
?
p
:
p
+
zipRawEntryLength
(
p
);
unsigned
int
lensize
;
}
if
(
*
p
==
ZIP_END
)
return
NULL
;
if
(
entry
)
{
/* Get entry pointer to by 'p' and store in either 'e' or 'v' depending
*
elen
=
zipDecodeLength
(
p
,
&
lensize
);
* on the encoding of the entry. 'e' is always set to NULL to be able
*
entry
=
p
+
lensize
;
* to find out whether the string pointer or the integer value was set.
* Return 0 if 'p' points to the end of the zipmap, 1 otherwise. */
unsigned
int
ziplistGet
(
unsigned
char
*
p
,
unsigned
char
**
e
,
unsigned
int
*
elen
,
long
long
*
v
)
{
unsigned
int
len
,
lensize
;
if
(
*
p
==
ZIP_END
)
return
0
;
if
(
e
)
*
e
=
NULL
;
len
=
zipDecodeLength
(
p
,
&
lensize
);
if
(
ZIP_ENCODING
(
p
)
==
ZIP_ENC_RAW
)
{
if
(
e
)
{
*
elen
=
len
;
*
e
=
p
+
lensize
;
}
}
else
{
if
(
v
)
{
*
v
=
zipLoadInteger
(
p
+
lensize
,
ZIP_ENCODING
(
p
));
}
}
}
if
(
q
!=
NULL
)
*
q
=
p
;
return
1
;
p
+=
zipRawEntryLength
(
p
);
return
p
;
}
}
/* Delete a range of entries from the ziplist. */
/* Delete a range of entries from the ziplist. */
...
@@ -382,6 +395,7 @@ unsigned char *createList() {
...
@@ -382,6 +395,7 @@ unsigned char *createList() {
zl
=
ziplistPush
(
zl
,
(
unsigned
char
*
)
"foo"
,
3
,
ZIPLIST_TAIL
);
zl
=
ziplistPush
(
zl
,
(
unsigned
char
*
)
"foo"
,
3
,
ZIPLIST_TAIL
);
zl
=
ziplistPush
(
zl
,
(
unsigned
char
*
)
"quux"
,
4
,
ZIPLIST_TAIL
);
zl
=
ziplistPush
(
zl
,
(
unsigned
char
*
)
"quux"
,
4
,
ZIPLIST_TAIL
);
zl
=
ziplistPush
(
zl
,
(
unsigned
char
*
)
"hello"
,
5
,
ZIPLIST_HEAD
);
zl
=
ziplistPush
(
zl
,
(
unsigned
char
*
)
"hello"
,
5
,
ZIPLIST_HEAD
);
zl
=
ziplistPush
(
zl
,
(
unsigned
char
*
)
"1024"
,
4
,
ZIPLIST_TAIL
);
return
zl
;
return
zl
;
}
}
...
@@ -407,6 +421,7 @@ unsigned char *createIntList() {
...
@@ -407,6 +421,7 @@ unsigned char *createIntList() {
int
main
(
int
argc
,
char
**
argv
)
{
int
main
(
int
argc
,
char
**
argv
)
{
unsigned
char
*
zl
,
*
p
,
*
q
,
*
entry
;
unsigned
char
*
zl
,
*
p
,
*
q
,
*
entry
;
unsigned
int
elen
;
unsigned
int
elen
;
long
long
value
;
sds
s
;
sds
s
;
zl
=
createIntList
();
zl
=
createIntList
();
...
@@ -427,10 +442,15 @@ int main(int argc, char **argv) {
...
@@ -427,10 +442,15 @@ int main(int argc, char **argv) {
{
{
zl
=
createList
();
zl
=
createList
();
p
=
ziplistIndex
(
zl
,
0
);
p
=
ziplistIndex
(
zl
,
0
);
while
(
(
p
=
ziplist
Nex
t
(
p
,
NULL
,
&
entry
,
&
elen
))
!=
NULL
)
{
while
(
ziplist
Ge
t
(
p
,
&
entry
,
&
elen
,
&
value
)
)
{
printf
(
"Entry: "
);
printf
(
"Entry: "
);
fwrite
(
entry
,
elen
,
1
,
stdout
);
if
(
entry
)
{
printf
(
" (length %d)
\n
"
,
elen
);
fwrite
(
entry
,
elen
,
1
,
stdout
);
}
else
{
printf
(
"%lld"
,
value
);
}
p
=
ziplistNext
(
p
);
printf
(
"
\n
"
);
}
}
printf
(
"
\n
"
);
printf
(
"
\n
"
);
}
}
...
@@ -439,10 +459,15 @@ int main(int argc, char **argv) {
...
@@ -439,10 +459,15 @@ int main(int argc, char **argv) {
{
{
zl
=
createList
();
zl
=
createList
();
p
=
ziplistIndex
(
zl
,
1
);
p
=
ziplistIndex
(
zl
,
1
);
while
(
(
p
=
ziplist
Nex
t
(
p
,
NULL
,
&
entry
,
&
elen
))
!=
NULL
)
{
while
(
ziplist
Ge
t
(
p
,
&
entry
,
&
elen
,
&
value
)
)
{
printf
(
"Entry: "
);
printf
(
"Entry: "
);
fwrite
(
entry
,
elen
,
1
,
stdout
);
if
(
entry
)
{
printf
(
" (length %d)
\n
"
,
elen
);
fwrite
(
entry
,
elen
,
1
,
stdout
);
}
else
{
printf
(
"%lld"
,
value
);
}
p
=
ziplistNext
(
p
);
printf
(
"
\n
"
);
}
}
printf
(
"
\n
"
);
printf
(
"
\n
"
);
}
}
...
@@ -451,10 +476,15 @@ int main(int argc, char **argv) {
...
@@ -451,10 +476,15 @@ int main(int argc, char **argv) {
{
{
zl
=
createList
();
zl
=
createList
();
p
=
ziplistIndex
(
zl
,
2
);
p
=
ziplistIndex
(
zl
,
2
);
while
(
(
p
=
ziplist
Nex
t
(
p
,
NULL
,
&
entry
,
&
elen
))
!=
NULL
)
{
while
(
ziplist
Ge
t
(
p
,
&
entry
,
&
elen
,
&
value
)
)
{
printf
(
"Entry: "
);
printf
(
"Entry: "
);
fwrite
(
entry
,
elen
,
1
,
stdout
);
if
(
entry
)
{
printf
(
" (length %d)
\n
"
,
elen
);
fwrite
(
entry
,
elen
,
1
,
stdout
);
}
else
{
printf
(
"%lld"
,
value
);
}
p
=
ziplistNext
(
p
);
printf
(
"
\n
"
);
}
}
printf
(
"
\n
"
);
printf
(
"
\n
"
);
}
}
...
@@ -462,8 +492,8 @@ int main(int argc, char **argv) {
...
@@ -462,8 +492,8 @@ int main(int argc, char **argv) {
printf
(
"Iterate starting out of range:
\n
"
);
printf
(
"Iterate starting out of range:
\n
"
);
{
{
zl
=
createList
();
zl
=
createList
();
p
=
ziplistIndex
(
zl
,
3
);
p
=
ziplistIndex
(
zl
,
4
);
if
(
ziplist
Nex
t
(
p
,
&
entry
,
NULL
,
&
elen
)
==
NULL
)
{
if
(
!
ziplist
Ge
t
(
p
,
&
entry
,
&
elen
,
&
value
)
)
{
printf
(
"No entry
\n
"
);
printf
(
"No entry
\n
"
);
}
else
{
}
else
{
printf
(
"ERROR
\n
"
);
printf
(
"ERROR
\n
"
);
...
@@ -510,15 +540,19 @@ int main(int argc, char **argv) {
...
@@ -510,15 +540,19 @@ int main(int argc, char **argv) {
{
{
zl
=
createList
();
zl
=
createList
();
p
=
ziplistIndex
(
zl
,
0
);
p
=
ziplistIndex
(
zl
,
0
);
while
(
(
p
=
ziplist
Nex
t
(
p
,
&
q
,
&
entry
,
&
elen
))
!=
NULL
)
{
while
(
ziplist
Ge
t
(
p
,
&
entry
,
&
elen
,
&
value
)
)
{
if
(
strncmp
(
"foo"
,
entry
,
elen
)
==
0
)
{
if
(
entry
&&
strncmp
(
"foo"
,
entry
,
elen
)
==
0
)
{
printf
(
"Delete foo
\n
"
);
printf
(
"Delete foo
\n
"
);
zl
=
ziplistDelete
(
zl
,
&
q
);
zl
=
ziplistDelete
(
zl
,
&
p
);
p
=
q
;
}
else
{
}
else
{
printf
(
"Entry: "
);
printf
(
"Entry: "
);
fwrite
(
entry
,
elen
,
1
,
stdout
);
if
(
entry
)
{
printf
(
" (length %d)
\n
"
,
elen
);
fwrite
(
entry
,
elen
,
1
,
stdout
);
}
else
{
printf
(
"%lld"
,
value
);
}
p
=
ziplistNext
(
p
);
printf
(
"
\n
"
);
}
}
}
}
printf
(
"
\n
"
);
printf
(
"
\n
"
);
...
...
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