Commit 2ae7f491 authored by Oran Agra's avatar Oran Agra
Browse files

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: default avatarItamar 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: default avatarItamar 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 af347a8c
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 3df1eb85
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 e504583b
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 46a51cdc
Author: 杨东衡 <yangdongheng@xiaomi.com>
Date:   Tue Dec 4 23:56:11 2018 +0800

    Merge branch 'unstable' of antirez/redis into unstable

commit 42b02b7
Merge: 68c0e6e3 b8febe60


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: default avatarBo 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: default avatarbinyan <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: default avatarQix <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: default avatarcharpty <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

(cherry picked from commit 1c710385)
parent 03b59cd5
...@@ -62,7 +62,7 @@ int keyspaceEventsStringToFlags(char *classes) { ...@@ -62,7 +62,7 @@ int keyspaceEventsStringToFlags(char *classes) {
return flags; return flags;
} }
/* This function does exactly the revese of the function above: it gets /* This function does exactly the reverse of the function above: it gets
* as input an integer with the xored flags and returns a string representing * as input an integer with the xored flags and returns a string representing
* the selected classes. The string returned is an sds string that needs to * the selected classes. The string returned is an sds string that needs to
* be released with sdsfree(). */ * be released with sdsfree(). */
......
...@@ -126,7 +126,7 @@ robj *createStringObject(const char *ptr, size_t len) { ...@@ -126,7 +126,7 @@ robj *createStringObject(const char *ptr, size_t len) {
/* Create a string object from a long long value. When possible returns a /* Create a string object from a long long value. When possible returns a
* shared integer object, or at least an integer encoded one. * shared integer object, or at least an integer encoded one.
* *
* If valueobj is non zero, the function avoids returning a a shared * If valueobj is non zero, the function avoids returning a shared
* integer, because the object is going to be used as value in the Redis key * integer, because the object is going to be used as value in the Redis key
* space (for instance when the INCR command is used), so we want LFU/LRU * space (for instance when the INCR command is used), so we want LFU/LRU
* values specific for each key. */ * values specific for each key. */
...@@ -1223,7 +1223,7 @@ robj *objectCommandLookupOrReply(client *c, robj *key, robj *reply) { ...@@ -1223,7 +1223,7 @@ robj *objectCommandLookupOrReply(client *c, robj *key, robj *reply) {
return o; return o;
} }
/* Object command allows to inspect the internals of an Redis Object. /* Object command allows to inspect the internals of a Redis Object.
* Usage: OBJECT <refcount|encoding|idletime|freq> <key> */ * Usage: OBJECT <refcount|encoding|idletime|freq> <key> */
void objectCommand(client *c) { void objectCommand(client *c) {
robj *o; robj *o;
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
* count: 16 bits, max 65536 (max zl bytes is 65k, so max count actually < 32k). * count: 16 bits, max 65536 (max zl bytes is 65k, so max count actually < 32k).
* encoding: 2 bits, RAW=1, LZF=2. * encoding: 2 bits, RAW=1, LZF=2.
* container: 2 bits, NONE=1, ZIPLIST=2. * container: 2 bits, NONE=1, ZIPLIST=2.
* recompress: 1 bit, bool, true if node is temporarry decompressed for usage. * recompress: 1 bit, bool, true if node is temporary decompressed for usage.
* attempted_compress: 1 bit, boolean, used for verifying during testing. * attempted_compress: 1 bit, boolean, used for verifying during testing.
* extra: 10 bits, free for future use; pads out the remainder of 32 bits */ * extra: 10 bits, free for future use; pads out the remainder of 32 bits */
typedef struct quicklistNode { typedef struct quicklistNode {
...@@ -97,7 +97,7 @@ typedef struct quicklistBookmark { ...@@ -97,7 +97,7 @@ typedef struct quicklistBookmark {
/* quicklist is a 40 byte struct (on 64-bit systems) describing a quicklist. /* quicklist is a 40 byte struct (on 64-bit systems) describing a quicklist.
* 'count' is the number of total entries. * 'count' is the number of total entries.
* 'len' is the number of quicklist nodes. * 'len' is the number of quicklist nodes.
* 'compress' is: -1 if compression disabled, otherwise it's the number * 'compress' is: 0 if compression disabled, otherwise it's the number
* of quicklistNodes to leave uncompressed at ends of quicklist. * of quicklistNodes to leave uncompressed at ends of quicklist.
* 'fill' is the user-requested (or default) fill factor. * 'fill' is the user-requested (or default) fill factor.
* 'bookmakrs are an optional feature that is used by realloc this struct, * 'bookmakrs are an optional feature that is used by realloc this struct,
......
...@@ -628,7 +628,7 @@ int raxGenericInsert(rax *rax, unsigned char *s, size_t len, void *data, void ** ...@@ -628,7 +628,7 @@ int raxGenericInsert(rax *rax, unsigned char *s, size_t len, void *data, void **
* *
* 3b. IF $SPLITPOS != 0: * 3b. IF $SPLITPOS != 0:
* Trim the compressed node (reallocating it as well) in order to * Trim the compressed node (reallocating it as well) in order to
* contain $splitpos characters. Change chilid pointer in order to link * contain $splitpos characters. Change child pointer in order to link
* to the split node. If new compressed node len is just 1, set * to the split node. If new compressed node len is just 1, set
* iscompr to 0 (layout is the same). Fix parent's reference. * iscompr to 0 (layout is the same). Fix parent's reference.
* *
...@@ -1082,7 +1082,7 @@ int raxRemove(rax *rax, unsigned char *s, size_t len, void **old) { ...@@ -1082,7 +1082,7 @@ int raxRemove(rax *rax, unsigned char *s, size_t len, void **old) {
} }
} else if (h->size == 1) { } else if (h->size == 1) {
/* If the node had just one child, after the removal of the key /* If the node had just one child, after the removal of the key
* further compression with adjacent nodes is pontentially possible. */ * further compression with adjacent nodes is potentially possible. */
trycompress = 1; trycompress = 1;
} }
...@@ -1329,7 +1329,7 @@ int raxIteratorNextStep(raxIterator *it, int noup) { ...@@ -1329,7 +1329,7 @@ int raxIteratorNextStep(raxIterator *it, int noup) {
if (!noup && children) { if (!noup && children) {
debugf("GO DEEPER\n"); debugf("GO DEEPER\n");
/* Seek the lexicographically smaller key in this subtree, which /* Seek the lexicographically smaller key in this subtree, which
* is the first one found always going torwards the first child * is the first one found always going towards the first child
* of every successive node. */ * of every successive node. */
if (!raxStackPush(&it->stack,it->node)) return 0; if (!raxStackPush(&it->stack,it->node)) return 0;
raxNode **cp = raxNodeFirstChildPtr(it->node); raxNode **cp = raxNodeFirstChildPtr(it->node);
...@@ -1348,7 +1348,7 @@ int raxIteratorNextStep(raxIterator *it, int noup) { ...@@ -1348,7 +1348,7 @@ int raxIteratorNextStep(raxIterator *it, int noup) {
return 1; return 1;
} }
} else { } else {
/* If we finished exporing the previous sub-tree, switch to the /* If we finished exploring the previous sub-tree, switch to the
* new one: go upper until a node is found where there are * new one: go upper until a node is found where there are
* children representing keys lexicographically greater than the * children representing keys lexicographically greater than the
* current key. */ * current key. */
...@@ -1510,7 +1510,7 @@ int raxIteratorPrevStep(raxIterator *it, int noup) { ...@@ -1510,7 +1510,7 @@ int raxIteratorPrevStep(raxIterator *it, int noup) {
int raxSeek(raxIterator *it, const char *op, unsigned char *ele, size_t len) { int raxSeek(raxIterator *it, const char *op, unsigned char *ele, size_t len) {
int eq = 0, lt = 0, gt = 0, first = 0, last = 0; int eq = 0, lt = 0, gt = 0, first = 0, last = 0;
it->stack.items = 0; /* Just resetting. Intialized by raxStart(). */ it->stack.items = 0; /* Just resetting. Initialized by raxStart(). */
it->flags |= RAX_ITER_JUST_SEEKED; it->flags |= RAX_ITER_JUST_SEEKED;
it->flags &= ~RAX_ITER_EOF; it->flags &= ~RAX_ITER_EOF;
it->key_len = 0; it->key_len = 0;
...@@ -1731,7 +1731,7 @@ int raxPrev(raxIterator *it) { ...@@ -1731,7 +1731,7 @@ int raxPrev(raxIterator *it) {
* tree, expect a disappointing distribution. A random walk produces good * tree, expect a disappointing distribution. A random walk produces good
* random elements if the tree is not sparse, however in the case of a radix * random elements if the tree is not sparse, however in the case of a radix
* tree certain keys will be reported much more often than others. At least * tree certain keys will be reported much more often than others. At least
* this function should be able to expore every possible element eventually. */ * this function should be able to explore every possible element eventually. */
int raxRandomWalk(raxIterator *it, size_t steps) { int raxRandomWalk(raxIterator *it, size_t steps) {
if (it->rt->numele == 0) { if (it->rt->numele == 0) {
it->flags |= RAX_ITER_EOF; it->flags |= RAX_ITER_EOF;
...@@ -1825,7 +1825,7 @@ uint64_t raxSize(rax *rax) { ...@@ -1825,7 +1825,7 @@ uint64_t raxSize(rax *rax) {
/* ----------------------------- Introspection ------------------------------ */ /* ----------------------------- Introspection ------------------------------ */
/* This function is mostly used for debugging and learning purposes. /* This function is mostly used for debugging and learning purposes.
* It shows an ASCII representation of a tree on standard output, outling * It shows an ASCII representation of a tree on standard output, outline
* all the nodes and the contained keys. * all the nodes and the contained keys.
* *
* The representation is as follow: * The representation is as follow:
...@@ -1835,7 +1835,7 @@ uint64_t raxSize(rax *rax) { ...@@ -1835,7 +1835,7 @@ uint64_t raxSize(rax *rax) {
* [abc]=0x12345678 (node is a key, pointing to value 0x12345678) * [abc]=0x12345678 (node is a key, pointing to value 0x12345678)
* [] (a normal empty node) * [] (a normal empty node)
* *
* Children are represented in new idented lines, each children prefixed by * Children are represented in new indented lines, each children prefixed by
* the "`-(x)" string, where "x" is the edge byte. * the "`-(x)" string, where "x" is the edge byte.
* *
* [abc] * [abc]
......
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
* successive nodes having a single child are "compressed" into the node * successive nodes having a single child are "compressed" into the node
* itself as a string of characters, each representing a next-level child, * itself as a string of characters, each representing a next-level child,
* and only the link to the node representing the last character node is * and only the link to the node representing the last character node is
* provided inside the representation. So the above representation is turend * provided inside the representation. So the above representation is turned
* into: * into:
* *
* ["foo"] "" * ["foo"] ""
...@@ -123,7 +123,7 @@ typedef struct raxNode { ...@@ -123,7 +123,7 @@ typedef struct raxNode {
* nodes). * nodes).
* *
* If the node has an associated key (iskey=1) and is not NULL * If the node has an associated key (iskey=1) and is not NULL
* (isnull=0), then after the raxNode pointers poiting to the * (isnull=0), then after the raxNode pointers pointing to the
* children, an additional value pointer is present (as you can see * children, an additional value pointer is present (as you can see
* in the representation above as "value-ptr" field). * in the representation above as "value-ptr" field).
*/ */
......
...@@ -2172,7 +2172,7 @@ int rdbLoadRio(rio *rdb, int rdbflags, rdbSaveInfo *rsi) { ...@@ -2172,7 +2172,7 @@ int rdbLoadRio(rio *rdb, int rdbflags, rdbSaveInfo *rsi) {
} else if (type == RDB_OPCODE_AUX) { } else if (type == RDB_OPCODE_AUX) {
/* AUX: generic string-string fields. Use to add state to RDB /* AUX: generic string-string fields. Use to add state to RDB
* which is backward compatible. Implementations of RDB loading * which is backward compatible. Implementations of RDB loading
* are requierd to skip AUX fields they don't understand. * are required to skip AUX fields they don't understand.
* *
* An AUX field is composed of two strings: key and value. */ * An AUX field is composed of two strings: key and value. */
robj *auxkey, *auxval; robj *auxkey, *auxval;
...@@ -2421,7 +2421,7 @@ void backgroundSaveDoneHandlerDisk(int exitcode, int bysignal) { ...@@ -2421,7 +2421,7 @@ void backgroundSaveDoneHandlerDisk(int exitcode, int bysignal) {
latencyEndMonitor(latency); latencyEndMonitor(latency);
latencyAddSampleIfNeeded("rdb-unlink-temp-file",latency); latencyAddSampleIfNeeded("rdb-unlink-temp-file",latency);
/* SIGUSR1 is whitelisted, so we have a way to kill a child without /* SIGUSR1 is whitelisted, so we have a way to kill a child without
* tirggering an error condition. */ * triggering an error condition. */
if (bysignal != SIGUSR1) if (bysignal != SIGUSR1)
server.lastbgsave_status = C_ERR; server.lastbgsave_status = C_ERR;
} }
......
...@@ -331,7 +331,7 @@ err: ...@@ -331,7 +331,7 @@ err:
return 1; return 1;
} }
/* RDB check main: called form redis.c when Redis is executed with the /* RDB check main: called form server.c when Redis is executed with the
* redis-check-rdb alias, on during RDB loading errors. * redis-check-rdb alias, on during RDB loading errors.
* *
* The function works in two ways: can be called with argc/argv as a * The function works in two ways: can be called with argc/argv as a
......
...@@ -309,7 +309,7 @@ static void cliRefreshPrompt(void) { ...@@ -309,7 +309,7 @@ static void cliRefreshPrompt(void) {
/* Return the name of the dotfile for the specified 'dotfilename'. /* Return the name of the dotfile for the specified 'dotfilename'.
* Normally it just concatenates user $HOME to the file specified * Normally it just concatenates user $HOME to the file specified
* in 'dotfilename'. However if the environment varialbe 'envoverride' * in 'dotfilename'. However if the environment variable 'envoverride'
* is set, its value is taken as the path. * is set, its value is taken as the path.
* *
* The function returns NULL (if the file is /dev/null or cannot be * The function returns NULL (if the file is /dev/null or cannot be
...@@ -1713,7 +1713,7 @@ static void usage(void) { ...@@ -1713,7 +1713,7 @@ static void usage(void) {
" -a <password> Password to use when connecting to the server.\n" " -a <password> Password to use when connecting to the server.\n"
" You can also use the " REDIS_CLI_AUTH_ENV " environment\n" " You can also use the " REDIS_CLI_AUTH_ENV " environment\n"
" variable to pass this password more safely\n" " variable to pass this password more safely\n"
" (if both are used, this argument takes predecence).\n" " (if both are used, this argument takes precedence).\n"
" --user <username> Used to send ACL style 'AUTH username pass'. Needs -a.\n" " --user <username> Used to send ACL style 'AUTH username pass'. Needs -a.\n"
" --pass <password> Alias of -a for consistency with the new --user option.\n" " --pass <password> Alias of -a for consistency with the new --user option.\n"
" --askpass Force user to input password with mask from STDIN.\n" " --askpass Force user to input password with mask from STDIN.\n"
...@@ -2142,7 +2142,7 @@ static int evalMode(int argc, char **argv) { ...@@ -2142,7 +2142,7 @@ static int evalMode(int argc, char **argv) {
argv2[2] = sdscatprintf(sdsempty(),"%d",keys); argv2[2] = sdscatprintf(sdsempty(),"%d",keys);
/* Call it */ /* Call it */
int eval_ldb = config.eval_ldb; /* Save it, may be reverteed. */ int eval_ldb = config.eval_ldb; /* Save it, may be reverted. */
retval = issueCommand(argc+3-got_comma, argv2); retval = issueCommand(argc+3-got_comma, argv2);
if (eval_ldb) { if (eval_ldb) {
if (!config.eval_ldb) { if (!config.eval_ldb) {
...@@ -6658,13 +6658,13 @@ struct distsamples { ...@@ -6658,13 +6658,13 @@ struct distsamples {
* samples greater than the previous one, and is also the stop sentinel. * samples greater than the previous one, and is also the stop sentinel.
* *
* "tot' is the total number of samples in the different buckets, so it * "tot' is the total number of samples in the different buckets, so it
* is the SUM(samples[i].conut) for i to 0 up to the max sample. * is the SUM(samples[i].count) for i to 0 up to the max sample.
* *
* As a side effect the function sets all the buckets count to 0. */ * As a side effect the function sets all the buckets count to 0. */
void showLatencyDistSamples(struct distsamples *samples, long long tot) { void showLatencyDistSamples(struct distsamples *samples, long long tot) {
int j; int j;
/* We convert samples into a index inside the palette /* We convert samples into an index inside the palette
* proportional to the percentage a given bucket represents. * proportional to the percentage a given bucket represents.
* This way intensity of the different parts of the spectrum * This way intensity of the different parts of the spectrum
* don't change relative to the number of requests, which avoids to * don't change relative to the number of requests, which avoids to
...@@ -7971,7 +7971,7 @@ static void LRUTestMode(void) { ...@@ -7971,7 +7971,7 @@ static void LRUTestMode(void) {
* Intrisic latency mode. * Intrisic latency mode.
* *
* Measure max latency of a running process that does not result from * Measure max latency of a running process that does not result from
* syscalls. Basically this software should provide an hint about how much * syscalls. Basically this software should provide a hint about how much
* time the kernel leaves the process without a chance to run. * time the kernel leaves the process without a chance to run.
*--------------------------------------------------------------------------- */ *--------------------------------------------------------------------------- */
......
...@@ -963,4 +963,4 @@ static int RedisModule_Init(RedisModuleCtx *ctx, const char *name, int ver, int ...@@ -963,4 +963,4 @@ static int RedisModule_Init(RedisModuleCtx *ctx, const char *name, int ver, int
#define RedisModuleString robj #define RedisModuleString robj
#endif /* REDISMODULE_CORE */ #endif /* REDISMODULE_CORE */
#endif /* REDISMOUDLE_H */ #endif /* REDISMODULE_H */
...@@ -83,16 +83,16 @@ char *replicationGetSlaveName(client *c) { ...@@ -83,16 +83,16 @@ char *replicationGetSlaveName(client *c) {
* the file deletion to the filesystem. This call removes the file in a * the file deletion to the filesystem. This call removes the file in a
* background thread instead. We actually just do close() in the thread, * background thread instead. We actually just do close() in the thread,
* by using the fact that if there is another instance of the same file open, * by using the fact that if there is another instance of the same file open,
* the foreground unlink() will not really do anything, and deleting the * the foreground unlink() will only remove the fs name, and deleting the
* file will only happen once the last reference is lost. */ * file's storage space will only happen once the last reference is lost. */
int bg_unlink(const char *filename) { int bg_unlink(const char *filename) {
int fd = open(filename,O_RDONLY|O_NONBLOCK); int fd = open(filename,O_RDONLY|O_NONBLOCK);
if (fd == -1) { if (fd == -1) {
/* Can't open the file? Fall back to unlinking in the main thread. */ /* Can't open the file? Fall back to unlinking in the main thread. */
return unlink(filename); return unlink(filename);
} else { } else {
/* The following unlink() will not do anything since file /* The following unlink() removes the name but doesn't free the
* is still open. */ * file contents because a process still has it open. */
int retval = unlink(filename); int retval = unlink(filename);
if (retval == -1) { if (retval == -1) {
/* If we got an unlink error, we just return it, closing the /* If we got an unlink error, we just return it, closing the
...@@ -204,7 +204,7 @@ void feedReplicationBacklogWithObject(robj *o) { ...@@ -204,7 +204,7 @@ void feedReplicationBacklogWithObject(robj *o) {
* as well. This function is used if the instance is a master: we use * as well. This function is used if the instance is a master: we use
* the commands received by our clients in order to create the replication * the commands received by our clients in order to create the replication
* stream. Instead if the instance is a slave and has sub-slaves attached, * stream. Instead if the instance is a slave and has sub-slaves attached,
* we use replicationFeedSlavesFromMaster() */ * we use replicationFeedSlavesFromMasterStream() */
void replicationFeedSlaves(list *slaves, int dictid, robj **argv, int argc) { void replicationFeedSlaves(list *slaves, int dictid, robj **argv, int argc) {
listNode *ln; listNode *ln;
listIter li; listIter li;
...@@ -535,7 +535,7 @@ int masterTryPartialResynchronization(client *c) { ...@@ -535,7 +535,7 @@ int masterTryPartialResynchronization(client *c) {
(strcasecmp(master_replid, server.replid2) || (strcasecmp(master_replid, server.replid2) ||
psync_offset > server.second_replid_offset)) psync_offset > server.second_replid_offset))
{ {
/* Run id "?" is used by slaves that want to force a full resync. */ /* Replid "?" is used by slaves that want to force a full resync. */
if (master_replid[0] != '?') { if (master_replid[0] != '?') {
if (strcasecmp(master_replid, server.replid) && if (strcasecmp(master_replid, server.replid) &&
strcasecmp(master_replid, server.replid2)) strcasecmp(master_replid, server.replid2))
...@@ -707,7 +707,7 @@ int startBgsaveForReplication(int mincapa) { ...@@ -707,7 +707,7 @@ int startBgsaveForReplication(int mincapa) {
return retval; return retval;
} }
/* SYNC and PSYNC command implemenation. */ /* SYNC and PSYNC command implementation. */
void syncCommand(client *c) { void syncCommand(client *c) {
/* ignore SYNC if already slave or in monitor mode */ /* ignore SYNC if already slave or in monitor mode */
if (c->flags & CLIENT_SLAVE) return; if (c->flags & CLIENT_SLAVE) return;
...@@ -1377,7 +1377,7 @@ void replicationEmptyDbCallback(void *privdata) { ...@@ -1377,7 +1377,7 @@ void replicationEmptyDbCallback(void *privdata) {
replicationSendNewlineToMaster(); replicationSendNewlineToMaster();
} }
/* Once we have a link with the master and the synchroniziation was /* Once we have a link with the master and the synchronization was
* performed, this function materializes the master client we store * performed, this function materializes the master client we store
* at server.master, starting from the specified file descriptor. */ * at server.master, starting from the specified file descriptor. */
void replicationCreateMasterClient(connection *conn, int dbid) { void replicationCreateMasterClient(connection *conn, int dbid) {
...@@ -1454,7 +1454,7 @@ redisDb *disklessLoadMakeBackups(void) { ...@@ -1454,7 +1454,7 @@ redisDb *disklessLoadMakeBackups(void) {
* the 'restore' argument (the number of DBs to replace) is non-zero. * the 'restore' argument (the number of DBs to replace) is non-zero.
* *
* When instead the loading succeeded we want just to free our old backups, * When instead the loading succeeded we want just to free our old backups,
* in that case the funciton will do just that when 'restore' is 0. */ * in that case the function will do just that when 'restore' is 0. */
void disklessLoadRestoreBackups(redisDb *backup, int restore, int empty_db_flags) void disklessLoadRestoreBackups(redisDb *backup, int restore, int empty_db_flags)
{ {
if (restore) { if (restore) {
...@@ -1488,7 +1488,7 @@ void readSyncBulkPayload(connection *conn) { ...@@ -1488,7 +1488,7 @@ void readSyncBulkPayload(connection *conn) {
off_t left; off_t left;
/* Static vars used to hold the EOF mark, and the last bytes received /* Static vars used to hold the EOF mark, and the last bytes received
* form the server: when they match, we reached the end of the transfer. */ * from the server: when they match, we reached the end of the transfer. */
static char eofmark[CONFIG_RUN_ID_SIZE]; static char eofmark[CONFIG_RUN_ID_SIZE];
static char lastbytes[CONFIG_RUN_ID_SIZE]; static char lastbytes[CONFIG_RUN_ID_SIZE];
static int usemark = 0; static int usemark = 0;
...@@ -1805,7 +1805,7 @@ void readSyncBulkPayload(connection *conn) { ...@@ -1805,7 +1805,7 @@ void readSyncBulkPayload(connection *conn) {
REDISMODULE_SUBEVENT_MASTER_LINK_UP, REDISMODULE_SUBEVENT_MASTER_LINK_UP,
NULL); NULL);
/* After a full resynchroniziation we use the replication ID and /* After a full resynchronization we use the replication ID and
* offset of the master. The secondary ID / offset are cleared since * offset of the master. The secondary ID / offset are cleared since
* we are starting a new history. */ * we are starting a new history. */
memcpy(server.replid,server.master->replid,sizeof(server.replid)); memcpy(server.replid,server.master->replid,sizeof(server.replid));
...@@ -1901,7 +1901,7 @@ char *sendSynchronousCommand(int flags, connection *conn, ...) { ...@@ -1901,7 +1901,7 @@ char *sendSynchronousCommand(int flags, connection *conn, ...) {
/* Try a partial resynchronization with the master if we are about to reconnect. /* Try a partial resynchronization with the master if we are about to reconnect.
* If there is no cached master structure, at least try to issue a * If there is no cached master structure, at least try to issue a
* "PSYNC ? -1" command in order to trigger a full resync using the PSYNC * "PSYNC ? -1" command in order to trigger a full resync using the PSYNC
* command in order to obtain the master run id and the master replication * command in order to obtain the master replid and the master replication
* global offset. * global offset.
* *
* This function is designed to be called from syncWithMaster(), so the * This function is designed to be called from syncWithMaster(), so the
...@@ -1929,7 +1929,7 @@ char *sendSynchronousCommand(int flags, connection *conn, ...) { ...@@ -1929,7 +1929,7 @@ char *sendSynchronousCommand(int flags, connection *conn, ...) {
* *
* PSYNC_CONTINUE: If the PSYNC command succeeded and we can continue. * PSYNC_CONTINUE: If the PSYNC command succeeded and we can continue.
* PSYNC_FULLRESYNC: If PSYNC is supported but a full resync is needed. * PSYNC_FULLRESYNC: If PSYNC is supported but a full resync is needed.
* In this case the master run_id and global replication * In this case the master replid and global replication
* offset is saved. * offset is saved.
* PSYNC_NOT_SUPPORTED: If the server does not understand PSYNC at all and * PSYNC_NOT_SUPPORTED: If the server does not understand PSYNC at all and
* the caller should fall back to SYNC. * the caller should fall back to SYNC.
...@@ -1960,7 +1960,7 @@ int slaveTryPartialResynchronization(connection *conn, int read_reply) { ...@@ -1960,7 +1960,7 @@ int slaveTryPartialResynchronization(connection *conn, int read_reply) {
/* Writing half */ /* Writing half */
if (!read_reply) { if (!read_reply) {
/* Initially set master_initial_offset to -1 to mark the current /* Initially set master_initial_offset to -1 to mark the current
* master run_id and offset as not valid. Later if we'll be able to do * master replid and offset as not valid. Later if we'll be able to do
* a FULL resync using the PSYNC command we'll set the offset at the * a FULL resync using the PSYNC command we'll set the offset at the
* right value, so that this information will be propagated to the * right value, so that this information will be propagated to the
* client structure representing the master into server.master. */ * client structure representing the master into server.master. */
...@@ -2001,7 +2001,7 @@ int slaveTryPartialResynchronization(connection *conn, int read_reply) { ...@@ -2001,7 +2001,7 @@ int slaveTryPartialResynchronization(connection *conn, int read_reply) {
if (!strncmp(reply,"+FULLRESYNC",11)) { if (!strncmp(reply,"+FULLRESYNC",11)) {
char *replid = NULL, *offset = NULL; char *replid = NULL, *offset = NULL;
/* FULL RESYNC, parse the reply in order to extract the run id /* FULL RESYNC, parse the reply in order to extract the replid
* and the replication offset. */ * and the replication offset. */
replid = strchr(reply,' '); replid = strchr(reply,' ');
if (replid) { if (replid) {
...@@ -2293,7 +2293,7 @@ void syncWithMaster(connection *conn) { ...@@ -2293,7 +2293,7 @@ void syncWithMaster(connection *conn) {
/* Try a partial resynchonization. If we don't have a cached master /* Try a partial resynchonization. If we don't have a cached master
* slaveTryPartialResynchronization() will at least try to use PSYNC * slaveTryPartialResynchronization() will at least try to use PSYNC
* to start a full resynchronization so that we get the master run id * to start a full resynchronization so that we get the master replid
* and the global offset, to try a partial resync at the next * and the global offset, to try a partial resync at the next
* reconnection attempt. */ * reconnection attempt. */
if (server.repl_state == REPL_STATE_SEND_PSYNC) { if (server.repl_state == REPL_STATE_SEND_PSYNC) {
...@@ -2455,7 +2455,7 @@ void replicationAbortSyncTransfer(void) { ...@@ -2455,7 +2455,7 @@ void replicationAbortSyncTransfer(void) {
* If there was a replication handshake in progress 1 is returned and * If there was a replication handshake in progress 1 is returned and
* the replication state (server.repl_state) set to REPL_STATE_CONNECT. * the replication state (server.repl_state) set to REPL_STATE_CONNECT.
* *
* Otherwise zero is returned and no operation is perforemd at all. */ * Otherwise zero is returned and no operation is performed at all. */
int cancelReplicationHandshake(void) { int cancelReplicationHandshake(void) {
if (server.repl_state == REPL_STATE_TRANSFER) { if (server.repl_state == REPL_STATE_TRANSFER) {
replicationAbortSyncTransfer(); replicationAbortSyncTransfer();
...@@ -2887,7 +2887,7 @@ void refreshGoodSlavesCount(void) { ...@@ -2887,7 +2887,7 @@ void refreshGoodSlavesCount(void) {
* *
* We don't care about taking a different cache for every different slave * We don't care about taking a different cache for every different slave
* since to fill the cache again is not very costly, the goal of this code * since to fill the cache again is not very costly, the goal of this code
* is to avoid that the same big script is trasmitted a big number of times * is to avoid that the same big script is transmitted a big number of times
* per second wasting bandwidth and processor speed, but it is not a problem * per second wasting bandwidth and processor speed, but it is not a problem
* if we need to rebuild the cache from scratch from time to time, every used * if we need to rebuild the cache from scratch from time to time, every used
* script will need to be transmitted a single time to reappear in the cache. * script will need to be transmitted a single time to reappear in the cache.
...@@ -2897,7 +2897,7 @@ void refreshGoodSlavesCount(void) { ...@@ -2897,7 +2897,7 @@ void refreshGoodSlavesCount(void) {
* 1) Every time a new slave connects, we flush the whole script cache. * 1) Every time a new slave connects, we flush the whole script cache.
* 2) We only send as EVALSHA what was sent to the master as EVALSHA, without * 2) We only send as EVALSHA what was sent to the master as EVALSHA, without
* trying to convert EVAL into EVALSHA specifically for slaves. * trying to convert EVAL into EVALSHA specifically for slaves.
* 3) Every time we trasmit a script as EVAL to the slaves, we also add the * 3) Every time we transmit a script as EVAL to the slaves, we also add the
* corresponding SHA1 of the script into the cache as we are sure every * corresponding SHA1 of the script into the cache as we are sure every
* slave knows about the script starting from now. * slave knows about the script starting from now.
* 4) On SCRIPT FLUSH command, we replicate the command to all the slaves * 4) On SCRIPT FLUSH command, we replicate the command to all the slaves
...@@ -2988,7 +2988,7 @@ int replicationScriptCacheExists(sds sha1) { ...@@ -2988,7 +2988,7 @@ int replicationScriptCacheExists(sds sha1) {
/* This just set a flag so that we broadcast a REPLCONF GETACK command /* This just set a flag so that we broadcast a REPLCONF GETACK command
* to all the slaves in the beforeSleep() function. Note that this way * to all the slaves in the beforeSleep() function. Note that this way
* we "group" all the clients that want to wait for synchronouns replication * we "group" all the clients that want to wait for synchronous replication
* in a given event loop iteration, and send a single GETACK for them all. */ * in a given event loop iteration, and send a single GETACK for them all. */
void replicationRequestAckFromSlaves(void) { void replicationRequestAckFromSlaves(void) {
server.get_ack_from_slaves = 1; server.get_ack_from_slaves = 1;
......
...@@ -69,7 +69,7 @@ struct ldbState { ...@@ -69,7 +69,7 @@ struct ldbState {
list *children; /* All forked debugging sessions pids. */ list *children; /* All forked debugging sessions pids. */
int bp[LDB_BREAKPOINTS_MAX]; /* An array of breakpoints line numbers. */ int bp[LDB_BREAKPOINTS_MAX]; /* An array of breakpoints line numbers. */
int bpcount; /* Number of valid entries inside bp. */ int bpcount; /* Number of valid entries inside bp. */
int step; /* Stop at next line ragardless of breakpoints. */ int step; /* Stop at next line regardless of breakpoints. */
int luabp; /* Stop at next line because redis.breakpoint() was called. */ int luabp; /* Stop at next line because redis.breakpoint() was called. */
sds *src; /* Lua script source code split by line. */ sds *src; /* Lua script source code split by line. */
int lines; /* Number of lines in 'src'. */ int lines; /* Number of lines in 'src'. */
...@@ -886,7 +886,7 @@ int luaRedisReplicateCommandsCommand(lua_State *lua) { ...@@ -886,7 +886,7 @@ int luaRedisReplicateCommandsCommand(lua_State *lua) {
/* redis.breakpoint() /* redis.breakpoint()
* *
* Allows to stop execution during a debuggign session from within * Allows to stop execution during a debugging session from within
* the Lua code implementation, like if a breakpoint was set in the code * the Lua code implementation, like if a breakpoint was set in the code
* immediately after the function. */ * immediately after the function. */
int luaRedisBreakpointCommand(lua_State *lua) { int luaRedisBreakpointCommand(lua_State *lua) {
...@@ -1499,7 +1499,7 @@ void evalGenericCommand(client *c, int evalsha) { ...@@ -1499,7 +1499,7 @@ void evalGenericCommand(client *c, int evalsha) {
/* Hash the code if this is an EVAL call */ /* Hash the code if this is an EVAL call */
sha1hex(funcname+2,c->argv[1]->ptr,sdslen(c->argv[1]->ptr)); sha1hex(funcname+2,c->argv[1]->ptr,sdslen(c->argv[1]->ptr));
} else { } else {
/* We already have the SHA if it is a EVALSHA */ /* We already have the SHA if it is an EVALSHA */
int j; int j;
char *sha = c->argv[1]->ptr; char *sha = c->argv[1]->ptr;
...@@ -1628,7 +1628,7 @@ void evalGenericCommand(client *c, int evalsha) { ...@@ -1628,7 +1628,7 @@ void evalGenericCommand(client *c, int evalsha) {
* To do so we use a cache of SHA1s of scripts that we already propagated * To do so we use a cache of SHA1s of scripts that we already propagated
* as full EVAL, that's called the Replication Script Cache. * as full EVAL, that's called the Replication Script Cache.
* *
* For repliation, everytime a new slave attaches to the master, we need to * For replication, everytime a new slave attaches to the master, we need to
* flush our cache of scripts that can be replicated as EVALSHA, while * flush our cache of scripts that can be replicated as EVALSHA, while
* for AOF we need to do so every time we rewrite the AOF file. */ * for AOF we need to do so every time we rewrite the AOF file. */
if (evalsha && !server.lua_replicate_commands) { if (evalsha && !server.lua_replicate_commands) {
...@@ -1801,7 +1801,7 @@ void ldbLog(sds entry) { ...@@ -1801,7 +1801,7 @@ void ldbLog(sds entry) {
} }
/* A version of ldbLog() which prevents producing logs greater than /* A version of ldbLog() which prevents producing logs greater than
* ldb.maxlen. The first time the limit is reached an hint is generated * ldb.maxlen. The first time the limit is reached a hint is generated
* to inform the user that reply trimming can be disabled using the * to inform the user that reply trimming can be disabled using the
* debugger "maxlen" command. */ * debugger "maxlen" command. */
void ldbLogWithMaxLen(sds entry) { void ldbLogWithMaxLen(sds entry) {
...@@ -1842,7 +1842,7 @@ void ldbSendLogs(void) { ...@@ -1842,7 +1842,7 @@ void ldbSendLogs(void) {
} }
/* Start a debugging session before calling EVAL implementation. /* Start a debugging session before calling EVAL implementation.
* The techique we use is to capture the client socket file descriptor, * The technique we use is to capture the client socket file descriptor,
* in order to perform direct I/O with it from within Lua hooks. This * in order to perform direct I/O with it from within Lua hooks. This
* way we don't have to re-enter Redis in order to handle I/O. * way we don't have to re-enter Redis in order to handle I/O.
* *
...@@ -1925,7 +1925,7 @@ void ldbEndSession(client *c) { ...@@ -1925,7 +1925,7 @@ void ldbEndSession(client *c) {
connNonBlock(ldb.conn); connNonBlock(ldb.conn);
connSendTimeout(ldb.conn,0); connSendTimeout(ldb.conn,0);
/* Close the client connectin after sending the final EVAL reply /* Close the client connection after sending the final EVAL reply
* in order to signal the end of the debugging session. */ * in order to signal the end of the debugging session. */
c->flags |= CLIENT_CLOSE_AFTER_REPLY; c->flags |= CLIENT_CLOSE_AFTER_REPLY;
...@@ -2094,7 +2094,7 @@ void ldbLogSourceLine(int lnum) { ...@@ -2094,7 +2094,7 @@ void ldbLogSourceLine(int lnum) {
/* Implement the "list" command of the Lua debugger. If around is 0 /* Implement the "list" command of the Lua debugger. If around is 0
* the whole file is listed, otherwise only a small portion of the file * the whole file is listed, otherwise only a small portion of the file
* around the specified line is shown. When a line number is specified * around the specified line is shown. When a line number is specified
* the amonut of context (lines before/after) is specified via the * the amount of context (lines before/after) is specified via the
* 'context' argument. */ * 'context' argument. */
void ldbList(int around, int context) { void ldbList(int around, int context) {
int j; int j;
...@@ -2105,7 +2105,7 @@ void ldbList(int around, int context) { ...@@ -2105,7 +2105,7 @@ void ldbList(int around, int context) {
} }
} }
/* Append an human readable representation of the Lua value at position 'idx' /* Append a human readable representation of the Lua value at position 'idx'
* on the stack of the 'lua' state, to the SDS string passed as argument. * on the stack of the 'lua' state, to the SDS string passed as argument.
* The new SDS string with the represented value attached is returned. * The new SDS string with the represented value attached is returned.
* Used in order to implement ldbLogStackValue(). * Used in order to implement ldbLogStackValue().
...@@ -2349,7 +2349,7 @@ char *ldbRedisProtocolToHuman_Double(sds *o, char *reply) { ...@@ -2349,7 +2349,7 @@ char *ldbRedisProtocolToHuman_Double(sds *o, char *reply) {
return p+2; return p+2;
} }
/* Log a Redis reply as debugger output, in an human readable format. /* Log a Redis reply as debugger output, in a human readable format.
* If the resulting string is longer than 'len' plus a few more chars * If the resulting string is longer than 'len' plus a few more chars
* used as prefix, it gets truncated. */ * used as prefix, it gets truncated. */
void ldbLogRedisReply(char *reply) { void ldbLogRedisReply(char *reply) {
...@@ -2533,7 +2533,7 @@ void ldbTrace(lua_State *lua) { ...@@ -2533,7 +2533,7 @@ void ldbTrace(lua_State *lua) {
} }
} }
/* Impleemnts the debugger "maxlen" command. It just queries or sets the /* Implements the debugger "maxlen" command. It just queries or sets the
* ldb.maxlen variable. */ * ldb.maxlen variable. */
void ldbMaxlen(sds *argv, int argc) { void ldbMaxlen(sds *argv, int argc) {
if (argc == 2) { if (argc == 2) {
...@@ -2606,8 +2606,8 @@ ldbLog(sdsnew(" mode dataset changes will be retained.")); ...@@ -2606,8 +2606,8 @@ ldbLog(sdsnew(" mode dataset changes will be retained."));
ldbLog(sdsnew("")); ldbLog(sdsnew(""));
ldbLog(sdsnew("Debugger functions you can call from Lua scripts:")); ldbLog(sdsnew("Debugger functions you can call from Lua scripts:"));
ldbLog(sdsnew("redis.debug() Produce logs in the debugger console.")); ldbLog(sdsnew("redis.debug() Produce logs in the debugger console."));
ldbLog(sdsnew("redis.breakpoint() Stop execution like if there was a breakpoing.")); ldbLog(sdsnew("redis.breakpoint() Stop execution like if there was a breakpoint in the"));
ldbLog(sdsnew(" in the next line of code.")); ldbLog(sdsnew(" next line of code."));
ldbSendLogs(); ldbSendLogs();
} else if (!strcasecmp(argv[0],"s") || !strcasecmp(argv[0],"step") || } else if (!strcasecmp(argv[0],"s") || !strcasecmp(argv[0],"step") ||
!strcasecmp(argv[0],"n") || !strcasecmp(argv[0],"next")) { !strcasecmp(argv[0],"n") || !strcasecmp(argv[0],"next")) {
......
...@@ -405,7 +405,7 @@ sds sdscatlen(sds s, const void *t, size_t len) { ...@@ -405,7 +405,7 @@ sds sdscatlen(sds s, const void *t, size_t len) {
return s; return s;
} }
/* Append the specified null termianted C string to the sds string 's'. /* Append the specified null terminated C string to the sds string 's'.
* *
* After the call, the passed sds string is no longer valid and all the * After the call, the passed sds string is no longer valid and all the
* references must be substituted with the new pointer returned by the call. */ * references must be substituted with the new pointer returned by the call. */
...@@ -453,7 +453,7 @@ int sdsll2str(char *s, long long value) { ...@@ -453,7 +453,7 @@ int sdsll2str(char *s, long long value) {
size_t l; size_t l;
/* Generate the string representation, this method produces /* Generate the string representation, this method produces
* an reversed string. */ * a reversed string. */
v = (value < 0) ? -value : value; v = (value < 0) ? -value : value;
p = s; p = s;
do { do {
...@@ -484,7 +484,7 @@ int sdsull2str(char *s, unsigned long long v) { ...@@ -484,7 +484,7 @@ int sdsull2str(char *s, unsigned long long v) {
size_t l; size_t l;
/* Generate the string representation, this method produces /* Generate the string representation, this method produces
* an reversed string. */ * a reversed string. */
p = s; p = s;
do { do {
*p++ = '0'+(v%10); *p++ = '0'+(v%10);
......
...@@ -131,13 +131,13 @@ typedef struct sentinelAddr { ...@@ -131,13 +131,13 @@ typedef struct sentinelAddr {
/* The link to a sentinelRedisInstance. When we have the same set of Sentinels /* The link to a sentinelRedisInstance. When we have the same set of Sentinels
* monitoring many masters, we have different instances representing the * monitoring many masters, we have different instances representing the
* same Sentinels, one per master, and we need to share the hiredis connections * same Sentinels, one per master, and we need to share the hiredis connections
* among them. Oherwise if 5 Sentinels are monitoring 100 masters we create * among them. Otherwise if 5 Sentinels are monitoring 100 masters we create
* 500 outgoing connections instead of 5. * 500 outgoing connections instead of 5.
* *
* So this structure represents a reference counted link in terms of the two * So this structure represents a reference counted link in terms of the two
* hiredis connections for commands and Pub/Sub, and the fields needed for * hiredis connections for commands and Pub/Sub, and the fields needed for
* failure detection, since the ping/pong time are now local to the link: if * failure detection, since the ping/pong time are now local to the link: if
* the link is available, the instance is avaialbe. This way we don't just * the link is available, the instance is available. This way we don't just
* have 5 connections instead of 500, we also send 5 pings instead of 500. * have 5 connections instead of 500, we also send 5 pings instead of 500.
* *
* Links are shared only for Sentinels: master and slave instances have * Links are shared only for Sentinels: master and slave instances have
...@@ -986,7 +986,7 @@ instanceLink *createInstanceLink(void) { ...@@ -986,7 +986,7 @@ instanceLink *createInstanceLink(void) {
return link; return link;
} }
/* Disconnect an hiredis connection in the context of an instance link. */ /* Disconnect a hiredis connection in the context of an instance link. */
void instanceLinkCloseConnection(instanceLink *link, redisAsyncContext *c) { void instanceLinkCloseConnection(instanceLink *link, redisAsyncContext *c) {
if (c == NULL) return; if (c == NULL) return;
...@@ -1125,7 +1125,7 @@ int sentinelUpdateSentinelAddressInAllMasters(sentinelRedisInstance *ri) { ...@@ -1125,7 +1125,7 @@ int sentinelUpdateSentinelAddressInAllMasters(sentinelRedisInstance *ri) {
return reconfigured; return reconfigured;
} }
/* This function is called when an hiredis connection reported an error. /* This function is called when a hiredis connection reported an error.
* We set it to NULL and mark the link as disconnected so that it will be * We set it to NULL and mark the link as disconnected so that it will be
* reconnected again. * reconnected again.
* *
...@@ -2015,7 +2015,7 @@ void sentinelSendAuthIfNeeded(sentinelRedisInstance *ri, redisAsyncContext *c) { ...@@ -2015,7 +2015,7 @@ void sentinelSendAuthIfNeeded(sentinelRedisInstance *ri, redisAsyncContext *c) {
* The connection type is "cmd" or "pubsub" as specified by 'type'. * The connection type is "cmd" or "pubsub" as specified by 'type'.
* *
* This makes it possible to list all the sentinel instances connected * This makes it possible to list all the sentinel instances connected
* to a Redis servewr with CLIENT LIST, grepping for a specific name format. */ * to a Redis server with CLIENT LIST, grepping for a specific name format. */
void sentinelSetClientName(sentinelRedisInstance *ri, redisAsyncContext *c, char *type) { void sentinelSetClientName(sentinelRedisInstance *ri, redisAsyncContext *c, char *type) {
char name[64]; char name[64];
...@@ -2470,7 +2470,7 @@ void sentinelPublishReplyCallback(redisAsyncContext *c, void *reply, void *privd ...@@ -2470,7 +2470,7 @@ void sentinelPublishReplyCallback(redisAsyncContext *c, void *reply, void *privd
ri->last_pub_time = mstime(); ri->last_pub_time = mstime();
} }
/* Process an hello message received via Pub/Sub in master or slave instance, /* Process a hello message received via Pub/Sub in master or slave instance,
* or sent directly to this sentinel via the (fake) PUBLISH command of Sentinel. * or sent directly to this sentinel via the (fake) PUBLISH command of Sentinel.
* *
* If the master name specified in the message is not known, the message is * If the master name specified in the message is not known, the message is
...@@ -2607,7 +2607,7 @@ void sentinelReceiveHelloMessages(redisAsyncContext *c, void *reply, void *privd ...@@ -2607,7 +2607,7 @@ void sentinelReceiveHelloMessages(redisAsyncContext *c, void *reply, void *privd
sentinelProcessHelloMessage(r->element[2]->str, r->element[2]->len); sentinelProcessHelloMessage(r->element[2]->str, r->element[2]->len);
} }
/* Send an "Hello" message via Pub/Sub to the specified 'ri' Redis /* Send a "Hello" message via Pub/Sub to the specified 'ri' Redis
* instance in order to broadcast the current configuration for this * instance in order to broadcast the current configuration for this
* master, and to advertise the existence of this Sentinel at the same time. * master, and to advertise the existence of this Sentinel at the same time.
* *
...@@ -2661,7 +2661,7 @@ int sentinelSendHello(sentinelRedisInstance *ri) { ...@@ -2661,7 +2661,7 @@ int sentinelSendHello(sentinelRedisInstance *ri) {
} }
/* Reset last_pub_time in all the instances in the specified dictionary /* Reset last_pub_time in all the instances in the specified dictionary
* in order to force the delivery of an Hello update ASAP. */ * in order to force the delivery of a Hello update ASAP. */
void sentinelForceHelloUpdateDictOfRedisInstances(dict *instances) { void sentinelForceHelloUpdateDictOfRedisInstances(dict *instances) {
dictIterator *di; dictIterator *di;
dictEntry *de; dictEntry *de;
...@@ -2675,13 +2675,13 @@ void sentinelForceHelloUpdateDictOfRedisInstances(dict *instances) { ...@@ -2675,13 +2675,13 @@ void sentinelForceHelloUpdateDictOfRedisInstances(dict *instances) {
dictReleaseIterator(di); dictReleaseIterator(di);
} }
/* This function forces the delivery of an "Hello" message (see /* This function forces the delivery of a "Hello" message (see
* sentinelSendHello() top comment for further information) to all the Redis * sentinelSendHello() top comment for further information) to all the Redis
* and Sentinel instances related to the specified 'master'. * and Sentinel instances related to the specified 'master'.
* *
* It is technically not needed since we send an update to every instance * It is technically not needed since we send an update to every instance
* with a period of SENTINEL_PUBLISH_PERIOD milliseconds, however when a * with a period of SENTINEL_PUBLISH_PERIOD milliseconds, however when a
* Sentinel upgrades a configuration it is a good idea to deliever an update * Sentinel upgrades a configuration it is a good idea to deliver an update
* to the other Sentinels ASAP. */ * to the other Sentinels ASAP. */
int sentinelForceHelloUpdateForMaster(sentinelRedisInstance *master) { int sentinelForceHelloUpdateForMaster(sentinelRedisInstance *master) {
if (!(master->flags & SRI_MASTER)) return C_ERR; if (!(master->flags & SRI_MASTER)) return C_ERR;
...@@ -3082,7 +3082,7 @@ void sentinelCommand(client *c) { ...@@ -3082,7 +3082,7 @@ void sentinelCommand(client *c) {
* ip and port are the ip and port of the master we want to be * ip and port are the ip and port of the master we want to be
* checked by Sentinel. Note that the command will not check by * checked by Sentinel. Note that the command will not check by
* name but just by master, in theory different Sentinels may monitor * name but just by master, in theory different Sentinels may monitor
* differnet masters with the same name. * different masters with the same name.
* *
* current-epoch is needed in order to understand if we are allowed * current-epoch is needed in order to understand if we are allowed
* to vote for a failover leader or not. Each Sentinel can vote just * to vote for a failover leader or not. Each Sentinel can vote just
...@@ -3995,7 +3995,7 @@ int sentinelSendSlaveOf(sentinelRedisInstance *ri, char *host, int port) { ...@@ -3995,7 +3995,7 @@ int sentinelSendSlaveOf(sentinelRedisInstance *ri, char *host, int port) {
* the following tasks: * the following tasks:
* 1) Reconfigure the instance according to the specified host/port params. * 1) Reconfigure the instance according to the specified host/port params.
* 2) Rewrite the configuration. * 2) Rewrite the configuration.
* 3) Disconnect all clients (but this one sending the commnad) in order * 3) Disconnect all clients (but this one sending the command) in order
* to trigger the ask-master-on-reconnection protocol for connected * to trigger the ask-master-on-reconnection protocol for connected
* clients. * clients.
* *
...@@ -4547,7 +4547,7 @@ void sentinelHandleDictOfRedisInstances(dict *instances) { ...@@ -4547,7 +4547,7 @@ void sentinelHandleDictOfRedisInstances(dict *instances) {
* difference bigger than SENTINEL_TILT_TRIGGER milliseconds if one of the * difference bigger than SENTINEL_TILT_TRIGGER milliseconds if one of the
* following conditions happen: * following conditions happen:
* *
* 1) The Sentiel process for some time is blocked, for every kind of * 1) The Sentinel process for some time is blocked, for every kind of
* random reason: the load is huge, the computer was frozen for some time * random reason: the load is huge, the computer was frozen for some time
* in I/O or alike, the process was stopped by a signal. Everything. * in I/O or alike, the process was stopped by a signal. Everything.
* 2) The system clock was altered significantly. * 2) The system clock was altered significantly.
......
...@@ -115,7 +115,7 @@ volatile unsigned long lru_clock; /* Server global current LRU time. */ ...@@ -115,7 +115,7 @@ volatile unsigned long lru_clock; /* Server global current LRU time. */
* write: Write command (may modify the key space). * write: Write command (may modify the key space).
* *
* read-only: All the non special commands just reading from keys without * read-only: All the non special commands just reading from keys without
* changing the content, or returning other informations like * changing the content, or returning other information like
* the TIME command. Special commands such administrative commands * the TIME command. Special commands such administrative commands
* or transaction related commands (multi, exec, discard, ...) * or transaction related commands (multi, exec, discard, ...)
* are not flagged as read-only commands, since they affect the * are not flagged as read-only commands, since they affect the
...@@ -1280,7 +1280,7 @@ dictType objectKeyHeapPointerValueDictType = { ...@@ -1280,7 +1280,7 @@ dictType objectKeyHeapPointerValueDictType = {
dictVanillaFree /* val destructor */ dictVanillaFree /* val destructor */
}; };
/* Set dictionary type. Keys are SDS strings, values are ot used. */ /* Set dictionary type. Keys are SDS strings, values are not used. */
dictType setDictType = { dictType setDictType = {
dictSdsHash, /* hash function */ dictSdsHash, /* hash function */
NULL, /* key dup */ NULL, /* key dup */
...@@ -1385,9 +1385,8 @@ dictType clusterNodesBlackListDictType = { ...@@ -1385,9 +1385,8 @@ dictType clusterNodesBlackListDictType = {
NULL /* val destructor */ NULL /* val destructor */
}; };
/* Cluster re-addition blacklist. This maps node IDs to the time /* Modules system dictionary type. Keys are module name,
* we can re-add this node. The goal is to avoid readding a removed * values are pointer to RedisModule struct. */
* node for some time. */
dictType modulesDictType = { dictType modulesDictType = {
dictSdsCaseHash, /* hash function */ dictSdsCaseHash, /* hash function */
NULL, /* key dup */ NULL, /* key dup */
...@@ -1440,7 +1439,7 @@ void tryResizeHashTables(int dbid) { ...@@ -1440,7 +1439,7 @@ void tryResizeHashTables(int dbid) {
/* Our hash table implementation performs rehashing incrementally while /* Our hash table implementation performs rehashing incrementally while
* we write/read from the hash table. Still if the server is idle, the hash * we write/read from the hash table. Still if the server is idle, the hash
* table will use two tables for a long time. So we try to use 1 millisecond * table will use two tables for a long time. So we try to use 1 millisecond
* of CPU time at every call of this function to perform some rehahsing. * of CPU time at every call of this function to perform some rehashing.
* *
* The function returns 1 if some rehashing was performed, otherwise 0 * The function returns 1 if some rehashing was performed, otherwise 0
* is returned. */ * is returned. */
...@@ -1462,8 +1461,8 @@ int incrementallyRehash(int dbid) { ...@@ -1462,8 +1461,8 @@ int incrementallyRehash(int dbid) {
* as we want to avoid resizing the hash tables when there is a child in order * as we want to avoid resizing the hash tables when there is a child in order
* to play well with copy-on-write (otherwise when a resize happens lots of * to play well with copy-on-write (otherwise when a resize happens lots of
* memory pages are copied). The goal of this function is to update the ability * memory pages are copied). The goal of this function is to update the ability
* for dict.c to resize the hash tables accordingly to the fact we have o not * for dict.c to resize the hash tables accordingly to the fact we have an
* running childs. */ * active fork child running. */
void updateDictResizePolicy(void) { void updateDictResizePolicy(void) {
if (!hasActiveChildProcess()) if (!hasActiveChildProcess())
dictEnableResize(); dictEnableResize();
...@@ -1613,7 +1612,7 @@ int clientsCronTrackClientsMemUsage(client *c) { ...@@ -1613,7 +1612,7 @@ int clientsCronTrackClientsMemUsage(client *c) {
mem += sdsAllocSize(c->querybuf); mem += sdsAllocSize(c->querybuf);
mem += sizeof(client); mem += sizeof(client);
/* Now that we have the memory used by the client, remove the old /* Now that we have the memory used by the client, remove the old
* value from the old categoty, and add it back. */ * value from the old category, and add it back. */
server.stat_clients_type_memory[c->client_cron_last_memory_type] -= server.stat_clients_type_memory[c->client_cron_last_memory_type] -=
c->client_cron_last_memory_usage; c->client_cron_last_memory_usage;
server.stat_clients_type_memory[type] += mem; server.stat_clients_type_memory[type] += mem;
...@@ -2028,7 +2027,7 @@ int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) { ...@@ -2028,7 +2027,7 @@ int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) {
/* AOF write errors: in this case we have a buffer to flush as well and /* AOF write errors: in this case we have a buffer to flush as well and
* clear the AOF error in case of success to make the DB writable again, * clear the AOF error in case of success to make the DB writable again,
* however to try every second is enough in case of 'hz' is set to * however to try every second is enough in case of 'hz' is set to
* an higher frequency. */ * a higher frequency. */
run_with_period(1000) { run_with_period(1000) {
if (server.aof_last_write_status == C_ERR) if (server.aof_last_write_status == C_ERR)
flushAppendOnlyFile(0); flushAppendOnlyFile(0);
...@@ -2198,7 +2197,7 @@ void beforeSleep(struct aeEventLoop *eventLoop) { ...@@ -2198,7 +2197,7 @@ void beforeSleep(struct aeEventLoop *eventLoop) {
if (moduleCount()) moduleReleaseGIL(); if (moduleCount()) moduleReleaseGIL();
} }
/* This function is called immadiately after the event loop multiplexing /* This function is called immediately after the event loop multiplexing
* API returned, and the control is going to soon return to Redis by invoking * API returned, and the control is going to soon return to Redis by invoking
* the different events callbacks. */ * the different events callbacks. */
void afterSleep(struct aeEventLoop *eventLoop) { void afterSleep(struct aeEventLoop *eventLoop) {
...@@ -2420,7 +2419,7 @@ void initServerConfig(void) { ...@@ -2420,7 +2419,7 @@ void initServerConfig(void) {
R_NegInf = -1.0/R_Zero; R_NegInf = -1.0/R_Zero;
R_Nan = R_Zero/R_Zero; R_Nan = R_Zero/R_Zero;
/* Command table -- we initiialize it here as it is part of the /* Command table -- we initialize it here as it is part of the
* initial configuration, since command names may be changed via * initial configuration, since command names may be changed via
* redis.conf using the rename-command directive. */ * redis.conf using the rename-command directive. */
server.commands = dictCreate(&commandTableDictType,NULL); server.commands = dictCreate(&commandTableDictType,NULL);
...@@ -3085,7 +3084,7 @@ int populateCommandTableParseFlags(struct redisCommand *c, char *strflags) { ...@@ -3085,7 +3084,7 @@ int populateCommandTableParseFlags(struct redisCommand *c, char *strflags) {
} }
/* Populates the Redis Command Table starting from the hard coded list /* Populates the Redis Command Table starting from the hard coded list
* we have on top of redis.c file. */ * we have on top of server.c file. */
void populateCommandTable(void) { void populateCommandTable(void) {
int j; int j;
int numcommands = sizeof(redisCommandTable)/sizeof(struct redisCommand); int numcommands = sizeof(redisCommandTable)/sizeof(struct redisCommand);
...@@ -3219,12 +3218,12 @@ void propagate(struct redisCommand *cmd, int dbid, robj **argv, int argc, ...@@ -3219,12 +3218,12 @@ void propagate(struct redisCommand *cmd, int dbid, robj **argv, int argc,
* *
* 'cmd' must be a pointer to the Redis command to replicate, dbid is the * 'cmd' must be a pointer to the Redis command to replicate, dbid is the
* database ID the command should be propagated into. * database ID the command should be propagated into.
* Arguments of the command to propagte are passed as an array of redis * Arguments of the command to propagate are passed as an array of redis
* objects pointers of len 'argc', using the 'argv' vector. * objects pointers of len 'argc', using the 'argv' vector.
* *
* The function does not take a reference to the passed 'argv' vector, * The function does not take a reference to the passed 'argv' vector,
* so it is up to the caller to release the passed argv (but it is usually * so it is up to the caller to release the passed argv (but it is usually
* stack allocated). The function autoamtically increments ref count of * stack allocated). The function automatically increments ref count of
* passed objects, so the caller does not need to. */ * passed objects, so the caller does not need to. */
void alsoPropagate(struct redisCommand *cmd, int dbid, robj **argv, int argc, void alsoPropagate(struct redisCommand *cmd, int dbid, robj **argv, int argc,
int target) int target)
...@@ -3384,7 +3383,7 @@ void call(client *c, int flags) { ...@@ -3384,7 +3383,7 @@ void call(client *c, int flags) {
if (c->flags & CLIENT_FORCE_AOF) propagate_flags |= PROPAGATE_AOF; if (c->flags & CLIENT_FORCE_AOF) propagate_flags |= PROPAGATE_AOF;
/* However prevent AOF / replication propagation if the command /* However prevent AOF / replication propagation if the command
* implementations called preventCommandPropagation() or similar, * implementation called preventCommandPropagation() or similar,
* or if we don't have the call() flags to do so. */ * or if we don't have the call() flags to do so. */
if (c->flags & CLIENT_PREVENT_REPL_PROP || if (c->flags & CLIENT_PREVENT_REPL_PROP ||
!(flags & CMD_CALL_PROPAGATE_REPL)) !(flags & CMD_CALL_PROPAGATE_REPL))
...@@ -3632,7 +3631,7 @@ int processCommand(client *c) { ...@@ -3632,7 +3631,7 @@ int processCommand(client *c) {
} }
/* Save out_of_memory result at script start, otherwise if we check OOM /* Save out_of_memory result at script start, otherwise if we check OOM
* untill first write within script, memory used by lua stack and * until first write within script, memory used by lua stack and
* arguments might interfere. */ * arguments might interfere. */
if (c->cmd->proc == evalCommand || c->cmd->proc == evalShaCommand) { if (c->cmd->proc == evalCommand || c->cmd->proc == evalShaCommand) {
server.lua_oom = out_of_memory; server.lua_oom = out_of_memory;
...@@ -3870,7 +3869,7 @@ int prepareForShutdown(int flags) { ...@@ -3870,7 +3869,7 @@ int prepareForShutdown(int flags) {
/*================================== Commands =============================== */ /*================================== Commands =============================== */
/* Sometimes Redis cannot accept write commands because there is a perstence /* Sometimes Redis cannot accept write commands because there is a persistence
* error with the RDB or AOF file, and Redis is configured in order to stop * error with the RDB or AOF file, and Redis is configured in order to stop
* accepting writes in such situation. This function returns if such a * accepting writes in such situation. This function returns if such a
* condition is active, and the type of the condition. * condition is active, and the type of the condition.
......
...@@ -161,7 +161,7 @@ extern int configOOMScoreAdjValuesDefaults[CONFIG_OOM_COUNT]; ...@@ -161,7 +161,7 @@ extern int configOOMScoreAdjValuesDefaults[CONFIG_OOM_COUNT];
/* Hash table parameters */ /* Hash table parameters */
#define HASHTABLE_MIN_FILL 10 /* Minimal hash table fill 10% */ #define HASHTABLE_MIN_FILL 10 /* Minimal hash table fill 10% */
/* Command flags. Please check the command table defined in the redis.c file /* Command flags. Please check the command table defined in the server.c file
* for more information about the meaning of every flag. */ * for more information about the meaning of every flag. */
#define CMD_WRITE (1ULL<<0) /* "write" flag */ #define CMD_WRITE (1ULL<<0) /* "write" flag */
#define CMD_READONLY (1ULL<<1) /* "read-only" flag */ #define CMD_READONLY (1ULL<<1) /* "read-only" flag */
...@@ -827,7 +827,7 @@ typedef struct client { ...@@ -827,7 +827,7 @@ typedef struct client {
copying this slave output buffer copying this slave output buffer
should use. */ should use. */
char replid[CONFIG_RUN_ID_SIZE+1]; /* Master replication ID (if master). */ char replid[CONFIG_RUN_ID_SIZE+1]; /* Master replication ID (if master). */
int slave_listening_port; /* As configured with: SLAVECONF listening-port */ int slave_listening_port; /* As configured with: REPLCONF listening-port */
char slave_ip[NET_IP_STR_LEN]; /* Optionally given by REPLCONF ip-address */ char slave_ip[NET_IP_STR_LEN]; /* Optionally given by REPLCONF ip-address */
int slave_capa; /* Slave capabilities: SLAVE_CAPA_* bitwise OR. */ int slave_capa; /* Slave capabilities: SLAVE_CAPA_* bitwise OR. */
multiState mstate; /* MULTI/EXEC state */ multiState mstate; /* MULTI/EXEC state */
...@@ -939,7 +939,7 @@ typedef struct redisOp { ...@@ -939,7 +939,7 @@ typedef struct redisOp {
} redisOp; } redisOp;
/* Defines an array of Redis operations. There is an API to add to this /* Defines an array of Redis operations. There is an API to add to this
* structure in a easy way. * structure in an easy way.
* *
* redisOpArrayInit(); * redisOpArrayInit();
* redisOpArrayAppend(); * redisOpArrayAppend();
...@@ -1349,7 +1349,7 @@ struct redisServer { ...@@ -1349,7 +1349,7 @@ struct redisServer {
unsigned int maxclients; /* Max number of simultaneous clients */ unsigned int maxclients; /* Max number of simultaneous clients */
unsigned long long maxmemory; /* Max number of memory bytes to use */ unsigned long long maxmemory; /* Max number of memory bytes to use */
int maxmemory_policy; /* Policy for key eviction */ int maxmemory_policy; /* Policy for key eviction */
int maxmemory_samples; /* Pricision of random sampling */ int maxmemory_samples; /* Precision of random sampling */
int lfu_log_factor; /* LFU logarithmic counter factor. */ int lfu_log_factor; /* LFU logarithmic counter factor. */
int lfu_decay_time; /* LFU counter decay factor. */ int lfu_decay_time; /* LFU counter decay factor. */
long long proto_max_bulk_len; /* Protocol bulk length maximum size. */ long long proto_max_bulk_len; /* Protocol bulk length maximum size. */
...@@ -1429,7 +1429,7 @@ struct redisServer { ...@@ -1429,7 +1429,7 @@ struct redisServer {
int lua_random_dirty; /* True if a random command was called during the int lua_random_dirty; /* True if a random command was called during the
execution of the current script. */ execution of the current script. */
int lua_replicate_commands; /* True if we are doing single commands repl. */ int lua_replicate_commands; /* True if we are doing single commands repl. */
int lua_multi_emitted;/* True if we already proagated MULTI. */ int lua_multi_emitted;/* True if we already propagated MULTI. */
int lua_repl; /* Script replication flags for redis.set_repl(). */ int lua_repl; /* Script replication flags for redis.set_repl(). */
int lua_timedout; /* True if we reached the time limit for script int lua_timedout; /* True if we reached the time limit for script
execution. */ execution. */
...@@ -1935,7 +1935,7 @@ void addACLLogEntry(client *c, int reason, int keypos, sds username); ...@@ -1935,7 +1935,7 @@ void addACLLogEntry(client *c, int reason, int keypos, sds username);
/* Flags only used by the ZADD command but not by zsetAdd() API: */ /* Flags only used by the ZADD command but not by zsetAdd() API: */
#define ZADD_CH (1<<16) /* Return num of elements added or updated. */ #define ZADD_CH (1<<16) /* Return num of elements added or updated. */
/* Struct to hold a inclusive/exclusive range spec by score comparison. */ /* Struct to hold an inclusive/exclusive range spec by score comparison. */
typedef struct { typedef struct {
double min, max; double min, max;
int minex, maxex; /* are min or max exclusive? */ int minex, maxex; /* are min or max exclusive? */
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
1. We use SipHash 1-2. This is not believed to be as strong as the 1. We use SipHash 1-2. This is not believed to be as strong as the
suggested 2-4 variant, but AFAIK there are not trivial attacks suggested 2-4 variant, but AFAIK there are not trivial attacks
against this reduced-rounds version, and it runs at the same speed against this reduced-rounds version, and it runs at the same speed
as Murmurhash2 that we used previously, why the 2-4 variant slowed as Murmurhash2 that we used previously, while the 2-4 variant slowed
down Redis by a 4% figure more or less. down Redis by a 4% figure more or less.
2. Hard-code rounds in the hope the compiler can optimize it more 2. Hard-code rounds in the hope the compiler can optimize it more
in this raw from. Anyway we always want the standard 2-4 variant. in this raw from. Anyway we always want the standard 2-4 variant.
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
perform a text transformation in some temporary buffer, which is costly. perform a text transformation in some temporary buffer, which is costly.
5. Remove debugging code. 5. Remove debugging code.
6. Modified the original test.c file to be a stand-alone function testing 6. Modified the original test.c file to be a stand-alone function testing
the function in the new form (returing an uint64_t) using just the the function in the new form (returning an uint64_t) using just the
relevant test vector. relevant test vector.
*/ */
#include <assert.h> #include <assert.h>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
#include <ctype.h> #include <ctype.h>
/* Fast tolower() alike function that does not care about locale /* Fast tolower() alike function that does not care about locale
* but just returns a-z insetad of A-Z. */ * but just returns a-z instead of A-Z. */
int siptlw(int c) { int siptlw(int c) {
if (c >= 'A' && c <= 'Z') { if (c >= 'A' && c <= 'Z') {
return c+('a'-'A'); return c+('a'-'A');
......
...@@ -75,7 +75,7 @@ slowlogEntry *slowlogCreateEntry(client *c, robj **argv, int argc, long long dur ...@@ -75,7 +75,7 @@ slowlogEntry *slowlogCreateEntry(client *c, robj **argv, int argc, long long dur
} else if (argv[j]->refcount == OBJ_SHARED_REFCOUNT) { } else if (argv[j]->refcount == OBJ_SHARED_REFCOUNT) {
se->argv[j] = argv[j]; se->argv[j] = argv[j];
} else { } else {
/* Here we need to dupliacate the string objects composing the /* Here we need to duplicate the string objects composing the
* argument vector of the command, because those may otherwise * argument vector of the command, because those may otherwise
* end shared with string objects stored into keys. Having * end shared with string objects stored into keys. Having
* shared objects between any part of Redis, and the data * shared objects between any part of Redis, and the data
......
...@@ -115,7 +115,7 @@ robj *lookupKeyByPattern(redisDb *db, robj *pattern, robj *subst, int writeflag) ...@@ -115,7 +115,7 @@ robj *lookupKeyByPattern(redisDb *db, robj *pattern, robj *subst, int writeflag)
if (fieldobj) { if (fieldobj) {
if (o->type != OBJ_HASH) goto noobj; if (o->type != OBJ_HASH) goto noobj;
/* Retrieve value from hash by the field name. The returend object /* Retrieve value from hash by the field name. The returned object
* is a new object with refcount already incremented. */ * is a new object with refcount already incremented. */
o = hashTypeGetValueObject(o, fieldobj->ptr); o = hashTypeGetValueObject(o, fieldobj->ptr);
} else { } else {
......
...@@ -92,7 +92,7 @@ void freeSparklineSequence(struct sequence *seq) { ...@@ -92,7 +92,7 @@ void freeSparklineSequence(struct sequence *seq) {
* ------------------------------------------------------------------------- */ * ------------------------------------------------------------------------- */
/* Render part of a sequence, so that render_sequence() call call this function /* Render part of a sequence, so that render_sequence() call call this function
* with differnent parts in order to create the full output without overflowing * with different parts in order to create the full output without overflowing
* the current terminal columns. */ * the current terminal columns. */
sds sparklineRenderRange(sds output, struct sequence *seq, int rows, int offset, int len, int flags) { sds sparklineRenderRange(sds output, struct sequence *seq, int rows, int offset, int len, int flags) {
int j; int j;
......
...@@ -74,7 +74,7 @@ typedef struct streamConsumer { ...@@ -74,7 +74,7 @@ typedef struct streamConsumer {
consumer not yet acknowledged. Keys are consumer not yet acknowledged. Keys are
big endian message IDs, while values are big endian message IDs, while values are
the same streamNACK structure referenced the same streamNACK structure referenced
in the "pel" of the conumser group structure in the "pel" of the consumer group structure
itself, so the value is shared. */ itself, so the value is shared. */
} streamConsumer; } streamConsumer;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment