Swappability bug due to a typo fixed thanks to code review by Felix Geisendörfer...

diff --git a/redis.c b/redis.c
index b7fd3b5b845ff3fecb4ae2073ea2dd6f6706fce8..52ada3801afd7895b240fa24bca1e05cb8cee3b2 100644 (file)
--- a/redis.c
+++ b/redis.c
@@ -7560,7 +7560,7 @@ static double computeObjectSwappability(robj *o) {
         }
         break;
     }
-    return (double)asize*log(1+asize);
+    return (double)age*log(1+asize);
 }
 
 /* Try to swap an object that's a good candidate for swapping.

diff --git a/test-redis.tcl b/test-redis.tcl
index 9b546722481761f27238597ab92050b87af0e63d..36b82e38156eff1db0d64d51a1c3f508bf5ae566 100644 (file)
--- a/test-redis.tcl
+++ b/test-redis.tcl
@@ -952,7 +952,6 @@ proc main {server port} {
         $r sort tosort {DESC}
     } [lsort -decreasing -integer $res]
 
-while 1 {
     test {SORT speed, sorting 10000 elements list using BY, 100 times} {
         set start [clock clicks -milliseconds]
         for {set i 0} {$i < 100} {incr i} {
@@ -963,7 +962,7 @@ while 1 {
         flush stdout
         format {}
     } {}
-}
+
     test {SORT speed, sorting 10000 elements list directly, 100 times} {
         set start [clock clicks -milliseconds]
         for {set i 0} {$i < 100} {incr i} {