75f1a7bdfc
Merge branch 'unstable' of github.com:/antirez/redis into unstable
2018-06-28 00:17:21 +02:00
4a70ff7451
Add unblock in CLIENT HELP.
2018-06-28 00:17:10 +02:00
3c27db1cd9
fix empty string for sentinel rename-command
2018-06-28 01:08:55 +08:00
730a4cfa00
Merge pull request #5067 from mpaltun/mpaltun-doc-fix
...
Streams documentation fix
2018-06-27 18:54:27 +02:00
2214043b5c
CLIENT UNBLOCK: support unblocking by error.
2018-06-27 18:51:06 +02:00
010dc172d4
Update t_stream.c
2018-06-27 16:35:30 +03:00
6d0acb330a
Update help.h
2018-06-27 16:33:31 +03:00
71295ee305
CLIENT UNBLOCK implemented.
2018-06-27 14:08:42 +02:00
fb39bfd7af
Take clients in a ID -> Client handle dictionary.
2018-06-27 14:08:42 +02:00
ed65d734e7
CLIENT ID implemented.
2018-06-27 14:08:42 +02:00
5616d4c603
add active defrag support for streams
2018-06-27 15:00:41 +03:00
bb666d445d
Merge pull request #5027 from tigertv/unstable
...
Update sort.c
2018-06-26 16:13:20 +02:00
eb052ba93a
Merge pull request #5059 from guybe7/fix_restore_warning
...
Fix compiler warning in restoreCommand
2018-06-26 14:41:48 +02:00
27178a3fde
Fix type of argslen in sendSynchronousCommand().
...
Related to #5037 .
2018-06-26 14:38:35 +02:00
1f1e724f47
Remove black space.
2018-06-26 14:37:22 +02:00
aa5eaad48c
Merge pull request #5037 from madolson/repl-auth-fix
...
Fixed replication authentication with whitespace password
2018-06-26 14:33:20 +02:00
3cf8dd2c84
Sentinel: fix SENTINEL SET error reporting.
...
Thanks to @shenlongxing for reporting the problem.
Related to #5062 .
2018-06-26 09:17:38 +02:00
45731edc4b
Addressed comments
2018-06-26 00:57:35 +00:00
e8d68b6b72
Fixed replication authentication with whitespace in password
2018-06-26 00:48:37 +00:00
fc0c9c8097
Sentinel: drop the renamed-command entry in a more natural way.
...
Instead of telling the user to set the renamed command to "" to remove
the renaming, to the obvious thing when a command is renamed to itself.
So if I want to remove the renaming of PING, I just rename it to PING
again.
2018-06-25 17:50:46 +02:00
a8a76bda1b
Merge branch 'unstable' of github.com:/antirez/redis into unstable
2018-06-25 17:34:12 +02:00
2358de6816
Sentinel command renaming: use case sensitive hashing for the dict.
2018-06-25 17:31:57 +02:00
a9c5008895
Sentinel command renaming: fix CONFIG SET event logging.
2018-06-25 17:24:04 +02:00
b72cecd7c8
Sentinel command renaming: fix CONFIG SET after refactoring.
2018-06-25 17:23:32 +02:00
91a384a5cd
Sentinel command renaming: implement SENTINEL SET.
2018-06-25 17:13:20 +02:00
903582dd7b
Sentinel: make SENTINEL SET able to handle different arities.
2018-06-25 17:12:39 +02:00
c303e768bf
Sentinel command renaming: config rewriting.
2018-06-25 16:55:01 +02:00
60df7dbea1
Sentinel command renaming: rename-command option parsing.
2018-06-25 16:47:50 +02:00
72e8a33b35
Sentinel command renaming: base machanism implemented.
2018-06-25 14:06:05 +02:00
dfcc20f4fd
Fix compiler warning in restoreCommand
2018-06-24 16:53:01 +07:00
cf7fcdbe4e
Merge pull request #4634 from soloestoy/special-auth
...
config: handle special configuration "" for auth
2018-06-22 15:48:33 +02:00
70b7fa2c52
Merge pull request #5049 from youjiali1995/fix-load-rdb
...
Fix rdbLoadIntegerObject() to create shared objects when needed.
2018-06-22 15:47:45 +02:00
54d66d39a0
Merge pull request #5053 from michael-grunder/zpopminmax-keypos
...
Update ZPOPMIN/ZPOPMAX command declaration
2018-06-22 15:35:36 +02:00
199e704a42
Merge pull request #5050 from shenlongxing/fix-typo
...
fix typo
2018-06-22 15:34:36 +02:00
db6b99f90c
Update ZPOPMIN/ZPOPMAX command declaration
...
Unlike the BZPOP variants, these functions take a single key. This fixes
an erroneous CROSSSLOT error when passing a count to a cluster enabled
server.
2018-06-21 12:30:42 -07:00
a16aa03a67
Merge pull request #5051 from oranagra/streams_mem_estimate
...
fix streams memory estimation, missing raxSeek
2018-06-21 17:36:28 +02:00
20e10dc7b8
fix streams memory estimation, missing raxSeek
2018-06-21 17:58:29 +03:00
ec55df117f
fix typo
2018-06-21 22:08:09 +08:00
df6644fe0e
Fix rdbLoadIntegerObject() to create shared objects when needed.
2018-06-21 19:23:16 +08:00
c1e8240565
Merge pull request #5039 from oranagra/rdb_dbsize_hint
...
64 bit RDB_OPCODE_RESIZEDB in rdb saving
2018-06-20 11:18:31 +02:00
79f55eeddd
Merge pull request #5040 from oranagra/memrev64ifbe_fix
...
use safe macro (non empty) in memrev64ifbe to eliminate empty if warning
2018-06-20 11:17:06 +02:00
b5197f1fc9
Enhance RESTORE with RDBv9 new features
...
RESTORE now supports:
1. Setting LRU/LFU
2. Absolute-time TTL
Other related changes:
1. RDB loading will not override LRU bits when RDB file
does not contain the LRU opcode.
2. RDB loading will not set LRU/LFU bits if the server's
maxmemory-policy does not match.
2018-06-20 15:11:08 +07:00
c6fdebf533
Merge pull request #5042 from oranagra/malloc_usable_size_libc
...
add malloc_usable_size for libc malloc
2018-06-19 17:22:36 +02:00
482785ac62
add malloc_usable_size for libc malloc
...
this reduces the extra 8 bytes we save before each pointer.
but more importantly maybe, it makes the valgrind runs to be more similiar
to our normal runs.
note: the change in malloc_stats struct in server.h is to eliminate an name conflict.
structs that are not typedefed are resolved from a separate name space.
2018-06-19 18:18:23 +03:00
4da296307c
Merge pull request #5023 from FX-HAO/unstable
...
Fix update_zmalloc_stat_alloc in zrealloc
2018-06-19 16:50:22 +02:00
5f5e1199ef
Merge pull request #5041 from oranagra/redis-rdb-check_rdbLoadMillisecondTime
...
fix redis-rdb-check to provide proper arguments to rdbLoadMillisecondTime
2018-06-19 16:06:11 +02:00
4848fbec8b
Modules: convert hash to hash table for big objects.
2018-06-19 16:03:00 +02:00
f31b0405f0
fix redis-rdb-check to provide proper arguments to rdbLoadMillisecondTime
...
due to incorrect forward declaration, it didn't provide all arguments.
this lead to random value being read from the stack and return of incorrect time,
which in this case doesn't matter since no one uses it.
2018-06-19 16:54:22 +03:00
333c98c43a
AOF: remove no longer used variable "now".
2018-06-19 15:54:05 +02:00
e94b2053c6
Modify clusterRedirectClient() to handle ZPOP and XREAD.
2018-06-19 15:53:32 +02:00
