summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | Merge pull request #5894 from soloestoy/fix-rdb-warningSalvatore Sanfilippo2019-03-132-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix compile some warnings
| * | | | | | | | | | | | | | Fix compile warning in redis-cli.czhaozhao.zz2019-03-131-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix compile warning when log aux fieldzhaozhao.zz2019-03-041-1/+1
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #2774 from ↵Salvatore Sanfilippo2019-03-121-4/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rouzier/blocking-list-commands-support-milliseconds-floating Added millisecond resolution for blpop command && friends
| * | | | | | | | | | | | | | If the unit of a timeout is seconds treat it a floatJames Rouzier2016-02-231-4/+11
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #5913 from wurongxin1987/unstableSalvatore Sanfilippo2019-03-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix a bufferoverflow bug
| * | | | | | | | | | | | | | | fix a bufferoverflow bugwurongxin2019-03-101-1/+1
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #5900 from artix75/cluster_backupSalvatore Sanfilippo2019-03-121-0/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cluster Manager: add importing/migrating nodes to backup info
| * | | | | | | | | | | | | | | Cluster Manager: add importing/migrating nodes to backup infoartix2019-03-061-0/+30
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #5903 from soloestoy/sunionstore-lazyfreeSalvatore Sanfilippo2019-03-121-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | try lazyfree temp set in SUNION & SDIFF
| * | | | | | | | | | | | | | | try lazyfree temp set in SUNION & SDIFFzhaozhao.zz2019-03-071-1/+2
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #5915 from swilly22/redismodule-replicated-cmd-ctx-flagSalvatore Sanfilippo2019-03-122-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | Extend REDISMODULE_CTX_FLAGS to indicate if command was sent by master
| * | | | | | | | | | | | | | Extend REDISMODULE_CTX_FLAGS to indicate if command was sent by masterswilly222019-03-112-0/+6
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #5920 from chendq8/aofrewriteSalvatore Sanfilippo2019-03-121-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | remove temp-rewriteaof-xxx.aof when interrupt aofrewrite
| * | | | | | | | | | | | | remove temp-rewriteaof-xxx.aof when interrupt aofrewritechendianqiang2019-03-121-0/+3
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Make comment in #5911 stay inside 80 cols.antirez2019-03-101-1/+2
| | | | | | | | | | | | |
* | | | | | | | | | | | | Replicas aren't allowed to run the replicaof commandJohn Sully2019-03-091-0/+8
| |_|/ / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | server.h: remove dead codeYuan Zhou2019-03-071-1/+0
| |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hashTypeTryObjectEncoding() is not used now
* | | | | | | | | | | ACL: GENPASS subcommand.antirez2019-03-051-0/+7
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'unstable' of github.com:/antirez/redis into unstableantirez2019-03-024-60/+1858
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge pull request #5888 from artix75/cluster_backupSalvatore Sanfilippo2019-03-011-10/+148
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Cluster Manager (redis-cli): new "backup" command
| | * | | | | | | | | | Cluster Manager backup: remove --cluster-ignore-issue optionartix2019-03-011-27/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always save the backup, even if there are problems in the cluster. Just display a warn message and save "cluster_errors" property inside the json.
| | * | | | | | | | | | Cluster Manager: check cluster before backupartix2019-03-011-32/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Prevent cluster backup if cluster has issues and needs to be fixed. This behaviour can be overridden by adding the option '--cluster-ignore-issues'
| | * | | | | | | | | | Cluster Manager: 'backup' commandartix2019-03-011-10/+117
| | | | | | | | | | | |
| * | | | | | | | | | | Redis benchmark: update help with threads/cluster optionsartix2019-03-011-0/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Redis benchmark: fix default hset test keyartix2019-03-011-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Redis Benchmark: update slots configuration after MOVED/ASK replyartix2019-03-012-2/+184
| | | | | | | | | | | |
| * | | | | | | | | | | Redis Benchmark: use atomic var for liveclients in 'createClient'artix2019-03-011-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Redis Benchmark: display 'save' and 'appendonly' configurationartix2019-03-011-1/+113
| | | | | | | | | | | |
| * | | | | | | | | | | Redis benchmark: add {tag} to all default testsartix2019-03-011-13/+13
| | | | | | | | | | | |
| * | | | | | | | | | | Redis benchmark: fixed issued with config.hostip and code cleanupartix2019-03-011-30/+32
| | | | | | | | | | | |
| * | | | | | | | | | | Redis benchmark: configurable thread count in cluster mode and fixesartix2019-03-011-14/+35
| | | | | | | | | | | |
| * | | | | | | | | | | Various changes to redis-benchmark thread and cluster supportartix2019-03-011-39/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - MOVED or ASK replies are now handled in cluster mode. - Only the first slot per node is used in cluster mode. - Mutlithreading: reduced usage of mutexes in favor of atomic vars.
| * | | | | | | | | | | Redis benchmark: table-based slot hashtag placeholder replacement in cluster ↵artix2019-03-011-25/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mode.
| * | | | | | | | | | | Added basic support for clusters to redis-benchmark.artix2019-03-012-2/+1126
| | | | | | | | | | | |
| * | | | | | | | | | | Thread support for redis-benchmark.artix2019-03-011-22/+166
| |/ / / / / / / / / /
* | | | | | | | | | | Use the RDB info fields to provide info to users.antirez2019-03-021-2/+19
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #5790 and 5878. Maybe a better option was to have such fields named with the first byte '%' as those are info fields for specification, however now to break it in a backward incompatible way is not an option, so let's use the fields actively to provide info when sensible, otherwise ignore when they are not really helpful.
* | | | | | | | | | Merge pull request #5875 from chendq8/partialsyncSalvatore Sanfilippo2019-03-011-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | fix:Slave will do full sync when restart with SHUTDOWN SAVE on cluster mode
| * | | | | | | | | | fix replicationid will not change for server.masterhost==NULL in cluster ↵chendianqiang2019-02-271-1/+1
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mode when restart slave
* | | | | | | | | | Merge pull request #5873 from ↵Salvatore Sanfilippo2019-03-011-7/+7
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | madolson/dev-unstable-minor-benchmark-precision-fix Updated redis-benchmark so it doesn't show 1 value above 2ms
| * | | | | | | | | | Updated redis-benchmark so it doesn't show 1 value above 2ms at higher precisionMadelyn Olson2019-02-261-7/+7
| | | | | | | | | | |
* | | | | | | | | | | Cluster Manager: change join issue messageartix2019-02-281-2/+2
| | | | | | | | | | |
* | | | | | | | | | | Cluster Manager: change text alert clusterManagerWaitForClusterJoinartix2019-02-281-3/+3
| | | | | | | | | | |
* | | | | | | | | | | Cluster Manager: code cleanupartix2019-02-281-12/+10
| | | | | | | | | | |
* | | | | | | | | | | Cluster Manager: fix bus error in clusterManagerGetLinkStatusartix2019-02-281-7/+13
| | | | | | | | | | |
* | | | | | | | | | | Cluster Manager: fix memory leaks in clusterManagerGetDisconnectedLinksArtix2019-02-281-1/+2
| | | | | | | | | | |
* | | | | | | | | | | Cluster Manager: fix memory leak in clusterManagerWaitForClusterJoinartix2019-02-281-4/+5
| | | | | | | | | | |
* | | | | | | | | | | Cluster Manager: improve join issue checkingartix2019-02-281-15/+40
| | | | | | | | | | |
* | | | | | | | | | | Cluster Manager: check for unreachable nodes during cluster join.artix2019-02-281-0/+128
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #3649 from Alkorin/fixTypoSalvatore Sanfilippo2019-02-271-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix typo (unsupproted => unsupported) in error message