root
/
redis
mirror of https://github.com/redis/redis.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity
7,548 Commits 93 Branches 334 Tags 487 MiB
Commit Graph

5193 Commits

Author SHA1 Message Date
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 5ddd507624 if we read a expired key, misses++ 2018-10-19 18:16:29 +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
Itamar Haber edeaf85cab Plugs a potential underflow 2018-10-17 19:33:11 +03: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
Itamar Haber acb3b55280 Corrects inline documentation of syntax 2018-10-17 16:13:55 +03: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
zhaozhao.zz e2de7e7524 MULTI: OOM err if cannot free enough memory in MULTI/EXEC context 2018-10-17 16:40:45 +08: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
zhaozhao.zz ec511fa709 Streams: add a new command XTREAM 
XSTREAM CREATE <key> <id or *> -- Create a new empty stream.
XSTREAM SETID <key> <id or $>  -- Set the current stream ID.
 2018-10-09 13:11:04 +08:00
antirez 3e78344d87 Refactoring of XADD / XTRIM MAXLEN rewriting. 
See #5141.
 2018-10-08 12:05:22 +02:00
Salvatore Sanfilippo e5f1de1448
Merge pull request #5141 from soloestoy/fix-xtrim-inconsistency 
Fix XTRIM and XADD with MAXLEN inconsistency
 2018-10-08 12:00:00 +02:00
O(ʒ) 534c3bc21a
Fix typo 2018-10-07 13:37:58 +02:00
antirez 3d07ed983e Fix typo in replicationCron() comment. 2018-10-05 18:30:45 +02:00
antirez ce8b6ede34 Fix typo in design comment of bio.c. 2018-10-05 18:29:23 +02:00
antirez 68c0e6e331 xclaimCommand(): fix comment typos. 2018-10-04 17:34:06 +02:00
Hamid Alaei 87264235cc fix timer context selected database 2018-10-04 17:02:10 +03:30
antirez 32e0d2376f streamAppendItem(): Update the radix tree pointer only if changed. 2018-10-02 19:45:33 +02:00
antirez 9d4f51e1ff Listpack: optionally force reallocation on inserts. 
This is useful in order to spot bugs where we fail
at updating the pointer returned by the insertion
function. Normally often the same pointer is returned,
making it harder than needed to spot bugs.

Related to #5210.
 2018-10-02 19:37:36 +02:00
antirez 73a78adf13 Fix printf type mismatch in genRedisInfoString(). 2018-10-02 16:26:30 +02:00
antirez c7c3b23787 streamIteratorRemoveEntry(): set back lp only if pointer changed. 
Most of the times the pointer will remain the same since integers of
similar size don't take more space in listpacks.

Related to #5210.
 2018-10-02 16:20:40 +02:00
Salvatore Sanfilippo 9fe7cd8f14
Merge pull request #5210 from soloestoy/raxinsert-in-xdel 
Streams: update listpack with new pointer in XDEL
 2018-10-02 16:18:55 +02:00
Salvatore Sanfilippo 2b09884faf
Merge pull request #5392 from soloestoy/bugfix-brpoplpush 
bugfix: replace lastcmd with cmd when rewrite BRPOPLPUSH as RPOPLPUSH
 2018-10-02 16:09:22 +02:00
Salvatore Sanfilippo e19a06d2dd
Merge pull request #5242 from oranagra/script_mem 
script cache memory in INFO and MEMORY includes both script code and overheads
 2018-10-02 16:03:05 +02:00
Salvatore Sanfilippo fe43406929
Merge pull request #5397 from bmerry/fix-bad-zmalloc-size 
Fix invalid use of sdsZmallocSize on an embedded string
 2018-10-01 13:30:42 +02:00
Salvatore Sanfilippo 9ce638695c
Merge pull request #5398 from bmerry/fix-zrealloc-accounting 
Fix incorrect memory usage accounting in zrealloc
 2018-10-01 13:28:53 +02:00
Salvatore Sanfilippo cd2ee8b113
Merge pull request #5396 from oranagra/cmdstats_exec 
fix #5024 - commandstats for multi-exec were logged as EXEC.
 2018-10-01 13:24:49 +02:00
Salvatore Sanfilippo 1da93f85cc
Merge pull request #5400 from halaei/fix-dict-get-on-not-found 
fix dict get on not found
 2018-10-01 13:22:33 +02:00
Hamid Alaei 86fb7b20bf fix dict get on not found 2018-10-01 13:57:25 +03:30
antirez 9e0e5ccbf4 Fix XINFO comment for consistency. 2018-10-01 11:38:58 +02:00
Bruce Merry 8fd1031b10 Fix incorrect memory usage accounting in zrealloc 
When HAVE_MALLOC_SIZE is false, each call to zrealloc causes used_memory
to increase by PREFIX_SIZE more than it should, due to mis-matched
accounting between the original zmalloc (which includes PREFIX size in
its increment) and zrealloc (which misses it from its decrement).

I've also supplied a command-line test to easily demonstrate the
problem. It's not wired into the test framework, because I don't know
TCL so I'm not sure how to automate it.
 2018-09-30 11:49:03 +02:00
Oran Agra f03aed3ca9 fix #5024 - commandstats for multi-exec were logged as EXEC. 
this was broken a while back by ba9154d7e7
the purpose of which was to fix commandstats for GEOADD
 2018-09-30 12:43:11 +03:00
Bruce Merry ecc48369ce Fix invalid use of sdsZmallocSize on an embedded string 
sdsZmallocSize assumes a dynamically allocated SDS. When given a string
object created by createEmbeddedStringObject, it calls zmalloc_size on a
pointer that isn't the one returned by zmalloc
 2018-09-30 11:32:48 +02:00
antirez 08c26591e3 Try to avoid issues with GCC pragmas and older compilers. 
See issue #5394.
 2018-09-28 13:00:44 +02:00
zhaozhao.zz fc9b4e7958 bugfix: replace lastcmd with cmd when rewrite BRPOPLPUSH as RPOPLPUSH 
There are two problems if we use lastcmd:

1. BRPOPLPUSH cannot be rewrited as RPOPLPUSH in multi/exec
    In mulit/exec context, the lastcmd is exec.
2. Redis will crash when execute RPOPLPUSH loading from AOF
    In fakeClient, the lastcmd is NULL.
 2018-09-28 12:06:48 +08:00
Andrey Bugaevskiy 466c277b4f Move child termination to readSyncBulkPayload 2018-09-27 19:38:58 +03:00
antirez 5aa347b377 Modules: hellodict example WIP #3: KEYRANGE. 2018-09-27 17:01:35 +02:00
antirez 0aecb135c9 Modules: Modules: dictionary API WIP #13: Compare API exported. 2018-09-27 11:46:22 +02:00
antirez 80bde9844b Modules: Modules: dictionary API WIP #12: DictCompare API. 2018-09-27 11:44:25 +02:00
antirez 7af83a0c11 Modules: Modules: dictionary API WIP #11: DictCompareC API. 2018-09-27 11:44:16 +02:00
antirez 20f047965c Modules: hellodict example WIP #1: GET command. 2018-09-27 11:22:43 +02:00
antirez 880ca07719 Modules: hellodict example WIP #1: SET command. 2018-09-26 17:52:12 +02:00
antirez bbe18eacda Modules: remove useless defines in hellotimer.c 2018-09-26 17:42:00 +02:00
antirez 6c3bfb00fc Modules: fix top comment of hellotimer.c 2018-09-26 17:41:08 +02:00
antirez bec4bfaa0b Merge branch 'unstable' of github.com:/antirez/redis into unstable 2018-09-26 13:39:16 +02:00
antirez 1e585d01de Modules: dictionary API WIP #10: export API to modules. 2018-09-26 13:39:01 +02:00
Salvatore Sanfilippo 1d6711a764
Merge pull request #5373 from gkorland/patch-5 
add missing argument to function doc
 2018-09-25 17:18:50 +02:00
antirez 3ff82790e1 Modules: dictionary API WIP #9: iterator returning string object. 2018-09-25 16:49:46 +02:00
antirez fb1d5717de Modules: dictionary API WIP #8: Iterator next/prev. 2018-09-25 16:25:46 +02:00
antirez 58ac1f8bbe Modules: dictionary API WIP #7: don't store the context. 
Storing the context is useless, because we can't really reuse that
later. For instance in the API RM_DictNext() that returns a
RedisModuleString for the next key iterated, the user should pass the
new context, because we may run the keys of the dictionary in a
different context of the one where the dictionary was created. Also the
dictionary may be created without a context, but we may still demand
automatic memory management for the returned strings while iterating.
 2018-09-25 12:58:16 +02:00
antirez b6c794acf6 Modules: dictionary API WIP #6: implement automatic memory management. 2018-09-25 12:45:08 +02:00
antirez 448d696549 Modules: dictionary API work in progress #5: rename API for consistency. 
By using the "C" suffix for functions getting pointer/len, we can do the
same in the future for other modules APIs that need a variant with
pointer/len and that are now accepting a RedisModuleString.
 2018-09-25 12:31:46 +02:00
antirez c7e0c410d6 Modules: change RedisModuleString API to allow NULL context. 
The burden of having to always create RedisModuleString objects within a
module context was too much, especially now that we have threaded
operations and modules are doing more interesting things. The context in
the string API is currently only used for automatic memory managemnet,
so now the API was modified so that the user can opt-out this feature by
passing a NULL context.
 2018-09-24 17:20:00 +02:00
antirez 3968550135 Modules: dictionary API work in progress #4: reseek API. 2018-09-24 16:43:47 +02:00
antirez 14b2f7b033 Modules: dictionary API work in progress #3: Iterator creation. 2018-09-24 11:44:49 +02:00
antirez bb64c7d8b2 Modules: dictionary API work in progress #2: Del API. 2018-09-24 11:16:58 +02:00
antirez c5e0bc1070 Modules: dictionary API work in progress #1. 2018-09-21 17:54:09 +02:00
Guy Korland 8b87876094
add missing argument to function doc 2018-09-21 02:46:31 +03:00
Andrey Bugaevskiy 98a64523c4 Prevent RDB autosave from overwriting full resync results 
During the full database resync we may still have unsaved changes
on the receiving side. This causes a race condition between
synced data rename/load and the rename of rdbSave tempfile.
 2018-09-19 19:58:39 +03:00
antirez 0d6f11f4d1 Module cluster flags: use RM_SetClusterFlags() in the example. 2018-09-19 16:17:20 +02:00
antirez 3213e8de92 Module cluster flags: add RM_SetClusterFlags() API. 2018-09-19 12:02:37 +02:00