mirrors
/
redis
mirror of https://mirror.osredm.com/root/redis.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,487 Commits 92 Branches 331 Tags 486 MiB
Commit Graph

5140 Commits

Author SHA1 Message Date
Salvatore Sanfilippo a2131f907a
Merge pull request #5453 from damz/pr/aof-buffer-evict 
Overhead is the allocated size of the AOF buffer, not its length
 2018-10-24 12:28:28 +02:00
antirez 8749fc3f67 Simplify part of the #5470 patch. 2018-10-24 12:26:27 +02:00
Salvatore Sanfilippo 3c89fb5ffd
Merge pull request #5470 from soloestoy/keys-no-trigger-expire 
do not delete expired keys in KEYS command
 2018-10-24 12:23:59 +02:00
antirez 54e8dd11ff Use guide comments to make changes in #5462 more obvious. 2018-10-22 17:43:48 +02:00
antirez 0f18d8e0ed Merge branch 'unstable' of github.com:/antirez/redis into unstable 2018-10-22 17:41:43 +02:00
Salvatore Sanfilippo 3f6893a4e2
Merge pull request #5462 from youjiali1995/fix-migrate-expired-keys 
migrate: fix mismatch of RESTORE reply when some keys have expired.
 2018-10-22 17:40:37 +02:00
antirez c33ef454f0 Remove useless complexity from MSET implementation. 2018-10-22 12:24:02 +02:00
Salvatore Sanfilippo 2f8912c36c
Merge pull request #5451 from hujiecs/unstable 
several typos fixed, optimize MSETNX to avoid unnecessary loop
 2018-10-22 12:17:08 +02:00
hujie e610dbce14
fix typo in config.c 2018-10-21 10:37:36 +08:00
hujie 63e41ee192
fix typo 2018-10-20 12:18:56 +08:00
zhaozhao.zz 7ab9cba59b do not delete expired keys in KEYS command 2018-10-19 18:00:57 +08:00
antirez f30b18f4de Fix again stack generation on the Raspberry Pi. 
The fix was removed by c8ca71d40 attempting to fix the stack generation
on ARM64, without testing if it would still work on ARM32.
Now it should work both sides.
 2018-10-19 10:39:57 +02:00
youjiali1995 a6499ecac2 migrate: fix mismatch of RESTORE reply when some keys have expired. 2018-10-18 18:57:51 +08:00
antirez 144832ee67 Streams: use bulk replies instead of status replies. 
They play better with Lua scripting, otherwise Lua will see status
replies as "ok" = "string" which is very odd, and actually as @oranagra
reasoned in issue #5456 in the rest of the Redis code base there was no
such concern as saving a few bytes when the protocol is emitted.
 2018-10-17 17:21:09 +02:00
antirez fdb575993f Fix conditional in XGROUP. 2018-10-17 13:00:35 +02:00
antirez ad78b50f62 Update help.h for redis-cli. 2018-10-17 12:57:21 +02:00
antirez 492fd5c011 Fix XGROUP CREATE MKSTREAM handling of . 2018-10-17 12:10:52 +02:00
antirez 2e3d403349 Process MKSTREAM option of XGROUP CREATE at a later time. 
This avoids issues with having to replicate a command that produced
errors.
 2018-10-17 12:04:06 +02:00
antirez ab11c5ebd1 Merge branch 'unstable' of github.com:/antirez/redis into unstable 2018-10-17 11:36:03 +02:00
antirez cb27dd1a68 XGROUP CREATE: MKSTREAM option for automatic stream creation. 2018-10-17 11:27:27 +02:00
Salvatore Sanfilippo 3f7bc5a5d2
Merge pull request #5333 from soloestoy/stream-commands-flag 
Scripting & Streams: some commands need right flags
 2018-10-17 07:50:32 +02:00
Damien Tournoud 29e488cbb0 Overhead is the allocated size of the AOF buffer, not its length 2018-10-16 11:47:42 -07:00
zhaozhao.zz a273ce9578 Streams: rewrite empty streams with certain lastid 2018-10-16 23:47:27 +08:00
antirez c1689166b7 Streams: rewrite empty streams with XADD MAXLEN 0. Use XSETID. 
Related to #5426.
 2018-10-16 16:48:31 +02:00
antirez ea78a1db32 XSETID: accept IDs based on last entry. 
Related to #5426.
 2018-10-16 16:46:17 +02:00
antirez e3446fea9e Streams: XSTREAM SETID -> XSETID. 
Keep vanilla stream commands at toplevel, see #5426.
 2018-10-16 13:17:14 +02:00
