Commit 1c53928f authored by Pieter Noordhuis's avatar Pieter Noordhuis Committed by antirez
Browse files

Functions to get size of specially encoded value in bytes

parent 660a0cdf
...@@ -222,6 +222,11 @@ uint32_t intsetLen(intset *is) { ...@@ -222,6 +222,11 @@ uint32_t intsetLen(intset *is) {
return is->length; return is->length;
} }
/* Return intset size in bytes. */
size_t intsetSize(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>
......
...@@ -15,5 +15,6 @@ uint8_t intsetFind(intset *is, int64_t value); ...@@ -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 intsetSize(intset *is);
#endif // __INTSET_H #endif // __INTSET_H
...@@ -732,8 +732,8 @@ unsigned int ziplistLen(unsigned char *zl) { ...@@ -732,8 +732,8 @@ unsigned int ziplistLen(unsigned char *zl) {
return len; return len;
} }
/* Return size in bytes of ziplist. */ /* Return ziplist size in bytes. */
unsigned int ziplistSize(unsigned char *zl) { size_t ziplistSize(unsigned char *zl) {
return ZIPLIST_BYTES(zl); return ZIPLIST_BYTES(zl);
} }
......
...@@ -12,4 +12,4 @@ unsigned char *ziplistDelete(unsigned char *zl, unsigned char **p); ...@@ -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 ziplistSize(unsigned char *zl);
...@@ -144,7 +144,7 @@ static unsigned char *zipmapLookupRaw(unsigned char *zm, unsigned char *key, uns ...@@ -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) {
...@@ -360,6 +360,13 @@ unsigned int zipmapLen(unsigned char *zm) { ...@@ -360,6 +360,13 @@ unsigned int zipmapLen(unsigned char *zm) {
return len; return len;
} }
/* Return zipmap size in bytes. */
size_t zipmapSize(unsigned char *zm) {
unsigned int totlen;
zipmapLookupRaw(zm,NULL,0,&totlen);
return totlen;
}
#ifdef ZIPMAP_TEST_MAIN #ifdef ZIPMAP_TEST_MAIN
void zipmapRepr(unsigned char *p) { void zipmapRepr(unsigned char *p) {
......
...@@ -43,5 +43,6 @@ unsigned char *zipmapNext(unsigned char *zm, unsigned char **key, unsigned int * ...@@ -43,5 +43,6 @@ unsigned char *zipmapNext(unsigned char *zm, unsigned char **key, unsigned int *
int zipmapGet(unsigned char *zm, unsigned char *key, unsigned int klen, unsigned char **value, unsigned int *vlen); int zipmapGet(unsigned char *zm, unsigned char *key, unsigned int klen, unsigned char **value, unsigned int *vlen);
int zipmapExists(unsigned char *zm, unsigned char *key, unsigned int klen); int zipmapExists(unsigned char *zm, unsigned char *key, unsigned int klen);
unsigned int zipmapLen(unsigned char *zm); unsigned int zipmapLen(unsigned char *zm);
size_t zipmapSize(unsigned char *zm);
#endif #endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment