caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-23 00:28:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into aof-speedup

Browse Source
This commit is contained in:
antirez 2010-05-06 23:19:46 +02:00
commit f424d5f398
2 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
redis.c
View File

@ -3227,7 +3227,7 @@ static int getDoubleFromObject(robj *o, double *target) {
} else if (o->encoding == REDIS_ENCODING_INT) {
value = (long)o->ptr;
} else {
redisAssert(1 != 1);
redisPanic("Unknown string encoding");
}
}
@ -3264,7 +3264,7 @@ static int getLongLongFromObject(robj *o, long long *target) {
} else if (o->encoding == REDIS_ENCODING_INT) {
value = (long)o->ptr;
} else {
redisAssert(1 != 1);
redisPanic("Unknown string encoding");
}
}
@ -6468,12 +6468,11 @@ static void hincrbyCommand(redisClient *c) {
if (getLongLongFromObjectOrReply(c,c->argv[3],&incr,NULL) != REDIS_OK) return;
if ((o = hashLookupWriteOrCreate(c,c->argv[1])) == NULL) return;
if ((current = hashGet(o,c->argv[2])) != NULL) {
if (current->encoding == REDIS_ENCODING_RAW)
value = strtoll(current->ptr,NULL,10);
else if (current->encoding == REDIS_ENCODING_INT)
value = (long)current->ptr;
else
redisAssert(1 != 1);
if (getLongLongFromObjectOrReply(c,current,&value,
"hash value is not an integer") != REDIS_OK) {
decrRefCount(current);
return;
}
decrRefCount(current);
} else {
value = 0;
@ -8140,12 +8139,14 @@ static struct redisClient *createFakeClient(void) {
c->reply = listCreate();
listSetFreeMethod(c->reply,decrRefCount);
listSetDupMethod(c->reply,dupClientReplyValue);
initClientMultiState(c);
return c;
}
static void freeFakeClient(struct redisClient *c) {
sdsfree(c->querybuf);
listRelease(c->reply);
freeClientMultiState(c);
zfree(c);
}
@ -8157,6 +8158,7 @@ int loadAppendOnlyFile(char *filename) {
FILE *fp = fopen(filename,"r");
struct redis_stat sb;
unsigned long long loadedkeys = 0;
int appendonly = server.appendonly;
if (redis_fstat(fileno(fp),&sb) != -1 && sb.st_size == 0)
return REDIS_ERR;
@ -8166,6 +8168,10 @@ int loadAppendOnlyFile(char *filename) {
exit(1);
}
/* Temporarily disable AOF, to prevent EXEC from feeding a MULTI
* to the same file we're about to read. */
server.appendonly = 0;
fakeClient = createFakeClient();
while(1) {
int argc, j;
@ -8221,8 +8227,14 @@ int loadAppendOnlyFile(char *filename) {
}
}
}
/* This point can only be reached when EOF is reached without errors.
* If the client is in the middle of a MULTI/EXEC, log error and quit. */
if (fakeClient->flags & REDIS_MULTI) goto readerr;
fclose(fp);
freeFakeClient(fakeClient);
server.appendonly = appendonly;
return REDIS_OK;
readerr:

14
test-redis.tcl
View File

@ -1898,11 +1898,15 @@ proc main {} {
list [$r hincrby smallhash tmp 17179869184] [$r hincrby bighash tmp 17179869184]
} {34359738368 34359738368}
test {HINCRBY against key with spaces (no integer encoded)} {
$r hset smallhash tmp " 11 "
$r hset bighash tmp " 11 "
list [$r hincrby smallhash tmp 1] [$r hincrby bighash tmp 1]
} {12 12}
test {HINCRBY fails against hash value with spaces} {
$r hset smallhash str " 11 "
$r hset bighash str " 11 "
catch {$r hincrby smallhash str 1} smallerr
catch {$r hincrby smallhash str 1} bigerr
set rv {}
lappend rv [string match "ERR*not an integer*" $smallerr]
lappend rv [string match "ERR*not an integer*" $bigerr]
} {1 1}
# TODO:
# Randomized test, small and big