summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* RDB v9: Save Lua scripts state into RDB file.rdb9antirez2017-11-294-5/+56
| | | | | | This is currently needed in order to fix #4483, but this can be useful in other contexts, so maybe later we may want to remove the conditionals and always save/load scripts.
* Merge pull request #4200 from jeesyn/fix_typoSalvatore Sanfilippo2017-11-281-1/+1
|\ | | | | fix a typo
| * fix a typojeesyn.liu2017-08-081-1/+1
| |
* | Merge pull request #4165 from zyegfryed/patch-1Salvatore Sanfilippo2017-11-281-3/+3
|\ \ | | | | | | Fix some typos
| * | Fix some typosSébastien Fievet2017-07-261-3/+3
| | |
* | | Merge pull request #4166 from charpty/wip-redisclic-typoSalvatore Sanfilippo2017-11-281-1/+1
|\ \ \ | | | | | | | | redis-cli.c typo: helpe -> helper.
| * | | redis-cli.c typo: helpe -> helper.Bo Cai2017-07-261-1/+1
| |/ / | | | | | | | | | Signed-off-by: Bo Cai <charpty@gmail.com>
* | | Merge pull request #4167 from charpty/wip-redisclic-typo2Salvatore Sanfilippo2017-11-281-1/+1
|\ \ \ | | | | | | | | redis-cli.c typo: Requets -> Requests.
| * | | redis-cli.c typo: Requets -> Requests.Bo Cai2017-07-261-1/+1
| |/ / | | | | | | | | | Signed-off-by: Bo Cai <charpty@gmail.com>
* | | Merge pull request #4170 from TehWebby/patch-2Salvatore Sanfilippo2017-11-281-1/+1
|\ \ \ | | | | | | | | Fix typo
| * | | Fix typoShaun Webb2017-07-271-1/+1
| |/ /
* | | Merge pull request #4172 from TehWebby/patch-3Salvatore Sanfilippo2017-11-281-1/+1
|\ \ \ | | | | | | | | Fix typo
| * | | Typo fixShaun Webb2017-07-271-1/+1
| |/ /
* | | Merge pull request #4176 from KrauseFx/patch-1Salvatore Sanfilippo2017-11-281-1/+1
|\ \ \ | | | | | | | | Update link to https and use inline link
| * | | Update link to https and use inline linkFelix Krause2017-07-281-1/+1
| | | |
* | | | t_hash.c: clarify calling two times the same function.antirez2017-11-281-2/+2
| | | |
* | | | Merge branch 'unstable' of github.com:/antirez/redis into unstableantirez2017-11-281-1/+1
|\ \ \ \
| * \ \ \ Merge pull request #4215 from lamby/correct-faield-spellingSalvatore Sanfilippo2017-11-281-1/+1
| |\ \ \ \ | | | | | | | | | | | | Correct spelling of "faield".
| | * | | | Correct spelling of "faield".Chris Lamb2017-08-121-1/+1
| | | |_|/ | | |/| |
* | | | | adlist: fix listJoin() in the case the second list is empty.antirez2017-11-281-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | See #4192, the original PR removed lines of code that are actually needed, so thanks to @chunqiulfq for reporting the problem, but merging solution from @jeesyn after checking, together with @artix75, that the logic covers all the cases.
* | | | Merge pull request #4374 from rouzier/patch-1Salvatore Sanfilippo2017-11-281-3/+6
|\ \ \ \ | | | | | | | | | | Fix file descriptor leak and error handling
| * | | | Fix file descriptor leak and error handlingrouzier2017-10-131-3/+6
| | | | |
* | | | | Merge pull request #4451 from devnexen/minor_build_fixesSalvatore Sanfilippo2017-11-282-2/+10
|\ \ \ \ \ | | | | | | | | | | | | Fix undefined behavior constant defined.
| * | | | | Fix undefined behavior constant defined.David Carlier2017-11-192-2/+10
| | | | | |
* | | | | | Improve OBJECT HELP descriptions.antirez2017-11-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | See #4472.
* | | | | | Fix entry command table entry for OBJECT for HELP option.antirez2017-11-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | After #4472 the command may have just 2 arguments.
* | | | | | Merge pull request #4472 from itamarhaber/object_patchSalvatore Sanfilippo2017-11-271-5/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | A minor fix and `help` subcommand for `OBJECT`
| * | | | | | Adds `OBJECT help`Itamar Haber2017-11-241-3/+18
| | | | | | |
| * | | | | | Prevents `OBJECT freq` with `noeviction`Itamar Haber2017-11-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When maxmemory is set to noeviction, idletime is implicitly kept. This renders access frequency nonsensical.
* | | | | | | Adds -u <uri> option to redis-cli.Itamar Haber2017-11-271-0/+89
| | | | | | |
* | | | | | | Test: regression test for latency expire events logging bug.antirez2017-11-241-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression for #4452.
* | | | | | | Merge pull request #4452 from soloestoy/expire-latencySalvatore Sanfilippo2017-11-241-8/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | expire & latency: fix the missing latency records generated by expire
| * | | | | | | expire & latency: fix the missing latency records generated by expirezhaozhao.zz2017-11-211-8/+11
| | |_|/ / / / | |/| | | | |
* | | | | | | Modules: fix memory leak in RM_IsModuleNameBusy().antirez2017-11-241-7/+3
| | | | | | |
* | | | | | | PSYNC2: reorganize comments related to recent fixes.antirez2017-11-242-26/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Related to PR #4412 and issue #4407.
* | | | | | | Merge pull request #4412 from soloestoy/bugfix-psync2Salvatore Sanfilippo2017-11-243-12/+50
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | PSYNC2: safe free backlog when reach the time limit and others
| * | | | | | | PSYNC2: persist cached_master's dbid inside the RDBzhaozhao.zz2017-11-221-2/+16
| | | | | | | |
| * | | | | | | PSYNC2: make repl_stream_db never be -1zhaozhao.zz2017-11-221-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it means that after this change all the replication info in RDB is valid, and it can distinguish us from the older version.
| * | | | | | | PSYNC2: clarify the scenario when repl_stream_db can be -1zhaozhao.zz2017-11-022-9/+21
| | | | | | | |
| * | | | | | | PSYNC2 & RDB: fix the missing rdbSaveInfo for BGSAVEzhaozhao.zz2017-11-011-1/+4
| | | | | | | |
| * | | | | | | PSYNC2: safe free backlog when reach the time limitzhaozhao.zz2017-11-011-0/+12
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we free the backlog, we should use a new replication ID and clear the ID2. Since without backlog we can not increment master_repl_offset even do write commands, that may lead to inconsistency when we try to connect a "slave-before" master (if this master is our slave before, our replid equals the master's replid2). As the master have our history, so we can match the master's replid2 and second_replid_offset, that make partial sync work, but the data is inconsistent.
* | | | | | | Merge pull request #4344 from soloestoy/fix-module-name-conflictSalvatore Sanfilippo2017-11-242-23/+47
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix module name conflict
| * | | | | | | Modules: handle the busy module namezhaozhao.zz2017-09-282-2/+19
| | | | | | | |
| * | | | | | | Modules: handle the conflict of registering commandszhaozhao.zz2017-09-281-21/+28
| | | | | | | |
* | | | | | | | Merge pull request #4470 from oranagra/fix_string_to_doubleSalvatore Sanfilippo2017-11-242-2/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | fix string to double conversion, stopped parsing on \0 …
| * | | | | | | | fix string to double conversion, stopped parsing on \0 even if the string ↵Oran Agra2017-11-232-2/+9
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | has more data. getLongLongFromObject calls string2ll which has this line: /* Return if not all bytes were used. */ so if you pass an sds with 3 characters "1\01" it will fail. but getLongDoubleFromObject calls strtold, and considers it ok if eptr[0]==`\0` i.e. if the end of the string found by strtold ends with null terminator 127.0.0.1:6379> set a 1 OK 127.0.0.1:6379> setrange a 2 2 (integer) 3 127.0.0.1:6379> get a "1\x002" 127.0.0.1:6379> incrbyfloat a 2 "3" 127.0.0.1:6379> get a "3"
* | | | | | | | Modules: fix for scripting replication of modules commands.antirez2017-11-232-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See issue #4466 / #4467.
* | | | | | | | Merge pull request #4467 from yossigo/fix-nested-multiSalvatore Sanfilippo2017-11-232-0/+10
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Nested MULTI/EXEC may replicate in different cases.
| * | | | | | | Nested MULTI/EXEC may replicate in different cases.Yossi Gottlieb2017-11-222-0/+10
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For example: 1. A module command called within a MULTI section. 2. A Lua script with replicate_commands() called within a MULTI section. 3. A module command called from a Lua script in the above context.
* | | | | | | rehash: handle one db until finishedzhaozhao.zz2017-11-211-2/+5
| |_|/ / / / |/| | | | |