gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
11,882 Commits 1 Branch 0 Tags
Commit Graph

11882 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Salvatore Sanfilippo
c2d7c5bbcd 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
antirez
dd4ac1654b 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
zhaozhao.zz
3b2b5e1d1b 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
a17226d419 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
antirez
1ea37fcf4f 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
Salvatore Sanfilippo
a998d21f71 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
8bdaeaa4c1 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
antirez
a881942e60 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
Salvatore Sanfilippo
9f2abcd020 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
zhaozhao.zz
4e8a00e6b0 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
antirez
ad984d169b 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
Mota
c9a10a9419 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
2fa611607b 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
60ead966fb 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
f3db15d2c9 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
3e071d1f9a 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
1af1d38775 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
3c098ab96f 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
antirez
6fe1cbaa94 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
13f646e8c4 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
3e493b1bca 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
61f7f49070 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
Salvatore Sanfilippo
a99b41c816 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
2afb128ebc 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
antirez
d816a658e9 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