BITCOUNT performance improved.

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

diff --git a/tests/unit/bitops.tcl b/tests/unit/bitops.tcl
index c072f54575ad25c92057e98acaf39cb0783636de..bc4799432c7b44beec082709945ef364e18b8994 100644 (file)
--- a/tests/unit/bitops.tcl
+++ b/tests/unit/bitops.tcl
@@ -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"] {

         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,19 @@ 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} {
+                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]

         }
     }
 }
         }
     }
 }