Commits on Oct 25, 2012
  1. Redis 2.6.1

    committed Oct 25, 2012
  2. Fix compilation on Linux kernels or glibc versions lacking sync_file_…

    This fixes issue #667.
    Many thanks to Didier Spezia for the fix.
    committed Oct 25, 2012
Commits on Oct 24, 2012
Commits on Oct 22, 2012
  1. Redis 2.6.0

    committed Oct 22, 2012
  2. A filed called slave_read_only added in INFO output.

    This was an important information missing from the INFO output in the
    replication section.
    It obviously reflects if the slave is read only or not.
    committed Oct 22, 2012
  3. Fix (cosmetic) typos in dict.h

    Greg Hurrell committed with Oct 3, 2012
  4. redis-check-dump now understands dumps produced by Redis 2.6

    (Commit message from @antirez as it was missign in the original commits,
    also the patch was modified a bit to still work with 2.4 dumps and to
    avoid if expressions that are always true due to checked types range)
    This commit changes redis-check-dump to account for new encodings and
    for the new MSTIME expire format. It also refactors the test for valid
    type into a function.
    The code is still compatible with Redis 2.4 generated dumps.
    This fixes issue #709.
    ripcurld00d committed with Oct 22, 2012
  5. Default memory limit for 32bit instanced moved from 3.5 GB to 3 GB.

    In some system, notably osx, the 3.5 GB limit was too far and not able
    to prevent a crash for out of memory. The 3 GB limit works better and it
    is still a lot of memory within a 4 GB theorical limit so it's not going
    to bore anyone :-)
    This fixes issue #711
    committed Oct 22, 2012
  6. Differentiate SCRIPT KILL error replies.

    When calling SCRIPT KILL currently you can get two errors:
    * No script in timeout (busy) state.
    * The script already performed a write.
    It is useful to be able to distinguish the two errors, but right now both
    start with "ERR" prefix, so string matching (that is fragile) must be used.
    This commit introduces two different prefixes.
    -NOTBUSY and -UNKILLABLE respectively to reply with an error when no
    script is busy at the moment, and when the script already executed a
    write operation and can not be killed.
    committed Oct 22, 2012
Commits on Oct 18, 2012
  1. Update src/redis-benchmark.c

    The code of current implementation:
    if (c->pending == 0) clientDone(c);
    In clientDone function, the c's memory has been freed, then the loop will continue: while(c->pending). The memory of c has been freed now, so c->pending is invalid (c is an invalid pointer now), and this will cause memory dump in some platforams(eg: Solaris).
    So I think the code should be modified as:
    if (c->pending == 0)
    and this will not lead to while(c->pending).
    NanXiao committed with Oct 10, 2012
Commits on Oct 16, 2012
  1. Fix MULTI / EXEC rendering in MONITOR output.

    Before of this commit it used to be like this:
    ... actual commands of the transaction ...
    Because after all that is the natural order of things. Transaction
    commands are queued and executed *only after* EXEC is called.
    However this makes debugging with MONITOR a mess, so the code was
    modified to provide a coherent output.
    What happens is that MULTI is rendered in the MONITOR output as far as
    possible, instead EXEC is propagated only after the transaction is
    executed, or even in the case it fails because of WATCH, so in this case
    you'll simply see:
    An empty transaction.
    committed Oct 16, 2012
Commits on Oct 11, 2012
  1. Allow AUTH when Redis is busy because of timedout Lua script.

    If the server is password protected we need to accept AUTH when there is
    a server busy (-BUSY) condition, otherwise it will be impossible to send
    This fixes issue #708.
    committed Oct 11, 2012
Commits on Oct 6, 2012
  1. CONTRIBUTING file updated.

    committed Oct 6, 2012
