projects
/
redis.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into intset-split
[redis.git]
/
tests
/
support
/
util.tcl
diff --git
a/tests/support/util.tcl
b/tests/support/util.tcl
index 26cf1dc177f24b0b3ca057697bbde8f1c874f8b4..95153111f2df263a125978cedfa08f1360e4d3ae 100644
(file)
--- a/
tests/support/util.tcl
+++ b/
tests/support/util.tcl
@@
-44,7
+44,7
@@
proc warnings_from_file {filename} {
# Return value for INFO property
proc status {r property} {
# Return value for INFO property
proc status {r property} {
- if {[regexp "\r\n$property:(.*?)\r\n" [$r info] _ value]} {
+ if {[regexp "\r\n$property:(.*?)\r\n" [
{*}
$r info] _ value]} {
set _ $value
}
}
set _ $value
}
}
@@
-129,23
+129,30
@@
proc randomKey {} {
proc findKeyWithType {r type} {
for {set j 0} {$j < 20} {incr j} {
proc findKeyWithType {r type} {
for {set j 0} {$j < 20} {incr j} {
- set k [$r randomkey]
+ set k [
{*}
$r randomkey]
if {$k eq {}} {
return {}
}
if {$k eq {}} {
return {}
}
- if {[$r type $k] eq $type} {
+ if {[
{*}
$r type $k] eq $type} {
return $k
}
}
return {}
}
return $k
}
}
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]
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()}]
} {
randpath {
set d [expr {rand()}]
} {
@@
-159,23
+166,23
@@
proc createComplexDataset {r ops} {
} {
randpath {set d +inf} {set d -inf}
}
} {
randpath {set d +inf} {set d -inf}
}
- set t [$r type $k]
+ set t [
{*}
$r type $k]
if {$t eq {none}} {
randpath {
if {$t eq {none}} {
randpath {
- $r set $k $v
+
{*}
$r set $k $v
} {
} {
- $r lpush $k $v
+
{*}
$r lpush $k $v
} {
} {
- $r sadd $k $v
+
{*}
$r sadd $k $v
} {
} {
- $r zadd $k $d $v
+
{*}
$r zadd $k $d $v
} {
} {
- $r hset $k $f $v
+
{*}
$r hset $k $f $v
} {
} {
- $r del $k
+
{*}
$r del $k
}
}
- set t [$r type $k]
+ set t [
{*}
$r type $k]
}
switch $t {
}
switch $t {
@@
-183,35
+190,45
@@
proc createComplexDataset {r ops} {
# Nothing to do
}
{list} {
# Nothing to do
}
{list} {
- randpath {$r lpush $k $v} \
- {$r rpush $k $v} \
- {$r lrem $k 0 $v} \
- {$r rpop $k} \
- {$r lpop $k}
+ randpath {
{*}
$r lpush $k $v} \
+ {
{*}
$r rpush $k $v} \
+ {
{*}
$r lrem $k 0 $v} \
+ {
{*}
$r rpop $k} \
+ {
{*}
$r lpop $k}
}
{set} {
}
{set} {
- randpath {$r sadd $k $v} \
- {$r srem $k $v} \
+ randpath {
{*}
$r sadd $k $v} \
+ {
{*}
$r srem $k $v} \
{
set otherset [findKeyWithType r set]
if {$otherset ne {}} {
{
set otherset [findKeyWithType r set]
if {$otherset ne {}} {
- $r sunionstore $k2 $k $otherset
+ randpath {
+ {*}$r sunionstore $k2 $k $otherset
+ } {
+ {*}$r sinterstore $k2 $k $otherset
+ } {
+ {*}$r sdiffstore $k2 $k $otherset
+ }
}
}
}
{zset} {
}
}
}
{zset} {
- randpath {$r zadd $k $d $v} \
- {$r zrem $k $v} \
+ randpath {
{*}
$r zadd $k $d $v} \
+ {
{*}
$r zrem $k $v} \
{
set otherzset [findKeyWithType r zset]
if {$otherzset ne {}} {
{
set otherzset [findKeyWithType r zset]
if {$otherzset ne {}} {
- $r zunionstore $k2 2 $k $otherzset
+ randpath {
+ {*}$r zunionstore $k2 2 $k $otherzset
+ } {
+ {*}$r zinterstore $k2 2 $k $otherzset
+ }
}
}
}
{hash} {
}
}
}
{hash} {
- randpath {$r hset $k $f $v} \
- {$r hdel $k $f}
+ randpath {
{*}
$r hset $k $f $v} \
+ {
{*}
$r hdel $k $f}
}
}
}
}
}
}
@@
-227,33
+244,33
@@
proc formatCommand {args} {
proc csvdump r {
set o {}
proc csvdump r {
set o {}
- foreach k [lsort [$r keys *]] {
- set type [$r type $k]
+ foreach k [lsort [
{*}
$r keys *]] {
+ set type [
{*}
$r type $k]
append o [csvstring $k] , [csvstring $type] ,
switch $type {
string {
append o [csvstring $k] , [csvstring $type] ,
switch $type {
string {
- append o [csvstring [$r get $k]] "\n"
+ append o [csvstring [
{*}
$r get $k]] "\n"
}
list {
}
list {
- foreach e [$r lrange $k 0 -1] {
+ foreach e [
{*}
$r lrange $k 0 -1] {
append o [csvstring $e] ,
}
append o "\n"
}
set {
append o [csvstring $e] ,
}
append o "\n"
}
set {
- foreach e [lsort [$r smembers $k]] {
+ foreach e [lsort [
{*}
$r smembers $k]] {
append o [csvstring $e] ,
}
append o "\n"
}
zset {
append o [csvstring $e] ,
}
append o "\n"
}
zset {
- foreach e [$r zrange $k 0 -1 withscores] {
+ foreach e [
{*}
$r zrange $k 0 -1 withscores] {
append o [csvstring $e] ,
}
append o "\n"
}
hash {
append o [csvstring $e] ,
}
append o "\n"
}
hash {
- set fields [$r hgetall $k]
+ set fields [
{*}
$r hgetall $k]
set newfields {}
foreach {k v} $fields {
lappend newfields [list $k $v]
set newfields {}
foreach {k v} $fields {
lappend newfields [list $k $v]