fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-25 11:51:03 +00:00
Code Issues Projects Releases Wiki Activity

updated iteration code to work well with different encodings

Browse Source
This commit is contained in:
Pieter Noordhuis 2010-05-22 15:48:27 +02:00
parent 37fff074a2
commit 75d8978e7a
1 changed files with 62 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
ziplist.c
View File

@ -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() {
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() {
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) {
{ {
zl = createList(); zl = createList();
p = ziplistIndex(zl, 0); p = ziplistIndex(zl, 0);
while ((p = ziplistNext(p, NULL, &entry, &elen)) != NULL) { while (ziplistGet(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) {
{ {
zl = createList(); zl = createList();
p = ziplistIndex(zl, 1); p = ziplistIndex(zl, 1);
while ((p = ziplistNext(p, NULL, &entry, &elen)) != NULL) { while (ziplistGet(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) {
{ {
zl = createList(); zl = createList();
p = ziplistIndex(zl, 2); p = ziplistIndex(zl, 2);
while ((p = ziplistNext(p, NULL, &entry, &elen)) != NULL) { while (ziplistGet(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) {
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 (ziplistNext(p, &entry, NULL, &elen) == NULL) { if (!ziplistGet(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) {
{ {
zl = createList(); zl = createList();
p = ziplistIndex(zl, 0); p = ziplistIndex(zl, 0);
while ((p = ziplistNext(p, &q, &entry, &elen)) != NULL) { while (ziplistGet(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");