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

encoded types API to get blob length

Browse Source
This commit is contained in:
antirez 2011-02-28 14:48:49 +01:00
parent 2cc993655f
commit d4fb9f4144
5 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/intset.c
View File

@ -222,6 +222,11 @@ uint32_t intsetLen(intset *is) {
return is->length; return is->length;
} }
/* Return intset blob size in bytes. */
size_t intsetBlobLen(intset *is) {
return sizeof(intset)+is->length*is->encoding;
}
#ifdef INTSET_TEST_MAIN #ifdef INTSET_TEST_MAIN
#include <sys/time.h> #include <sys/time.h>

1
src/intset.h
View File

@ -15,5 +15,6 @@ uint8_t intsetFind(intset *is, int64_t value);
int64_t intsetRandom(intset *is); int64_t intsetRandom(intset *is);
uint8_t intsetGet(intset *is, uint32_t pos, int64_t *value); uint8_t intsetGet(intset *is, uint32_t pos, int64_t *value);
uint32_t intsetLen(intset *is); uint32_t intsetLen(intset *is);
size_t intsetBlobLen(intset *is);
#endif // __INTSET_H #endif // __INTSET_H

4
src/ziplist.c
View File

@ -730,8 +730,8 @@ unsigned int ziplistLen(unsigned char *zl) {
return len; return len;
} }
/* Return size in bytes of ziplist. */ /* Return ziplist blob size in bytes. */
unsigned int ziplistSize(unsigned char *zl) { size_t ziplistBlobLen(unsigned char *zl) {
return ZIPLIST_BYTES(zl); return ZIPLIST_BYTES(zl);
} }

2
src/ziplist.h
View File

@ -12,4 +12,4 @@ unsigned char *ziplistDelete(unsigned char *zl, unsigned char **p);
unsigned char *ziplistDeleteRange(unsigned char *zl, unsigned int index, unsigned int num); unsigned char *ziplistDeleteRange(unsigned char *zl, unsigned int index, unsigned int num);
unsigned int ziplistCompare(unsigned char *p, unsigned char *s, unsigned int slen); unsigned int ziplistCompare(unsigned char *p, unsigned char *s, unsigned int slen);
unsigned int ziplistLen(unsigned char *zl); unsigned int ziplistLen(unsigned char *zl);
unsigned int ziplistSize(unsigned char *zl); size_t ziplistBlobLen(unsigned char *zl);

13
src/zipmap.c
View File

@ -144,7 +144,7 @@ static unsigned char *zipmapLookupRaw(unsigned char *zm, unsigned char *key, uns
/* Match or skip the key */ /* Match or skip the key */
l = zipmapDecodeLength(p); l = zipmapDecodeLength(p);
llen = zipmapEncodeLength(NULL,l); llen = zipmapEncodeLength(NULL,l);
if (k == NULL && l == klen && !memcmp(p+llen,key,l)) { if (key != NULL && k == NULL && l == klen && !memcmp(p+llen,key,l)) {
/* Only return when the user doesn't care /* Only return when the user doesn't care
* for the total length of the zipmap. */ * for the total length of the zipmap. */
if (totlen != NULL) { if (totlen != NULL) {
@ -364,14 +364,12 @@ unsigned int zipmapLen(unsigned char *zm) {
* the zipmap on disk (or everywhere is needed) just writing the returned * the zipmap on disk (or everywhere is needed) just writing the returned
* amount of bytes of the C array starting at the zipmap pointer. */ * amount of bytes of the C array starting at the zipmap pointer. */
size_t zipmapBlobLen(unsigned char *zm) { size_t zipmapBlobLen(unsigned char *zm) {
unsigned char *p = zipmapRewind(zm); unsigned int totlen;
unsigned char *old = p; zipmapLookupRaw(zm,NULL,0,&totlen);
while((p = zipmapNext(p,NULL,NULL,NULL,NULL)) != NULL) { return totlen;
old = p;
}
return (old-zm)+1;
} }
#ifdef ZIPMAP_TEST_MAIN
void zipmapRepr(unsigned char *p) { void zipmapRepr(unsigned char *p) {
unsigned int l; unsigned int l;
@ -405,7 +403,6 @@ void zipmapRepr(unsigned char *p) {
printf("\n"); printf("\n");
} }
#ifdef ZIPMAP_TEST_MAIN
int main(void) { int main(void) {
unsigned char *zm; unsigned char *zm;