fixed a ziplist bug about encoding of integer values overflowing 64 bit

[redis.git] / tests / support / util.tcl

diff --git a/tests/support/util.tcl b/tests/support/util.tcl
index 8a7c3f1d81f86d6eeb6bf97c0fe73a5e1688ea2f..26cf1dc177f24b0b3ca057697bbde8f1c874f8b4 100644 (file)
--- a/tests/support/util.tcl
+++ b/tests/support/util.tcl
@@ -25,6 +25,23 @@ proc zlistAlikeSort {a b} {
     string compare [lindex $a 1] [lindex $b 1]
 }
 
+# Return all log lines starting with the first line that contains a warning.
+# Generally, this will be an assertion error with a stack trace.
+proc warnings_from_file {filename} {
+    set lines [split [exec cat $filename] "\n"]
+    set matched 0
+    set result {}
+    foreach line $lines {
+        if {[regexp {^\[\d+\]\s+\d+\s+\w+\s+\d{2}:\d{2}:\d{2} \#} $line]} {
+            set matched 1
+        }
+        if {$matched} {
+            lappend result $line
+        }
+    }
+    join $result "\n"
+}
+
 # Return value for INFO property
 proc status {r property} {
     if {[regexp "\r\n$property:(.*?)\r\n" [$r info] _ value]} {
@@ -110,9 +127,23 @@ proc randomKey {} {
     }
 }
 
+proc findKeyWithType {r type} {
+    for {set j 0} {$j < 20} {incr j} {
+        set k [$r randomkey]
+        if {$k eq {}} {
+            return {}
+        }
+        if {[$r type $k] eq $type} {
+            return $k
+        }
+    }
+    return {}
+}
+
 proc createComplexDataset {r ops} {
     for {set j 0} {$j < $ops} {incr j} {
         set k [randomKey]
+        set k2 [randomKey]
         set f [randomValue]
         set v [randomValue]
         randpath {
@@ -141,6 +172,8 @@ proc createComplexDataset {r ops} {
                 $r zadd $k $d $v
             } {
                 $r hset $k $f $v
+            } {
+                $r del $k
             }
             set t [$r type $k]
         }
@@ -158,11 +191,23 @@ proc createComplexDataset {r ops} {
             }
             {set} {
                 randpath {$r sadd $k $v} \
-                        {$r srem $k $v}
+                        {$r srem $k $v} \
+                        {
+                            set otherset [findKeyWithType r set]
+                            if {$otherset ne {}} {
+                                $r sunionstore $k2 $k $otherset
+                            }
+                        }
             }
             {zset} {
                 randpath {$r zadd $k $d $v} \
-                        {$r zrem $k $v}
+                        {$r zrem $k $v} \
+                        {
+                            set otherzset [findKeyWithType r zset]
+                            if {$otherzset ne {}} {
+                                $r zunionstore $k2 2 $k $otherzset
+                            }
+                        }
             }
             {hash} {
                 randpath {$r hset $k $f $v} \
@@ -171,3 +216,60 @@ proc createComplexDataset {r ops} {
         }
     }
 }
+
+proc formatCommand {args} {
+    set cmd "*[llength $args]\r\n"
+    foreach a $args {
+        append cmd "$[string length $a]\r\n$a\r\n"
+    }
+    set _ $cmd
+}
+
+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] ,
+                }
+                append o "\n"
+            }
+            set {
+                foreach e [lsort [$r smembers $k]] {
+                    append o [csvstring $e] ,
+                }
+                append o "\n"
+            }
+            zset {
+                foreach e [$r zrange $k 0 -1 withscores] {
+                    append o [csvstring $e] ,
+                }
+                append o "\n"
+            }
+            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"
+            }
+        }
+    }
+    return $o
+}
+
+proc csvstring s {
+    return "\"$s\""
+}