Aman Gupta changes merged

diff --git a/TODO b/TODO
index 52bd9ffb279522be2edc1fff01c7a72a2ccda756..e40a7ed444ca40eb9b16dfff3ae77d3d0fb9a2d6 100644 (file)
--- a/TODO
+++ b/TODO
@@ -18,7 +18,8 @@ BEFORE REDIS 1.0.0-rc1
 AFTER 1.0 stable release
 
  * Consistent hashing implemented in all the client libraries having an user base
 AFTER 1.0 stable release
 
  * Consistent hashing implemented in all the client libraries having an user base

- * Use partial qsort for SORT + LIMIT. Don't copy the list into a vector when BY argument is constant.
+ * SORT: Don't copy the list into a vector when BY argument is constant.
+ * SORT ... STORE keyname. Instead to return the SORTed data set it into key.

  * Profiling and optimization in order to limit the CPU usage at minimum
  * Write the hash table size of every db in the dump, so that Redis can resize the hash table just one time when loading a big DB.
  * Elapsed time in logs for SAVE when saving is going to take more than 2 seconds
  * Profiling and optimization in order to limit the CPU usage at minimum
  * Write the hash table size of every db in the dump, so that Redis can resize the hash table just one time when loading a big DB.
  * Elapsed time in logs for SAVE when saving is going to take more than 2 seconds

diff --git a/test-redis.tcl b/test-redis.tcl
index 1672390346088270a423f5e33a80e78f558d9470..bd58cb2e7183bea9fc62334ecad0f474ceeaf7c6 100644 (file)
--- a/test-redis.tcl
+++ b/test-redis.tcl
@@ -481,11 +481,6 @@ proc main {server port} {
         lsort [$r smembers setres]
     } [lsort -uniq "[$r smembers set1] [$r smembers set2]"]
 
         lsort [$r smembers setres]
     } [lsort -uniq "[$r smembers set1] [$r smembers set2]"]
 

-    test {SUNIONSTORE with same src and dest} {
-        $r sunionstore set1 set1 set1
-        $r scard set1
-    } {1000}
-

     test {SINTER against three sets} {
         $r sadd set3 999
         $r sadd set3 995
     test {SINTER against three sets} {
         $r sadd set3 999
         $r sadd set3 995


@@ -499,11 +494,6 @@ proc main {server port} {
         lsort [$r smembers setres]
     } {995 999}
 
         lsort [$r smembers setres]
     } {995 999}
 

-    test {SINTERSTORE with same src and dest} {
-       $r sinterstore set1 set1 set1
-       $r scard set1
-    } {1000}
-

     test {SUNION with non existing keys} {
         lsort [$r sunion nokey1 set1 set2 nokey2]
     } [lsort -uniq "[$r smembers set1] [$r smembers set2]"]
     test {SUNION with non existing keys} {
         lsort [$r sunion nokey1 set1 set2 nokey2]
     } [lsort -uniq "[$r smembers set1] [$r smembers set2]"]