CLUSTER SETSLOT command and some refactoring of the cluster command

[redis.git] / redis.conf

diff --git a/redis.conf b/redis.conf
index 150eb6907b64fc6f286c0182798a7482a6c59ac4..e7a01eec4e5618910e3613badaad59ee7e96779d 100644 (file)
--- a/redis.conf
+++ b/redis.conf
@@ -21,6 +21,7 @@ daemonize no
 pidfile /var/run/redis.pid
 
 # Accept connections on the specified port, default is 6379.
 pidfile /var/run/redis.pid
 
 # Accept connections on the specified port, default is 6379.

+# If port 0 is specified Redis will not listen on a TCP socket.

 port 6379
 
 # If you want you can bind a single interface, if the bind option is not
 port 6379
 
 # If you want you can bind a single interface, if the bind option is not


@@ -323,8 +324,8 @@ cache-flush-delay 0
 # have at max a given numer of elements, and the biggest element does not
 # exceed a given threshold. You can configure this limits with the following
 # configuration directives.
 # have at max a given numer of elements, and the biggest element does not
 # exceed a given threshold. You can configure this limits with the following
 # configuration directives.

-hash-max-zipmap-entries 64
-hash-max-zipmap-value 512
+hash-max-zipmap-entries 512
+hash-max-zipmap-value 64

 
 # Similarly to hashes, small lists are also encoded in a special way in order
 # to save a lot of space. The special representation is only used when
 
 # Similarly to hashes, small lists are also encoded in a special way in order
 # to save a lot of space. The special representation is only used when


@@ -339,6 +340,12 @@ list-max-ziplist-value 64
 # set in order to use this special memory saving encoding.
 set-max-intset-entries 512
 
 # set in order to use this special memory saving encoding.
 set-max-intset-entries 512
 

+# Similarly to hashes and lists, sorted sets are also specially encoded in
+# order to save a lot of space. This encoding is only used when the length and
+# elements of a sorted set are below the following limits:
+zset-max-ziplist-entries 128
+zset-max-ziplist-value 64
+

 # Active rehashing uses 1 millisecond every 100 milliseconds of CPU time in
 # order to help rehashing the main Redis hash table (the one mapping top-level
 # keys to values). The hash table implementation redis uses (see dict.c)
 # Active rehashing uses 1 millisecond every 100 milliseconds of CPU time in
 # order to help rehashing the main Redis hash table (the one mapping top-level
 # keys to values). The hash table implementation redis uses (see dict.c)