slipenkomk/valkey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compression/decompression of large values on disk now working

Browse Source
This commit is contained in:
antirez 2009-04-02 17:10:02 +02:00
parent 40c32c3e49
commit 88e859984a
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
redis.c
View File

@ -1657,7 +1657,7 @@ static int rdbSaveLzfStringObject(FILE *fp, robj *obj) {
if ((out = zmalloc(outlen)) == NULL) return 0; if ((out = zmalloc(outlen)) == NULL) return 0;
comprlen = lzf_compress(obj->ptr, sdslen(obj->ptr), out, outlen); comprlen = lzf_compress(obj->ptr, sdslen(obj->ptr), out, outlen);
if (comprlen == 0) { if (comprlen == 0) {
free(out); zfree(out);
return 0; return 0;
} }
/* Data compressed! Let's save it on disk */ /* Data compressed! Let's save it on disk */
@ -1666,11 +1666,11 @@ static int rdbSaveLzfStringObject(FILE *fp, robj *obj) {
if (rdbSaveLen(fp,comprlen) == -1) goto writeerr; if (rdbSaveLen(fp,comprlen) == -1) goto writeerr;
if (rdbSaveLen(fp,sdslen(obj->ptr)) == -1) goto writeerr; if (rdbSaveLen(fp,sdslen(obj->ptr)) == -1) goto writeerr;
if (fwrite(out,comprlen,1,fp) == 0) goto writeerr; if (fwrite(out,comprlen,1,fp) == 0) goto writeerr;
free(out); zfree(out);
return comprlen; return comprlen;
writeerr: writeerr:
free(out); zfree(out);
return -1; return -1;
} }
@ -1690,8 +1690,8 @@ static int rdbSaveStringObject(FILE *fp, robj *obj) {
} }
/* Try LZF compression - under 20 bytes it's unable to compress even /* Try LZF compression - under 20 bytes it's unable to compress even
* aaaaaaaaaaaaaaaaaa so to try is just useful to make the CPU hot */ * aaaaaaaaaaaaaaaaaa so skip it */
if (0 && len > 20) { if (len > 20) {
int retval; int retval;
retval = rdbSaveLzfStringObject(fp,obj); retval = rdbSaveLzfStringObject(fp,obj);
@ -1892,6 +1892,24 @@ static robj *rdbLoadIntegerObject(FILE *fp, int enctype) {
return createObject(REDIS_STRING,sdscatprintf(sdsempty(),"%lld",val)); return createObject(REDIS_STRING,sdscatprintf(sdsempty(),"%lld",val));
} }
static robj *rdbLoadLzfStringObject(FILE*fp, int rdbver) {
unsigned int len, clen;
unsigned char *c = NULL;
sds val = NULL;
if ((clen = rdbLoadLen(fp,rdbver,NULL)) == REDIS_RDB_LENERR) return NULL;
if ((len = rdbLoadLen(fp,rdbver,NULL)) == REDIS_RDB_LENERR) return NULL;
if ((c = zmalloc(clen)) == NULL) goto err;
if ((val = sdsnewlen(NULL,len)) == NULL) goto err;
if (fread(c,clen,1,fp) == 0) goto err;
if (lzf_decompress(c,clen,val,len) == 0) goto err;
return createObject(REDIS_STRING,val);
err:
zfree(c);
sdsfree(val);
return NULL;
}
static robj *rdbLoadStringObject(FILE*fp, int rdbver) { static robj *rdbLoadStringObject(FILE*fp, int rdbver) {
int isencoded; int isencoded;
uint32_t len; uint32_t len;
@ -1904,6 +1922,8 @@ static robj *rdbLoadStringObject(FILE*fp, int rdbver) {
case REDIS_RDB_ENC_INT16: case REDIS_RDB_ENC_INT16:
case REDIS_RDB_ENC_INT32: case REDIS_RDB_ENC_INT32:
return tryObjectSharing(rdbLoadIntegerObject(fp,len)); return tryObjectSharing(rdbLoadIntegerObject(fp,len));
case REDIS_RDB_ENC_LZF:
return tryObjectSharing(rdbLoadLzfStringObject(fp,rdbver));
default: default:
assert(0!=0); assert(0!=0);
} }