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

21057 Commits

Author SHA1 Message Date
Salvatore Sanfilippo
610aff3251
Merge pull request #5924 from swilly22/redismodule-replicated-cmd-ctx-flag 
document additional flag of RM_GetContextFlags
 2019-03-13 11:52:07 +01:00
Salvatore Sanfilippo
e73f7b3a84 Merge pull request #5894 from soloestoy/fix-rdb-warning 
Fix compile some warnings
 2019-03-13 11:47:48 +01:00
Salvatore Sanfilippo
02dab20026
Merge pull request #5894 from soloestoy/fix-rdb-warning 
Fix compile some warnings
 2019-03-13 11:47:48 +01:00
zhaozhao.zz
9fd8f0df98 Fix compile warning in redis-cli.c 2019-03-13 16:54:34 +08:00
zhaozhao.zz
5a3d3d8be4 Fix compile warning in redis-cli.c 2019-03-13 16:54:34 +08:00
swilly22
31625ad5b1 document additional flag of RM_GetContextFlags 2019-03-13 08:22:40 +02:00
swilly22
89bf4db4fa document additional flag of RM_GetContextFlags 2019-03-13 08:22:40 +02:00
Steve Webster
c652f706cb Only increment delivery count if JUSTID option is omitted 2019-03-12 20:27:53 +00:00
Steve Webster
dfcb227b50 Only increment delivery count if JUSTID option is omitted 2019-03-12 20:27:53 +00:00
Salvatore Sanfilippo
685d10894b Merge pull request #2774 from rouzier/blocking-list-commands-support-milliseconds-floating 
Added millisecond resolution for blpop command && friends
 2019-03-12 18:10:28 +01:00
Salvatore Sanfilippo
e5acc5ef4f
Merge pull request #2774 from rouzier/blocking-list-commands-support-milliseconds-floating 
Added millisecond resolution for blpop command && friends
 2019-03-12 18:10:28 +01:00
Salvatore Sanfilippo
d70014ec0e Merge pull request #5913 from wurongxin1987/unstable 
fix a bufferoverflow bug
 2019-03-12 17:25:21 +01:00
Salvatore Sanfilippo
fba6e26e87
Merge pull request #5913 from wurongxin1987/unstable 
fix a bufferoverflow bug
 2019-03-12 17:25:21 +01:00
Salvatore Sanfilippo
b6350da979 Merge pull request #5900 from artix75/cluster_backup 
Cluster Manager: add importing/migrating nodes to backup info
 2019-03-12 17:21:17 +01:00
Salvatore Sanfilippo
b0bc602bb3
Merge pull request #5900 from artix75/cluster_backup 
Cluster Manager: add importing/migrating nodes to backup info
 2019-03-12 17:21:17 +01:00
Salvatore Sanfilippo
2604fc27da Merge pull request #5903 from soloestoy/sunionstore-lazyfree 
try lazyfree temp set in SUNION & SDIFF
 2019-03-12 17:20:52 +01:00
Salvatore Sanfilippo
c02b414e9a
Merge pull request #5903 from soloestoy/sunionstore-lazyfree 
try lazyfree temp set in SUNION & SDIFF
 2019-03-12 17:20:52 +01:00
Salvatore Sanfilippo
9de07aca25 Merge pull request #5915 from swilly22/redismodule-replicated-cmd-ctx-flag 
Extend REDISMODULE_CTX_FLAGS to indicate if command was sent by master
 2019-03-12 17:17:19 +01:00
Salvatore Sanfilippo
45645aee7f
Merge pull request #5915 from swilly22/redismodule-replicated-cmd-ctx-flag 
Extend REDISMODULE_CTX_FLAGS to indicate if command was sent by master
 2019-03-12 17:17:19 +01:00
artix
95b932ffcf Redis Benchmark: fix possible usage of freed pointer (getRedisConfig) 
Fixes issue #5912
 2019-03-12 17:07:23 +01:00
artix
5284d67e37 Redis Benchmark: fix possible usage of freed pointer (getRedisConfig) 
Fixes issue #5912
 2019-03-12 17:07:23 +01:00
Salvatore Sanfilippo
7fd8cf9c4c Merge pull request #5920 from chendq8/aofrewrite 
remove temp-rewriteaof-xxx.aof when interrupt aofrewrite
 2019-03-12 17:03:02 +01:00
Salvatore Sanfilippo
f63bbb4335
Merge pull request #5920 from chendq8/aofrewrite 
remove temp-rewriteaof-xxx.aof when interrupt aofrewrite
 2019-03-12 17:03:02 +01:00
