mirrors
/
redis
mirror of https://mirror.osredm.com/root/redis.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,048 Commits 92 Branches 328 Tags 468 MiB
Commit Graph

7048 Commits

Author SHA1 Message Date
Salvatore Sanfilippo f8fd6639e7
Merge pull request #4948 from soloestoy/avoid-warning-stream 
avoid warning in t_stream.c
 2018-05-25 17:00:46 +02:00
antirez 2bd36616ba Streams: fix test ID format. 2018-05-25 16:57:08 +02:00
zhaozhao.zz c2d7e6cea7 avoid warning in t_stream.c 2018-05-25 22:49:49 +08:00
antirez fb6ebaa598 Backport hiredis issue 525 fix to compile on FreeBSD. 
Close #4947.
 2018-05-25 16:33:23 +02:00
antirez fb9c1c3dbd Simplify XADD ID syntax error code path,. 2018-05-25 16:29:37 +02:00
Salvatore Sanfilippo a60f553b68
Merge pull request #4832 from 0xtonyxia/fix-xadd-ID-parse 
Bugfix: xadd command ID parse
 2018-05-25 16:27:21 +02:00
antirez 95fa564add Avoid warning by explicitly initializing var to NULL. 2018-05-25 16:19:14 +02:00
antirez b2b4e186a2 Explicitly cast void pointers to char pointers for printf style logging. 2018-05-25 16:15:59 +02:00
Salvatore Sanfilippo 42ec8e8cb2
Merge pull request #4946 from soloestoy/linux-make-lrt 
append -lrt to FINAL_LIBS for linux
 2018-05-25 16:12:19 +02:00
zhaozhao.zz 2711f053f2 append -lrt to FINAL_LIBS for linux 2018-05-25 20:16:57 +08:00
antirez e4f5c04930 Don't append libjemalloc.a otherwise it will be after -ldl. 2018-05-25 13:36:51 +02:00
Mota af3471a5dc Fix debug crash-and-recover help info. 2018-05-25 16:49:23 +08:00
antirez 694145bd74 Merge branch 'unstable' of github.com:/antirez/redis into unstable 2018-05-24 18:21:23 +02:00
antirez 4e729fcdaf Generate configure for Jemalloc. 2018-05-24 18:21:13 +02:00
antirez 98d5d3f118 Make active defragmentation tests optional. 
They failed when active defrag could not be activated because the
Jemalloc version does not include the additional APIs.
 2018-05-24 18:04:21 +02:00
antirez fef42d0985 Add --with-version in Jemalloc config script. 2018-05-24 17:50:12 +02:00
antirez 8d76c6a878 Specify that Jemalloc configure requires version. 2018-05-24 17:49:36 +02:00
antirez 08e1c8e820 Jemalloc upgraded to version 5.0.1. 2018-05-24 17:17:37 +02:00
antirez 8f4e2075a7 Update documentation about how to upgrade Jemalloc. 2018-05-24 17:16:12 +02:00
Salvatore Sanfilippo b23a501135
Merge pull request #4099 from JunHe77/aarch64_stack_cflag 
Fixed stack trace generation on aarch64
 2018-05-24 16:16:12 +02:00
Salvatore Sanfilippo 18b7f71130
Merge pull request #4932 from 0xtonyxia/fix-redis-cli-set-prefer-memory-leak 
Fix redis-cli memory leak when sending set :preference command.
 2018-05-24 16:15:21 +02:00
Salvatore Sanfilippo ef7ccad180
Merge pull request #4922 from 0xtonyxia/enhance-cli-security 
Enhance security for redis-cli
 2018-05-24 16:14:42 +02:00
Salvatore Sanfilippo 8a200b04c3
Merge pull request #4831 from 0xtonyxia/fix-xadd-arity-check 
Bugfix: xadd comand <field,value> arity check
 2018-05-24 16:07:19 +02:00
antirez de4b6cb27b Merge branch 'unstable' of github.com:/antirez/redis into unstable 2018-05-23 17:14:59 +02:00
antirez 8631e64779 Sentinel: fix delay in detecting ODOWN. 
See issue #2819 for details. The gist is that when we want to send INFO
because we are over the time, we used to send only INFO commands, no
longer sending PING commands. However if a master fails exactly when we
are about to send an INFO command, the PING times will result zero
because the PONG reply was already received, and we'll fail to send more
PINGs, since we try only to send INFO commands: the failure detector
will delay until the connection is closed and re-opened for "long
timeout".

This commit changes the logic so that we can send the three kind of
messages regardless of the fact we sent another one already in the same
code path. It could happen that we go over the message limit for the
link by a few messages, but this is not significant. However now we'll
not introduce delays in sending commands just because there was
something else to send at the same time.
 2018-05-23 17:13:44 +02:00