Salvatore Sanfilippo af09df08d7
Merge pull request #5426 from soloestoy/feature-xstream 
Bugfix data inconsistency after aof rewrite, and add XSTREAM command.
 2018-10-16 13:10:36 +02:00
hujiecs 297950e8b8 several typos fixed, optimize MSETNX to avoid unnecessary loop 2018-10-16 15:48:03 +08:00
Salvatore Sanfilippo 1caabd59b2
Merge pull request #5416 from halaei/fix-timer-selected-db 
fix timer context selected database
 2018-10-15 13:01:58 +02:00
antirez 3640e029d6 Make comment about nack->consumer test for minidle more obvious. 
Related to #5437.
 2018-10-15 12:01:17 +02:00
antirez 0b1784b188 Streams: use propagate_last_id itself as streamPropagateGroupID trigger. 
Avoid storing the dirty value. See #5437.
 2018-10-15 11:52:24 +02:00
antirez 820b1e6e7d Streams: better naming: lastid_updated -> propagate_last_id. 
See #5437 but also I updated a previous usage of the same var name.
 2018-10-15 11:50:18 +02:00
Salvatore Sanfilippo 440574d624
Merge pull request #5437 from soloestoy/fix-xclaim 
Fix xclaim
 2018-10-15 11:47:21 +02:00
antirez f54cde3a15 Rax: radix tree updated to latest version from antirez/rax. 2018-10-13 14:17:38 +02:00
zhaozhao.zz 5cc0522303 Streams: panic if streamID invalid after check, should not be possible. 2018-10-11 21:46:47 +08:00
zhaozhao.zz 08ae522ff9 Streams: propagate lastid in XCLAIM when it has effect 2018-10-11 21:44:20 +08:00
zhaozhao.zz 183ef7ae9b Streams: XCLAIM ignore minidle if NACK is created by FORCE 
Because the NACK->consumer is NULL, if idletime < minidle
the NACK does not belong to any consumer, then redis will crash
in XPENDING.
 2018-10-11 21:20:49 +08:00
zhaozhao.zz 4dc48a0d11 Streams: bugfix XCLAIM should propagate group name not consumer name 2018-10-11 21:12:09 +08:00
antirez 91685eeeb1 LOLWUT: capitalize Nees. 2018-10-11 13:00:55 +02:00
antirez 1048b5d13a Merge branch 'unstable' of github.com:/antirez/redis into unstable 2018-10-10 12:51:39 +02:00
antirez c9d9ae7baa Fix propagation of consumer groups last ID. 
Issue #5433.
 2018-10-10 12:51:02 +02:00
zhaozhao.zz 35b7296ff4 Avoid recreate write handler for protected client. 2018-10-09 20:34:11 +08:00
antirez 8e2bbe9105 Free protected clients asynchronously. 
Related to #4840.

Note that when we re-enter the event loop with aeProcessEvents() we
don't process timers, nor before/after sleep callbacks, so we should
never end calling freeClientsInAsyncFreeQueue() when re-entering the
loop.
 2018-10-09 13:28:51 +02:00
antirez 929c686cce Actually use the protectClient() API where needed. 
Related to #4804.
 2018-10-09 13:18:52 +02:00
antirez 69c30965eb Introduce protectClient() + some refactoring. 
The idea is to have an API for the cases like -BUSY state and DEBUG
RELOAD where we have to manually deinstall the read handler.
See #4804.
 2018-10-09 13:15:41 +02:00
Salvatore Sanfilippo 6660458a4c
Merge pull request #4804 from soloestoy/fix-debug-load 
debug: avoid free client unexpectedly when reload & loadaof
 2018-10-09 12:56:08 +02:00
antirez db86dfb985 aof.c: improve indentation and change warning message. 
Related to #5201.

I removed the !!! Warning part since compared to the other errors, a
missing EXEC is in theory a normal happening in the AOF file, at least
in theory: may happen in a differnet number of situations, and it's
probably better to don't give the user the feeling that something really
bad happened.
 2018-10-09 11:51:04 +02:00
Salvatore Sanfilippo 1a476b69ad
Merge pull request #5201 from soloestoy/abort-if-lost-exec-aof-load 
AOF: discard if we lost EXEC when loading aof
 2018-10-09 11:47:04 +02:00
zhaozhao.zz 480e299436 Streams: rewrite id in XSTREAM CREATE * 2018-10-09 16:22:30 +08:00
zhaozhao.zz b3e80d2f65 Stream & AOF: rewrite stream in correct way 2018-10-09 15:40:20 +08:00