vattezhang
d41e245dab fix: fix the if condition in clusterManagerShowClusterInfo 2019-03-12 22:01:02 +08:00
vattezhang
bdc783b472 fix: fix the if condition in clusterManagerShowClusterInfo 2019-03-12 22:01:02 +08:00
vattezhang
d3de74f795 Merge branch 'unstable' of github.com:antirez/redis into unstable 2019-03-12 21:52:20 +08:00
vattezhang
270a111433 Merge branch 'unstable' of github.com:antirez/redis into unstable 2019-03-12 21:52:20 +08:00
chendianqiang
e56e1bceee remove temp-rewriteaof-xxx.aof when interrupt aofrewrite 2019-03-12 20:46:40 +08:00
chendianqiang
3621223fbb remove temp-rewriteaof-xxx.aof when interrupt aofrewrite 2019-03-12 20:46:40 +08:00
John Sully
c56b68f9a5 Werror is good for me, but not for people compiling on other compilers 
Former-commit-id: 99ccb11d89c049e467ed552709d9cd3674561e8c
 2019-03-11 20:53:57 -04:00
John Sully
458cb19da3 Werror is good for me, but not for people compiling on other compilers 
Former-commit-id: 99ccb11d89c049e467ed552709d9cd3674561e8c
 2019-03-11 20:53:57 -04:00
swilly22
58bcc05b1d Extend REDISMODULE_CTX_FLAGS to indicate if command was sent by master 2019-03-11 10:02:19 +02:00
swilly22
468860ae18 Extend REDISMODULE_CTX_FLAGS to indicate if command was sent by master 2019-03-11 10:02:19 +02:00
antirez
beaacf96cd Make comment in #5911 stay inside 80 cols. 2019-03-10 09:48:06 +01:00
antirez
8a46d32be2 Make comment in #5911 stay inside 80 cols. 2019-03-10 09:48:06 +01:00
wurongxin
4c4b18963b fix a bufferoverflow bug 2019-03-10 15:30:32 +08:00
wurongxin
0298d3ad18 fix a bufferoverflow bug 2019-03-10 15:30:32 +08:00
John Sully
94319db950 Make storage.h C++ safe 
Former-commit-id: cc98d10fc695dd61b1ef5d96ac2866a877111e50
 2019-03-09 13:42:08 -05:00
John Sully
3c4a69fe36 Make storage.h C++ safe 
Former-commit-id: cc98d10fc695dd61b1ef5d96ac2866a877111e50
 2019-03-09 13:42:08 -05:00
John Sully
02b23107cc sizeof is too big 
Former-commit-id: a6a022faa228fd67deeb1767c10ed7f184c28c29
 2019-03-09 13:41:49 -05:00
John Sully
6ef744f242 sizeof is too big 
Former-commit-id: a6a022faa228fd67deeb1767c10ed7f184c28c29
 2019-03-09 13:41:49 -05:00
John Sully
a3e3a24057 Replicas aren't allowed to run the replicaof command 2019-03-09 11:04:48 -05:00
John Sully
5b52bc738b Replicas aren't allowed to run the replicaof command 2019-03-09 11:04:48 -05:00
Steve Webster
8fd63c220a Increment delivery counter on XCLAIM unless RETRYCOUNT specified 
The XCLAIM docs state the XCLAIM increments the delivery counter for
messages. This PR makes the code match the documentation - which seems
like the desired behaviour - whilst still allowing RETRYCOUNT to be
specified manually.

My understanding of the way streamPropagateXCLAIM() works is that this
change will safely propagate to replicas since retry count is pulled
directly from the streamNACK struct.

Fixes #5194
 2019-03-08 17:09:11 +00:00
Steve Webster
f1e7df4b7c Increment delivery counter on XCLAIM unless RETRYCOUNT specified 
The XCLAIM docs state the XCLAIM increments the delivery counter for
messages. This PR makes the code match the documentation - which seems
like the desired behaviour - whilst still allowing RETRYCOUNT to be
specified manually.

My understanding of the way streamPropagateXCLAIM() works is that this
change will safely propagate to replicas since retry count is pulled
directly from the streamNACK struct.

Fixes #5194
 2019-03-08 17:09:11 +00:00
artix
14cce99469 Redis Benchmark: handle CLUSTERDOWN error 2019-03-08 11:05:02 +01:00
artix
8fadebfcca Redis Benchmark: handle CLUSTERDOWN error 2019-03-08 11:05:02 +01:00
John Sully
778a48b574 bump version 
Former-commit-id: a864ad1c9c6bf25f2224499bec8b49f1bdb5eab0
 2019-03-07 19:13:59 -05:00
John Sully
e23a80277f bump version 
Former-commit-id: a864ad1c9c6bf25f2224499bec8b49f1bdb5eab0
 2019-03-07 19:13:59 -05:00
John Sully
38fd0476d5 Merge branch 'unstable' into RELEASE_0_9 
Former-commit-id: 0bc586933ff91fd07128d5419b06303f05d16f2e
 2019-03-07 19:13:33 -05:00