2016-07-06 09:28:18 -04:00
|
|
|
/* Maxmemory directive handling (LRU eviction and other policies).
|
|
|
|
*
|
|
|
|
* ----------------------------------------------------------------------------
|
|
|
|
*
|
|
|
|
* Copyright (c) 2009-2016, Salvatore Sanfilippo <antirez at gmail dot com>
|
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions are met:
|
|
|
|
*
|
|
|
|
* * Redistributions of source code must retain the above copyright notice,
|
|
|
|
* this list of conditions and the following disclaimer.
|
|
|
|
* * Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
* * Neither the name of Redis nor the names of its contributors may be used
|
|
|
|
* to endorse or promote products derived from this software without
|
|
|
|
* specific prior written permission.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
|
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
|
|
|
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
|
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
|
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
|
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
|
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
|
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
|
|
* POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "server.h"
|
|
|
|
#include "bio.h"
|
2017-05-09 05:57:09 -04:00
|
|
|
#include "atomicvar.h"
|
2020-09-16 02:16:01 -04:00
|
|
|
#include <math.h>
|
2016-07-06 09:28:18 -04:00
|
|
|
|
2016-07-07 09:04:25 -04:00
|
|
|
/* ----------------------------------------------------------------------------
|
|
|
|
* Data structures
|
|
|
|
* --------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
/* To improve the quality of the LRU approximation we take a set of keys
|
2020-09-16 02:16:01 -04:00
|
|
|
* that are good candidate for eviction across performEvictions() calls.
|
2016-07-07 09:04:25 -04:00
|
|
|
*
|
Squash merging 125 typo/grammar/comment/doc PRs (#7773)
List of squashed commits or PRs
===============================
commit 66801ea
Author: hwware <wen.hui.ware@gmail.com>
Date: Mon Jan 13 00:54:31 2020 -0500
typo fix in acl.c
commit 46f55db
Author: Itamar Haber <itamar@redislabs.com>
Date: Sun Sep 6 18:24:11 2020 +0300
Updates a couple of comments
Specifically:
* RM_AutoMemory completed instead of pointing to docs
* Updated link to custom type doc
commit 61a2aa0
Author: xindoo <xindoo@qq.com>
Date: Tue Sep 1 19:24:59 2020 +0800
Correct errors in code comments
commit a5871d1
Author: yz1509 <pro-756@qq.com>
Date: Tue Sep 1 18:36:06 2020 +0800
fix typos in module.c
commit 41eede7
Author: bookug <bookug@qq.com>
Date: Sat Aug 15 01:11:33 2020 +0800
docs: fix typos in comments
commit c303c84
Author: lazy-snail <ws.niu@outlook.com>
Date: Fri Aug 7 11:15:44 2020 +0800
fix spelling in redis.conf
commit 1eb76bf
Author: zhujian <zhujianxyz@gmail.com>
Date: Thu Aug 6 15:22:10 2020 +0800
add a missing 'n' in comment
commit 1530ec2
Author: Daniel Dai <764122422@qq.com>
Date: Mon Jul 27 00:46:35 2020 -0400
fix spelling in tracking.c
commit e517b31
Author: Hunter-Chen <huntcool001@gmail.com>
Date: Fri Jul 17 22:33:32 2020 +0800
Update redis.conf
Co-authored-by: Itamar Haber <itamar@redislabs.com>
commit c300eff
Author: Hunter-Chen <huntcool001@gmail.com>
Date: Fri Jul 17 22:33:23 2020 +0800
Update redis.conf
Co-authored-by: Itamar Haber <itamar@redislabs.com>
commit 4c058a8
Author: 陈浩鹏 <chenhaopeng@heytea.com>
Date: Thu Jun 25 19:00:56 2020 +0800
Grammar fix and clarification
commit 5fcaa81
Author: bodong.ybd <bodong.ybd@alibaba-inc.com>
Date: Fri Jun 19 10:09:00 2020 +0800
Fix typos
commit 4caca9a
Author: Pruthvi P <pruthvi@ixigo.com>
Date: Fri May 22 00:33:22 2020 +0530
Fix typo eviciton => eviction
commit b2a25f6
Author: Brad Dunbar <dunbarb2@gmail.com>
Date: Sun May 17 12:39:59 2020 -0400
Fix a typo.
commit 12842ae
Author: hwware <wen.hui.ware@gmail.com>
Date: Sun May 3 17:16:59 2020 -0400
fix spelling in redis conf
commit ddba07c
Author: Chris Lamb <chris@chris-lamb.co.uk>
Date: Sat May 2 23:25:34 2020 +0100
Correct a "conflicts" spelling error.
commit 8fc7bf2
Author: Nao YONASHIRO <yonashiro@r.recruit.co.jp>
Date: Thu Apr 30 10:25:27 2020 +0900
docs: fix EXPIRE_FAST_CYCLE_DURATION to ACTIVE_EXPIRE_CYCLE_FAST_DURATION
commit 9b2b67a
Author: Brad Dunbar <dunbarb2@gmail.com>
Date: Fri Apr 24 11:46:22 2020 -0400
Fix a typo.
commit 0746f10
Author: devilinrust <63737265+devilinrust@users.noreply.github.com>
Date: Thu Apr 16 00:17:53 2020 +0200
Fix typos in server.c
commit 92b588d
Author: benjessop12 <56115861+benjessop12@users.noreply.github.com>
Date: Mon Apr 13 13:43:55 2020 +0100
Fix spelling mistake in lazyfree.c
commit 1da37aa
Merge: 2d4ba28 af347a8
Author: hwware <wen.hui.ware@gmail.com>
Date: Thu Mar 5 22:41:31 2020 -0500
Merge remote-tracking branch 'upstream/unstable' into expiretypofix
commit 2d4ba28
Author: hwware <wen.hui.ware@gmail.com>
Date: Mon Mar 2 00:09:40 2020 -0500
fix typo in expire.c
commit 1a746f7
Author: SennoYuki <minakami1yuki@gmail.com>
Date: Thu Feb 27 16:54:32 2020 +0800
fix typo
commit 8599b1a
Author: dongheejeong <donghee950403@gmail.com>
Date: Sun Feb 16 20:31:43 2020 +0000
Fix typo in server.c
commit f38d4e8
Author: hwware <wen.hui.ware@gmail.com>
Date: Sun Feb 2 22:58:38 2020 -0500
fix typo in evict.c
commit fe143fc
Author: Leo Murillo <leonardo.murillo@gmail.com>
Date: Sun Feb 2 01:57:22 2020 -0600
Fix a few typos in redis.conf
commit 1ab4d21
Author: viraja1 <anchan.viraj@gmail.com>
Date: Fri Dec 27 17:15:58 2019 +0530
Fix typo in Latency API docstring
commit ca1f70e
Author: gosth <danxuedexing@qq.com>
Date: Wed Dec 18 15:18:02 2019 +0800
fix typo in sort.c
commit a57c06b
Author: ZYunH <zyunhjob@163.com>
Date: Mon Dec 16 22:28:46 2019 +0800
fix-zset-typo
commit b8c92b5
Author: git-hulk <hulk.website@gmail.com>
Date: Mon Dec 16 15:51:42 2019 +0800
FIX: typo in cluster.c, onformation->information
commit 9dd981c
Author: wujm2007 <jim.wujm@gmail.com>
Date: Mon Dec 16 09:37:52 2019 +0800
Fix typo
commit e132d7a
Author: Sebastien Williams-Wynn <s.williamswynn.mail@gmail.com>
Date: Fri Nov 15 00:14:07 2019 +0000
Minor typo change
commit 47f44d5
Author: happynote3966 <01ssrmikururudevice01@gmail.com>
Date: Mon Nov 11 22:08:48 2019 +0900
fix comment typo in redis-cli.c
commit b8bdb0d
Author: fulei <fulei@kuaishou.com>
Date: Wed Oct 16 18:00:17 2019 +0800
Fix a spelling mistake of comments in defragDictBucketCallback
commit 0def46a
Author: fulei <fulei@kuaishou.com>
Date: Wed Oct 16 13:09:27 2019 +0800
fix some spelling mistakes of comments in defrag.c
commit f3596fd
Author: Phil Rajchgot <tophil@outlook.com>
Date: Sun Oct 13 02:02:32 2019 -0400
Typo and grammar fixes
Redis and its documentation are great -- just wanted to submit a few corrections in the spirit of Hacktoberfest. Thanks for all your work on this project. I use it all the time and it works beautifully.
commit 2b928cd
Author: KangZhiDong <worldkzd@gmail.com>
Date: Sun Sep 1 07:03:11 2019 +0800
fix typos
commit 33aea14
Author: Axlgrep <axlgrep@gmail.com>
Date: Tue Aug 27 11:02:18 2019 +0800
Fixed eviction spelling issues
commit e282a80
Author: Simen Flatby <simen@oms.no>
Date: Tue Aug 20 15:25:51 2019 +0200
Update comments to reflect prop name
In the comments the prop is referenced as replica-validity-factor,
but it is really named cluster-replica-validity-factor.
commit 74d1f9a
Author: Jim Green <jimgreen2013@qq.com>
Date: Tue Aug 20 20:00:31 2019 +0800
fix comment error, the code is ok
commit eea1407
Author: Liao Tonglang <liaotonglang@gmail.com>
Date: Fri May 31 10:16:18 2019 +0800
typo fix
fix cna't to can't
commit 0da553c
Author: KAWACHI Takashi <tkawachi@gmail.com>
Date: Wed Jul 17 00:38:16 2019 +0900
Fix typo
commit 7fc8fb6
Author: Michael Prokop <mika@grml.org>
Date: Tue May 28 17:58:42 2019 +0200
Typo fixes
s/familar/familiar/
s/compatiblity/compatibility/
s/ ot / to /
s/itsef/itself/
commit 5f46c9d
Author: zhumoing <34539422+zhumoing@users.noreply.github.com>
Date: Tue May 21 21:16:50 2019 +0800
typo-fixes
typo-fixes
commit 321dfe1
Author: wxisme <850885154@qq.com>
Date: Sat Mar 16 15:10:55 2019 +0800
typo fix
commit b4fb131
Merge: 267e0e6 3df1eb8
Author: Nikitas Bastas <nikitasbst@gmail.com>
Date: Fri Feb 8 22:55:45 2019 +0200
Merge branch 'unstable' of antirez/redis into unstable
commit 267e0e6
Author: Nikitas Bastas <nikitasbst@gmail.com>
Date: Wed Jan 30 21:26:04 2019 +0200
Minor typo fix
commit 30544e7
Author: inshal96 <39904558+inshal96@users.noreply.github.com>
Date: Fri Jan 4 16:54:50 2019 +0500
remove an extra 'a' in the comments
commit 337969d
Author: BrotherGao <yangdongheng11@gmail.com>
Date: Sat Dec 29 12:37:29 2018 +0800
fix typo in redis.conf
commit 9f4b121
Merge: 423a030 e504583
Author: BrotherGao <yangdongheng@xiaomi.com>
Date: Sat Dec 29 11:41:12 2018 +0800
Merge branch 'unstable' of antirez/redis into unstable
commit 423a030
Merge: 42b02b7 46a51cd
Author: 杨东衡 <yangdongheng@xiaomi.com>
Date: Tue Dec 4 23:56:11 2018 +0800
Merge branch 'unstable' of antirez/redis into unstable
commit 42b02b7
Merge: 68c0e6e b8febe6
Author: Dongheng Yang <yangdongheng11@gmail.com>
Date: Sun Oct 28 15:54:23 2018 +0800
Merge pull request #1 from antirez/unstable
update local data
commit 714b589
Author: Christian <crifei93@gmail.com>
Date: Fri Dec 28 01:17:26 2018 +0100
fix typo "resulution"
commit e23259d
Author: garenchan <1412950785@qq.com>
Date: Wed Dec 26 09:58:35 2018 +0800
fix typo: segfauls -> segfault
commit a9359f8
Author: xjp <jianping_xie@aliyun.com>
Date: Tue Dec 18 17:31:44 2018 +0800
Fixed REDISMODULE_H spell bug
commit a12c3e4
Author: jdiaz <jrd.palacios@gmail.com>
Date: Sat Dec 15 23:39:52 2018 -0600
Fixes hyperloglog hash function comment block description
commit 770eb11
Author: 林上耀 <1210tom@163.com>
Date: Sun Nov 25 17:16:10 2018 +0800
fix typo
commit fd97fbb
Author: Chris Lamb <chris@chris-lamb.co.uk>
Date: Fri Nov 23 17:14:01 2018 +0100
Correct "unsupported" typo.
commit a85522d
Author: Jungnam Lee <jungnam.lee@oracle.com>
Date: Thu Nov 8 23:01:29 2018 +0900
fix typo in test comments
commit ade8007
Author: Arun Kumar <palerdot@users.noreply.github.com>
Date: Tue Oct 23 16:56:35 2018 +0530
Fixed grammatical typo
Fixed typo for word 'dictionary'
commit 869ee39
Author: Hamid Alaei <hamid.a85@gmail.com>
Date: Sun Aug 12 16:40:02 2018 +0430
fix documentations: (ThreadSafeContextStart/Stop -> ThreadSafeContextLock/Unlock), minor typo
commit f89d158
Author: Mayank Jain <mayankjain255@gmail.com>
Date: Tue Jul 31 23:01:21 2018 +0530
Updated README.md with some spelling corrections.
Made correction in spelling of some misspelled words.
commit 892198e
Author: dsomeshwar <someshwar.dhayalan@gmail.com>
Date: Sat Jul 21 23:23:04 2018 +0530
typo fix
commit 8a4d780
Author: Itamar Haber <itamar@redislabs.com>
Date: Mon Apr 30 02:06:52 2018 +0300
Fixes some typos
commit e3acef6
Author: Noah Rosamilia <ivoahivoah@gmail.com>
Date: Sat Mar 3 23:41:21 2018 -0500
Fix typo in /deps/README.md
commit 04442fb
Author: WuYunlong <xzsyeb@126.com>
Date: Sat Mar 3 10:32:42 2018 +0800
Fix typo in readSyncBulkPayload() comment.
commit 9f36880
Author: WuYunlong <xzsyeb@126.com>
Date: Sat Mar 3 10:20:37 2018 +0800
replication.c comment: run_id -> replid.
commit f866b4a
Author: Francesco 'makevoid' Canessa <makevoid@gmail.com>
Date: Thu Feb 22 22:01:56 2018 +0000
fix comment typo in server.c
commit 0ebc69b
Author: 줍 <jubee0124@gmail.com>
Date: Mon Feb 12 16:38:48 2018 +0900
Fix typo in redis.conf
Fix `five behaviors` to `eight behaviors` in [this sentence ](antirez/redis@unstable/redis.conf#L564)
commit b50a620
Author: martinbroadhurst <martinbroadhurst@users.noreply.github.com>
Date: Thu Dec 28 12:07:30 2017 +0000
Fix typo in valgrind.sup
commit 7d8f349
Author: Peter Boughton <peter@sorcerersisle.com>
Date: Mon Nov 27 19:52:19 2017 +0000
Update CONTRIBUTING; refer doc updates to redis-doc repo.
commit 02dec7e
Author: Klauswk <klauswk1@hotmail.com>
Date: Tue Oct 24 16:18:38 2017 -0200
Fix typo in comment
commit e1efbc8
Author: chenshi <baiwfg2@gmail.com>
Date: Tue Oct 3 18:26:30 2017 +0800
Correct two spelling errors of comments
commit 93327d8
Author: spacewander <spacewanderlzx@gmail.com>
Date: Wed Sep 13 16:47:24 2017 +0800
Update the comment for OBJ_ENCODING_EMBSTR_SIZE_LIMIT's value
The value of OBJ_ENCODING_EMBSTR_SIZE_LIMIT is 44 now instead of 39.
commit 63d361f
Author: spacewander <spacewanderlzx@gmail.com>
Date: Tue Sep 12 15:06:42 2017 +0800
Fix <prevlen> related doc in ziplist.c
According to the definition of ZIP_BIG_PREVLEN and other related code,
the guard of single byte <prevlen> should be 254 instead of 255.
commit ebe228d
Author: hanael80 <hanael80@gmail.com>
Date: Tue Aug 15 09:09:40 2017 +0900
Fix typo
commit 6b696e6
Author: Matt Robenolt <matt@ydekproductions.com>
Date: Mon Aug 14 14:50:47 2017 -0700
Fix typo in LATENCY DOCTOR output
commit a2ec6ae
Author: caosiyang <caosiyang@qiyi.com>
Date: Tue Aug 15 14:15:16 2017 +0800
Fix a typo: form => from
commit 3ab7699
Author: caosiyang <caosiyang@qiyi.com>
Date: Thu Aug 10 18:40:33 2017 +0800
Fix a typo: replicationFeedSlavesFromMaster() => replicationFeedSlavesFromMasterStream()
commit 72d43ef
Author: caosiyang <caosiyang@qiyi.com>
Date: Tue Aug 8 15:57:25 2017 +0800
fix a typo: servewr => server
commit 707c958
Author: Bo Cai <charpty@gmail.com>
Date: Wed Jul 26 21:49:42 2017 +0800
redis-cli.c typo: conut -> count.
Signed-off-by: Bo Cai <charpty@gmail.com>
commit b9385b2
Author: JackDrogon <jack.xsuperman@gmail.com>
Date: Fri Jun 30 14:22:31 2017 +0800
Fix some spell problems
commit 20d9230
Author: akosel <aaronjkosel@gmail.com>
Date: Sun Jun 4 19:35:13 2017 -0500
Fix typo
commit b167bfc
Author: Krzysiek Witkowicz <krzysiekwitkowicz@gmail.com>
Date: Mon May 22 21:32:27 2017 +0100
Fix #4008 small typo in comment
commit 2b78ac8
Author: Jake Clarkson <jacobwclarkson@gmail.com>
Date: Wed Apr 26 15:49:50 2017 +0100
Correct typo in tests/unit/hyperloglog.tcl
commit b0f1cdb
Author: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Wed Apr 19 14:25:18 2017 -0700
Fix typo
commit a90b0f9
Author: charsyam <charsyam@naver.com>
Date: Thu Mar 16 18:19:53 2017 +0900
fix typos
fix typos
fix typos
commit 8430a79
Author: Richard Hart <richardhart92@gmail.com>
Date: Mon Mar 13 22:17:41 2017 -0400
Fixed log message typo in listenToPort.
commit 481a1c2
Author: Vinod Kumar <kumar003vinod@gmail.com>
Date: Sun Jan 15 23:04:51 2017 +0530
src/db.c: Correct "save" -> "safe" typo
commit 586b4d3
Author: wangshaonan <wshn13@gmail.com>
Date: Wed Dec 21 20:28:27 2016 +0800
Fix typo they->the in helloworld.c
commit c1c4b5e
Author: Jenner <hypxm@qq.com>
Date: Mon Dec 19 16:39:46 2016 +0800
typo error
commit 1ee1a3f
Author: tielei <43289893@qq.com>
Date: Mon Jul 18 13:52:25 2016 +0800
fix some comments
commit 11a41fb
Author: Otto Kekäläinen <otto@seravo.fi>
Date: Sun Jul 3 10:23:55 2016 +0100
Fix spelling in documentation and comments
commit 5fb5d82
Author: francischan <f1ancis621@gmail.com>
Date: Tue Jun 28 00:19:33 2016 +0800
Fix outdated comments about redis.c file.
It should now refer to server.c file.
commit 6b254bc
Author: lmatt-bit <lmatt123n@gmail.com>
Date: Thu Apr 21 21:45:58 2016 +0800
Refine the comment of dictRehashMilliseconds func
SLAVECONF->REPLCONF in comment - by andyli029
commit ee9869f
Author: clark.kang <charsyam@naver.com>
Date: Tue Mar 22 11:09:51 2016 +0900
fix typos
commit f7b3b11
Author: Harisankar H <harisankarh@gmail.com>
Date: Wed Mar 9 11:49:42 2016 +0530
Typo correction: "faield" --> "failed"
Typo correction: "faield" --> "failed"
commit 3fd40fc
Author: Itamar Haber <itamar@redislabs.com>
Date: Thu Feb 25 10:31:51 2016 +0200
Fixes a typo in comments
commit 621c160
Author: Prayag Verma <prayag.verma@gmail.com>
Date: Mon Feb 1 12:36:20 2016 +0530
Fix typo in Readme.md
Spelling mistakes -
`eviciton` > `eviction`
`familar` > `familiar`
commit d7d07d6
Author: WonCheol Lee <toctoc21c@gmail.com>
Date: Wed Dec 30 15:11:34 2015 +0900
Typo fixed
commit a4dade7
Author: Felix Bünemann <buenemann@louis.info>
Date: Mon Dec 28 11:02:55 2015 +0100
[ci skip] Improve supervised upstart config docs
This mentions that "expect stop" is required for supervised upstart
to work correctly. See http://upstart.ubuntu.com/cookbook/#expect-stop
for an explanation.
commit d9caba9
Author: daurnimator <quae@daurnimator.com>
Date: Mon Dec 21 18:30:03 2015 +1100
README: Remove trailing whitespace
commit 72d42e5
Author: daurnimator <quae@daurnimator.com>
Date: Mon Dec 21 18:29:32 2015 +1100
README: Fix typo. th => the
commit dd6e957
Author: daurnimator <quae@daurnimator.com>
Date: Mon Dec 21 18:29:20 2015 +1100
README: Fix typo. familar => familiar
commit 3a12b23
Author: daurnimator <quae@daurnimator.com>
Date: Mon Dec 21 18:28:54 2015 +1100
README: Fix typo. eviciton => eviction
commit 2d1d03b
Author: daurnimator <quae@daurnimator.com>
Date: Mon Dec 21 18:21:45 2015 +1100
README: Fix typo. sever => server
commit 3973b06
Author: Itamar Haber <itamar@garantiadata.com>
Date: Sat Dec 19 17:01:20 2015 +0200
Typo fix
commit 4f2e460
Author: Steve Gao <fu@2token.com>
Date: Fri Dec 4 10:22:05 2015 +0800
Update README - fix typos
commit b21667c
Author: binyan <binbin.yan@nokia.com>
Date: Wed Dec 2 22:48:37 2015 +0800
delete redundancy color judge in sdscatcolor
commit 88894c7
Author: binyan <binbin.yan@nokia.com>
Date: Wed Dec 2 22:14:42 2015 +0800
the example output shoule be HelloWorld
commit 2763470
Author: binyan <binbin.yan@nokia.com>
Date: Wed Dec 2 17:41:39 2015 +0800
modify error word keyevente
Signed-off-by: binyan <binbin.yan@nokia.com>
commit 0847b3d
Author: Bruno Martins <bscmartins@gmail.com>
Date: Wed Nov 4 11:37:01 2015 +0000
typo
commit bbb9e9e
Author: dawedawe <dawedawe@gmx.de>
Date: Fri Mar 27 00:46:41 2015 +0100
typo: zimap -> zipmap
commit 5ed297e
Author: Axel Advento <badwolf.bloodseeker.rev@gmail.com>
Date: Tue Mar 3 15:58:29 2015 +0800
Fix 'salve' typos to 'slave'
commit edec9d6
Author: LudwikJaniuk <ludvig.janiuk@gmail.com>
Date: Wed Jun 12 14:12:47 2019 +0200
Update README.md
Co-Authored-By: Qix <Qix-@users.noreply.github.com>
commit 692a7af
Author: LudwikJaniuk <ludvig.janiuk@gmail.com>
Date: Tue May 28 14:32:04 2019 +0200
grammar
commit d962b0a
Author: Nick Frost <nickfrostatx@gmail.com>
Date: Wed Jul 20 15:17:12 2016 -0700
Minor grammar fix
commit 24fff01aaccaf5956973ada8c50ceb1462e211c6 (typos)
Author: Chad Miller <chadm@squareup.com>
Date: Tue Sep 8 13:46:11 2020 -0400
Fix faulty comment about operation of unlink()
commit 3cd5c1f3326c52aa552ada7ec797c6bb16452355
Author: Kevin <kevin.xgr@gmail.com>
Date: Wed Nov 20 00:13:50 2019 +0800
Fix typo in server.c.
From a83af59 Mon Sep 17 00:00:00 2001
From: wuwo <wuwo@wacai.com>
Date: Fri, 17 Mar 2017 20:37:45 +0800
Subject: [PATCH] falure to failure
From c961896 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B7=A6=E6=87=B6?= <veficos@gmail.com>
Date: Sat, 27 May 2017 15:33:04 +0800
Subject: [PATCH] fix typo
From e600ef2 Mon Sep 17 00:00:00 2001
From: "rui.zou" <rui.zou@yunify.com>
Date: Sat, 30 Sep 2017 12:38:15 +0800
Subject: [PATCH] fix a typo
From c7d07fa Mon Sep 17 00:00:00 2001
From: Alexandre Perrin <alex@kaworu.ch>
Date: Thu, 16 Aug 2018 10:35:31 +0200
Subject: [PATCH] deps README.md typo
From b25cb67 Mon Sep 17 00:00:00 2001
From: Guy Korland <gkorland@gmail.com>
Date: Wed, 26 Sep 2018 10:55:37 +0300
Subject: [PATCH 1/2] fix typos in header
From ad28ca6 Mon Sep 17 00:00:00 2001
From: Guy Korland <gkorland@gmail.com>
Date: Wed, 26 Sep 2018 11:02:36 +0300
Subject: [PATCH 2/2] fix typos
commit 34924cdedd8552466fc22c1168d49236cb7ee915
Author: Adrian Lynch <adi_ady_ade@hotmail.com>
Date: Sat Apr 4 21:59:15 2015 +0100
Typos fixed
commit fd2a1e7
Author: Jan <jsteemann@users.noreply.github.com>
Date: Sat Oct 27 19:13:01 2018 +0200
Fix typos
Fix typos
commit e14e47c1a234b53b0e103c5f6a1c61481cbcbb02
Author: Andy Lester <andy@petdance.com>
Date: Fri Aug 2 22:30:07 2019 -0500
Fix multiple misspellings of "following"
commit 79b948ce2dac6b453fe80995abbcaac04c213d5a
Author: Andy Lester <andy@petdance.com>
Date: Fri Aug 2 22:24:28 2019 -0500
Fix misspelling of create-cluster
commit 1fffde52666dc99ab35efbd31071a4c008cb5a71
Author: Andy Lester <andy@petdance.com>
Date: Wed Jul 31 17:57:56 2019 -0500
Fix typos
commit 204c9ba9651e9e05fd73936b452b9a30be456cfe
Author: Xiaobo Zhu <xiaobo.zhu@shopee.com>
Date: Tue Aug 13 22:19:25 2019 +0800
fix typos
Squashed commit of the following:
commit 1d9aaf8
Author: danmedani <danmedani@gmail.com>
Date: Sun Aug 2 11:40:26 2015 -0700
README typo fix.
Squashed commit of the following:
commit 32bfa7c
Author: Erik Dubbelboer <erik@dubbelboer.com>
Date: Mon Jul 6 21:15:08 2015 +0200
Fixed grammer
Squashed commit of the following:
commit b24f69c
Author: Sisir Koppaka <sisir.koppaka@gmail.com>
Date: Mon Mar 2 22:38:45 2015 -0500
utils/hashtable/rehashing.c: Fix typos
Squashed commit of the following:
commit 4e04082
Author: Erik Dubbelboer <erik@dubbelboer.com>
Date: Mon Mar 23 08:22:21 2015 +0000
Small config file documentation improvements
Squashed commit of the following:
commit acb8773
Author: ctd1500 <ctd1500@gmail.com>
Date: Fri May 8 01:52:48 2015 -0700
Typo and grammar fixes in readme
commit 2eb75b6
Author: ctd1500 <ctd1500@gmail.com>
Date: Fri May 8 01:36:18 2015 -0700
fixed redis.conf comment
Squashed commit of the following:
commit a8249a2
Author: Masahiko Sawada <sawada.mshk@gmail.com>
Date: Fri Dec 11 11:39:52 2015 +0530
Revise correction of typos.
Squashed commit of the following:
commit 3c02028
Author: zhaojun11 <zhaojun11@jd.com>
Date: Wed Jan 17 19:05:28 2018 +0800
Fix typos include two code typos in cluster.c and latency.c
Squashed commit of the following:
commit 9dba47c
Author: q191201771 <191201771@qq.com>
Date: Sat Jan 4 11:31:04 2020 +0800
fix function listCreate comment in adlist.c
Update src/server.c
commit 2c7c2cb536e78dd211b1ac6f7bda00f0f54faaeb
Author: charpty <charpty@gmail.com>
Date: Tue May 1 23:16:59 2018 +0800
server.c typo: modules system dictionary type comment
Signed-off-by: charpty <charpty@gmail.com>
commit a8395323fb63cb59cb3591cb0f0c8edb7c29a680
Author: Itamar Haber <itamar@redislabs.com>
Date: Sun May 6 00:25:18 2018 +0300
Updates test_helper.tcl's help with undocumented options
Specifically:
* Host
* Port
* Client
commit bde6f9ced15755cd6407b4af7d601b030f36d60b
Author: wxisme <850885154@qq.com>
Date: Wed Aug 8 15:19:19 2018 +0800
fix comments in deps files
commit 3172474ba991532ab799ee1873439f3402412331
Author: wxisme <850885154@qq.com>
Date: Wed Aug 8 14:33:49 2018 +0800
fix some comments
commit 01b6f2b6858b5cf2ce4ad5092d2c746e755f53f0
Author: Thor Juhasz <thor@juhasz.pro>
Date: Sun Nov 18 14:37:41 2018 +0100
Minor fixes to comments
Found some parts a little unclear on a first read, which prompted me to have a better look at the file and fix some minor things I noticed.
Fixing minor typos and grammar. There are no changes to configuration options.
These changes are only meant to help the user better understand the explanations to the various configuration options
2020-09-10 06:43:38 -04:00
|
|
|
* Entries inside the eviction pool are taken ordered by idle time, putting
|
2016-07-07 09:04:25 -04:00
|
|
|
* greater idle times to the right (ascending order).
|
|
|
|
*
|
2016-07-18 12:17:57 -04:00
|
|
|
* When an LFU policy is used instead, a reverse frequency indication is used
|
|
|
|
* instead of the idle time, so that we still evict by larger value (larger
|
|
|
|
* inverse frequency means to evict keys with the least frequent accesses).
|
|
|
|
*
|
2016-07-07 09:04:25 -04:00
|
|
|
* Empty entries have the key pointer set to NULL. */
|
2016-07-12 06:31:37 -04:00
|
|
|
#define EVPOOL_SIZE 16
|
|
|
|
#define EVPOOL_CACHED_SDS_SIZE 255
|
2016-07-07 09:04:25 -04:00
|
|
|
struct evictionPoolEntry {
|
2016-07-18 12:17:57 -04:00
|
|
|
unsigned long long idle; /* Object idle time (inverse frequency for LFU) */
|
2016-07-07 09:04:25 -04:00
|
|
|
sds key; /* Key name. */
|
2016-07-12 06:31:37 -04:00
|
|
|
sds cached; /* Cached SDS object for key name. */
|
2016-07-13 04:45:37 -04:00
|
|
|
int dbid; /* Key DB number. */
|
2016-07-07 09:04:25 -04:00
|
|
|
};
|
|
|
|
|
2016-07-13 04:45:37 -04:00
|
|
|
static struct evictionPoolEntry *EvictionPoolLRU;
|
|
|
|
|
2016-07-07 09:04:25 -04:00
|
|
|
/* ----------------------------------------------------------------------------
|
|
|
|
* Implementation of eviction, aging and LRU
|
|
|
|
* --------------------------------------------------------------------------*/
|
|
|
|
|
2016-07-06 09:28:18 -04:00
|
|
|
/* Return the LRU clock, based on the clock resolution. This is a time
|
|
|
|
* in a reduced-bits format that can be used to set and check the
|
|
|
|
* object->lru field of redisObject structures. */
|
|
|
|
unsigned int getLRUClock(void) {
|
|
|
|
return (mstime()/LRU_CLOCK_RESOLUTION) & LRU_CLOCK_MAX;
|
|
|
|
}
|
|
|
|
|
2017-05-09 05:57:09 -04:00
|
|
|
/* This function is used to obtain the current LRU clock.
|
|
|
|
* If the current resolution is lower than the frequency we refresh the
|
|
|
|
* LRU clock (as it should be in production servers) we return the
|
|
|
|
* precomputed value, otherwise we need to resort to a system call. */
|
|
|
|
unsigned int LRU_CLOCK(void) {
|
|
|
|
unsigned int lruclock;
|
|
|
|
if (1000/server.hz <= LRU_CLOCK_RESOLUTION) {
|
Implement redisAtomic to replace _Atomic C11 builtin (#7707)
Redis 6.0 introduces I/O threads, it is so cool and efficient, we use C11
_Atomic to establish inter-thread synchronization without mutex. But the
compiler that must supports C11 _Atomic can compile redis code, that brings a
lot of inconvenience since some common platforms can't support by default such
as CentOS7, so we want to implement redis atomic type to make it more portable.
We have implemented our atomic variable for redis that only has 'relaxed'
operations in src/atomicvar.h, so we implement some operations with
'sequentially-consistent', just like the default behavior of C11 _Atomic that
can establish inter-thread synchronization. And we replace all uses of C11
_Atomic with redis atomic variable.
Our implementation of redis atomic variable uses C11 _Atomic, __atomic or
__sync macros if available, it supports most common platforms, and we will
detect automatically which feature we use. In Makefile we use a dummy file to
detect if the compiler supports C11 _Atomic. Now for gcc, we can compile redis
code theoretically if your gcc version is not less than 4.1.2(starts to support
__sync_xxx operations). Otherwise, we remove use mutex fallback to implement
redis atomic variable for performance and test. You will get compiling errors
if your compiler doesn't support all features of above.
For cover redis atomic variable tests, we add other CI jobs that build redis on
CentOS6 and CentOS7 and workflow daily jobs that run the tests on them.
For them, we just install gcc by default in order to cover different compiler
versions, gcc is 4.4.7 by default installation on CentOS6 and 4.8.5 on CentOS7.
We restore the feature that we can test redis with Helgrind to find data race
errors. But you need install Valgrind in the default path configuration firstly
before running your tests, since we use macros in helgrind.h to tell Helgrind
inter-thread happens-before relationship explicitly for avoiding false positives.
Please open an issue on github if you find data race errors relate to this commit.
Unrelated:
- Fix redefinition of typedef 'RedisModuleUserChangedFunc'
For some old version compilers, they will report errors or warnings, if we
re-define function type.
2020-09-17 09:01:45 -04:00
|
|
|
atomicGet(server.lruclock,lruclock);
|
2017-05-09 05:57:09 -04:00
|
|
|
} else {
|
|
|
|
lruclock = getLRUClock();
|
|
|
|
}
|
|
|
|
return lruclock;
|
|
|
|
}
|
|
|
|
|
2016-07-06 09:28:18 -04:00
|
|
|
/* Given an object returns the min number of milliseconds the object was never
|
|
|
|
* requested, using an approximated LRU algorithm. */
|
|
|
|
unsigned long long estimateObjectIdleTime(robj *o) {
|
|
|
|
unsigned long long lruclock = LRU_CLOCK();
|
|
|
|
if (lruclock >= o->lru) {
|
|
|
|
return (lruclock - o->lru) * LRU_CLOCK_RESOLUTION;
|
|
|
|
} else {
|
|
|
|
return (lruclock + (LRU_CLOCK_MAX - o->lru)) *
|
|
|
|
LRU_CLOCK_RESOLUTION;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-09-16 02:16:01 -04:00
|
|
|
/* LRU approximation algorithm
|
2016-07-06 09:28:18 -04:00
|
|
|
*
|
|
|
|
* Redis uses an approximation of the LRU algorithm that runs in constant
|
|
|
|
* memory. Every time there is a key to expire, we sample N keys (with
|
|
|
|
* N very small, usually in around 5) to populate a pool of best keys to
|
2016-07-12 06:31:37 -04:00
|
|
|
* evict of M keys (the pool size is defined by EVPOOL_SIZE).
|
2016-07-06 09:28:18 -04:00
|
|
|
*
|
|
|
|
* The N keys sampled are added in the pool of good keys to expire (the one
|
|
|
|
* with an old access time) if they are better than one of the current keys
|
|
|
|
* in the pool.
|
|
|
|
*
|
|
|
|
* After the pool is populated, the best key we have in the pool is expired.
|
|
|
|
* However note that we don't remove keys from the pool when they are deleted
|
|
|
|
* so the pool may contain keys that no longer exist.
|
|
|
|
*
|
|
|
|
* When we try to evict a key, and all the entries in the pool don't exist
|
|
|
|
* we populate it again. This time we'll be sure that the pool has at least
|
|
|
|
* one key that can be evicted, if there is at least one key that can be
|
|
|
|
* evicted in the whole database. */
|
|
|
|
|
|
|
|
/* Create a new eviction pool. */
|
2016-07-13 04:45:37 -04:00
|
|
|
void evictionPoolAlloc(void) {
|
2016-07-06 09:28:18 -04:00
|
|
|
struct evictionPoolEntry *ep;
|
|
|
|
int j;
|
|
|
|
|
2016-07-12 06:31:37 -04:00
|
|
|
ep = zmalloc(sizeof(*ep)*EVPOOL_SIZE);
|
|
|
|
for (j = 0; j < EVPOOL_SIZE; j++) {
|
2016-07-06 09:28:18 -04:00
|
|
|
ep[j].idle = 0;
|
|
|
|
ep[j].key = NULL;
|
2016-07-12 06:31:37 -04:00
|
|
|
ep[j].cached = sdsnewlen(NULL,EVPOOL_CACHED_SDS_SIZE);
|
2016-07-13 04:45:37 -04:00
|
|
|
ep[j].dbid = 0;
|
2016-07-06 09:28:18 -04:00
|
|
|
}
|
2016-07-13 04:45:37 -04:00
|
|
|
EvictionPoolLRU = ep;
|
2016-07-06 09:28:18 -04:00
|
|
|
}
|
|
|
|
|
2020-09-16 02:16:01 -04:00
|
|
|
/* This is an helper function for performEvictions(), it is used in order
|
2016-07-06 09:28:18 -04:00
|
|
|
* to populate the evictionPool with a few entries every time we want to
|
|
|
|
* expire a key. Keys with idle time smaller than one of the current
|
|
|
|
* keys are added. Keys are always added if there are free entries.
|
|
|
|
*
|
|
|
|
* We insert keys on place in ascending order, so keys with the smaller
|
|
|
|
* idle time are on the left, and keys with the higher idle time on the
|
|
|
|
* right. */
|
|
|
|
|
2016-07-13 04:45:37 -04:00
|
|
|
void evictionPoolPopulate(int dbid, dict *sampledict, dict *keydict, struct evictionPoolEntry *pool) {
|
2016-07-06 09:28:18 -04:00
|
|
|
int j, k, count;
|
2016-07-08 08:17:11 -04:00
|
|
|
dictEntry *samples[server.maxmemory_samples];
|
2016-07-06 09:28:18 -04:00
|
|
|
|
|
|
|
count = dictGetSomeKeys(sampledict,samples,server.maxmemory_samples);
|
|
|
|
for (j = 0; j < count; j++) {
|
|
|
|
unsigned long long idle;
|
|
|
|
sds key;
|
|
|
|
robj *o;
|
|
|
|
dictEntry *de;
|
|
|
|
|
|
|
|
de = samples[j];
|
|
|
|
key = dictGetKey(de);
|
2016-07-20 13:53:27 -04:00
|
|
|
|
2016-07-06 09:28:18 -04:00
|
|
|
/* If the dictionary we are sampling from is not the main
|
|
|
|
* dictionary (but the expires one) we need to lookup the key
|
|
|
|
* again in the key dictionary to obtain the value object. */
|
2016-07-20 13:53:27 -04:00
|
|
|
if (server.maxmemory_policy != MAXMEMORY_VOLATILE_TTL) {
|
|
|
|
if (sampledict != keydict) de = dictFind(keydict, key);
|
|
|
|
o = dictGetVal(de);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Calculate the idle time according to the policy. This is called
|
|
|
|
* idle just because the code initially handled LRU, but is in fact
|
|
|
|
* just a score where an higher score means better candidate. */
|
2016-07-18 12:17:57 -04:00
|
|
|
if (server.maxmemory_policy & MAXMEMORY_FLAG_LRU) {
|
|
|
|
idle = estimateObjectIdleTime(o);
|
2016-07-20 13:53:27 -04:00
|
|
|
} else if (server.maxmemory_policy & MAXMEMORY_FLAG_LFU) {
|
2016-07-18 12:17:57 -04:00
|
|
|
/* When we use an LRU policy, we sort the keys by idle time
|
|
|
|
* so that we expire keys starting from greater idle time.
|
|
|
|
* However when the policy is an LFU one, we have a frequency
|
|
|
|
* estimation, and we want to evict keys with lower frequency
|
|
|
|
* first. So inside the pool we put objects using the inverted
|
|
|
|
* frequency subtracting the actual frequency to the maximum
|
|
|
|
* frequency of 255. */
|
|
|
|
idle = 255-LFUDecrAndReturn(o);
|
2016-07-20 13:53:27 -04:00
|
|
|
} else if (server.maxmemory_policy == MAXMEMORY_VOLATILE_TTL) {
|
|
|
|
/* In this case the sooner the expire the better. */
|
|
|
|
idle = ULLONG_MAX - (long)dictGetVal(de);
|
|
|
|
} else {
|
|
|
|
serverPanic("Unknown eviction policy in evictionPoolPopulate()");
|
2016-07-18 12:17:57 -04:00
|
|
|
}
|
2016-07-06 09:28:18 -04:00
|
|
|
|
|
|
|
/* Insert the element inside the pool.
|
|
|
|
* First, find the first empty bucket or the first populated
|
|
|
|
* bucket that has an idle time smaller than our idle time. */
|
|
|
|
k = 0;
|
2016-07-12 06:31:37 -04:00
|
|
|
while (k < EVPOOL_SIZE &&
|
2016-07-06 09:28:18 -04:00
|
|
|
pool[k].key &&
|
|
|
|
pool[k].idle < idle) k++;
|
2016-07-12 06:31:37 -04:00
|
|
|
if (k == 0 && pool[EVPOOL_SIZE-1].key != NULL) {
|
2016-07-06 09:28:18 -04:00
|
|
|
/* Can't insert if the element is < the worst element we have
|
|
|
|
* and there are no empty buckets. */
|
|
|
|
continue;
|
2016-07-12 06:31:37 -04:00
|
|
|
} else if (k < EVPOOL_SIZE && pool[k].key == NULL) {
|
2016-07-06 09:28:18 -04:00
|
|
|
/* Inserting into empty position. No setup needed before insert. */
|
|
|
|
} else {
|
|
|
|
/* Inserting in the middle. Now k points to the first element
|
|
|
|
* greater than the element to insert. */
|
2016-07-12 06:31:37 -04:00
|
|
|
if (pool[EVPOOL_SIZE-1].key == NULL) {
|
2016-07-06 09:28:18 -04:00
|
|
|
/* Free space on the right? Insert at k shifting
|
|
|
|
* all the elements from k to end to the right. */
|
2016-07-13 04:45:37 -04:00
|
|
|
|
|
|
|
/* Save SDS before overwriting. */
|
|
|
|
sds cached = pool[EVPOOL_SIZE-1].cached;
|
2016-07-06 09:28:18 -04:00
|
|
|
memmove(pool+k+1,pool+k,
|
2016-07-12 06:31:37 -04:00
|
|
|
sizeof(pool[0])*(EVPOOL_SIZE-k-1));
|
2016-07-13 04:45:37 -04:00
|
|
|
pool[k].cached = cached;
|
2016-07-06 09:28:18 -04:00
|
|
|
} else {
|
|
|
|
/* No free space on right? Insert at k-1 */
|
|
|
|
k--;
|
|
|
|
/* Shift all elements on the left of k (included) to the
|
|
|
|
* left, so we discard the element with smaller idle time. */
|
2016-07-13 04:45:37 -04:00
|
|
|
sds cached = pool[0].cached; /* Save SDS before overwriting. */
|
2016-07-12 06:31:37 -04:00
|
|
|
if (pool[0].key != pool[0].cached) sdsfree(pool[0].key);
|
2016-07-06 09:28:18 -04:00
|
|
|
memmove(pool,pool+1,sizeof(pool[0])*k);
|
2016-07-13 04:45:37 -04:00
|
|
|
pool[k].cached = cached;
|
2016-07-06 09:28:18 -04:00
|
|
|
}
|
|
|
|
}
|
2016-07-12 06:31:37 -04:00
|
|
|
|
|
|
|
/* Try to reuse the cached SDS string allocated in the pool entry,
|
|
|
|
* because allocating and deallocating this object is costly
|
|
|
|
* (according to the profiler, not my fantasy. Remember:
|
Squash merging 125 typo/grammar/comment/doc PRs (#7773)
List of squashed commits or PRs
===============================
commit 66801ea
Author: hwware <wen.hui.ware@gmail.com>
Date: Mon Jan 13 00:54:31 2020 -0500
typo fix in acl.c
commit 46f55db
Author: Itamar Haber <itamar@redislabs.com>
Date: Sun Sep 6 18:24:11 2020 +0300
Updates a couple of comments
Specifically:
* RM_AutoMemory completed instead of pointing to docs
* Updated link to custom type doc
commit 61a2aa0
Author: xindoo <xindoo@qq.com>
Date: Tue Sep 1 19:24:59 2020 +0800
Correct errors in code comments
commit a5871d1
Author: yz1509 <pro-756@qq.com>
Date: Tue Sep 1 18:36:06 2020 +0800
fix typos in module.c
commit 41eede7
Author: bookug <bookug@qq.com>
Date: Sat Aug 15 01:11:33 2020 +0800
docs: fix typos in comments
commit c303c84
Author: lazy-snail <ws.niu@outlook.com>
Date: Fri Aug 7 11:15:44 2020 +0800
fix spelling in redis.conf
commit 1eb76bf
Author: zhujian <zhujianxyz@gmail.com>
Date: Thu Aug 6 15:22:10 2020 +0800
add a missing 'n' in comment
commit 1530ec2
Author: Daniel Dai <764122422@qq.com>
Date: Mon Jul 27 00:46:35 2020 -0400
fix spelling in tracking.c
commit e517b31
Author: Hunter-Chen <huntcool001@gmail.com>
Date: Fri Jul 17 22:33:32 2020 +0800
Update redis.conf
Co-authored-by: Itamar Haber <itamar@redislabs.com>
commit c300eff
Author: Hunter-Chen <huntcool001@gmail.com>
Date: Fri Jul 17 22:33:23 2020 +0800
Update redis.conf
Co-authored-by: Itamar Haber <itamar@redislabs.com>
commit 4c058a8
Author: 陈浩鹏 <chenhaopeng@heytea.com>
Date: Thu Jun 25 19:00:56 2020 +0800
Grammar fix and clarification
commit 5fcaa81
Author: bodong.ybd <bodong.ybd@alibaba-inc.com>
Date: Fri Jun 19 10:09:00 2020 +0800
Fix typos
commit 4caca9a
Author: Pruthvi P <pruthvi@ixigo.com>
Date: Fri May 22 00:33:22 2020 +0530
Fix typo eviciton => eviction
commit b2a25f6
Author: Brad Dunbar <dunbarb2@gmail.com>
Date: Sun May 17 12:39:59 2020 -0400
Fix a typo.
commit 12842ae
Author: hwware <wen.hui.ware@gmail.com>
Date: Sun May 3 17:16:59 2020 -0400
fix spelling in redis conf
commit ddba07c
Author: Chris Lamb <chris@chris-lamb.co.uk>
Date: Sat May 2 23:25:34 2020 +0100
Correct a "conflicts" spelling error.
commit 8fc7bf2
Author: Nao YONASHIRO <yonashiro@r.recruit.co.jp>
Date: Thu Apr 30 10:25:27 2020 +0900
docs: fix EXPIRE_FAST_CYCLE_DURATION to ACTIVE_EXPIRE_CYCLE_FAST_DURATION
commit 9b2b67a
Author: Brad Dunbar <dunbarb2@gmail.com>
Date: Fri Apr 24 11:46:22 2020 -0400
Fix a typo.
commit 0746f10
Author: devilinrust <63737265+devilinrust@users.noreply.github.com>
Date: Thu Apr 16 00:17:53 2020 +0200
Fix typos in server.c
commit 92b588d
Author: benjessop12 <56115861+benjessop12@users.noreply.github.com>
Date: Mon Apr 13 13:43:55 2020 +0100
Fix spelling mistake in lazyfree.c
commit 1da37aa
Merge: 2d4ba28 af347a8
Author: hwware <wen.hui.ware@gmail.com>
Date: Thu Mar 5 22:41:31 2020 -0500
Merge remote-tracking branch 'upstream/unstable' into expiretypofix
commit 2d4ba28
Author: hwware <wen.hui.ware@gmail.com>
Date: Mon Mar 2 00:09:40 2020 -0500
fix typo in expire.c
commit 1a746f7
Author: SennoYuki <minakami1yuki@gmail.com>
Date: Thu Feb 27 16:54:32 2020 +0800
fix typo
commit 8599b1a
Author: dongheejeong <donghee950403@gmail.com>
Date: Sun Feb 16 20:31:43 2020 +0000
Fix typo in server.c
commit f38d4e8
Author: hwware <wen.hui.ware@gmail.com>
Date: Sun Feb 2 22:58:38 2020 -0500
fix typo in evict.c
commit fe143fc
Author: Leo Murillo <leonardo.murillo@gmail.com>
Date: Sun Feb 2 01:57:22 2020 -0600
Fix a few typos in redis.conf
commit 1ab4d21
Author: viraja1 <anchan.viraj@gmail.com>
Date: Fri Dec 27 17:15:58 2019 +0530
Fix typo in Latency API docstring
commit ca1f70e
Author: gosth <danxuedexing@qq.com>
Date: Wed Dec 18 15:18:02 2019 +0800
fix typo in sort.c
commit a57c06b
Author: ZYunH <zyunhjob@163.com>
Date: Mon Dec 16 22:28:46 2019 +0800
fix-zset-typo
commit b8c92b5
Author: git-hulk <hulk.website@gmail.com>
Date: Mon Dec 16 15:51:42 2019 +0800
FIX: typo in cluster.c, onformation->information
commit 9dd981c
Author: wujm2007 <jim.wujm@gmail.com>
Date: Mon Dec 16 09:37:52 2019 +0800
Fix typo
commit e132d7a
Author: Sebastien Williams-Wynn <s.williamswynn.mail@gmail.com>
Date: Fri Nov 15 00:14:07 2019 +0000
Minor typo change
commit 47f44d5
Author: happynote3966 <01ssrmikururudevice01@gmail.com>
Date: Mon Nov 11 22:08:48 2019 +0900
fix comment typo in redis-cli.c
commit b8bdb0d
Author: fulei <fulei@kuaishou.com>
Date: Wed Oct 16 18:00:17 2019 +0800
Fix a spelling mistake of comments in defragDictBucketCallback
commit 0def46a
Author: fulei <fulei@kuaishou.com>
Date: Wed Oct 16 13:09:27 2019 +0800
fix some spelling mistakes of comments in defrag.c
commit f3596fd
Author: Phil Rajchgot <tophil@outlook.com>
Date: Sun Oct 13 02:02:32 2019 -0400
Typo and grammar fixes
Redis and its documentation are great -- just wanted to submit a few corrections in the spirit of Hacktoberfest. Thanks for all your work on this project. I use it all the time and it works beautifully.
commit 2b928cd
Author: KangZhiDong <worldkzd@gmail.com>
Date: Sun Sep 1 07:03:11 2019 +0800
fix typos
commit 33aea14
Author: Axlgrep <axlgrep@gmail.com>
Date: Tue Aug 27 11:02:18 2019 +0800
Fixed eviction spelling issues
commit e282a80
Author: Simen Flatby <simen@oms.no>
Date: Tue Aug 20 15:25:51 2019 +0200
Update comments to reflect prop name
In the comments the prop is referenced as replica-validity-factor,
but it is really named cluster-replica-validity-factor.
commit 74d1f9a
Author: Jim Green <jimgreen2013@qq.com>
Date: Tue Aug 20 20:00:31 2019 +0800
fix comment error, the code is ok
commit eea1407
Author: Liao Tonglang <liaotonglang@gmail.com>
Date: Fri May 31 10:16:18 2019 +0800
typo fix
fix cna't to can't
commit 0da553c
Author: KAWACHI Takashi <tkawachi@gmail.com>
Date: Wed Jul 17 00:38:16 2019 +0900
Fix typo
commit 7fc8fb6
Author: Michael Prokop <mika@grml.org>
Date: Tue May 28 17:58:42 2019 +0200
Typo fixes
s/familar/familiar/
s/compatiblity/compatibility/
s/ ot / to /
s/itsef/itself/
commit 5f46c9d
Author: zhumoing <34539422+zhumoing@users.noreply.github.com>
Date: Tue May 21 21:16:50 2019 +0800
typo-fixes
typo-fixes
commit 321dfe1
Author: wxisme <850885154@qq.com>
Date: Sat Mar 16 15:10:55 2019 +0800
typo fix
commit b4fb131
Merge: 267e0e6 3df1eb8
Author: Nikitas Bastas <nikitasbst@gmail.com>
Date: Fri Feb 8 22:55:45 2019 +0200
Merge branch 'unstable' of antirez/redis into unstable
commit 267e0e6
Author: Nikitas Bastas <nikitasbst@gmail.com>
Date: Wed Jan 30 21:26:04 2019 +0200
Minor typo fix
commit 30544e7
Author: inshal96 <39904558+inshal96@users.noreply.github.com>
Date: Fri Jan 4 16:54:50 2019 +0500
remove an extra 'a' in the comments
commit 337969d
Author: BrotherGao <yangdongheng11@gmail.com>
Date: Sat Dec 29 12:37:29 2018 +0800
fix typo in redis.conf
commit 9f4b121
Merge: 423a030 e504583
Author: BrotherGao <yangdongheng@xiaomi.com>
Date: Sat Dec 29 11:41:12 2018 +0800
Merge branch 'unstable' of antirez/redis into unstable
commit 423a030
Merge: 42b02b7 46a51cd
Author: 杨东衡 <yangdongheng@xiaomi.com>
Date: Tue Dec 4 23:56:11 2018 +0800
Merge branch 'unstable' of antirez/redis into unstable
commit 42b02b7
Merge: 68c0e6e b8febe6
Author: Dongheng Yang <yangdongheng11@gmail.com>
Date: Sun Oct 28 15:54:23 2018 +0800
Merge pull request #1 from antirez/unstable
update local data
commit 714b589
Author: Christian <crifei93@gmail.com>
Date: Fri Dec 28 01:17:26 2018 +0100
fix typo "resulution"
commit e23259d
Author: garenchan <1412950785@qq.com>
Date: Wed Dec 26 09:58:35 2018 +0800
fix typo: segfauls -> segfault
commit a9359f8
Author: xjp <jianping_xie@aliyun.com>
Date: Tue Dec 18 17:31:44 2018 +0800
Fixed REDISMODULE_H spell bug
commit a12c3e4
Author: jdiaz <jrd.palacios@gmail.com>
Date: Sat Dec 15 23:39:52 2018 -0600
Fixes hyperloglog hash function comment block description
commit 770eb11
Author: 林上耀 <1210tom@163.com>
Date: Sun Nov 25 17:16:10 2018 +0800
fix typo
commit fd97fbb
Author: Chris Lamb <chris@chris-lamb.co.uk>
Date: Fri Nov 23 17:14:01 2018 +0100
Correct "unsupported" typo.
commit a85522d
Author: Jungnam Lee <jungnam.lee@oracle.com>
Date: Thu Nov 8 23:01:29 2018 +0900
fix typo in test comments
commit ade8007
Author: Arun Kumar <palerdot@users.noreply.github.com>
Date: Tue Oct 23 16:56:35 2018 +0530
Fixed grammatical typo
Fixed typo for word 'dictionary'
commit 869ee39
Author: Hamid Alaei <hamid.a85@gmail.com>
Date: Sun Aug 12 16:40:02 2018 +0430
fix documentations: (ThreadSafeContextStart/Stop -> ThreadSafeContextLock/Unlock), minor typo
commit f89d158
Author: Mayank Jain <mayankjain255@gmail.com>
Date: Tue Jul 31 23:01:21 2018 +0530
Updated README.md with some spelling corrections.
Made correction in spelling of some misspelled words.
commit 892198e
Author: dsomeshwar <someshwar.dhayalan@gmail.com>
Date: Sat Jul 21 23:23:04 2018 +0530
typo fix
commit 8a4d780
Author: Itamar Haber <itamar@redislabs.com>
Date: Mon Apr 30 02:06:52 2018 +0300
Fixes some typos
commit e3acef6
Author: Noah Rosamilia <ivoahivoah@gmail.com>
Date: Sat Mar 3 23:41:21 2018 -0500
Fix typo in /deps/README.md
commit 04442fb
Author: WuYunlong <xzsyeb@126.com>
Date: Sat Mar 3 10:32:42 2018 +0800
Fix typo in readSyncBulkPayload() comment.
commit 9f36880
Author: WuYunlong <xzsyeb@126.com>
Date: Sat Mar 3 10:20:37 2018 +0800
replication.c comment: run_id -> replid.
commit f866b4a
Author: Francesco 'makevoid' Canessa <makevoid@gmail.com>
Date: Thu Feb 22 22:01:56 2018 +0000
fix comment typo in server.c
commit 0ebc69b
Author: 줍 <jubee0124@gmail.com>
Date: Mon Feb 12 16:38:48 2018 +0900
Fix typo in redis.conf
Fix `five behaviors` to `eight behaviors` in [this sentence ](antirez/redis@unstable/redis.conf#L564)
commit b50a620
Author: martinbroadhurst <martinbroadhurst@users.noreply.github.com>
Date: Thu Dec 28 12:07:30 2017 +0000
Fix typo in valgrind.sup
commit 7d8f349
Author: Peter Boughton <peter@sorcerersisle.com>
Date: Mon Nov 27 19:52:19 2017 +0000
Update CONTRIBUTING; refer doc updates to redis-doc repo.
commit 02dec7e
Author: Klauswk <klauswk1@hotmail.com>
Date: Tue Oct 24 16:18:38 2017 -0200
Fix typo in comment
commit e1efbc8
Author: chenshi <baiwfg2@gmail.com>
Date: Tue Oct 3 18:26:30 2017 +0800
Correct two spelling errors of comments
commit 93327d8
Author: spacewander <spacewanderlzx@gmail.com>
Date: Wed Sep 13 16:47:24 2017 +0800
Update the comment for OBJ_ENCODING_EMBSTR_SIZE_LIMIT's value
The value of OBJ_ENCODING_EMBSTR_SIZE_LIMIT is 44 now instead of 39.
commit 63d361f
Author: spacewander <spacewanderlzx@gmail.com>
Date: Tue Sep 12 15:06:42 2017 +0800
Fix <prevlen> related doc in ziplist.c
According to the definition of ZIP_BIG_PREVLEN and other related code,
the guard of single byte <prevlen> should be 254 instead of 255.
commit ebe228d
Author: hanael80 <hanael80@gmail.com>
Date: Tue Aug 15 09:09:40 2017 +0900
Fix typo
commit 6b696e6
Author: Matt Robenolt <matt@ydekproductions.com>
Date: Mon Aug 14 14:50:47 2017 -0700
Fix typo in LATENCY DOCTOR output
commit a2ec6ae
Author: caosiyang <caosiyang@qiyi.com>
Date: Tue Aug 15 14:15:16 2017 +0800
Fix a typo: form => from
commit 3ab7699
Author: caosiyang <caosiyang@qiyi.com>
Date: Thu Aug 10 18:40:33 2017 +0800
Fix a typo: replicationFeedSlavesFromMaster() => replicationFeedSlavesFromMasterStream()
commit 72d43ef
Author: caosiyang <caosiyang@qiyi.com>
Date: Tue Aug 8 15:57:25 2017 +0800
fix a typo: servewr => server
commit 707c958
Author: Bo Cai <charpty@gmail.com>
Date: Wed Jul 26 21:49:42 2017 +0800
redis-cli.c typo: conut -> count.
Signed-off-by: Bo Cai <charpty@gmail.com>
commit b9385b2
Author: JackDrogon <jack.xsuperman@gmail.com>
Date: Fri Jun 30 14:22:31 2017 +0800
Fix some spell problems
commit 20d9230
Author: akosel <aaronjkosel@gmail.com>
Date: Sun Jun 4 19:35:13 2017 -0500
Fix typo
commit b167bfc
Author: Krzysiek Witkowicz <krzysiekwitkowicz@gmail.com>
Date: Mon May 22 21:32:27 2017 +0100
Fix #4008 small typo in comment
commit 2b78ac8
Author: Jake Clarkson <jacobwclarkson@gmail.com>
Date: Wed Apr 26 15:49:50 2017 +0100
Correct typo in tests/unit/hyperloglog.tcl
commit b0f1cdb
Author: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Wed Apr 19 14:25:18 2017 -0700
Fix typo
commit a90b0f9
Author: charsyam <charsyam@naver.com>
Date: Thu Mar 16 18:19:53 2017 +0900
fix typos
fix typos
fix typos
commit 8430a79
Author: Richard Hart <richardhart92@gmail.com>
Date: Mon Mar 13 22:17:41 2017 -0400
Fixed log message typo in listenToPort.
commit 481a1c2
Author: Vinod Kumar <kumar003vinod@gmail.com>
Date: Sun Jan 15 23:04:51 2017 +0530
src/db.c: Correct "save" -> "safe" typo
commit 586b4d3
Author: wangshaonan <wshn13@gmail.com>
Date: Wed Dec 21 20:28:27 2016 +0800
Fix typo they->the in helloworld.c
commit c1c4b5e
Author: Jenner <hypxm@qq.com>
Date: Mon Dec 19 16:39:46 2016 +0800
typo error
commit 1ee1a3f
Author: tielei <43289893@qq.com>
Date: Mon Jul 18 13:52:25 2016 +0800
fix some comments
commit 11a41fb
Author: Otto Kekäläinen <otto@seravo.fi>
Date: Sun Jul 3 10:23:55 2016 +0100
Fix spelling in documentation and comments
commit 5fb5d82
Author: francischan <f1ancis621@gmail.com>
Date: Tue Jun 28 00:19:33 2016 +0800
Fix outdated comments about redis.c file.
It should now refer to server.c file.
commit 6b254bc
Author: lmatt-bit <lmatt123n@gmail.com>
Date: Thu Apr 21 21:45:58 2016 +0800
Refine the comment of dictRehashMilliseconds func
SLAVECONF->REPLCONF in comment - by andyli029
commit ee9869f
Author: clark.kang <charsyam@naver.com>
Date: Tue Mar 22 11:09:51 2016 +0900
fix typos
commit f7b3b11
Author: Harisankar H <harisankarh@gmail.com>
Date: Wed Mar 9 11:49:42 2016 +0530
Typo correction: "faield" --> "failed"
Typo correction: "faield" --> "failed"
commit 3fd40fc
Author: Itamar Haber <itamar@redislabs.com>
Date: Thu Feb 25 10:31:51 2016 +0200
Fixes a typo in comments
commit 621c160
Author: Prayag Verma <prayag.verma@gmail.com>
Date: Mon Feb 1 12:36:20 2016 +0530
Fix typo in Readme.md
Spelling mistakes -
`eviciton` > `eviction`
`familar` > `familiar`
commit d7d07d6
Author: WonCheol Lee <toctoc21c@gmail.com>
Date: Wed Dec 30 15:11:34 2015 +0900
Typo fixed
commit a4dade7
Author: Felix Bünemann <buenemann@louis.info>
Date: Mon Dec 28 11:02:55 2015 +0100
[ci skip] Improve supervised upstart config docs
This mentions that "expect stop" is required for supervised upstart
to work correctly. See http://upstart.ubuntu.com/cookbook/#expect-stop
for an explanation.
commit d9caba9
Author: daurnimator <quae@daurnimator.com>
Date: Mon Dec 21 18:30:03 2015 +1100
README: Remove trailing whitespace
commit 72d42e5
Author: daurnimator <quae@daurnimator.com>
Date: Mon Dec 21 18:29:32 2015 +1100
README: Fix typo. th => the
commit dd6e957
Author: daurnimator <quae@daurnimator.com>
Date: Mon Dec 21 18:29:20 2015 +1100
README: Fix typo. familar => familiar
commit 3a12b23
Author: daurnimator <quae@daurnimator.com>
Date: Mon Dec 21 18:28:54 2015 +1100
README: Fix typo. eviciton => eviction
commit 2d1d03b
Author: daurnimator <quae@daurnimator.com>
Date: Mon Dec 21 18:21:45 2015 +1100
README: Fix typo. sever => server
commit 3973b06
Author: Itamar Haber <itamar@garantiadata.com>
Date: Sat Dec 19 17:01:20 2015 +0200
Typo fix
commit 4f2e460
Author: Steve Gao <fu@2token.com>
Date: Fri Dec 4 10:22:05 2015 +0800
Update README - fix typos
commit b21667c
Author: binyan <binbin.yan@nokia.com>
Date: Wed Dec 2 22:48:37 2015 +0800
delete redundancy color judge in sdscatcolor
commit 88894c7
Author: binyan <binbin.yan@nokia.com>
Date: Wed Dec 2 22:14:42 2015 +0800
the example output shoule be HelloWorld
commit 2763470
Author: binyan <binbin.yan@nokia.com>
Date: Wed Dec 2 17:41:39 2015 +0800
modify error word keyevente
Signed-off-by: binyan <binbin.yan@nokia.com>
commit 0847b3d
Author: Bruno Martins <bscmartins@gmail.com>
Date: Wed Nov 4 11:37:01 2015 +0000
typo
commit bbb9e9e
Author: dawedawe <dawedawe@gmx.de>
Date: Fri Mar 27 00:46:41 2015 +0100
typo: zimap -> zipmap
commit 5ed297e
Author: Axel Advento <badwolf.bloodseeker.rev@gmail.com>
Date: Tue Mar 3 15:58:29 2015 +0800
Fix 'salve' typos to 'slave'
commit edec9d6
Author: LudwikJaniuk <ludvig.janiuk@gmail.com>
Date: Wed Jun 12 14:12:47 2019 +0200
Update README.md
Co-Authored-By: Qix <Qix-@users.noreply.github.com>
commit 692a7af
Author: LudwikJaniuk <ludvig.janiuk@gmail.com>
Date: Tue May 28 14:32:04 2019 +0200
grammar
commit d962b0a
Author: Nick Frost <nickfrostatx@gmail.com>
Date: Wed Jul 20 15:17:12 2016 -0700
Minor grammar fix
commit 24fff01aaccaf5956973ada8c50ceb1462e211c6 (typos)
Author: Chad Miller <chadm@squareup.com>
Date: Tue Sep 8 13:46:11 2020 -0400
Fix faulty comment about operation of unlink()
commit 3cd5c1f3326c52aa552ada7ec797c6bb16452355
Author: Kevin <kevin.xgr@gmail.com>
Date: Wed Nov 20 00:13:50 2019 +0800
Fix typo in server.c.
From a83af59 Mon Sep 17 00:00:00 2001
From: wuwo <wuwo@wacai.com>
Date: Fri, 17 Mar 2017 20:37:45 +0800
Subject: [PATCH] falure to failure
From c961896 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B7=A6=E6=87=B6?= <veficos@gmail.com>
Date: Sat, 27 May 2017 15:33:04 +0800
Subject: [PATCH] fix typo
From e600ef2 Mon Sep 17 00:00:00 2001
From: "rui.zou" <rui.zou@yunify.com>
Date: Sat, 30 Sep 2017 12:38:15 +0800
Subject: [PATCH] fix a typo
From c7d07fa Mon Sep 17 00:00:00 2001
From: Alexandre Perrin <alex@kaworu.ch>
Date: Thu, 16 Aug 2018 10:35:31 +0200
Subject: [PATCH] deps README.md typo
From b25cb67 Mon Sep 17 00:00:00 2001
From: Guy Korland <gkorland@gmail.com>
Date: Wed, 26 Sep 2018 10:55:37 +0300
Subject: [PATCH 1/2] fix typos in header
From ad28ca6 Mon Sep 17 00:00:00 2001
From: Guy Korland <gkorland@gmail.com>
Date: Wed, 26 Sep 2018 11:02:36 +0300
Subject: [PATCH 2/2] fix typos
commit 34924cdedd8552466fc22c1168d49236cb7ee915
Author: Adrian Lynch <adi_ady_ade@hotmail.com>
Date: Sat Apr 4 21:59:15 2015 +0100
Typos fixed
commit fd2a1e7
Author: Jan <jsteemann@users.noreply.github.com>
Date: Sat Oct 27 19:13:01 2018 +0200
Fix typos
Fix typos
commit e14e47c1a234b53b0e103c5f6a1c61481cbcbb02
Author: Andy Lester <andy@petdance.com>
Date: Fri Aug 2 22:30:07 2019 -0500
Fix multiple misspellings of "following"
commit 79b948ce2dac6b453fe80995abbcaac04c213d5a
Author: Andy Lester <andy@petdance.com>
Date: Fri Aug 2 22:24:28 2019 -0500
Fix misspelling of create-cluster
commit 1fffde52666dc99ab35efbd31071a4c008cb5a71
Author: Andy Lester <andy@petdance.com>
Date: Wed Jul 31 17:57:56 2019 -0500
Fix typos
commit 204c9ba9651e9e05fd73936b452b9a30be456cfe
Author: Xiaobo Zhu <xiaobo.zhu@shopee.com>
Date: Tue Aug 13 22:19:25 2019 +0800
fix typos
Squashed commit of the following:
commit 1d9aaf8
Author: danmedani <danmedani@gmail.com>
Date: Sun Aug 2 11:40:26 2015 -0700
README typo fix.
Squashed commit of the following:
commit 32bfa7c
Author: Erik Dubbelboer <erik@dubbelboer.com>
Date: Mon Jul 6 21:15:08 2015 +0200
Fixed grammer
Squashed commit of the following:
commit b24f69c
Author: Sisir Koppaka <sisir.koppaka@gmail.com>
Date: Mon Mar 2 22:38:45 2015 -0500
utils/hashtable/rehashing.c: Fix typos
Squashed commit of the following:
commit 4e04082
Author: Erik Dubbelboer <erik@dubbelboer.com>
Date: Mon Mar 23 08:22:21 2015 +0000
Small config file documentation improvements
Squashed commit of the following:
commit acb8773
Author: ctd1500 <ctd1500@gmail.com>
Date: Fri May 8 01:52:48 2015 -0700
Typo and grammar fixes in readme
commit 2eb75b6
Author: ctd1500 <ctd1500@gmail.com>
Date: Fri May 8 01:36:18 2015 -0700
fixed redis.conf comment
Squashed commit of the following:
commit a8249a2
Author: Masahiko Sawada <sawada.mshk@gmail.com>
Date: Fri Dec 11 11:39:52 2015 +0530
Revise correction of typos.
Squashed commit of the following:
commit 3c02028
Author: zhaojun11 <zhaojun11@jd.com>
Date: Wed Jan 17 19:05:28 2018 +0800
Fix typos include two code typos in cluster.c and latency.c
Squashed commit of the following:
commit 9dba47c
Author: q191201771 <191201771@qq.com>
Date: Sat Jan 4 11:31:04 2020 +0800
fix function listCreate comment in adlist.c
Update src/server.c
commit 2c7c2cb536e78dd211b1ac6f7bda00f0f54faaeb
Author: charpty <charpty@gmail.com>
Date: Tue May 1 23:16:59 2018 +0800
server.c typo: modules system dictionary type comment
Signed-off-by: charpty <charpty@gmail.com>
commit a8395323fb63cb59cb3591cb0f0c8edb7c29a680
Author: Itamar Haber <itamar@redislabs.com>
Date: Sun May 6 00:25:18 2018 +0300
Updates test_helper.tcl's help with undocumented options
Specifically:
* Host
* Port
* Client
commit bde6f9ced15755cd6407b4af7d601b030f36d60b
Author: wxisme <850885154@qq.com>
Date: Wed Aug 8 15:19:19 2018 +0800
fix comments in deps files
commit 3172474ba991532ab799ee1873439f3402412331
Author: wxisme <850885154@qq.com>
Date: Wed Aug 8 14:33:49 2018 +0800
fix some comments
commit 01b6f2b6858b5cf2ce4ad5092d2c746e755f53f0
Author: Thor Juhasz <thor@juhasz.pro>
Date: Sun Nov 18 14:37:41 2018 +0100
Minor fixes to comments
Found some parts a little unclear on a first read, which prompted me to have a better look at the file and fix some minor things I noticed.
Fixing minor typos and grammar. There are no changes to configuration options.
These changes are only meant to help the user better understand the explanations to the various configuration options
2020-09-10 06:43:38 -04:00
|
|
|
* premature optimization bla bla bla. */
|
2016-07-12 06:31:37 -04:00
|
|
|
int klen = sdslen(key);
|
|
|
|
if (klen > EVPOOL_CACHED_SDS_SIZE) {
|
|
|
|
pool[k].key = sdsdup(key);
|
|
|
|
} else {
|
|
|
|
memcpy(pool[k].cached,key,klen+1);
|
|
|
|
sdssetlen(pool[k].cached,klen);
|
|
|
|
pool[k].key = pool[k].cached;
|
|
|
|
}
|
2016-07-06 09:28:18 -04:00
|
|
|
pool[k].idle = idle;
|
2016-07-13 04:45:37 -04:00
|
|
|
pool[k].dbid = dbid;
|
2016-07-06 09:28:18 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-07-15 06:12:52 -04:00
|
|
|
/* ----------------------------------------------------------------------------
|
|
|
|
* LFU (Least Frequently Used) implementation.
|
|
|
|
|
|
|
|
* We have 24 total bits of space in each object in order to implement
|
|
|
|
* an LFU (Least Frequently Used) eviction policy, since we re-use the
|
|
|
|
* LRU field for this purpose.
|
|
|
|
*
|
|
|
|
* We split the 24 bits into two fields:
|
|
|
|
*
|
|
|
|
* 16 bits 8 bits
|
|
|
|
* +----------------+--------+
|
|
|
|
* + Last decr time | LOG_C |
|
|
|
|
* +----------------+--------+
|
|
|
|
*
|
|
|
|
* LOG_C is a logarithmic counter that provides an indication of the access
|
|
|
|
* frequency. However this field must also be decremented otherwise what used
|
|
|
|
* to be a frequently accessed key in the past, will remain ranked like that
|
|
|
|
* forever, while we want the algorithm to adapt to access pattern changes.
|
|
|
|
*
|
|
|
|
* So the remaining 16 bits are used in order to store the "decrement time",
|
|
|
|
* a reduced-precision Unix time (we take 16 bits of the time converted
|
|
|
|
* in minutes since we don't care about wrapping around) where the LOG_C
|
|
|
|
* counter is halved if it has an high value, or just decremented if it
|
|
|
|
* has a low value.
|
|
|
|
*
|
|
|
|
* New keys don't start at zero, in order to have the ability to collect
|
|
|
|
* some accesses before being trashed away, so they start at COUNTER_INIT_VAL.
|
|
|
|
* The logarithmic increment performed on LOG_C takes care of COUNTER_INIT_VAL
|
|
|
|
* when incrementing the key, so that keys starting at COUNTER_INIT_VAL
|
|
|
|
* (or having a smaller value) have a very high chance of being incremented
|
|
|
|
* on access.
|
|
|
|
*
|
|
|
|
* During decrement, the value of the logarithmic counter is halved if
|
|
|
|
* its current value is greater than two times the COUNTER_INIT_VAL, otherwise
|
|
|
|
* it is just decremented by one.
|
|
|
|
* --------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
/* Return the current time in minutes, just taking the least significant
|
|
|
|
* 16 bits. The returned time is suitable to be stored as LDT (last decrement
|
|
|
|
* time) for the LFU implementation. */
|
|
|
|
unsigned long LFUGetTimeInMinutes(void) {
|
|
|
|
return (server.unixtime/60) & 65535;
|
|
|
|
}
|
|
|
|
|
2017-10-15 08:17:55 -04:00
|
|
|
/* Given an object last access time, compute the minimum number of minutes
|
|
|
|
* that elapsed since the last access. Handle overflow (ldt greater than
|
2016-07-15 06:12:52 -04:00
|
|
|
* the current 16 bits minutes time) considering the time as wrapping
|
|
|
|
* exactly once. */
|
|
|
|
unsigned long LFUTimeElapsed(unsigned long ldt) {
|
|
|
|
unsigned long now = LFUGetTimeInMinutes();
|
2016-07-18 08:19:38 -04:00
|
|
|
if (now >= ldt) return now-ldt;
|
2016-07-15 06:12:52 -04:00
|
|
|
return 65535-ldt+now;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Logarithmically increment a counter. The greater is the current counter value
|
|
|
|
* the less likely is that it gets really implemented. Saturate it at 255. */
|
|
|
|
uint8_t LFULogIncr(uint8_t counter) {
|
|
|
|
if (counter == 255) return 255;
|
|
|
|
double r = (double)rand()/RAND_MAX;
|
|
|
|
double baseval = counter - LFU_INIT_VAL;
|
|
|
|
if (baseval < 0) baseval = 0;
|
2016-07-20 09:00:35 -04:00
|
|
|
double p = 1.0/(baseval*server.lfu_log_factor+1);
|
2016-07-15 06:12:52 -04:00
|
|
|
if (r < p) counter++;
|
|
|
|
return counter;
|
|
|
|
}
|
|
|
|
|
2017-10-15 08:17:55 -04:00
|
|
|
/* If the object decrement time is reached decrement the LFU counter but
|
|
|
|
* do not update LFU fields of the object, we update the access time
|
|
|
|
* and counter in an explicit way when the object is really accessed.
|
|
|
|
* And we will times halve the counter according to the times of
|
|
|
|
* elapsed time than server.lfu_decay_time.
|
|
|
|
* Return the object frequency counter.
|
2016-07-15 06:12:52 -04:00
|
|
|
*
|
|
|
|
* This function is used in order to scan the dataset for the best object
|
|
|
|
* to fit: as we check for the candidate, we incrementally decrement the
|
|
|
|
* counter of the scanned objects if needed. */
|
|
|
|
unsigned long LFUDecrAndReturn(robj *o) {
|
|
|
|
unsigned long ldt = o->lru >> 8;
|
|
|
|
unsigned long counter = o->lru & 255;
|
2017-11-27 13:04:58 -05:00
|
|
|
unsigned long num_periods = server.lfu_decay_time ? LFUTimeElapsed(ldt) / server.lfu_decay_time : 0;
|
|
|
|
if (num_periods)
|
|
|
|
counter = (num_periods > counter) ? 0 : counter - num_periods;
|
2016-07-15 06:12:52 -04:00
|
|
|
return counter;
|
|
|
|
}
|
|
|
|
|
2017-02-21 06:25:29 -05:00
|
|
|
/* We don't want to count AOF buffers and slaves output buffers as
|
|
|
|
* used memory: the eviction should use mostly data size. This function
|
|
|
|
* returns the sum of AOF and slaves buffer. */
|
|
|
|
size_t freeMemoryGetNotCountedMemory(void) {
|
|
|
|
size_t overhead = 0;
|
2016-07-06 09:28:18 -04:00
|
|
|
int slaves = listLength(server.slaves);
|
|
|
|
|
|
|
|
if (slaves) {
|
|
|
|
listIter li;
|
|
|
|
listNode *ln;
|
|
|
|
|
|
|
|
listRewind(server.slaves,&li);
|
|
|
|
while((ln = listNext(&li))) {
|
|
|
|
client *slave = listNodeValue(ln);
|
2017-02-21 06:25:29 -05:00
|
|
|
overhead += getClientOutputBufferMemoryUsage(slave);
|
2016-07-06 09:28:18 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if (server.aof_state != AOF_OFF) {
|
2018-10-16 14:47:42 -04:00
|
|
|
overhead += sdsalloc(server.aof_buf)+aofRewriteBufferSize();
|
2016-07-06 09:28:18 -04:00
|
|
|
}
|
2017-02-21 06:25:29 -05:00
|
|
|
return overhead;
|
|
|
|
}
|
|
|
|
|
2018-04-09 11:43:50 -04:00
|
|
|
/* Get the memory status from the point of view of the maxmemory directive:
|
2018-04-11 06:48:26 -04:00
|
|
|
* if the memory used is under the maxmemory setting then C_OK is returned.
|
2018-04-09 11:43:50 -04:00
|
|
|
* Otherwise, if we are over the memory limit, the function returns
|
2018-04-11 06:48:26 -04:00
|
|
|
* C_ERR.
|
|
|
|
*
|
|
|
|
* The function may return additional info via reference, only if the
|
|
|
|
* pointers to the respective arguments is not NULL. Certain fields are
|
|
|
|
* populated only when C_ERR is returned:
|
2018-04-09 11:43:50 -04:00
|
|
|
*
|
|
|
|
* 'total' total amount of bytes used.
|
2018-04-11 06:48:26 -04:00
|
|
|
* (Populated both for C_ERR and C_OK)
|
2018-04-09 11:43:50 -04:00
|
|
|
*
|
|
|
|
* 'logical' the amount of memory used minus the slaves/AOF buffers.
|
2018-04-11 06:48:26 -04:00
|
|
|
* (Populated when C_ERR is returned)
|
2018-04-09 11:43:50 -04:00
|
|
|
*
|
|
|
|
* 'tofree' the amount of memory that should be released
|
|
|
|
* in order to return back into the memory limits.
|
2018-04-11 06:48:26 -04:00
|
|
|
* (Populated when C_ERR is returned)
|
|
|
|
*
|
|
|
|
* 'level' this usually ranges from 0 to 1, and reports the amount of
|
|
|
|
* memory currently used. May be > 1 if we are over the memory
|
|
|
|
* limit.
|
|
|
|
* (Populated both for C_ERR and C_OK)
|
2018-04-09 11:43:50 -04:00
|
|
|
*/
|
2018-04-11 06:48:26 -04:00
|
|
|
int getMaxmemoryState(size_t *total, size_t *logical, size_t *tofree, float *level) {
|
2018-04-09 11:43:50 -04:00
|
|
|
size_t mem_reported, mem_used, mem_tofree;
|
|
|
|
|
|
|
|
/* Check if we are over the memory usage limit. If we are not, no need
|
|
|
|
* to subtract the slaves output buffers. We can just return ASAP. */
|
|
|
|
mem_reported = zmalloc_used_memory();
|
2018-04-11 06:48:26 -04:00
|
|
|
if (total) *total = mem_reported;
|
|
|
|
|
|
|
|
/* We may return ASAP if there is no need to compute the level. */
|
|
|
|
int return_ok_asap = !server.maxmemory || mem_reported <= server.maxmemory;
|
|
|
|
if (return_ok_asap && !level) return C_OK;
|
2018-04-09 11:43:50 -04:00
|
|
|
|
|
|
|
/* Remove the size of slaves output buffers and AOF buffer from the
|
|
|
|
* count of used memory. */
|
|
|
|
mem_used = mem_reported;
|
|
|
|
size_t overhead = freeMemoryGetNotCountedMemory();
|
|
|
|
mem_used = (mem_used > overhead) ? mem_used-overhead : 0;
|
|
|
|
|
2018-04-11 06:48:26 -04:00
|
|
|
/* Compute the ratio of memory usage. */
|
|
|
|
if (level) {
|
|
|
|
if (!server.maxmemory) {
|
|
|
|
*level = 0;
|
|
|
|
} else {
|
|
|
|
*level = (float)mem_used / (float)server.maxmemory;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (return_ok_asap) return C_OK;
|
|
|
|
|
2018-04-09 11:43:50 -04:00
|
|
|
/* Check if we are still over the memory limit. */
|
|
|
|
if (mem_used <= server.maxmemory) return C_OK;
|
|
|
|
|
|
|
|
/* Compute how much memory we need to free. */
|
|
|
|
mem_tofree = mem_used - server.maxmemory;
|
|
|
|
|
2018-04-11 06:48:26 -04:00
|
|
|
if (logical) *logical = mem_used;
|
|
|
|
if (tofree) *tofree = mem_tofree;
|
2018-04-09 11:43:50 -04:00
|
|
|
|
|
|
|
return C_ERR;
|
|
|
|
}
|
|
|
|
|
Limit the main db and expires dictionaries to expand (#7954)
As we know, redis may reject user's requests or evict some keys if
used memory is over maxmemory. Dictionaries expanding may make
things worse, some big dictionaries, such as main db and expires dict,
may eat huge memory at once for allocating a new big hash table and be
far more than maxmemory after expanding.
There are related issues: #4213 #4583
More details, when expand dict in redis, we will allocate a new big
ht[1] that generally is double of ht[0], The size of ht[1] will be
very big if ht[0] already is big. For db dict, if we have more than
64 million keys, we need to cost 1GB for ht[1] when dict expands.
If the sum of used memory and new hash table of dict needed exceeds
maxmemory, we shouldn't allow the dict to expand. Because, if we
enable keys eviction, we still couldn't add much more keys after
eviction and rehashing, what's worse, redis will keep less keys when
redis only remains a little memory for storing new hash table instead
of users' data. Moreover users can't write data in redis if disable
keys eviction.
What this commit changed ?
Add a new member function expandAllowed for dict type, it provide a way
for caller to allow expand or not. We expose two parameters for this
function: more memory needed for expanding and dict current load factor,
users can implement a function to make a decision by them.
For main db dict and expires dict type, these dictionaries may be very
big and cost huge memory for expanding, so we implement a judgement
function: we can stop dict to expand provisionally if used memory will
be over maxmemory after dict expands, but to guarantee the performance
of redis, we still allow dict to expand if dict load factor exceeds the
safe load factor.
Add test cases to verify we don't allow main db to expand when left
memory is not enough, so that avoid keys eviction.
Other changes:
For new hash table size when expand. Before this commit, the size is
that double used of dict and later _dictNextPower. Actually we aim to
control a dict load factor between 0.5 and 1.0. Now we replace *2 with
+1, since the first check is that used >= size, the outcome of before
will usually be the same as _dictNextPower(used+1). The only case where
it'll differ is when dict_can_resize is false during fork, so that later
the _dictNextPower(used*2) will cause the dict to jump to *4 (i.e.
_dictNextPower(1025*2) will return 4096).
Fix rehash test cases due to changing algorithm of new hash table size
when expand.
2020-12-06 04:53:04 -05:00
|
|
|
/* Return 1 if used memory is more than maxmemory after allocating more memory,
|
|
|
|
* return 0 if not. Redis may reject user's requests or evict some keys if used
|
|
|
|
* memory exceeds maxmemory, especially, when we allocate huge memory at once. */
|
|
|
|
int overMaxmemoryAfterAlloc(size_t moremem) {
|
|
|
|
if (!server.maxmemory) return 0; /* No limit. */
|
|
|
|
|
|
|
|
/* Check quickly. */
|
|
|
|
size_t mem_used = zmalloc_used_memory();
|
|
|
|
if (mem_used + moremem <= server.maxmemory) return 0;
|
|
|
|
|
|
|
|
size_t overhead = freeMemoryGetNotCountedMemory();
|
|
|
|
mem_used = (mem_used > overhead) ? mem_used - overhead : 0;
|
|
|
|
return mem_used + moremem > server.maxmemory;
|
|
|
|
}
|
2020-09-16 02:16:01 -04:00
|
|
|
|
|
|
|
/* The evictionTimeProc is started when "maxmemory" has been breached and
|
|
|
|
* could not immediately be resolved. This will spin the event loop with short
|
|
|
|
* eviction cycles until the "maxmemory" condition has resolved or there are no
|
|
|
|
* more evictable items. */
|
|
|
|
static int isEvictionProcRunning = 0;
|
|
|
|
static int evictionTimeProc(
|
|
|
|
struct aeEventLoop *eventLoop, long long id, void *clientData) {
|
|
|
|
UNUSED(eventLoop);
|
|
|
|
UNUSED(id);
|
|
|
|
UNUSED(clientData);
|
|
|
|
|
|
|
|
if (performEvictions() == EVICT_RUNNING) return 0; /* keep evicting */
|
|
|
|
|
|
|
|
/* For EVICT_OK - things are good, no need to keep evicting.
|
|
|
|
* For EVICT_FAIL - there is nothing left to evict. */
|
|
|
|
isEvictionProcRunning = 0;
|
|
|
|
return AE_NOMORE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check if it's safe to perform evictions.
|
|
|
|
* Returns 1 if evictions can be performed
|
|
|
|
* Returns 0 if eviction processing should be skipped
|
|
|
|
*/
|
|
|
|
static int isSafeToPerformEvictions(void) {
|
|
|
|
/* - There must be no script in timeout condition.
|
|
|
|
* - Nor we are loading data right now. */
|
|
|
|
if (server.lua_timedout || server.loading) return 0;
|
|
|
|
|
2018-12-11 11:25:24 -05:00
|
|
|
/* By default replicas should ignore maxmemory
|
2018-12-12 05:37:15 -05:00
|
|
|
* and just be masters exact copies. */
|
2020-09-16 02:16:01 -04:00
|
|
|
if (server.masterhost && server.repl_slave_ignore_maxmemory) return 0;
|
|
|
|
|
|
|
|
/* When clients are paused the dataset should be static not just from the
|
|
|
|
* POV of clients not being able to write, but also from the POV of
|
|
|
|
* expires and evictions of keys not being performed. */
|
|
|
|
if (clientsArePaused()) return 0;
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Algorithm for converting tenacity (0-100) to a time limit. */
|
|
|
|
static unsigned long evictionTimeLimitUs() {
|
|
|
|
serverAssert(server.maxmemory_eviction_tenacity >= 0);
|
|
|
|
serverAssert(server.maxmemory_eviction_tenacity <= 100);
|
|
|
|
|
|
|
|
if (server.maxmemory_eviction_tenacity <= 10) {
|
|
|
|
/* A linear progression from 0..500us */
|
|
|
|
return 50uL * server.maxmemory_eviction_tenacity;
|
|
|
|
}
|
2018-08-27 06:09:08 -04:00
|
|
|
|
2020-09-16 02:16:01 -04:00
|
|
|
if (server.maxmemory_eviction_tenacity < 100) {
|
|
|
|
/* A 15% geometric progression, resulting in a limit of ~2 min at tenacity==99 */
|
|
|
|
return (unsigned long)(500.0 * pow(1.15, server.maxmemory_eviction_tenacity - 10.0));
|
|
|
|
}
|
|
|
|
|
|
|
|
return ULONG_MAX; /* No limit to eviction time */
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check that memory usage is within the current "maxmemory" limit. If over
|
|
|
|
* "maxmemory", attempt to free memory by evicting data (if it's safe to do so).
|
|
|
|
*
|
|
|
|
* It's possible for Redis to suddenly be significantly over the "maxmemory"
|
|
|
|
* setting. This can happen if there is a large allocation (like a hash table
|
|
|
|
* resize) or even if the "maxmemory" setting is manually adjusted. Because of
|
|
|
|
* this, it's important to evict for a managed period of time - otherwise Redis
|
|
|
|
* would become unresponsive while evicting.
|
|
|
|
*
|
|
|
|
* The goal of this function is to improve the memory situation - not to
|
|
|
|
* immediately resolve it. In the case that some items have been evicted but
|
|
|
|
* the "maxmemory" limit has not been achieved, an aeTimeProc will be started
|
|
|
|
* which will continue to evict items until memory limits are achieved or
|
|
|
|
* nothing more is evictable.
|
|
|
|
*
|
|
|
|
* This should be called before execution of commands. If EVICT_FAIL is
|
|
|
|
* returned, commands which will result in increased memory usage should be
|
|
|
|
* rejected.
|
|
|
|
*
|
|
|
|
* Returns:
|
|
|
|
* EVICT_OK - memory is OK or it's not possible to perform evictions now
|
|
|
|
* EVICT_RUNNING - memory is over the limit, but eviction is still processing
|
|
|
|
* EVICT_FAIL - memory is over the limit, and there's nothing to evict
|
|
|
|
* */
|
|
|
|
int performEvictions(void) {
|
|
|
|
if (!isSafeToPerformEvictions()) return EVICT_OK;
|
|
|
|
|
|
|
|
int keys_freed = 0;
|
2020-10-13 12:50:57 -04:00
|
|
|
size_t mem_reported, mem_tofree;
|
|
|
|
long long mem_freed; /* May be negative */
|
2020-09-16 02:16:01 -04:00
|
|
|
mstime_t latency, eviction_latency;
|
2017-02-21 06:25:29 -05:00
|
|
|
long long delta;
|
|
|
|
int slaves = listLength(server.slaves);
|
2020-09-16 02:16:01 -04:00
|
|
|
int result = EVICT_FAIL;
|
2017-02-21 06:25:29 -05:00
|
|
|
|
2018-04-11 06:48:26 -04:00
|
|
|
if (getMaxmemoryState(&mem_reported,NULL,&mem_tofree,NULL) == C_OK)
|
2020-09-16 02:16:01 -04:00
|
|
|
return EVICT_OK;
|
|
|
|
|
|
|
|
if (server.maxmemory_policy == MAXMEMORY_NO_EVICTION)
|
|
|
|
return EVICT_FAIL; /* We need to free memory, but policy forbids. */
|
|
|
|
|
|
|
|
unsigned long eviction_time_limit_us = evictionTimeLimitUs();
|
2017-06-01 17:24:10 -04:00
|
|
|
|
2016-07-06 09:28:18 -04:00
|
|
|
mem_freed = 0;
|
|
|
|
|
2019-02-27 06:38:03 -05:00
|
|
|
latencyStartMonitor(latency);
|
2020-09-16 02:16:01 -04:00
|
|
|
|
|
|
|
monotime evictionTimer;
|
|
|
|
elapsedStart(&evictionTimer);
|
2016-07-06 09:28:18 -04:00
|
|
|
|
2020-10-13 12:50:57 -04:00
|
|
|
while (mem_freed < (long long)mem_tofree) {
|
2019-10-06 06:55:21 -04:00
|
|
|
int j, k, i;
|
2018-01-10 10:47:02 -05:00
|
|
|
static unsigned int next_db = 0;
|
2016-07-13 04:45:37 -04:00
|
|
|
sds bestkey = NULL;
|
|
|
|
int bestdbid;
|
|
|
|
redisDb *db;
|
|
|
|
dict *dict;
|
|
|
|
dictEntry *de;
|
2016-07-06 09:28:18 -04:00
|
|
|
|
2016-07-20 13:53:27 -04:00
|
|
|
if (server.maxmemory_policy & (MAXMEMORY_FLAG_LRU|MAXMEMORY_FLAG_LFU) ||
|
|
|
|
server.maxmemory_policy == MAXMEMORY_VOLATILE_TTL)
|
|
|
|
{
|
2016-07-13 04:45:37 -04:00
|
|
|
struct evictionPoolEntry *pool = EvictionPoolLRU;
|
|
|
|
|
|
|
|
while(bestkey == NULL) {
|
|
|
|
unsigned long total_keys = 0, keys;
|
|
|
|
|
|
|
|
/* We don't want to make local-db choices when expiring keys,
|
|
|
|
* so to start populate the eviction pool sampling keys from
|
|
|
|
* every DB. */
|
|
|
|
for (i = 0; i < server.dbnum; i++) {
|
|
|
|
db = server.db+i;
|
2016-07-20 13:53:27 -04:00
|
|
|
dict = (server.maxmemory_policy & MAXMEMORY_FLAG_ALLKEYS) ?
|
2016-07-13 04:45:37 -04:00
|
|
|
db->dict : db->expires;
|
|
|
|
if ((keys = dictSize(dict)) != 0) {
|
|
|
|
evictionPoolPopulate(i, dict, db->dict, pool);
|
|
|
|
total_keys += keys;
|
2016-07-06 09:28:18 -04:00
|
|
|
}
|
|
|
|
}
|
2016-07-13 04:45:37 -04:00
|
|
|
if (!total_keys) break; /* No keys to evict. */
|
|
|
|
|
|
|
|
/* Go backward from best to worst element to evict. */
|
|
|
|
for (k = EVPOOL_SIZE-1; k >= 0; k--) {
|
|
|
|
if (pool[k].key == NULL) continue;
|
|
|
|
bestdbid = pool[k].dbid;
|
|
|
|
|
2016-07-20 13:53:27 -04:00
|
|
|
if (server.maxmemory_policy & MAXMEMORY_FLAG_ALLKEYS) {
|
2016-07-13 04:45:37 -04:00
|
|
|
de = dictFind(server.db[pool[k].dbid].dict,
|
|
|
|
pool[k].key);
|
|
|
|
} else {
|
|
|
|
de = dictFind(server.db[pool[k].dbid].expires,
|
|
|
|
pool[k].key);
|
|
|
|
}
|
2016-07-06 09:28:18 -04:00
|
|
|
|
2016-07-13 04:45:37 -04:00
|
|
|
/* Remove the entry from the pool. */
|
|
|
|
if (pool[k].key != pool[k].cached)
|
|
|
|
sdsfree(pool[k].key);
|
|
|
|
pool[k].key = NULL;
|
|
|
|
pool[k].idle = 0;
|
|
|
|
|
|
|
|
/* If the key exists, is our pick. Otherwise it is
|
|
|
|
* a ghost and we need to try the next element. */
|
|
|
|
if (de) {
|
|
|
|
bestkey = dictGetKey(de);
|
|
|
|
break;
|
|
|
|
} else {
|
|
|
|
/* Ghost... Iterate again. */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2016-07-06 09:28:18 -04:00
|
|
|
|
2016-07-13 04:45:37 -04:00
|
|
|
/* volatile-random and allkeys-random policy */
|
|
|
|
else if (server.maxmemory_policy == MAXMEMORY_ALLKEYS_RANDOM ||
|
|
|
|
server.maxmemory_policy == MAXMEMORY_VOLATILE_RANDOM)
|
|
|
|
{
|
|
|
|
/* When evicting a random key, we try to evict a key for
|
|
|
|
* each DB, so we use the static 'next_db' variable to
|
|
|
|
* incrementally visit all DBs. */
|
|
|
|
for (i = 0; i < server.dbnum; i++) {
|
|
|
|
j = (++next_db) % server.dbnum;
|
|
|
|
db = server.db+j;
|
|
|
|
dict = (server.maxmemory_policy == MAXMEMORY_ALLKEYS_RANDOM) ?
|
|
|
|
db->dict : db->expires;
|
|
|
|
if (dictSize(dict) != 0) {
|
2016-07-06 09:28:18 -04:00
|
|
|
de = dictGetRandomKey(dict);
|
2016-07-13 04:45:37 -04:00
|
|
|
bestkey = dictGetKey(de);
|
|
|
|
bestdbid = j;
|
|
|
|
break;
|
2016-07-06 09:28:18 -04:00
|
|
|
}
|
|
|
|
}
|
2016-07-13 04:45:37 -04:00
|
|
|
}
|
2016-07-06 09:28:18 -04:00
|
|
|
|
2016-07-13 04:45:37 -04:00
|
|
|
/* Finally remove the selected key. */
|
|
|
|
if (bestkey) {
|
|
|
|
db = server.db+bestdbid;
|
|
|
|
robj *keyobj = createStringObject(bestkey,sdslen(bestkey));
|
|
|
|
propagateExpire(db,keyobj,server.lazyfree_lazy_eviction);
|
|
|
|
/* We compute the amount of memory freed by db*Delete() alone.
|
|
|
|
* It is possible that actually the memory needed to propagate
|
|
|
|
* the DEL in AOF and replication link is greater than the one
|
|
|
|
* we are freeing removing the key, but we can't account for
|
|
|
|
* that otherwise we would never exit the loop.
|
|
|
|
*
|
2020-12-06 07:51:22 -05:00
|
|
|
* Same for CSC invalidation messages generated by signalModifiedKey.
|
|
|
|
*
|
2016-07-13 04:45:37 -04:00
|
|
|
* AOF and Output buffer memory will be freed eventually so
|
|
|
|
* we only care about memory used by the key space. */
|
|
|
|
delta = (long long) zmalloc_used_memory();
|
|
|
|
latencyStartMonitor(eviction_latency);
|
|
|
|
if (server.lazyfree_lazy_eviction)
|
|
|
|
dbAsyncDelete(db,keyobj);
|
|
|
|
else
|
|
|
|
dbSyncDelete(db,keyobj);
|
|
|
|
latencyEndMonitor(eviction_latency);
|
|
|
|
latencyAddSampleIfNeeded("eviction-del",eviction_latency);
|
|
|
|
delta -= (long long) zmalloc_used_memory();
|
|
|
|
mem_freed += delta;
|
|
|
|
server.stat_evictedkeys++;
|
2020-12-06 07:51:22 -05:00
|
|
|
signalModifiedKey(NULL,db,keyobj);
|
2016-07-13 04:45:37 -04:00
|
|
|
notifyKeyspaceEvent(NOTIFY_EVICTED, "evicted",
|
|
|
|
keyobj, db->id);
|
|
|
|
decrRefCount(keyobj);
|
|
|
|
keys_freed++;
|
|
|
|
|
2020-09-16 02:16:01 -04:00
|
|
|
if (keys_freed % 16 == 0) {
|
|
|
|
/* When the memory to free starts to be big enough, we may
|
|
|
|
* start spending so much time here that is impossible to
|
|
|
|
* deliver data to the replicas fast enough, so we force the
|
|
|
|
* transmission here inside the loop. */
|
|
|
|
if (slaves) flushSlavesOutputBuffers();
|
|
|
|
|
|
|
|
/* Normally our stop condition is the ability to release
|
|
|
|
* a fixed, pre-computed amount of memory. However when we
|
|
|
|
* are deleting objects in another thread, it's better to
|
|
|
|
* check, from time to time, if we already reached our target
|
|
|
|
* memory, since the "mem_freed" amount is computed only
|
|
|
|
* across the dbAsyncDelete() call, while the thread can
|
|
|
|
* release the memory all the time. */
|
|
|
|
if (server.lazyfree_lazy_eviction) {
|
|
|
|
if (getMaxmemoryState(NULL,NULL,NULL,NULL) == C_OK) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* After some time, exit the loop early - even if memory limit
|
|
|
|
* hasn't been reached. If we suddenly need to free a lot of
|
|
|
|
* memory, don't want to spend too much time here. */
|
|
|
|
if (elapsedUs(evictionTimer) > eviction_time_limit_us) {
|
|
|
|
// We still need to free memory - start eviction timer proc
|
|
|
|
if (!isEvictionProcRunning) {
|
|
|
|
isEvictionProcRunning = 1;
|
|
|
|
aeCreateTimeEvent(server.el, 0,
|
|
|
|
evictionTimeProc, NULL, NULL);
|
|
|
|
}
|
|
|
|
break;
|
2017-02-21 06:25:29 -05:00
|
|
|
}
|
|
|
|
}
|
2019-10-06 06:55:21 -04:00
|
|
|
} else {
|
2016-07-06 09:28:18 -04:00
|
|
|
goto cant_free; /* nothing to free... */
|
|
|
|
}
|
|
|
|
}
|
2020-09-16 02:16:01 -04:00
|
|
|
/* at this point, the memory is OK, or we have reached the time limit */
|
|
|
|
result = (isEvictionProcRunning) ? EVICT_RUNNING : EVICT_OK;
|
2016-07-06 09:28:18 -04:00
|
|
|
|
|
|
|
cant_free:
|
2020-09-16 02:16:01 -04:00
|
|
|
if (result == EVICT_FAIL) {
|
|
|
|
/* At this point, we have run out of evictable items. It's possible
|
|
|
|
* that some items are being freed in the lazyfree thread. Perform a
|
|
|
|
* short wait here if such jobs exist, but don't wait long. */
|
|
|
|
if (bioPendingJobsOfType(BIO_LAZY_FREE)) {
|
|
|
|
usleep(eviction_time_limit_us);
|
2019-02-27 06:38:03 -05:00
|
|
|
if (getMaxmemoryState(NULL,NULL,NULL,NULL) == C_OK) {
|
2020-09-16 02:16:01 -04:00
|
|
|
result = EVICT_OK;
|
2019-02-27 06:38:03 -05:00
|
|
|
}
|
|
|
|
}
|
2016-07-06 09:28:18 -04:00
|
|
|
}
|
2020-09-16 02:16:01 -04:00
|
|
|
|
2019-02-27 06:38:03 -05:00
|
|
|
latencyEndMonitor(latency);
|
|
|
|
latencyAddSampleIfNeeded("eviction-cycle",latency);
|
|
|
|
return result;
|
2016-07-06 09:28:18 -04:00
|
|
|
}
|
|
|
|
|