X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/a0573260b0928170d66268eb22be1a5699615275..9c00f078978e452d541ddc8a9a2b7704db2cb7f3:/tests/support/util.tcl diff --git a/tests/support/util.tcl b/tests/support/util.tcl index b9c89aa8..48d06b74 100644 --- a/tests/support/util.tcl +++ b/tests/support/util.tcl @@ -30,12 +30,16 @@ proc zlistAlikeSort {a b} { proc warnings_from_file {filename} { set lines [split [exec cat $filename] "\n"] set matched 0 + set logall 0 set result {} foreach line $lines { + if {[string match {*REDIS BUG REPORT START*} $line]} { + set logall 1 + } if {[regexp {^\[\d+\]\s+\d+\s+\w+\s+\d{2}:\d{2}:\d{2} \#} $line]} { set matched 1 } - if {$matched} { + if {$logall || $matched} { lappend result $line } } @@ -51,9 +55,11 @@ proc status {r property} { proc waitForBgsave r { while 1 { - if {[status r bgsave_in_progress] eq 1} { - puts -nonewline "\nWaiting for background save to finish... " - flush stdout + if {[status r rdb_bgsave_in_progress] eq 1} { + if {$::verbose} { + puts -nonewline "\nWaiting for background save to finish... " + flush stdout + } after 1000 } else { break @@ -63,9 +69,11 @@ proc waitForBgsave r { proc waitForBgrewriteaof r { while 1 { - if {[status r bgrewriteaof_in_progress] eq 1} { - puts -nonewline "\nWaiting for background AOF rewrite to finish... " - flush stdout + if {[status r aof_rewrite_in_progress] eq 1} { + if {$::verbose} { + puts -nonewline "\nWaiting for background AOF rewrite to finish... " + flush stdout + } after 1000 } else { break @@ -75,7 +83,7 @@ proc waitForBgrewriteaof r { proc wait_for_sync r { while 1 { - if {[status r master_link_status] eq "down"} { + if {[status $r master_link_status] eq "down"} { after 10 } else { break @@ -87,6 +95,14 @@ proc randomInt {max} { expr {int(rand()*$max)} } +proc randomSignedInt {max} { + set i [randomInt $max] + if {rand() > 0.5} { + set i -$i + } + return $i +} + proc randpath args { set path [expr {int(rand()*[llength $args])}] uplevel 1 [lindex $args $path] @@ -95,13 +111,13 @@ proc randpath args { proc randomValue {} { randpath { # Small enough to likely collide - randomInt 1000 + randomSignedInt 1000 } { # 32 bit compressible signed/unsigned - randpath {randomInt 2000000000} {randomInt 4000000000} + randpath {randomSignedInt 2000000000} {randomSignedInt 4000000000} } { # 64 bit - randpath {randomInt 1000000000000} + randpath {randomSignedInt 1000000000000} } { # Random string randpath {randstring 0 256 alpha} \ @@ -140,12 +156,19 @@ proc findKeyWithType {r type} { return {} } -proc createComplexDataset {r ops} { +proc createComplexDataset {r ops {opt {}}} { for {set j 0} {$j < $ops} {incr j} { set k [randomKey] set k2 [randomKey] set f [randomValue] set v [randomValue] + + if {[lsearch -exact $opt useexpire] != -1} { + if {rand() < 0.1} { + {*}$r expire [randomKey] [randomInt 2] + } + } + randpath { set d [expr {rand()}] } { @@ -193,7 +216,7 @@ proc createComplexDataset {r ops} { randpath {{*}$r sadd $k $v} \ {{*}$r srem $k $v} \ { - set otherset [findKeyWithType r set] + set otherset [findKeyWithType {*}$r set] if {$otherset ne {}} { randpath { {*}$r sunionstore $k2 $k $otherset @@ -209,7 +232,7 @@ proc createComplexDataset {r ops} { randpath {{*}$r zadd $k $d $v} \ {{*}$r zrem $k $v} \ { - set otherzset [findKeyWithType r zset] + set otherzset [findKeyWithType {*}$r zset] if {$otherzset ne {}} { randpath { {*}$r zunionstore $k2 2 $k $otherzset @@ -283,3 +306,7 @@ proc csvdump r { proc csvstring s { return "\"$s\"" } + +proc roundFloat f { + format "%.10g" $f +}