Salvatore Sanfilippo 1ab3c82375
Merge pull request #4908 from soloestoy/aof-rdb-preamble-compatible-checksum-no 
AOF & RDB: be compatible with rdbchecksum no
 2018-05-23 17:11:00 +02:00
Salvatore Sanfilippo f1321349d3
Merge pull request #4935 from soloestoy/bugfix-zpop 
bugfix for ZPOP: fix the wrong keyc, should be 1
 2018-05-22 15:52:21 +02:00
zhaozhao.zz 4e7a160b9b ZPOP: fix the wrong keyc, should be 1 2018-05-22 21:31:22 +08:00
dejun.xdj 46e241ac8e Fix redis-cli memory leak when sending set preference command. 2018-05-21 12:19:37 +08:00
dejun.xdj 95b988b6c6 Check if the repeat value is positive in while loop of cliSendCommand(). 
In case that the incoming repeat parameter is negative and causes a
deadless loop.
 2018-05-21 12:06:48 +08:00
dejun.xdj cc7ffdfdf2 Change the type of repeat argument to long for function cliSendCommand. 
To be in consistent with the original definition.
 2018-05-21 12:04:53 +08:00
dejun.xdj b2762f1ff2 Fix negtive repeat command value issue. 
If command like "-1 set a b" is sent with redis-cli, it will cause a deadless loop. So some repeat value checking logic is added to avoid this.
 2018-05-19 22:50:40 +08:00
dejun.xdj c2e2314640 Detect and stop saving history for auth command with repeat option. 
Put the repeat option checking code a little forward to avoid repeat logic.
 2018-05-18 11:40:05 +08:00
dejun.xdj ef931ef93e Change the warning message a little bit to avoid trademark issuses. 2018-05-18 11:37:31 +08:00
antirez 3c968ff030 Merge branch 'unstable' of github.com:/antirez/redis into unstable 2018-05-17 16:53:14 +02:00
antirez 3c43e984db Merge remote-tracking branch 'artix/trib2cli' into unstable 2018-05-17 16:52:31 +02:00
Salvatore Sanfilippo 13779c11f8
Merge pull request #4927 from oranagra/defrag_32bit_fix 
Active defrag fixes for 32bit builds
 2018-05-17 12:24:40 +02:00
Oran Agra ad133e1023 Active defrag fixes for 32bit builds 
problems fixed:
* failing to read fragmentation information from jemalloc
* overflow in jemalloc fragmentation hint to the defragger
* test suite not triggering eviction after population
 2018-05-17 09:52:00 +03:00
artix e47c751c74 Removed TODO in redis-cli 2018-05-16 18:04:13 +02:00
artix 1e4fb1b33a Cluster Manager: fixed unprinted reply error 2018-05-16 17:49:18 +02:00
dejun.xdj b263c7c465 Stop saving auth command in redis-cli history. 2018-05-16 16:18:00 +08:00
dejun.xdj c082221aef Add warning message when using password on command line 2018-05-16 16:15:12 +08:00
artix 2f9c032a13 Cluster Manager: print flags as strings. 2018-05-15 18:41:46 +02:00
antirez e344aa4a6d Test: fix blocking lists/zsets replication test. 
By verifying that it was able to find a regression, and fixing it
accordingly.
 2018-05-15 17:43:41 +02:00
antirez 8327ccef0e Test: replication test blocking lists/zsets ops. 2018-05-15 17:33:29 +02:00
antirez 25f017e563 ZPOP: fix replication of blocking ZPOP. 2018-05-15 16:03:56 +02:00
artix 3c039996b5 - Fixed mistyped redis command (clusterManagerGetNodeWithMostKeysInSlot) 
- Cluster node structure is now updated after ADDSLOTS
 2018-05-11 18:29:12 +02:00
antirez e87c1f1e6c ZPOP: fix the tests according to new non-blocking "count" argument. 2018-05-11 18:07:10 +02:00
antirez 56bbab238a ZPOP: change sync ZPOP to have a count argument instead of N keys. 
Usually blocking operations make a lot of sense with multiple keys so
that we can listen to multiple queues (or whatever the app models) with
a single connection. However in the synchronous case it is more useful
to be able to ask for N elements. This is a change that I also wanted to
perform soon or later in the blocking list variant, but here it is more
natural since there is no reply type difference.
 2018-05-11 18:00:32 +02:00
antirez 6efb6c1e06 ZPOP: renaming to have explicit MIN/MAX score idea. 
This commit also adds a top comment about a subtle behavior of mixing
blocking operations of different types in the same key.
 2018-05-11 17:31:53 +02:00