8313 Commits

Author SHA1 Message Date
John Sully
f25d4bf94e Merge /home/john/repos/redis_clean into unstable
Former-commit-id: 6157a5fc1be920085a136e43cdb23cf9dd724390
2019-03-14 14:22:41 -04:00
John Sully
aa76a89a9a Merge branch 'unstable' of https://github.com/antirez/redis into unstable
Former-commit-id: be3cb1ad3386f382ed7506dbfd1adb810e327007
2019-03-14 14:22:27 -04:00
John Sully
cb365ece10 Fix hyperloglog corruption 2019-03-14 14:02:16 -04:00
antirez
5199f1dc58 Fix ZPOP return type when COUNT=0. Related to #5799. 2019-03-14 17:51:20 +01:00
antirez
e8568bb341 Fix objectSetLRUOrLFU() when LFU underflows. 2019-03-14 17:06:59 +01:00
antirez
9c504573f1 Improve comments after merging #5834. 2019-03-14 12:47:36 +01:00
Salvatore Sanfilippo
06339c7f54 Merge pull request #5834 from guybe7/trim_module_sds
Trim SDS free space of retained module strings
2019-03-14 12:41:31 +01:00
Salvatore Sanfilippo
ac6b768352 Merge pull request #5931 from guybe7/fix_notify_classes
Fix mismatching keyspace notification classes
2019-03-14 12:30:10 +01:00
Guy Benoish
24300677e7 Fix mismatching keyspace notification classes 2019-03-14 12:11:16 +01:00
Salvatore Sanfilippo
0e4fbeb705 Merge pull request #4742 from guybe7/zrangebylex_leak
Fix zlexrangespec mem-leak in genericZrangebylexCommand
2019-03-14 11:44:56 +01:00
Salvatore Sanfilippo
b9ec23e2df Merge pull request #4904 from guybe7/memtoll_fix
Use memtoll() in 'CONFIG SET client-output-buffer-limit'
2019-03-14 11:43:55 +01:00
Salvatore Sanfilippo
436646aa32 Merge pull request #5812 from guybe7/fix_string2ld
Increase string2ld's buffer size (and fix HINCRBYFLOAT)
2019-03-14 11:35:01 +01:00
Salvatore Sanfilippo
1596a57f76 Merge pull request #5694 from guybe7/rm_log_args
Check server.verbosity in RM_LogRaw
2019-03-14 11:32:03 +01:00
Salvatore Sanfilippo
d40b5f8310 Merge pull request #5799 from guybe7/zpop_zero_count
ZPOP should return an empty array if COUNT=0
2019-03-14 11:29:24 +01:00
antirez
4e3f2ab269 Merge branch 'sharedapi' into unstable 2019-03-14 11:24:48 +01:00
John Sully
0c7bb3d208 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
6702b89166 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
7703340a65 Update README.md
Former-commit-id: a3da10f4ebbc983fc1e10269a1c72fc2d146cdf0
2019-03-13 16:57:40 -04:00
John Sully
06f8eb0571 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
d0de467103 Implement load database dumps from S3. We already save.
Former-commit-id: a45f212693956a6fb1aacf465d88e940bbbfd56f
2019-03-13 16:53:37 -04:00
JohnSully
4e584a1c60 Merge pull request #9 from 0xflotus/patch-1
fixed guarantees

Former-commit-id: 7c72cd547169926209a795b35f51c0f3f03c01ab
2019-03-13 12:22:29 -04:00
0xflotus
8fdb99a23e fixed guarantees
Former-commit-id: 66f203270862a53b27b18cea8a03999be2262492
2019-03-13 15:14:34 +01:00
Salvatore Sanfilippo
3c712621e4 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
0bfd7a01db Merge pull request #5893 from itamarhaber/bzpop-arity
Fixes BZ[REV]POP's arity
2019-03-13 12:27:35 +01:00
Salvatore Sanfilippo
328e68ed5a 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
a5eaaa2d72 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
26601c0cf2 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
c0fede93cf 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
29032e0d88 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
cb44f7ece0 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
f3f49db067 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
zhaozhao.zz
9fd8f0df98 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
Steve Webster
c652f706cb Only increment delivery count if JUSTID option is omitted 2019-03-12 20:27:53 +00:00
JohnSully
be0a6672e4 Update README.md
Former-commit-id: 7546c7d8b41358e4d2a0b71f41ca08b82fa3f8b8
2019-03-12 14:38:03 -04: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
d70014ec0e 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
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
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
artix
95b932ffcf 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
vattezhang
d41e245dab fix: fix the if condition in clusterManagerShowClusterInfo 2019-03-12 22:01:02 +08:00
chendianqiang
e56e1bceee 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
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
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
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
JohnSully
ff4d105d55 Explain how multithreading works
Former-commit-id: 8a5a513662d1eaeaf9887584a415d5e1bca06681
2019-03-11 20:37:57 -04:00