Commits on Oct 5, 2012
  1. Redis 2.6.0 RC8 (2.5.14)

    committed Oct 5, 2012
  2. Merge pull request #544 from dvirsky/2.6

    fixed install script to rewrite the default config
    committed Oct 5, 2012
  3. Hash function switched to murmurhash2.

    The previously used hash function, djbhash, is not secure against
    collision attacks even when the seed is randomized as there are simple
    ways to find seed-independent collisions.
    The new hash function appears to be safe (or much harder to exploit at
    least) in this case, and has better distribution.
    Better distribution does not always means that's better. For instance in
    a fast benchmark with "DEBUG POPULATE 1000000" I obtained the following
        1.6 seconds with djbhash
        2.0 seconds with murmurhash2
    This is due to the fact that djbhash will hash objects that follow the
    pattern `prefix:<id>` and where the id is numerically near, to near
    buckets. This improves the locality.
    However in other access patterns with keys that have no relation
    murmurhash2 has some (apparently minimal) speed advantage.
    On the other hand a better distribution should significantly
    improve the quality of the distribution of elements returned with
    dictGetRandomKey() that is used in SPOP, SRANDMEMBER, RANDOMKEY, and
    other commands.
    Everything considered, and under the suspect that this commit fixes a
    security issue in Redis, we are switching to the new hash function.
    If some serious speed regression will be found in the future we'll be able
    to step back easiliy.
    This commit fixes issue #663.
    committed Oct 3, 2012
  4. Warn when configured maxmemory value seems odd.

    This commit warns the user with a log at "warning" level if:
    1) After the server startup the maxmemory limit was found to be < 1MB.
    2) After a CONFIG SET command modifying the maxmemory setting the limit
    is set to a value that is smaller than the currently used memory.
    The behaviour of the Redis server is unmodified, and this wil not make
    the CONFIG SET command or a wrong configuration in redis.conf less
    likely to create problems, but at least this will make aware most users
    about a possbile error they committed without resorting to external
    However no warning is issued if, as a result of loading the AOF or RDB
    file, we are very near the maxmemory setting, or key eviction will be
    needed in order to go under the specified maxmemory setting. The reason
    is that in servers configured as a cache with an aggressive
    maxmemory-policy most of the times restarting the server will cause this
    condition to happen if persistence is not switched off.
    This fixes issue #429.
    committed Oct 5, 2012
Commits on Oct 4, 2012
  1. Force expire all timer events when system clock skew is detected.

    When system time changes back, the timer will not worker properly
    hence some core functionality of redis will stop working(e.g. replication,
    bgsave, etc). See issue #633 for details.
    The patch saves the previous time and when a system clock skew is detected,
    it will force expire all timers.
    Modiifed by @antirez: the previous time was moved into the eventLoop
    structure to make sure the library is still thread safe as long as you
    use different event loops into different threads (otherwise you need
    some synchronization). More comments added about the reasoning at the
    base of the patch, that's worth reporting here:
    /* If the system clock is moved to the future, and then set back to the
     * right value, time events may be delayed in a random way. Often this
     * means that scheduled operations will not be performed soon enough.
     * Here we try to detect system clock skews, and force all the time
     * events to be processed ASAP when this happens: the idea is that
     * processing events earlier is less dangerous than delaying them
     * indefinitely, and practice suggests it is. */
    jokea committed with Aug 30, 2012
  2. "Timeout receiving bulk data" error message modified.

    The new message now contains an hint about modifying the repl-timeout
    configuration directive if the problem persists.
    This should normally not be needed, because while the master generates
    the RDB file it makes sure to send newlines to the replication channel
    to prevent timeouts. However there are times when masters running on
    very slow systems can completely stop for seconds during the RDB saving
    process. In such a case enlarging the timeout value can fix the problem.
    See issue #695 for an example of this problem in an EC2 deployment.
    committed Oct 4, 2012
