BITOP bug when called against non existing keys fixed.

[redis.git] / tests / unit / bitops.tcl

diff --git a/tests/unit/bitops.tcl b/tests/unit/bitops.tcl
index c072f54575ad25c92057e98acaf39cb0783636de..0e3403bfe1818ee043788127f6cf430902418497 100644 (file)
--- a/tests/unit/bitops.tcl
+++ b/tests/unit/bitops.tcl
@@ -24,13 +24,13 @@ proc simulate_bit_op {op args} {
     set out {}
     for {set x 0} {$x < $maxlen} {incr x} {
         set bit [string range $b(0) $x $x]
     set out {}
     for {set x 0} {$x < $maxlen} {incr x} {
         set bit [string range $b(0) $x $x]

+        if {$op eq {not}} {set bit [expr {!$bit}]}

         for {set j 1} {$j < $count} {incr j} {
             set bit2 [string range $b($j) $x $x]
             switch $op {
                 and {set bit [expr {$bit & $bit2}]}
                 or  {set bit [expr {$bit | $bit2}]}
                 xor {set bit [expr {$bit ^ $bit2}]}
         for {set j 1} {$j < $count} {incr j} {
             set bit2 [string range $b($j) $x $x]
             switch $op {
                 and {set bit [expr {$bit & $bit2}]}
                 or  {set bit [expr {$bit | $bit2}]}
                 xor {set bit [expr {$bit ^ $bit2}]}

-                not {set bit [expr {!$bit}]}

             }
         }
         append out $bit
             }
         }
         append out $bit


@@ -44,11 +44,7 @@ start_server {tags {"bitops"}} {
     } 0
 
     catch {unset num}
     } 0
 
     catch {unset num}

-    foreach vec [list \
-        "" "\xaa" "\x00\x00\xff" "foobar" \
-        [randstring 2000 3000] [randstring 2000 3000] \
-        [randstring 2000 3000] \
-    ] {
+    foreach vec [list "" "\xaa" "\x00\x00\xff" "foobar" "123"] {

         incr num
         test "BITCOUNT against test vector #$num" {
             r set str $vec
         incr num
         test "BITCOUNT against test vector #$num" {
             r set str $vec


@@ -56,6 +52,14 @@ start_server {tags {"bitops"}} {
         }
     }
 
         }
     }
 

+    test {BITCOUNT fuzzing} {
+        for {set j 0} {$j < 100} {incr j} {
+            set str [randstring 0 3000]
+            r set str $str
+            assert {[r bitcount str] == [count_bits $str]}
+        }
+    }
+

     test {BITCOUNT with start, end} {
         r set s "foobar"
         assert_equal [r bitcount s 0 -1] [count_bits "foobar"]
     test {BITCOUNT with start, end} {
         r set s "foobar"
         assert_equal [r bitcount s 0 -1] [count_bits "foobar"]


@@ -114,17 +118,52 @@ start_server {tags {"bitops"}} {
 
     foreach op {and or xor} {
         test "BITOP $op fuzzing" {
 
     foreach op {and or xor} {
         test "BITOP $op fuzzing" {

-            set vec {}
-            set veckeys {}
-            set numvec [expr {[randomInt 10]+1}]
-            for {set j 0} {$j < $numvec} {incr j} {
-                set str [randstring 0 1000]
-                lappend vec $str
-                lappend veckeys vector_$j
-                r set vector_$j $str
+            for {set i 0} {$i < 10} {incr i} {
+                r flushall
+                set vec {}
+                set veckeys {}
+                set numvec [expr {[randomInt 10]+1}]
+                for {set j 0} {$j < $numvec} {incr j} {
+                    set str [randstring 0 1000]
+                    lappend vec $str
+                    lappend veckeys vector_$j
+                    r set vector_$j $str
+                }
+                r bitop $op target {*}$veckeys
+                assert_equal [r get target] [simulate_bit_op $op {*}$vec]

             }
             }

-            r bitop $op target {*}$veckeys
-            assert_equal [r get target] [simulate_bit_op $op {*}$vec]

         }
     }
         }
     }

+
+    test {BITOP NOT fuzzing} {
+        for {set i 0} {$i < 10} {incr i} {
+            r flushall
+            set str [randstring 0 1000]
+            r set str $str
+            r bitop not target str
+            assert_equal [r get target] [simulate_bit_op not $str]
+        }
+    }
+
+    test {BITOP with integer encoded source objects} {
+        r set a 1
+        r set b 2
+        r bitop xor dest a b a
+        r get dest
+    } {2}
+
+    test {BITOP with non string source key} {
+        r del c
+        r set a 1
+        r set b 2
+        r lpush c foo
+        catch {r bitop xor dest a b c d} e
+        set e
+    } {*ERR*}
+
+    test {BITOP with empty string after non empty string (issue #529)} {
+        r flushdb
+        r set a "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+        r bitop or x a b
+    } {32}

 }
 }