summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* AOF tests fixed turning aof-load-truncated to no.aofeofantirez2014-09-081-6/+6
| | | | | | | When aof-load-truncated option was introduced, with a default of "yes", the past behavior of the server to abort with trunncated AOF changed, so we need to explicitly configure the tests to abort with truncated AOF by setting the option to no.
* Make aof-load-truncated option actually configurable.antirez2014-09-082-1/+38
|
* Correct cleanup when aborting AOF loading.antirez2014-09-051-8/+29
| | | | | | | Because of the new ability to start with a truncated AOF, we need to correctly release all the memory on EOF error. Otherwise there is a small leak, that is not really a problem, but causes a false positive in the tests that detect memory leaks.
* AOF ability to load truncated files.antirez2014-09-053-3/+14
|
* Test AOF format error detection.antirez2014-09-051-0/+25
|
* AOF loading: split handling of format errors from unexpected EOF.antirez2014-09-052-8/+11
|
* Merge branch 'unstable' of github.com:/antirez/redis into unstableantirez2014-09-041-5/+5
|\
| * Merge pull request #1982 from mattsta/fix-getrange-32bitSalvatore Sanfilippo2014-09-031-5/+5
| |\ | | | | | | Increase size of range request in getrange
| | * Return empty string if GETRANGE of empty stringMatt Stancliff2014-09-021-1/+1
| | | | | | | | | | | | | | | | | | | | | Previously, GETRANGE of a key containing nothing ("") would allocate a large (size_t)-1 return value causing crashes on 32bit builds when it tried to allocate the 4 GB return string.
| | * Increase size of range request in getrangeMatt Stancliff2014-09-021-4/+4
| |/ | | | | | | | | | | | | | | | | | | 32 bit builds don't have a big enough long to capture the same range as a 64 bit build. If we use "long long" we get proper size limits everywhere. Also updates size of unsigned comparison to fit new size of `end`. Fixes #1981
* | Sentinel: don't set announce-ip if is empty.antirez2014-09-041-1/+2
| |
* | Sentinel: clarify announce-ip/port options in sentinel.conf.antirez2014-09-041-3/+18
| |
* | Sentinel: announce ip/port changes + rewrite.antirez2014-09-042-19/+35
| | | | | | | | | | | | The original implementation was modified in order to allow to selectively announce a different IP or port, and to rewrite the two options in the config file after a rewrite.
* | sentinel: Decouple bind address from address sent to other sentinelsDara Kong2014-09-042-3/+31
|/ | | | | | | There are instances such as EC2 where the bind address is private (behind a NAT) and cannot be accessible from WAN. https://groups.google.com/d/msg/redis-db/PVVvjO4nMd0/P3oWC036v3cJ
* Sentinel: Abort Hello quicker if not connectedMatt Stancliff2014-09-011-1/+2
| | | | | We can save a little work by aborting when we enter the function if we're disconnected.
* Add regression test for issue #1939Paddy Byers2014-09-011-0/+12
|
* Store the length of the static argv when first allocated.Paddy Byers2014-09-011-0/+1
|
* Fix dictRehash assert casting type.antirez2014-08-261-1/+1
| | | | Also related to #1929.
* Cast to right type in dictNext().antirez2014-08-261-1/+1
| | | | This closes issue #1929, the other part was fixed in the context of issue
* Use long for rehash and iterator index in dict.h.antirez2014-08-261-3/+5
| | | | | | | | This allows to support datasets with more than 2 billion of keys (possible in very large memory instances, this bug was actually reported). Closes issue #1814.
* Missing va_end also added in hiredis copy of sds.c.antirez2014-08-261-0/+1
|
* Merge pull request #1964 from mariano-perez-rodriguez/patch-2Salvatore Sanfilippo2014-08-261-1/+0
|\ | | | | Missing assert removal from sdsIncrLen()
| * Missing assert removal from sdsIncrLen()Mariano Pérez Rodríguez2014-08-251-1/+0
|/ | | Companion for 8eeb1802ec42682a614a5ebca318a0ba44ca7c03, but dealing with hiredis.
* Use modern typedef form in cluster.h.antirez2014-08-251-5/+4
|
* No longer useful assert removed from sdsIncrLen().antirez2014-08-251-1/+0
|
* Merge branch '1906-merge' into unstableantirez2014-08-2547-197/+375
|\
| * Fix redis-benchmark abort output1906-mergeMatt Stancliff2014-08-251-1/+1
| |
| * Deny CLIENT command in scriptsMatt Stancliff2014-08-251-1/+1
| | | | | | | | | | | | | | | | | | | | We don't want scripts doing CLIENT SETNAME or CLIENT KILL or CLIENT LIST or CLIENT PAUSE. Originally reported by Chris Wj then proper action inspired by Itamar Haber. Reference: https://groups.google.com/forum/#!topic/redis-db/09B2EYwyVgk
| * redis-benchmark: Remove unused bufferMatt Stancliff2014-08-251-9/+0
| | | | | | | | | | | | | | | | | | | | This just deletes old code that didn't get removed when logic changed. We were setting offsets that never got read anywhere. Since clients are now just cloned, we don't need to track per-client buffer offsets anywhere because they are all the same from the original client.
| * redis-benchmark: add auth optionCharSyam2014-08-251-0/+14
| | | | | | | | Closes #1097
| * Rename two 'buf' vars to 'ip' for better clarityMatt Stancliff2014-08-251-5/+5
| | | | | | | | | | Clearly ip[32] is wrong, but it's less clear that buf[32] was wrong without further reading.
| * Sentinel: fix bufsize to support IPv6 addressEiichi Sato2014-08-251-2/+2
| | | | | | | | Closes #1914
| * Use correct github url to find commands.jsonJan-Erik Rediger2014-08-251-1/+1
| | | | | | | | | | | | | | | | | | | | Once this is merged: - merge the latest changes to commands.json in antirez/redis-doc - re-run: utils/generate-command-help.rb > src/help.h Then we'll have nice and easy tab-completed help in redis-cli again. Closes #1909
| * Stop tests from leaving a black backgroundMariano Pérez Rodríguez2014-08-251-1/+1
| | | | | | | | | | | | | | | | Uses ANSI "default background" color code after closing tests so any non-black terminals don't remain polluted. Fixes #1649 Closes #1912
| * Sentinel: Reject config from STDINMatt Stancliff2014-08-251-0/+7
| | | | | | | | | | | | | | Sentinel needs to die with a more accurate error message when attempted to open a config from STDIN. See: https://groups.google.com/forum/#!topic/redis-db/sYx7VNMWaNM
| * Cluster: Fix segfault if cluster config corruptMatt Stancliff2014-08-251-3/+7
| | | | | | | | | | | | | | | | | | | | | | This commit adds a size check after initial config line parsing to make sure we have *at least* 8 arguments per line. Also, instead of asserting for cluster->myself, we just test and error out normally (since the error does a hard exit anyway). Closes #1597
| * Fix memory leak in cluster config parsingMatt Stancliff2014-08-181-0/+1
| | | | | | | | | | | | The continue stop us from triggering the free after the long line for loop, so add it earlier.
| * Remove unused global variableMatt Stancliff2014-08-181-1/+0
| | | | | | | | It has an important name, but nothing uses it...
| * Fix invalid expire error for SET family commands.antirez2014-08-181-1/+1
| |
| * Remove unused functionCong Ding2014-08-181-6/+0
| | | | | | | | Closes #878
| * Extend range of bytesToHuman to TB and PBDavid Palm2014-08-181-0/+9
| | | | | | | | | | | | | | Also adds a fallthrough case for when given large values (like overflow numbers of 2^64 by mistake). Closes #858
| * Add error check for writing RDB checksumyoav2014-08-181-1/+1
| | | | | | | | Closes #857
| * redis-cli: fix prompt after shutdown commandDov Murik2014-08-181-1/+4
| | | | | | | | | | Fix redis-cli prompt to state "not connected" after a SHUTDOWN command is sent.
| * Clarify argument to dict macroxiaoyu2014-08-181-1/+1
| | | | | | | | | | | | d is more clear because the type of argument is dict not dictht Closes #513
| * Clarify existing slot wording on cluster startMatt Stancliff2014-08-181-6/+5
| |
| * Remove warnings and improve integer sign correctness.antirez2014-08-1317-48/+66
| |
| * Add -W to compilation flags.antirez2014-08-131-1/+1
| |
| * Use unsigned integers in SDS header.antirez2014-08-134-9/+15
| | | | | | | | This raises the max string to 4GB without any downside.
| * va_copy must be matched by va_endPieter Noordhuis2014-08-121-0/+1
| | | | | | | | | | | | Hat tip to @rfuchs. See: https://github.com/redis/hiredis/pull/178. Fixes #1187
| * Remove duplicate prototypes in redis.hcharsyam2014-08-121-3/+1
| | | | | | | | | | | | Also moves acceptHandler() to be near the other accept...() functions. Closes #1105
View Lorry Controller Status