diff options
| author | antirez <antirez@gmail.com> | 2015-08-05 12:27:15 +0200 |
|---|---|---|
| committer | antirez <antirez@gmail.com> | 2015-08-05 13:53:32 +0200 |
| commit | 547ccc4b5e24682d2bb8c6fe0a1316172d7847bf (patch) | |
| tree | b57f3654535bed731ccbaf80ef9bb033b4aba445 | |
| parent | 99e4cf4d841eb3f79f80201567ff9df24676df7c (diff) | |
| download | redis-547ccc4b5e24682d2bb8c6fe0a1316172d7847bf.tar.gz | |
Test: csvdump now scans all DBs.
| -rw-r--r-- | tests/support/util.tcl | 68 |
1 files changed, 36 insertions, 32 deletions
diff --git a/tests/support/util.tcl b/tests/support/util.tcl index 4b9caced8..64c36b326 100644 --- a/tests/support/util.tcl +++ b/tests/support/util.tcl @@ -262,46 +262,50 @@ proc formatCommand {args} { proc csvdump r { set o {} - foreach k [lsort [{*}$r keys *]] { - set type [{*}$r type $k] - append o [csvstring $k] , [csvstring $type] , - switch $type { - string { - append o [csvstring [{*}$r get $k]] "\n" - } - list { - foreach e [{*}$r lrange $k 0 -1] { - append o [csvstring $e] , + for {set db 0} {$db < 16} {incr db} { + {*}$r select $db + foreach k [lsort [{*}$r keys *]] { + set type [{*}$r type $k] + append o [csvstring $db] , [csvstring $k] , [csvstring $type] , + switch $type { + string { + append o [csvstring [{*}$r get $k]] "\n" } - append o "\n" - } - set { - foreach e [lsort [{*}$r smembers $k]] { - append o [csvstring $e] , + list { + foreach e [{*}$r lrange $k 0 -1] { + append o [csvstring $e] , + } + append o "\n" } - append o "\n" - } - zset { - foreach e [{*}$r zrange $k 0 -1 withscores] { - append o [csvstring $e] , + set { + foreach e [lsort [{*}$r smembers $k]] { + append o [csvstring $e] , + } + append o "\n" } - append o "\n" - } - hash { - set fields [{*}$r hgetall $k] - set newfields {} - foreach {k v} $fields { - lappend newfields [list $k $v] + zset { + foreach e [{*}$r zrange $k 0 -1 withscores] { + append o [csvstring $e] , + } + append o "\n" } - set fields [lsort -index 0 $newfields] - foreach kv $fields { - append o [csvstring [lindex $kv 0]] , - append o [csvstring [lindex $kv 1]] , + hash { + set fields [{*}$r hgetall $k] + set newfields {} + foreach {k v} $fields { + lappend newfields [list $k $v] + } + set fields [lsort -index 0 $newfields] + foreach kv $fields { + append o [csvstring [lindex $kv 0]] , + append o [csvstring [lindex $kv 1]] , + } + append o "\n" } - append o "\n" } } } + {*}$r select 9 return $o } |