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

10601 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
antirez
6fd4af1f12 Merge branch 'sharedapi' into unstable 2019-03-14 11:24:48 +01:00
John Sully
22cea6d645 Merge branch 'unstable' of https://github.com/JohnSully/redis2 into unstable 
Former-commit-id: 966f4a8144c47093e21022bb6d2a94fed8b5e49f
 2019-03-13 18:08:59 -04:00
John Sully
46853f1357 Merge branch 'unstable' of https://github.com/antirez/redis into unstable 
Lots of fixes and improvements from upstream.


Former-commit-id: 261cf24efc8bedec7ee76a8897b9a800a4d663e2
 2019-03-13 18:08:22 -04:00
JohnSully
79e2308003 Update README.md 
Former-commit-id: a3da10f4ebbc983fc1e10269a1c72fc2d146cdf0
 2019-03-13 16:57:40 -04:00
John Sully
ec837b225f Merge branch 'unstable' of https://github.com/JohnSully/redis2 into unstable 
Former-commit-id: 6cb8063497679d51b9920da5b06e057b9921a0d5
 2019-03-13 16:53:55 -04:00
John Sully
25c335488e Implement load database dumps from S3. We already save. 
Former-commit-id: a45f212693956a6fb1aacf465d88e940bbbfd56f
 2019-03-13 16:53:37 -04:00
JohnSully
0566ea1b81 Merge pull request #9 from 0xflotus/patch-1 
fixed guarantees

Former-commit-id: 7c72cd547169926209a795b35f51c0f3f03c01ab
 2019-03-13 12:22:29 -04:00
0xflotus
f368a228d8 fixed guarantees 
Former-commit-id: 66f203270862a53b27b18cea8a03999be2262492
 2019-03-13 15:14:34 +01:00
vattezhang
ad223e2042 fix: fix benchmark cannot exit when NOAUTH err happens 2019-03-13 20:46:33 +08:00
vattezhang
31110f1caf Merge branch 'unstable' of github.com:antirez/redis into unstable 2019-03-13 20:26:54 +08:00
Salvatore Sanfilippo
2537b2140f
Merge pull request #5787 from soloestoy/bugfix-xgroup-create-with-mkstream 
Streams: checkType before XGROUP CREATE
 2019-03-13 12:34:29 +01:00
Salvatore Sanfilippo
71499ab1c6
Merge pull request #5893 from itamarhaber/bzpop-arity 
Fixes BZ[REV]POP's arity
 2019-03-13 12:27:35 +01:00
Salvatore Sanfilippo
c49abcb794
Merge pull request #5898 from bsolomon1124/make-uninstall-tgt 
Provide an uninstall target in Makefile
 2019-03-13 12:26:43 +01:00
Salvatore Sanfilippo
372cbc37e7
Merge pull request #5884 from chendq8/cluster_failover 
Reduce 100ms of cluster failover time on Manual mode
 2019-03-13 12:22:23 +01:00
Salvatore Sanfilippo
46a8cb2d18
Merge pull request #5910 from bsolomon1124/install-server-osx-note 
Note that install_server.sh is not for Mac OSX
 2019-03-13 12:19:03 +01:00
Salvatore Sanfilippo
84d6ce4f56
Merge pull request #5901 from artix75/bm_threads_cluster_dev 
Redis Benchmark: add multithread idle mode
 2019-03-13 12:18:32 +01:00
Salvatore Sanfilippo
53d1dc170c
Merge pull request #5921 from vattezhang/unstable_temp 
fix: fix the if condition in clusterManagerShowClusterInfo
 2019-03-13 12:18:08 +01:00
Salvatore Sanfilippo
3e648907ee
Merge pull request #5907 from spjwebster/xclaim-increment-delivery-count 
Increment delivery counter on XCLAIM unless RETRYCOUNT specified
 2019-03-13 11:55:46 +01:00
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
02dab20026
Merge pull request #5894 from soloestoy/fix-rdb-warning 
Fix compile some warnings
 2019-03-13 11:47:48 +01:00
