gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

load objects encoded from disk directly without useless conversion

Browse Source
This commit is contained in:
antirez 2010-05-11 16:12:22 +02:00
parent bd59ecfb92
commit ad30aa6069
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
redis.c
View File

@ -3797,7 +3797,11 @@ static uint32_t rdbLoadLen(FILE *fp, int *isencoded) {
} }
} }
static robj *rdbLoadIntegerObject(FILE *fp, int enctype) { /* Load an integer-encoded object from file 'fp', with the specified
* encoding type 'enctype'. If encode is true the function may return
* an integer-encoded object as reply, otherwise the returned object
* will always be encoded as a raw string. */
static robj *rdbLoadIntegerObject(FILE *fp, int enctype, int encode) {
unsigned char enc[4]; unsigned char enc[4];
long long val; long long val;
@ -3818,6 +3822,9 @@ static robj *rdbLoadIntegerObject(FILE *fp, int enctype) {
val = 0; /* anti-warning */ val = 0; /* anti-warning */
redisPanic("Unknown RDB integer encoding type"); redisPanic("Unknown RDB integer encoding type");
} }
if (encode)
return createStringObjectFromLongLong(val);
else
return createObject(REDIS_STRING,sdsfromlonglong(val)); return createObject(REDIS_STRING,sdsfromlonglong(val));
} }
@ -3840,7 +3847,7 @@ err:
return NULL; return NULL;
} }
static robj *rdbLoadStringObject(FILE*fp) { static robj *rdbGenericLoadStringObject(FILE*fp, int encode) {
int isencoded; int isencoded;
uint32_t len; uint32_t len;
sds val; sds val;
@ -3851,7 +3858,7 @@ static robj *rdbLoadStringObject(FILE*fp) {
case REDIS_RDB_ENC_INT8: case REDIS_RDB_ENC_INT8:
case REDIS_RDB_ENC_INT16: case REDIS_RDB_ENC_INT16:
case REDIS_RDB_ENC_INT32: case REDIS_RDB_ENC_INT32:
return rdbLoadIntegerObject(fp,len); return rdbLoadIntegerObject(fp,len,encode);
case REDIS_RDB_ENC_LZF: case REDIS_RDB_ENC_LZF:
return rdbLoadLzfStringObject(fp); return rdbLoadLzfStringObject(fp);
default: default:
@ -3868,6 +3875,14 @@ static robj *rdbLoadStringObject(FILE*fp) {
return createObject(REDIS_STRING,val); return createObject(REDIS_STRING,val);
} }
static robj *rdbLoadStringObject(FILE *fp) {
return rdbGenericLoadStringObject(fp,0);
}
static robj *rdbLoadEncodedStringObject(FILE *fp) {
return rdbGenericLoadStringObject(fp,1);
}
/* For information about double serialization check rdbSaveDoubleValue() */ /* For information about double serialization check rdbSaveDoubleValue() */
static int rdbLoadDoubleValue(FILE *fp, double *val) { static int rdbLoadDoubleValue(FILE *fp, double *val) {
char buf[128]; char buf[128];
@ -3894,7 +3909,7 @@ static robj *rdbLoadObject(int type, FILE *fp) {
redisLog(REDIS_DEBUG,"LOADING OBJECT %d (at %d)\n",type,ftell(fp)); redisLog(REDIS_DEBUG,"LOADING OBJECT %d (at %d)\n",type,ftell(fp));
if (type == REDIS_STRING) { if (type == REDIS_STRING) {
/* Read string value */ /* Read string value */
if ((o = rdbLoadStringObject(fp)) == NULL) return NULL; if ((o = rdbLoadEncodedStringObject(fp)) == NULL) return NULL;
o = tryObjectEncoding(o); o = tryObjectEncoding(o);
} else if (type == REDIS_LIST || type == REDIS_SET) { } else if (type == REDIS_LIST || type == REDIS_SET) {
/* Read list/set value */ /* Read list/set value */
@ -3910,7 +3925,7 @@ static robj *rdbLoadObject(int type, FILE *fp) {
while(listlen--) { while(listlen--) {
robj *ele; robj *ele;
if ((ele = rdbLoadStringObject(fp)) == NULL) return NULL; if ((ele = rdbLoadEncodedStringObject(fp)) == NULL) return NULL;
ele = tryObjectEncoding(ele); ele = tryObjectEncoding(ele);
if (type == REDIS_LIST) { if (type == REDIS_LIST) {
listAddNodeTail((list*)o->ptr,ele); listAddNodeTail((list*)o->ptr,ele);
@ -3931,7 +3946,7 @@ static robj *rdbLoadObject(int type, FILE *fp) {
robj *ele; robj *ele;
double *score = zmalloc(sizeof(double)); double *score = zmalloc(sizeof(double));
if ((ele = rdbLoadStringObject(fp)) == NULL) return NULL; if ((ele = rdbLoadEncodedStringObject(fp)) == NULL) return NULL;
ele = tryObjectEncoding(ele); ele = tryObjectEncoding(ele);
if (rdbLoadDoubleValue(fp,score) == -1) return NULL; if (rdbLoadDoubleValue(fp,score) == -1) return NULL;
dictAdd(zs->dict,ele,score); dictAdd(zs->dict,ele,score);