Merge remote-tracking branch 'origin/unstable' into unstable

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

diff --git a/tests/unit/sort.tcl b/tests/unit/sort.tcl
index 554477d1efe70bd515b035d75d0fa6a982cd4ddd..3a4c855f59fcf8bbca05cd3dcf083d680d0b266d 100644 (file)
--- a/tests/unit/sort.tcl
+++ b/tests/unit/sort.tcl
@@ -3,6 +3,7 @@ start_server {
     overrides {
         "list-max-ziplist-value" 16
         "list-max-ziplist-entries" 32
     overrides {
         "list-max-ziplist-value" 16
         "list-max-ziplist-entries" 32

+        "set-max-intset-entries" 32

     }
 } {
     proc create_random_dataset {num cmd} {
     }
 } {
     proc create_random_dataset {num cmd} {


@@ -34,15 +35,27 @@ start_server {
         set _ $result
     }
 
         set _ $result
     }
 

-    set result [create_random_dataset 16 lpush]
-    test "SORT BY key" {
-        assert_equal $result [r sort tosort {BY weight_*}]
-    }
+    foreach {num cmd enc title} {
+        16 lpush ziplist "Ziplist"
+        1000 lpush linkedlist "Linked list"
+        10000 lpush linkedlist "Big Linked list"
+        16 sadd intset "Intset"
+        1000 sadd hashtable "Hash table"
+        10000 sadd hashtable "Big Hash table"
+    } {
+        set result [create_random_dataset $num $cmd]
+        assert_encoding $enc tosort
+
+        test "$title: SORT BY key" {
+            assert_equal $result [r sort tosort BY weight_*]
+        }

 
 

-    test "SORT BY hash field" {
-        assert_equal $result [r sort tosort {BY wobj_*->weight}]
+        test "$title: SORT BY hash field" {
+            assert_equal $result [r sort tosort BY wobj_*->weight]
+        }

     }
 
     }
 

+    set result [create_random_dataset 16 lpush]

     test "SORT GET #" {
         assert_equal [lsort -integer $result] [r sort tosort GET #]
     }
     test "SORT GET #" {
         assert_equal [lsort -integer $result] [r sort tosort GET #]
     }


@@ -65,21 +78,21 @@ start_server {
     }
 
     test "SORT BY key STORE" {
     }
 
     test "SORT BY key STORE" {

-        r sort tosort {BY weight_*} store sort-res
+        r sort tosort BY weight_* store sort-res

         assert_equal $result [r lrange sort-res 0 -1]
         assert_equal 16 [r llen sort-res]
         assert_encoding ziplist sort-res
     }
 
     test "SORT BY hash field STORE" {
         assert_equal $result [r lrange sort-res 0 -1]
         assert_equal 16 [r llen sort-res]
         assert_encoding ziplist sort-res
     }
 
     test "SORT BY hash field STORE" {

-        r sort tosort {BY wobj_*->weight} store sort-res
+        r sort tosort BY wobj_*->weight store sort-res

         assert_equal $result [r lrange sort-res 0 -1]
         assert_equal 16 [r llen sort-res]
         assert_encoding ziplist sort-res
     }
 
     test "SORT DESC" {
         assert_equal $result [r lrange sort-res 0 -1]
         assert_equal 16 [r llen sort-res]
         assert_encoding ziplist sort-res
     }
 
     test "SORT DESC" {

-        assert_equal [lsort -decreasing -integer $result] [r sort tosort {DESC}]
+        assert_equal [lsort -decreasing -integer $result] [r sort tosort DESC]

     }
 
     test "SORT ALPHA against integer encoded strings" {
     }
 
     test "SORT ALPHA against integer encoded strings" {


@@ -128,41 +141,49 @@ start_server {
         test "SORT speed, $num element list BY key, 100 times" {
             set start [clock clicks -milliseconds]
             for {set i 0} {$i < 100} {incr i} {
         test "SORT speed, $num element list BY key, 100 times" {
             set start [clock clicks -milliseconds]
             for {set i 0} {$i < 100} {incr i} {

-                set sorted [r sort tosort {BY weight_* LIMIT 0 10}]
+                set sorted [r sort tosort BY weight_* LIMIT 0 10]

             }
             set elapsed [expr [clock clicks -milliseconds]-$start]
             }
             set elapsed [expr [clock clicks -milliseconds]-$start]

-            puts -nonewline "\n  Average time to sort: [expr double($elapsed)/100] milliseconds "
-            flush stdout
+            if {$::verbose} {
+                puts -nonewline "\n  Average time to sort: [expr double($elapsed)/100] milliseconds "
+                flush stdout
+            }

         }
 
         test "SORT speed, $num element list BY hash field, 100 times" {
             set start [clock clicks -milliseconds]
             for {set i 0} {$i < 100} {incr i} {
         }
 
         test "SORT speed, $num element list BY hash field, 100 times" {
             set start [clock clicks -milliseconds]
             for {set i 0} {$i < 100} {incr i} {

-                set sorted [r sort tosort {BY wobj_*->weight LIMIT 0 10}]
+                set sorted [r sort tosort BY wobj_*->weight LIMIT 0 10]

             }
             set elapsed [expr [clock clicks -milliseconds]-$start]
             }
             set elapsed [expr [clock clicks -milliseconds]-$start]

-            puts -nonewline "\n  Average time to sort: [expr double($elapsed)/100] milliseconds "
-            flush stdout
+            if {$::verbose} {
+                puts -nonewline "\n  Average time to sort: [expr double($elapsed)/100] milliseconds "
+                flush stdout
+            }

         }
 
         test "SORT speed, $num element list directly, 100 times" {
             set start [clock clicks -milliseconds]
             for {set i 0} {$i < 100} {incr i} {
         }
 
         test "SORT speed, $num element list directly, 100 times" {
             set start [clock clicks -milliseconds]
             for {set i 0} {$i < 100} {incr i} {

-                set sorted [r sort tosort {LIMIT 0 10}]
+                set sorted [r sort tosort LIMIT 0 10]

             }
             set elapsed [expr [clock clicks -milliseconds]-$start]
             }
             set elapsed [expr [clock clicks -milliseconds]-$start]

-            puts -nonewline "\n  Average time to sort: [expr double($elapsed)/100] milliseconds "
-            flush stdout
+            if {$::verbose} {
+                puts -nonewline "\n  Average time to sort: [expr double($elapsed)/100] milliseconds "
+                flush stdout
+            }

         }
 
         test "SORT speed, $num element list BY <const>, 100 times" {
             set start [clock clicks -milliseconds]
             for {set i 0} {$i < 100} {incr i} {
         }
 
         test "SORT speed, $num element list BY <const>, 100 times" {
             set start [clock clicks -milliseconds]
             for {set i 0} {$i < 100} {incr i} {

-                set sorted [r sort tosort {BY nokey LIMIT 0 10}]
+                set sorted [r sort tosort BY nokey LIMIT 0 10]

             }
             set elapsed [expr [clock clicks -milliseconds]-$start]
             }
             set elapsed [expr [clock clicks -milliseconds]-$start]

-            puts -nonewline "\n  Average time to sort: [expr double($elapsed)/100] milliseconds "
-            flush stdout
+            if {$::verbose} {
+                puts -nonewline "\n  Average time to sort: [expr double($elapsed)/100] milliseconds "
+                flush stdout
+            }

         }
     }
 }
         }
     }
 }