zhaozhao.zz
5a3d3d8be4 Fix compile warning in redis-cli.c 2019-03-13 16:54:34 +08:00
swilly22
89bf4db4fa document additional flag of RM_GetContextFlags 2019-03-13 08:22:40 +02:00
Steve Webster
dfcb227b50 Only increment delivery count if JUSTID option is omitted 2019-03-12 20:27:53 +00:00
JohnSully
3ea54b608a Update README.md 
Former-commit-id: 7546c7d8b41358e4d2a0b71f41ca08b82fa3f8b8
 2019-03-12 14:38:03 -04: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
fba6e26e87
Merge pull request #5913 from wurongxin1987/unstable 
fix a bufferoverflow bug
 2019-03-12 17:25:21 +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
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
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
5284d67e37 Redis Benchmark: fix possible usage of freed pointer (getRedisConfig) 
Fixes issue #5912
 2019-03-12 17:07:23 +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
bdc783b472 fix: fix the if condition in clusterManagerShowClusterInfo 2019-03-12 22:01:02 +08:00
vattezhang
270a111433 Merge branch 'unstable' of github.com:antirez/redis into unstable 2019-03-12 21:52:20 +08:00
chendianqiang
3621223fbb remove temp-rewriteaof-xxx.aof when interrupt aofrewrite 2019-03-12 20:46:40 +08:00
JohnSully
ec2d1ce822 formatting fixes 
Former-commit-id: 703e4ad2fe8bdd05b0655c25a3444f31a4c0d3b6
 2019-03-12 00:59:28 -04:00
JohnSully
c017b8370d Add charts to readme 
Hotlink from medium, hope they don't mind.

Former-commit-id: 0b98280a1f6a727c5566120b486a9e16aa7dbcc9
 2019-03-12 00:55:03 -04:00
John Sully
a4b2ed5861 Merge branch 'unstable' of https://github.com/JohnSully/redis2 into RELEASE_0_9 
Former-commit-id: 4609bed6a4ea066d575df740cb2ad617d31fd03a
 2019-03-11 20:54:14 -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
JohnSully
95150e9108 Explain how multithreading works 
Former-commit-id: 8a5a513662d1eaeaf9887584a415d5e1bca06681
 2019-03-11 20:37:57 -04:00
JohnSully
e60f381366 Update README.md 
Former-commit-id: bf0fd22309ad3992f10316a9f3c12916db78c1bb
 2019-03-11 19:38:20 -04:00
swilly22
468860ae18 Extend REDISMODULE_CTX_FLAGS to indicate if command was sent by master 2019-03-11 10:02:19 +02:00
antirez
8a46d32be2 Make comment in #5911 stay inside 80 cols. 2019-03-10 09:48:06 +01:00
Salvatore Sanfilippo
55acac04b4
Merge pull request #5911 from JohnSully/unstable 
Replicas aren't allowed to run the replicaof command
 2019-03-10 09:45:55 +01:00
wurongxin
0298d3ad18 fix a bufferoverflow bug 2019-03-10 15:30:32 +08:00
John Sully
3c4a69fe36 Make storage.h C++ safe 
Former-commit-id: cc98d10fc695dd61b1ef5d96ac2866a877111e50
 2019-03-09 13:42:08 -05:00
John Sully
6ef744f242 sizeof is too big 
Former-commit-id: a6a022faa228fd67deeb1767c10ed7f184c28c29
 2019-03-09 13:41:49 -05:00
John Sully
5b52bc738b Replicas aren't allowed to run the replicaof command 2019-03-09 11:04:48 -05:00
Brad Solomon
79660e4ff4 Note that install_server.sh is not for Mac OSX 
It will fail pretty quickly since there is no -f
readlink flag there.
 2019-03-09 10:21:15 -05: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
Salvatore Sanfilippo
0f03312c23
Merge pull request #5902 from zhouyuan/wip_cleanup 
server.h: remove dead code
 2019-03-08 16:53:20 +01:00