Commits on Oct 3, 2012
  1. "SORT by nosort" (skip sorting) respect sorted set ordering.

    When SORT is called with the option BY set to a string constant not
    inclduing the wildcard character "*", there is no way to sort the output
    so any ordering is valid. This allows the SORT internals to optimize its
    work and don't really sort the output at all.
    However it was odd that this option was not able to retain the natural
    order of a sorted set. This feature was requested by users multiple
    times as sometimes to call SORT with GET against sorted sets as a way to
    mass-fetch objects can be handy.
    This commit introduces two things:
    1) The ability of SORT to return sorted sets elements in their natural
    ordering when `BY nosort` is specified, accordingly to `DESC / ASC` options.
    2) The ability of SORT to optimize this case further if LIMIT is passed
    as well, avoiding to really fetch the whole sorted set, but directly
    obtaining the specified range.
    Because in this case the sorting is always deterministic, no
    post-sorting activity is performed when SORT is called from a Lua
    This commit fixes issue #98.
    committed Oct 3, 2012
Commits on Oct 1, 2012
  1. Revert "Scripting: redis.NIL to return nil bulk replies."

    This reverts commit e061d79.
    committed Oct 1, 2012
Commits on Sep 28, 2012
  1. Scripting: add helper functions redis.error_reply() and redis.status_…

    A previous commit introduced Redis.NIL. This commit adds similar helper
    functions to return tables with a single field set to the specified
    string so that instead of using 'return {err="My Error"}' it is possible
    to use a more idiomatic form:
        return redis.error_reply("My Error")
        return redis.status_reply("OK")
    committed Sep 28, 2012
  2. Scripting: redis.NIL to return nil bulk replies.

    Lua arrays can't contain nil elements (see for more information), so Lua scripts
    were not able to return a multi-bulk reply containing nil bulk
    elements inside.
    This commit introduces a special conversion: a table with just
    a "nilbulk" field set to a boolean value is converted by Redis as a nil
    bulk reply, but at the same time for Lua this type is not a "nil" so can
    be used inside Lua arrays.
    This type is also assigned to redis.NIL, so the following two forms
    are equivalent and will be able to return a nil bulk reply as second
    element of a three elements array:
        EVAL "return {1,redis.NIL,3}" 0
        EVAL "return {1,{nilbulk=true},3}" 0
    The result in redis-cli will be:
        1) (integer) 1
        2) (nil)
        3) (integer) 3
    committed Sep 28, 2012
Commits on Sep 27, 2012
  1. Final merge of Sentinel into 2.6.

    After cherry-picking Sentinel commits a few spurious issues remained
    about references to Redis Cluster that is not present in the 2.6 branch.
    committed Sep 27, 2012
  2. Sentinel: Support for AUTH.

    committed Sep 26, 2012
  3. Sentinel: reply -IDONTKNOW to get-master-addr-by-name on lack of info.

    If we don't have any clue about a master since it never replied to INFO
    so far, reply with an -IDONTKNOW error to SENTINEL
    get-master-addr-by-name requests.
    committed Sep 4, 2012
  4. Sentinel: more easy master redirection if master is a slave.

    Before this commit Sentienl used to redirect master ip/addr if the
    current instance reported to be a slave only if this was the first INFO
    output received, and the role was found to be slave.
    Now instead also if we find that the runid is different, and the
    reported role is slave, we also redirect to the reported master ip/addr.
    This unifies the behavior of Sentinel in the case of a reboot (where it
    will see the first INFO output with the wrong role and will perform the
    redirection), with the behavior of Sentinel in the case of a change in
    what it sees in the INFO output of the master.
    committed Sep 4, 2012
  5. Sentinel: do not crash against slaves not publishing the runid.

    Older versions of Redis (before 2.4.17) don't publish the runid field in
    INFO. This commit makes Sentinel able to handle that without crashing.
    committed Aug 30, 2012
  6. Sentinel: add Redis execution mode to INFO output.

    The new "redis_mode" field in the INFO output will show if Redis is
    running in standalone mode, cluster, or sentinel mode.
    committed Aug 29, 2012
  7. Sentinel: Sentinel-side support for slave priority.

    The slave priority that is now published by Redis in INFO output is
    now used by Sentinel in order to select the slave with minimum priority
    for promotion, and in order to consider slaves with priority set to 0 as
    not able to play the role of master (they will never be promoted by
    The "slave-priority" field is now one of the fileds that Sentinel
    publishes when describing an instance via the SENTINEL commands such as
    "SENTINEL slaves mastername".
    committed Aug 28, 2012