27350 Commits

Author SHA1 Message Date
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
JohnSully
89f9a9fea6 formatting fixes
Former-commit-id: 703e4ad2fe8bdd05b0655c25a3444f31a4c0d3b6
2019-03-12 00:59:28 -04:00
JohnSully
ec2d1ce822 formatting fixes
Former-commit-id: 703e4ad2fe8bdd05b0655c25a3444f31a4c0d3b6
2019-03-12 00:59:28 -04:00
JohnSully
aab69c02cb Add charts to readme
Hotlink from medium, hope they don't mind.

Former-commit-id: 0b98280a1f6a727c5566120b486a9e16aa7dbcc9
2019-03-12 00:55:03 -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
1d96e74069 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
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
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
JohnSully
ff4d105d55 Explain how multithreading works
Former-commit-id: 8a5a513662d1eaeaf9887584a415d5e1bca06681
2019-03-11 20:37:57 -04:00
JohnSully
95150e9108 Explain how multithreading works
Former-commit-id: 8a5a513662d1eaeaf9887584a415d5e1bca06681
2019-03-11 20:37:57 -04:00
JohnSully
e59b6b5469 Update README.md
Former-commit-id: bf0fd22309ad3992f10316a9f3c12916db78c1bb
2019-03-11 19:38:20 -04:00
JohnSully
e60f381366 Update README.md
Former-commit-id: bf0fd22309ad3992f10316a9f3c12916db78c1bb
2019-03-11 19:38:20 -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
Salvatore Sanfilippo
50f01fb683 Merge pull request #5911 from JohnSully/unstable
Replicas aren't allowed to run the replicaof command
2019-03-10 09:45:55 +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
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
Brad Solomon
7a9a0f891d 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
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
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
Salvatore Sanfilippo
e623b4d241 Merge pull request #5902 from zhouyuan/wip_cleanup
server.h: remove dead code
2019-03-08 16:53:20 +01: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
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
John Sully
7408646c8a Merge branch 'unstable' into RELEASE_0_9
Former-commit-id: 0bc586933ff91fd07128d5419b06303f05d16f2e
2019-03-07 19:13:33 -05:00
John Sully
25c2050c3a Module threading fixes
Former-commit-id: 2785a8b4d40b09caea5e209ab49fc5f1484981a8
2019-03-07 19:13:01 -05:00
John Sully
02b030bc8c Module threading fixes
Former-commit-id: 2785a8b4d40b09caea5e209ab49fc5f1484981a8
2019-03-07 19:13:01 -05:00
zhaozhao.zz
10ffb2b722 try lazyfree temp set in SUNION & SDIFF 2019-03-07 22:08:04 +08:00
zhaozhao.zz
0137f1a2e3 try lazyfree temp set in SUNION & SDIFF 2019-03-07 22:08:04 +08:00
Yuan Zhou
e5149be9de server.h: remove dead code
hashTypeTryObjectEncoding() is not used now
2019-03-07 18:38:27 +08:00
Yuan Zhou
feb4ebff45 server.h: remove dead code
hashTypeTryObjectEncoding() is not used now
2019-03-07 18:38:27 +08:00
artix
634f65d4a0 Redis Benchmark: fix key randomization with zero keyspacelen 2019-03-07 11:30:09 +01:00