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

Imporant bug leading to data corruption fixed (NOT affecting stable distribution), Tcl client lib MSET/MSETNX implementation fixed, Added new tests for MSET and MSETNX in test-redis.tcl

Browse Source
This commit is contained in:
antirez 2009-10-20 11:39:20 +02:00
parent 8165a5f2a3
commit f69f2cbafe
3 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client-libraries/tcl/redis.tcl
View File

@ -27,7 +27,7 @@ foreach redis_bulk_cmd {
# Flag commands requiring last argument as a bulk write operation # Flag commands requiring last argument as a bulk write operation
foreach redis_multibulk_cmd { foreach redis_multibulk_cmd {
mset mset msetnx
} { } {
set ::redis::multibulkarg($redis_multibulk_cmd) {} set ::redis::multibulkarg($redis_multibulk_cmd) {}
} }
@ -53,12 +53,13 @@ proc ::redis::__dispatch__ {id method args} {
append cmd [lindex $args end] append cmd [lindex $args end]
::redis::redis_writenl $fd $cmd ::redis::redis_writenl $fd $cmd
} elseif {[info exists ::redis::multibulkarg($method)]} { } elseif {[info exists ::redis::multibulkarg($method)]} {
set cmd "*[expr {[llength $args]}+1]\r\n" set cmd "*[expr {[llength $args]+1}]\r\n"
append cmd "$[string length $method]\r\n$method\r\n" append cmd "$[string length $method]\r\n$method\r\n"
foreach a $args { foreach a $args {
append cmd "$[string length $a]\r\n$a\r\n" append cmd "$[string length $a]\r\n$a\r\n"
} }
::redis::redis_write $fd $cmd ::redis::redis_write $fd $cmd
flush $fd
} else { } else {
set cmd "$method " set cmd "$method "
append cmd [join $args] append cmd [join $args]

4
redis.c
View File

@ -1936,7 +1936,7 @@ static robj *tryObjectSharing(robj *o) {
* *
* If so, the function returns REDIS_OK and *longval is set to the value * If so, the function returns REDIS_OK and *longval is set to the value
* of the number. Otherwise REDIS_ERR is returned */ * of the number. Otherwise REDIS_ERR is returned */
static int isStringRepresentableAsLong(char *s, long *longval) { static int isStringRepresentableAsLong(sds s, long *longval) {
char buf[32], *endptr; char buf[32], *endptr;
long value; long value;
int slen; int slen;
@ -1947,7 +1947,7 @@ static int isStringRepresentableAsLong(char *s, long *longval) {
/* If the number converted back into a string is not identical /* If the number converted back into a string is not identical
* then it's not possible to encode the string as integer */ * then it's not possible to encode the string as integer */
if (strlen(buf) != (unsigned)slen || memcmp(buf,s,slen)) return REDIS_ERR; if (sdslen(s) != (unsigned)slen || memcmp(buf,s,slen)) return REDIS_ERR;
if (longval) *longval = value; if (longval) *longval = value;
return REDIS_OK; return REDIS_OK;
} }

24
test-redis.tcl
View File

@ -750,19 +750,37 @@ proc main {server port} {
format $err format $err
} {ERR*} } {ERR*}
test {MSET base case} {
$r mset x 10 y "foo bar" z "x x x x x x x\n\n\r\n"
$r mget x y z
} [list 10 {foo bar} "x x x x x x x\n\n\r\n"]
test {MSET wrong number of args} {
catch {$r mset x 10 y "foo bar" z} err
format $err
} {*wrong number*}
test {MSETNX with already existent key} {
list [$r msetnx x1 xxx y2 yyy x 20] [$r exists x1] [$r exists y2]
} {0 0 0}
test {MSETNX with not existing keys} {
list [$r msetnx x1 xxx y2 yyy] [$r get x1] [$r get y2]
} {1 xxx yyy}
foreach fuzztype {binary alpha compr} { foreach fuzztype {binary alpha compr} {
test "FUZZ stresser with data model $fuzztype" { test "FUZZ stresser with data model $fuzztype" {
set err 0 set err 0
for {set i 0} {$i < 1000} {incr i} { for {set i 0} {$i < 10000} {incr i} {
set fuzz [randstring 0 512 $fuzztype] set fuzz [randstring 0 512 $fuzztype]
$r set foo $fuzz $r set foo $fuzz
set got [$r get foo] set got [$r get foo]
if {$got ne $fuzz} { if {$got ne $fuzz} {
incr err set err [list $fuzz $got]
break break
} }
} }
format $err set _ $err
} {0} } {0}
} }