antirez
0ab04287aa
AOF loading: split handling of format errors from unexpected EOF.
2014-09-08 10:56:52 +02:00
antirez
d9f0094154
Merge branch 'unstable' of github.com:/antirez/redis into unstable
2014-09-04 11:46:18 +02:00
antirez
0a6cbabb26
Sentinel: don't set announce-ip if is empty.
2014-09-04 11:45:58 +02:00
antirez
c9437fe5a3
Sentinel: clarify announce-ip/port options in sentinel.conf.
2014-09-04 11:30:11 +02:00
antirez
cd576a1aab
Sentinel: announce ip/port changes + rewrite.
...
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.
2014-09-04 11:23:31 +02:00
Dara Kong
3d939266be
sentinel: Decouple bind address from address sent to other sentinels
...
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
2014-09-04 10:54:21 +02:00
Salvatore Sanfilippo
0019479f86
Merge pull request #1982 from mattsta/fix-getrange-32bit
...
Increase size of range request in getrange
2014-09-03 15:10:35 +02:00
Matt Stancliff
b20df972ed
Return empty string if GETRANGE of empty string
...
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.
2014-09-02 18:56:28 -04:00
Matt Stancliff
f0e306f4a0
Increase size of range request in getrange
...
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
2014-09-02 18:56:01 -04:00
Matt Stancliff
67e414c7b8
Sentinel: Abort Hello quicker if not connected
...
We can save a little work by aborting when we enter the function
if we're disconnected.
2014-09-01 16:34:06 +02:00
Paddy Byers
a23502e5e8
Add regression test for issue #1939
2014-09-01 10:42:27 +02:00
Paddy Byers
86cde329d1
Store the length of the static argv when first allocated.
2014-09-01 10:42:27 +02:00
antirez
91e6b4d74e
Fix dictRehash assert casting type.
...
Also related to #1929 .
2014-08-26 10:32:44 +02:00
antirez
72aa797c89
Cast to right type in dictNext().
...
This closes issue #1929 , the other part was fixed in the context of issue
2014-08-26 10:26:36 +02:00
antirez
064d5c96ac
Use long for rehash and iterator index in dict.h.
...
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 .
2014-08-26 10:18:56 +02:00
antirez
293348d0de
Missing va_end also added in hiredis copy of sds.c.
2014-08-26 10:05:32 +02:00
Salvatore Sanfilippo
26744da0d1
Merge pull request #1964 from mariano-perez-rodriguez/patch-2
...
Missing assert removal from sdsIncrLen()
2014-08-26 10:03:54 +02:00
Mariano Pérez Rodríguez
8bbc1897c4
Missing assert removal from sdsIncrLen()
...
Companion for 8eeb1802ec
, but dealing with hiredis.
2014-08-25 15:24:15 -03:00
antirez
119a7000b5
Use modern typedef form in cluster.h.
2014-08-25 10:42:18 +02:00
antirez
8eeb1802ec
No longer useful assert removed from sdsIncrLen().
2014-08-25 10:36:26 +02:00
antirez
209f266cc5
Merge branch '1906-merge' into unstable
2014-08-25 10:27:53 +02:00
Matt Stancliff
1f8a6d806c
Fix redis-benchmark abort output
2014-08-25 10:26:30 +02:00
Matt Stancliff
6b099c7de6
Deny CLIENT command in scripts
...
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
2014-08-25 10:25:30 +02:00
Matt Stancliff
aa404fc11b
redis-benchmark: Remove unused buffer
...
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.
2014-08-25 10:19:43 +02:00
CharSyam
b34a8c3b75
redis-benchmark: add auth option
...
Closes #1097
2014-08-25 10:17:33 +02:00
Matt Stancliff
7e63dd23f3
Rename two 'buf' vars to 'ip' for better clarity
...
Clearly ip[32] is wrong, but it's less clear that buf[32] was wrong
without further reading.
2014-08-25 10:16:20 +02:00
Eiichi Sato
c38884ceac
Sentinel: fix bufsize to support IPv6 address
...
Closes #1914
2014-08-25 10:15:43 +02:00
Jan-Erik Rediger
ef57f94df0
Use correct github url to find commands.json
...
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
2014-08-25 10:15:28 +02:00
Mariano Pérez Rodríguez
5afe1e37c7
Stop tests from leaving a black background
...
Uses ANSI "default background" color code after closing tests
so any non-black terminals don't remain polluted.
Fixes #1649
Closes #1912
2014-08-25 10:14:03 +02:00
Matt Stancliff
681de88df4
Sentinel: Reject config from STDIN
...
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
2014-08-25 10:13:34 +02:00
Matt Stancliff
60c448b584
Cluster: Fix segfault if cluster config corrupt
...
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
2014-08-25 10:11:38 +02:00
Matt Stancliff
879e18b7ec
Fix memory leak in cluster config parsing
...
The continue stop us from triggering the
free after the long line for loop, so add it
earlier.
2014-08-18 11:27:19 +02:00
Matt Stancliff
82bac1b729
Remove unused global variable
...
It has an important name, but nothing uses it...
2014-08-18 11:23:58 +02:00
antirez
a6edfceaa8
Fix invalid expire error for SET family commands.
2014-08-18 11:15:50 +02:00
Cong Ding
18ca831830
Remove unused function
...
Closes #878
2014-08-18 11:12:26 +02:00
David Palm
100c3315be
Extend range of bytesToHuman to TB and PB
...
Also adds a fallthrough case for when given
large values (like overflow numbers of 2^64 by mistake).
Closes #858
2014-08-18 11:11:00 +02:00
yoav
0a98b21f65
Add error check for writing RDB checksum
...
Closes #857
2014-08-18 11:09:06 +02:00
Dov Murik
233d24a737
redis-cli: fix prompt after shutdown command
...
Fix redis-cli prompt to state "not connected" after a SHUTDOWN command
is sent.
2014-08-18 11:05:36 +02:00
xiaoyu
d786fb6e94
Clarify argument to dict macro
...
d is more clear because the type of argument is dict not dictht
Closes #513
2014-08-18 10:59:01 +02:00
Matt Stancliff
6a7a32a806
Clarify existing slot wording on cluster start
2014-08-18 10:58:00 +02:00
antirez
c951c3ee5a
Fix undefined behavior in ll2string().
...
The bug was found by @CAFxX, thanks!
See issue #1940 .
2014-08-15 15:48:15 +02:00
antirez
edca2b14d2
Remove warnings and improve integer sign correctness.
2014-08-13 11:44:38 +02:00
antirez
7e3ccddc6d
Add -W to compilation flags.
2014-08-13 10:53:54 +02:00
antirez
68db7b1f56
Use unsigned integers in SDS header.
...
This raises the max string to 4GB without any downside.
2014-08-13 10:53:51 +02:00
Pieter Noordhuis
cf85b5ba81
va_copy must be matched by va_end
...
Hat tip to @rfuchs. See: https://github.com/redis/hiredis/pull/178 .
Fixes #1187
2014-08-12 11:50:02 +02:00
charsyam
3426866e0a
Remove duplicate prototypes in redis.h
...
Also moves acceptHandler() to be near the other accept...() functions.
Closes #1105
2014-08-12 11:45:25 +02:00
NanXiao
951eefae3c
Use resolv library in Solaris
...
For some Solaris flavours, the inet_aton in in resolv library.
Not linking this library will introduce link error.
Improves compatability with older Solaris and still
works on new Solaris.
Closes #1092
2014-08-12 11:30:46 +02:00
Daniel Price
b57a4d07a2
Define AR to help with lua cross-compilation
...
Closes #997
2014-08-12 11:26:34 +02:00
antirez
ded57795ff
representRedisNodeFlags() moved into right code section.
...
The funciton was also modified in order to be more standalone and
produce an output without trailing spaces, making the reuse simpler.
The global variable was renamed in cammel case as most other Redis
globals, except the main ones we refer too many times, like 'server'.
2014-08-08 15:53:42 +02:00
charsyam
de5465baf7
Refactor cluster flag printing
...
Less copy/paste code duplication.
Closes #952
2014-08-08 15:39:44 +02:00