2010-02-27 12:07:46 -05:00
|
|
|
/* String -> String Map data structure optimized for size.
|
|
|
|
* This file implements a data structure mapping strings to other strings
|
|
|
|
* implementing an O(n) lookup data structure designed to be very memory
|
|
|
|
* efficient.
|
|
|
|
*
|
|
|
|
* The Redis Hash type uses this data structure for hashes composed of a small
|
2013-12-05 10:35:32 -05:00
|
|
|
* number of elements, to switch to a hash table once a given number of
|
2010-02-27 12:07:46 -05:00
|
|
|
* elements is reached.
|
|
|
|
*
|
|
|
|
* Given that many times Redis Hashes are used to represent objects composed
|
|
|
|
* of few fields, this is a very big win in terms of used memory.
|
|
|
|
*
|
|
|
|
* --------------------------------------------------------------------------
|
|
|
|
*
|
|
|
|
* Copyright (c) 2009-2010, Salvatore Sanfilippo <antirez at gmail dot com>
|
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions are met:
|
|
|
|
*
|
|
|
|
* * Redistributions of source code must retain the above copyright notice,
|
|
|
|
* this list of conditions and the following disclaimer.
|
|
|
|
* * Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
* * Neither the name of Redis nor the names of its contributors may be used
|
|
|
|
* to endorse or promote products derived from this software without
|
|
|
|
* specific prior written permission.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
|
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
|
|
|
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
|
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
|
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
|
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
|
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
|
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
|
|
* POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* Memory layout of a zipmap, for the map "foo" => "bar", "hello" => "world":
|
|
|
|
*
|
2010-04-01 07:24:18 -04:00
|
|
|
* <zmlen><len>"foo"<len><free>"bar"<len>"hello"<len><free>"world"
|
2010-02-27 12:07:46 -05:00
|
|
|
*
|
2010-04-01 07:24:18 -04:00
|
|
|
* <zmlen> is 1 byte length that holds the current size of the zipmap.
|
|
|
|
* When the zipmap length is greater than or equal to 254, this value
|
|
|
|
* is not used and the zipmap needs to be traversed to find out the length.
|
2010-02-27 12:07:46 -05:00
|
|
|
*
|
|
|
|
* <len> is the length of the following string (key or value).
|
|
|
|
* <len> lengths are encoded in a single value or in a 5 bytes value.
|
|
|
|
* If the first byte value (as an unsigned 8 bit value) is between 0 and
|
2014-11-25 08:58:05 -05:00
|
|
|
* 253, it's a single-byte length. If it is 254 then a four bytes unsigned
|
2012-04-07 08:40:29 -04:00
|
|
|
* integer follows (in the host byte ordering). A value of 255 is used to
|
2014-11-25 08:58:05 -05:00
|
|
|
* signal the end of the hash.
|
2010-02-27 12:07:46 -05:00
|
|
|
*
|
2014-06-26 12:48:40 -04:00
|
|
|
* <free> is the number of free unused bytes after the string, resulting
|
2012-04-07 08:40:29 -04:00
|
|
|
* from modification of values associated to a key. For instance if "foo"
|
|
|
|
* is set to "bar", and later "foo" will be set to "hi", it will have a
|
|
|
|
* free byte to use if the value will enlarge again later, or even in
|
|
|
|
* order to add a key/value pair if it fits.
|
2010-02-27 12:07:46 -05:00
|
|
|
*
|
|
|
|
* <free> is always an unsigned 8 bit number, because if after an
|
2010-04-01 07:24:18 -04:00
|
|
|
* update operation there are more than a few free bytes, the zipmap will be
|
|
|
|
* reallocated to make sure it is as small as possible.
|
2010-02-27 12:07:46 -05:00
|
|
|
*
|
|
|
|
* The most compact representation of the above two elements hash is actually:
|
|
|
|
*
|
2010-04-01 07:24:18 -04:00
|
|
|
* "\x02\x03foo\x03\x00bar\x05hello\x05\x00world\xff"
|
2010-02-27 12:07:46 -05:00
|
|
|
*
|
2010-04-01 07:24:18 -04:00
|
|
|
* Note that because keys and values are prefixed length "objects",
|
|
|
|
* the lookup will take O(N) where N is the number of elements
|
2010-02-27 12:07:46 -05:00
|
|
|
* in the zipmap and *not* the number of bytes needed to represent the zipmap.
|
|
|
|
* This lowers the constant times considerably.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include "zmalloc.h"
|
2012-02-14 10:11:46 -05:00
|
|
|
#include "endianconv.h"
|
2010-05-22 09:13:09 -04:00
|
|
|
|
|
|
|
#define ZIPMAP_BIGLEN 254
|
|
|
|
#define ZIPMAP_END 255
|
2010-02-27 12:07:46 -05:00
|
|
|
|
|
|
|
/* The following defines the max value for the <free> field described in the
|
|
|
|
* comments above, that is, the max number of trailing bytes in a value. */
|
2010-04-01 07:15:32 -04:00
|
|
|
#define ZIPMAP_VALUE_MAX_FREE 4
|
2010-02-27 12:07:46 -05:00
|
|
|
|
2010-05-22 09:13:09 -04:00
|
|
|
/* The following macro returns the number of bytes needed to encode the length
|
|
|
|
* for the integer value _l, that is, 1 byte for lengths < ZIPMAP_BIGLEN and
|
|
|
|
* 5 bytes for all the other lengths. */
|
|
|
|
#define ZIPMAP_LEN_BYTES(_l) (((_l) < ZIPMAP_BIGLEN) ? 1 : sizeof(unsigned int)+1)
|
|
|
|
|
2010-02-27 12:07:46 -05:00
|
|
|
/* Create a new empty zipmap. */
|
|
|
|
unsigned char *zipmapNew(void) {
|
|
|
|
unsigned char *zm = zmalloc(2);
|
|
|
|
|
2010-03-28 17:07:32 -04:00
|
|
|
zm[0] = 0; /* Length */
|
2010-05-22 09:13:09 -04:00
|
|
|
zm[1] = ZIPMAP_END;
|
2010-02-27 12:07:46 -05:00
|
|
|
return zm;
|
|
|
|
}
|
|
|
|
|
2010-05-22 09:13:09 -04:00
|
|
|
/* Decode the encoded length pointed by 'p' */
|
|
|
|
static unsigned int zipmapDecodeLength(unsigned char *p) {
|
|
|
|
unsigned int len = *p;
|
|
|
|
|
|
|
|
if (len < ZIPMAP_BIGLEN) return len;
|
|
|
|
memcpy(&len,p+1,sizeof(unsigned int));
|
2011-03-09 11:31:02 -05:00
|
|
|
memrev32ifbe(&len);
|
2010-05-22 09:13:09 -04:00
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
Sanitize dump payload: ziplist, listpack, zipmap, intset, stream
When loading an encoded payload we will at least do a shallow validation to
check that the size that's encoded in the payload matches the size of the
allocation.
This let's us later use this encoded size to make sure the various offsets
inside encoded payload don't reach outside the allocation, if they do, we'll
assert/panic, but at least we won't segfault or smear memory.
We can also do 'deep' validation which runs on all the records of the encoded
payload and validates that they don't contain invalid offsets. This lets us
detect corruptions early and reject a RESTORE command rather than accepting
it and asserting (crashing) later when accessing that payload via some command.
configuration:
- adding ACL flag skip-sanitize-payload
- adding config sanitize-dump-payload [yes/no/clients]
For now, we don't have a good way to ensure MIGRATE in cluster resharding isn't
being slowed down by these sanitation, so i'm setting the default value to `no`,
but later on it should be set to `clients` by default.
changes:
- changing rdbReportError not to `exit` in RESTORE command
- adding a new stat to be able to later check if cluster MIGRATE isn't being
slowed down by sanitation.
2020-08-13 09:41:05 -04:00
|
|
|
static unsigned int zipmapGetEncodedLengthSize(unsigned char *p) {
|
|
|
|
return (*p < ZIPMAP_BIGLEN) ? 1: 5;
|
|
|
|
}
|
|
|
|
|
2010-05-22 09:13:09 -04:00
|
|
|
/* Encode the length 'l' writing it in 'p'. If p is NULL it just returns
|
|
|
|
* the amount of bytes required to encode such a length. */
|
|
|
|
static unsigned int zipmapEncodeLength(unsigned char *p, unsigned int len) {
|
|
|
|
if (p == NULL) {
|
|
|
|
return ZIPMAP_LEN_BYTES(len);
|
|
|
|
} else {
|
|
|
|
if (len < ZIPMAP_BIGLEN) {
|
|
|
|
p[0] = len;
|
|
|
|
return 1;
|
|
|
|
} else {
|
|
|
|
p[0] = ZIPMAP_BIGLEN;
|
|
|
|
memcpy(p+1,&len,sizeof(len));
|
2011-03-09 11:31:02 -05:00
|
|
|
memrev32ifbe(p+1);
|
2010-05-22 09:13:09 -04:00
|
|
|
return 1+sizeof(len);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-02-27 12:07:46 -05:00
|
|
|
/* Search for a matching key, returning a pointer to the entry inside the
|
|
|
|
* zipmap. Returns NULL if the key is not found.
|
|
|
|
*
|
|
|
|
* If NULL is returned, and totlen is not NULL, it is set to the entire
|
Squash merging 125 typo/grammar/comment/doc PRs (#7773)
List of squashed commits or PRs
===============================
commit 66801ea
Author: hwware <wen.hui.ware@gmail.com>
Date: Mon Jan 13 00:54:31 2020 -0500
typo fix in acl.c
commit 46f55db
Author: Itamar Haber <itamar@redislabs.com>
Date: Sun Sep 6 18:24:11 2020 +0300
Updates a couple of comments
Specifically:
* RM_AutoMemory completed instead of pointing to docs
* Updated link to custom type doc
commit 61a2aa0
Author: xindoo <xindoo@qq.com>
Date: Tue Sep 1 19:24:59 2020 +0800
Correct errors in code comments
commit a5871d1
Author: yz1509 <pro-756@qq.com>
Date: Tue Sep 1 18:36:06 2020 +0800
fix typos in module.c
commit 41eede7
Author: bookug <bookug@qq.com>
Date: Sat Aug 15 01:11:33 2020 +0800
docs: fix typos in comments
commit c303c84
Author: lazy-snail <ws.niu@outlook.com>
Date: Fri Aug 7 11:15:44 2020 +0800
fix spelling in redis.conf
commit 1eb76bf
Author: zhujian <zhujianxyz@gmail.com>
Date: Thu Aug 6 15:22:10 2020 +0800
add a missing 'n' in comment
commit 1530ec2
Author: Daniel Dai <764122422@qq.com>
Date: Mon Jul 27 00:46:35 2020 -0400
fix spelling in tracking.c
commit e517b31
Author: Hunter-Chen <huntcool001@gmail.com>
Date: Fri Jul 17 22:33:32 2020 +0800
Update redis.conf
Co-authored-by: Itamar Haber <itamar@redislabs.com>
commit c300eff
Author: Hunter-Chen <huntcool001@gmail.com>
Date: Fri Jul 17 22:33:23 2020 +0800
Update redis.conf
Co-authored-by: Itamar Haber <itamar@redislabs.com>
commit 4c058a8
Author: 陈浩鹏 <chenhaopeng@heytea.com>
Date: Thu Jun 25 19:00:56 2020 +0800
Grammar fix and clarification
commit 5fcaa81
Author: bodong.ybd <bodong.ybd@alibaba-inc.com>
Date: Fri Jun 19 10:09:00 2020 +0800
Fix typos
commit 4caca9a
Author: Pruthvi P <pruthvi@ixigo.com>
Date: Fri May 22 00:33:22 2020 +0530
Fix typo eviciton => eviction
commit b2a25f6
Author: Brad Dunbar <dunbarb2@gmail.com>
Date: Sun May 17 12:39:59 2020 -0400
Fix a typo.
commit 12842ae
Author: hwware <wen.hui.ware@gmail.com>
Date: Sun May 3 17:16:59 2020 -0400
fix spelling in redis conf
commit ddba07c
Author: Chris Lamb <chris@chris-lamb.co.uk>
Date: Sat May 2 23:25:34 2020 +0100
Correct a "conflicts" spelling error.
commit 8fc7bf2
Author: Nao YONASHIRO <yonashiro@r.recruit.co.jp>
Date: Thu Apr 30 10:25:27 2020 +0900
docs: fix EXPIRE_FAST_CYCLE_DURATION to ACTIVE_EXPIRE_CYCLE_FAST_DURATION
commit 9b2b67a
Author: Brad Dunbar <dunbarb2@gmail.com>
Date: Fri Apr 24 11:46:22 2020 -0400
Fix a typo.
commit 0746f10
Author: devilinrust <63737265+devilinrust@users.noreply.github.com>
Date: Thu Apr 16 00:17:53 2020 +0200
Fix typos in server.c
commit 92b588d
Author: benjessop12 <56115861+benjessop12@users.noreply.github.com>
Date: Mon Apr 13 13:43:55 2020 +0100
Fix spelling mistake in lazyfree.c
commit 1da37aa
Merge: 2d4ba28 af347a8
Author: hwware <wen.hui.ware@gmail.com>
Date: Thu Mar 5 22:41:31 2020 -0500
Merge remote-tracking branch 'upstream/unstable' into expiretypofix
commit 2d4ba28
Author: hwware <wen.hui.ware@gmail.com>
Date: Mon Mar 2 00:09:40 2020 -0500
fix typo in expire.c
commit 1a746f7
Author: SennoYuki <minakami1yuki@gmail.com>
Date: Thu Feb 27 16:54:32 2020 +0800
fix typo
commit 8599b1a
Author: dongheejeong <donghee950403@gmail.com>
Date: Sun Feb 16 20:31:43 2020 +0000
Fix typo in server.c
commit f38d4e8
Author: hwware <wen.hui.ware@gmail.com>
Date: Sun Feb 2 22:58:38 2020 -0500
fix typo in evict.c
commit fe143fc
Author: Leo Murillo <leonardo.murillo@gmail.com>
Date: Sun Feb 2 01:57:22 2020 -0600
Fix a few typos in redis.conf
commit 1ab4d21
Author: viraja1 <anchan.viraj@gmail.com>
Date: Fri Dec 27 17:15:58 2019 +0530
Fix typo in Latency API docstring
commit ca1f70e
Author: gosth <danxuedexing@qq.com>
Date: Wed Dec 18 15:18:02 2019 +0800
fix typo in sort.c
commit a57c06b
Author: ZYunH <zyunhjob@163.com>
Date: Mon Dec 16 22:28:46 2019 +0800
fix-zset-typo
commit b8c92b5
Author: git-hulk <hulk.website@gmail.com>
Date: Mon Dec 16 15:51:42 2019 +0800
FIX: typo in cluster.c, onformation->information
commit 9dd981c
Author: wujm2007 <jim.wujm@gmail.com>
Date: Mon Dec 16 09:37:52 2019 +0800
Fix typo
commit e132d7a
Author: Sebastien Williams-Wynn <s.williamswynn.mail@gmail.com>
Date: Fri Nov 15 00:14:07 2019 +0000
Minor typo change
commit 47f44d5
Author: happynote3966 <01ssrmikururudevice01@gmail.com>
Date: Mon Nov 11 22:08:48 2019 +0900
fix comment typo in redis-cli.c
commit b8bdb0d
Author: fulei <fulei@kuaishou.com>
Date: Wed Oct 16 18:00:17 2019 +0800
Fix a spelling mistake of comments in defragDictBucketCallback
commit 0def46a
Author: fulei <fulei@kuaishou.com>
Date: Wed Oct 16 13:09:27 2019 +0800
fix some spelling mistakes of comments in defrag.c
commit f3596fd
Author: Phil Rajchgot <tophil@outlook.com>
Date: Sun Oct 13 02:02:32 2019 -0400
Typo and grammar fixes
Redis and its documentation are great -- just wanted to submit a few corrections in the spirit of Hacktoberfest. Thanks for all your work on this project. I use it all the time and it works beautifully.
commit 2b928cd
Author: KangZhiDong <worldkzd@gmail.com>
Date: Sun Sep 1 07:03:11 2019 +0800
fix typos
commit 33aea14
Author: Axlgrep <axlgrep@gmail.com>
Date: Tue Aug 27 11:02:18 2019 +0800
Fixed eviction spelling issues
commit e282a80
Author: Simen Flatby <simen@oms.no>
Date: Tue Aug 20 15:25:51 2019 +0200
Update comments to reflect prop name
In the comments the prop is referenced as replica-validity-factor,
but it is really named cluster-replica-validity-factor.
commit 74d1f9a
Author: Jim Green <jimgreen2013@qq.com>
Date: Tue Aug 20 20:00:31 2019 +0800
fix comment error, the code is ok
commit eea1407
Author: Liao Tonglang <liaotonglang@gmail.com>
Date: Fri May 31 10:16:18 2019 +0800
typo fix
fix cna't to can't
commit 0da553c
Author: KAWACHI Takashi <tkawachi@gmail.com>
Date: Wed Jul 17 00:38:16 2019 +0900
Fix typo
commit 7fc8fb6
Author: Michael Prokop <mika@grml.org>
Date: Tue May 28 17:58:42 2019 +0200
Typo fixes
s/familar/familiar/
s/compatiblity/compatibility/
s/ ot / to /
s/itsef/itself/
commit 5f46c9d
Author: zhumoing <34539422+zhumoing@users.noreply.github.com>
Date: Tue May 21 21:16:50 2019 +0800
typo-fixes
typo-fixes
commit 321dfe1
Author: wxisme <850885154@qq.com>
Date: Sat Mar 16 15:10:55 2019 +0800
typo fix
commit b4fb131
Merge: 267e0e6 3df1eb8
Author: Nikitas Bastas <nikitasbst@gmail.com>
Date: Fri Feb 8 22:55:45 2019 +0200
Merge branch 'unstable' of antirez/redis into unstable
commit 267e0e6
Author: Nikitas Bastas <nikitasbst@gmail.com>
Date: Wed Jan 30 21:26:04 2019 +0200
Minor typo fix
commit 30544e7
Author: inshal96 <39904558+inshal96@users.noreply.github.com>
Date: Fri Jan 4 16:54:50 2019 +0500
remove an extra 'a' in the comments
commit 337969d
Author: BrotherGao <yangdongheng11@gmail.com>
Date: Sat Dec 29 12:37:29 2018 +0800
fix typo in redis.conf
commit 9f4b121
Merge: 423a030 e504583
Author: BrotherGao <yangdongheng@xiaomi.com>
Date: Sat Dec 29 11:41:12 2018 +0800
Merge branch 'unstable' of antirez/redis into unstable
commit 423a030
Merge: 42b02b7 46a51cd
Author: 杨东衡 <yangdongheng@xiaomi.com>
Date: Tue Dec 4 23:56:11 2018 +0800
Merge branch 'unstable' of antirez/redis into unstable
commit 42b02b7
Merge: 68c0e6e b8febe6
Author: Dongheng Yang <yangdongheng11@gmail.com>
Date: Sun Oct 28 15:54:23 2018 +0800
Merge pull request #1 from antirez/unstable
update local data
commit 714b589
Author: Christian <crifei93@gmail.com>
Date: Fri Dec 28 01:17:26 2018 +0100
fix typo "resulution"
commit e23259d
Author: garenchan <1412950785@qq.com>
Date: Wed Dec 26 09:58:35 2018 +0800
fix typo: segfauls -> segfault
commit a9359f8
Author: xjp <jianping_xie@aliyun.com>
Date: Tue Dec 18 17:31:44 2018 +0800
Fixed REDISMODULE_H spell bug
commit a12c3e4
Author: jdiaz <jrd.palacios@gmail.com>
Date: Sat Dec 15 23:39:52 2018 -0600
Fixes hyperloglog hash function comment block description
commit 770eb11
Author: 林上耀 <1210tom@163.com>
Date: Sun Nov 25 17:16:10 2018 +0800
fix typo
commit fd97fbb
Author: Chris Lamb <chris@chris-lamb.co.uk>
Date: Fri Nov 23 17:14:01 2018 +0100
Correct "unsupported" typo.
commit a85522d
Author: Jungnam Lee <jungnam.lee@oracle.com>
Date: Thu Nov 8 23:01:29 2018 +0900
fix typo in test comments
commit ade8007
Author: Arun Kumar <palerdot@users.noreply.github.com>
Date: Tue Oct 23 16:56:35 2018 +0530
Fixed grammatical typo
Fixed typo for word 'dictionary'
commit 869ee39
Author: Hamid Alaei <hamid.a85@gmail.com>
Date: Sun Aug 12 16:40:02 2018 +0430
fix documentations: (ThreadSafeContextStart/Stop -> ThreadSafeContextLock/Unlock), minor typo
commit f89d158
Author: Mayank Jain <mayankjain255@gmail.com>
Date: Tue Jul 31 23:01:21 2018 +0530
Updated README.md with some spelling corrections.
Made correction in spelling of some misspelled words.
commit 892198e
Author: dsomeshwar <someshwar.dhayalan@gmail.com>
Date: Sat Jul 21 23:23:04 2018 +0530
typo fix
commit 8a4d780
Author: Itamar Haber <itamar@redislabs.com>
Date: Mon Apr 30 02:06:52 2018 +0300
Fixes some typos
commit e3acef6
Author: Noah Rosamilia <ivoahivoah@gmail.com>
Date: Sat Mar 3 23:41:21 2018 -0500
Fix typo in /deps/README.md
commit 04442fb
Author: WuYunlong <xzsyeb@126.com>
Date: Sat Mar 3 10:32:42 2018 +0800
Fix typo in readSyncBulkPayload() comment.
commit 9f36880
Author: WuYunlong <xzsyeb@126.com>
Date: Sat Mar 3 10:20:37 2018 +0800
replication.c comment: run_id -> replid.
commit f866b4a
Author: Francesco 'makevoid' Canessa <makevoid@gmail.com>
Date: Thu Feb 22 22:01:56 2018 +0000
fix comment typo in server.c
commit 0ebc69b
Author: 줍 <jubee0124@gmail.com>
Date: Mon Feb 12 16:38:48 2018 +0900
Fix typo in redis.conf
Fix `five behaviors` to `eight behaviors` in [this sentence ](antirez/redis@unstable/redis.conf#L564)
commit b50a620
Author: martinbroadhurst <martinbroadhurst@users.noreply.github.com>
Date: Thu Dec 28 12:07:30 2017 +0000
Fix typo in valgrind.sup
commit 7d8f349
Author: Peter Boughton <peter@sorcerersisle.com>
Date: Mon Nov 27 19:52:19 2017 +0000
Update CONTRIBUTING; refer doc updates to redis-doc repo.
commit 02dec7e
Author: Klauswk <klauswk1@hotmail.com>
Date: Tue Oct 24 16:18:38 2017 -0200
Fix typo in comment
commit e1efbc8
Author: chenshi <baiwfg2@gmail.com>
Date: Tue Oct 3 18:26:30 2017 +0800
Correct two spelling errors of comments
commit 93327d8
Author: spacewander <spacewanderlzx@gmail.com>
Date: Wed Sep 13 16:47:24 2017 +0800
Update the comment for OBJ_ENCODING_EMBSTR_SIZE_LIMIT's value
The value of OBJ_ENCODING_EMBSTR_SIZE_LIMIT is 44 now instead of 39.
commit 63d361f
Author: spacewander <spacewanderlzx@gmail.com>
Date: Tue Sep 12 15:06:42 2017 +0800
Fix <prevlen> related doc in ziplist.c
According to the definition of ZIP_BIG_PREVLEN and other related code,
the guard of single byte <prevlen> should be 254 instead of 255.
commit ebe228d
Author: hanael80 <hanael80@gmail.com>
Date: Tue Aug 15 09:09:40 2017 +0900
Fix typo
commit 6b696e6
Author: Matt Robenolt <matt@ydekproductions.com>
Date: Mon Aug 14 14:50:47 2017 -0700
Fix typo in LATENCY DOCTOR output
commit a2ec6ae
Author: caosiyang <caosiyang@qiyi.com>
Date: Tue Aug 15 14:15:16 2017 +0800
Fix a typo: form => from
commit 3ab7699
Author: caosiyang <caosiyang@qiyi.com>
Date: Thu Aug 10 18:40:33 2017 +0800
Fix a typo: replicationFeedSlavesFromMaster() => replicationFeedSlavesFromMasterStream()
commit 72d43ef
Author: caosiyang <caosiyang@qiyi.com>
Date: Tue Aug 8 15:57:25 2017 +0800
fix a typo: servewr => server
commit 707c958
Author: Bo Cai <charpty@gmail.com>
Date: Wed Jul 26 21:49:42 2017 +0800
redis-cli.c typo: conut -> count.
Signed-off-by: Bo Cai <charpty@gmail.com>
commit b9385b2
Author: JackDrogon <jack.xsuperman@gmail.com>
Date: Fri Jun 30 14:22:31 2017 +0800
Fix some spell problems
commit 20d9230
Author: akosel <aaronjkosel@gmail.com>
Date: Sun Jun 4 19:35:13 2017 -0500
Fix typo
commit b167bfc
Author: Krzysiek Witkowicz <krzysiekwitkowicz@gmail.com>
Date: Mon May 22 21:32:27 2017 +0100
Fix #4008 small typo in comment
commit 2b78ac8
Author: Jake Clarkson <jacobwclarkson@gmail.com>
Date: Wed Apr 26 15:49:50 2017 +0100
Correct typo in tests/unit/hyperloglog.tcl
commit b0f1cdb
Author: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Wed Apr 19 14:25:18 2017 -0700
Fix typo
commit a90b0f9
Author: charsyam <charsyam@naver.com>
Date: Thu Mar 16 18:19:53 2017 +0900
fix typos
fix typos
fix typos
commit 8430a79
Author: Richard Hart <richardhart92@gmail.com>
Date: Mon Mar 13 22:17:41 2017 -0400
Fixed log message typo in listenToPort.
commit 481a1c2
Author: Vinod Kumar <kumar003vinod@gmail.com>
Date: Sun Jan 15 23:04:51 2017 +0530
src/db.c: Correct "save" -> "safe" typo
commit 586b4d3
Author: wangshaonan <wshn13@gmail.com>
Date: Wed Dec 21 20:28:27 2016 +0800
Fix typo they->the in helloworld.c
commit c1c4b5e
Author: Jenner <hypxm@qq.com>
Date: Mon Dec 19 16:39:46 2016 +0800
typo error
commit 1ee1a3f
Author: tielei <43289893@qq.com>
Date: Mon Jul 18 13:52:25 2016 +0800
fix some comments
commit 11a41fb
Author: Otto Kekäläinen <otto@seravo.fi>
Date: Sun Jul 3 10:23:55 2016 +0100
Fix spelling in documentation and comments
commit 5fb5d82
Author: francischan <f1ancis621@gmail.com>
Date: Tue Jun 28 00:19:33 2016 +0800
Fix outdated comments about redis.c file.
It should now refer to server.c file.
commit 6b254bc
Author: lmatt-bit <lmatt123n@gmail.com>
Date: Thu Apr 21 21:45:58 2016 +0800
Refine the comment of dictRehashMilliseconds func
SLAVECONF->REPLCONF in comment - by andyli029
commit ee9869f
Author: clark.kang <charsyam@naver.com>
Date: Tue Mar 22 11:09:51 2016 +0900
fix typos
commit f7b3b11
Author: Harisankar H <harisankarh@gmail.com>
Date: Wed Mar 9 11:49:42 2016 +0530
Typo correction: "faield" --> "failed"
Typo correction: "faield" --> "failed"
commit 3fd40fc
Author: Itamar Haber <itamar@redislabs.com>
Date: Thu Feb 25 10:31:51 2016 +0200
Fixes a typo in comments
commit 621c160
Author: Prayag Verma <prayag.verma@gmail.com>
Date: Mon Feb 1 12:36:20 2016 +0530
Fix typo in Readme.md
Spelling mistakes -
`eviciton` > `eviction`
`familar` > `familiar`
commit d7d07d6
Author: WonCheol Lee <toctoc21c@gmail.com>
Date: Wed Dec 30 15:11:34 2015 +0900
Typo fixed
commit a4dade7
Author: Felix Bünemann <buenemann@louis.info>
Date: Mon Dec 28 11:02:55 2015 +0100
[ci skip] Improve supervised upstart config docs
This mentions that "expect stop" is required for supervised upstart
to work correctly. See http://upstart.ubuntu.com/cookbook/#expect-stop
for an explanation.
commit d9caba9
Author: daurnimator <quae@daurnimator.com>
Date: Mon Dec 21 18:30:03 2015 +1100
README: Remove trailing whitespace
commit 72d42e5
Author: daurnimator <quae@daurnimator.com>
Date: Mon Dec 21 18:29:32 2015 +1100
README: Fix typo. th => the
commit dd6e957
Author: daurnimator <quae@daurnimator.com>
Date: Mon Dec 21 18:29:20 2015 +1100
README: Fix typo. familar => familiar
commit 3a12b23
Author: daurnimator <quae@daurnimator.com>
Date: Mon Dec 21 18:28:54 2015 +1100
README: Fix typo. eviciton => eviction
commit 2d1d03b
Author: daurnimator <quae@daurnimator.com>
Date: Mon Dec 21 18:21:45 2015 +1100
README: Fix typo. sever => server
commit 3973b06
Author: Itamar Haber <itamar@garantiadata.com>
Date: Sat Dec 19 17:01:20 2015 +0200
Typo fix
commit 4f2e460
Author: Steve Gao <fu@2token.com>
Date: Fri Dec 4 10:22:05 2015 +0800
Update README - fix typos
commit b21667c
Author: binyan <binbin.yan@nokia.com>
Date: Wed Dec 2 22:48:37 2015 +0800
delete redundancy color judge in sdscatcolor
commit 88894c7
Author: binyan <binbin.yan@nokia.com>
Date: Wed Dec 2 22:14:42 2015 +0800
the example output shoule be HelloWorld
commit 2763470
Author: binyan <binbin.yan@nokia.com>
Date: Wed Dec 2 17:41:39 2015 +0800
modify error word keyevente
Signed-off-by: binyan <binbin.yan@nokia.com>
commit 0847b3d
Author: Bruno Martins <bscmartins@gmail.com>
Date: Wed Nov 4 11:37:01 2015 +0000
typo
commit bbb9e9e
Author: dawedawe <dawedawe@gmx.de>
Date: Fri Mar 27 00:46:41 2015 +0100
typo: zimap -> zipmap
commit 5ed297e
Author: Axel Advento <badwolf.bloodseeker.rev@gmail.com>
Date: Tue Mar 3 15:58:29 2015 +0800
Fix 'salve' typos to 'slave'
commit edec9d6
Author: LudwikJaniuk <ludvig.janiuk@gmail.com>
Date: Wed Jun 12 14:12:47 2019 +0200
Update README.md
Co-Authored-By: Qix <Qix-@users.noreply.github.com>
commit 692a7af
Author: LudwikJaniuk <ludvig.janiuk@gmail.com>
Date: Tue May 28 14:32:04 2019 +0200
grammar
commit d962b0a
Author: Nick Frost <nickfrostatx@gmail.com>
Date: Wed Jul 20 15:17:12 2016 -0700
Minor grammar fix
commit 24fff01aaccaf5956973ada8c50ceb1462e211c6 (typos)
Author: Chad Miller <chadm@squareup.com>
Date: Tue Sep 8 13:46:11 2020 -0400
Fix faulty comment about operation of unlink()
commit 3cd5c1f3326c52aa552ada7ec797c6bb16452355
Author: Kevin <kevin.xgr@gmail.com>
Date: Wed Nov 20 00:13:50 2019 +0800
Fix typo in server.c.
From a83af59 Mon Sep 17 00:00:00 2001
From: wuwo <wuwo@wacai.com>
Date: Fri, 17 Mar 2017 20:37:45 +0800
Subject: [PATCH] falure to failure
From c961896 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B7=A6=E6=87=B6?= <veficos@gmail.com>
Date: Sat, 27 May 2017 15:33:04 +0800
Subject: [PATCH] fix typo
From e600ef2 Mon Sep 17 00:00:00 2001
From: "rui.zou" <rui.zou@yunify.com>
Date: Sat, 30 Sep 2017 12:38:15 +0800
Subject: [PATCH] fix a typo
From c7d07fa Mon Sep 17 00:00:00 2001
From: Alexandre Perrin <alex@kaworu.ch>
Date: Thu, 16 Aug 2018 10:35:31 +0200
Subject: [PATCH] deps README.md typo
From b25cb67 Mon Sep 17 00:00:00 2001
From: Guy Korland <gkorland@gmail.com>
Date: Wed, 26 Sep 2018 10:55:37 +0300
Subject: [PATCH 1/2] fix typos in header
From ad28ca6 Mon Sep 17 00:00:00 2001
From: Guy Korland <gkorland@gmail.com>
Date: Wed, 26 Sep 2018 11:02:36 +0300
Subject: [PATCH 2/2] fix typos
commit 34924cdedd8552466fc22c1168d49236cb7ee915
Author: Adrian Lynch <adi_ady_ade@hotmail.com>
Date: Sat Apr 4 21:59:15 2015 +0100
Typos fixed
commit fd2a1e7
Author: Jan <jsteemann@users.noreply.github.com>
Date: Sat Oct 27 19:13:01 2018 +0200
Fix typos
Fix typos
commit e14e47c1a234b53b0e103c5f6a1c61481cbcbb02
Author: Andy Lester <andy@petdance.com>
Date: Fri Aug 2 22:30:07 2019 -0500
Fix multiple misspellings of "following"
commit 79b948ce2dac6b453fe80995abbcaac04c213d5a
Author: Andy Lester <andy@petdance.com>
Date: Fri Aug 2 22:24:28 2019 -0500
Fix misspelling of create-cluster
commit 1fffde52666dc99ab35efbd31071a4c008cb5a71
Author: Andy Lester <andy@petdance.com>
Date: Wed Jul 31 17:57:56 2019 -0500
Fix typos
commit 204c9ba9651e9e05fd73936b452b9a30be456cfe
Author: Xiaobo Zhu <xiaobo.zhu@shopee.com>
Date: Tue Aug 13 22:19:25 2019 +0800
fix typos
Squashed commit of the following:
commit 1d9aaf8
Author: danmedani <danmedani@gmail.com>
Date: Sun Aug 2 11:40:26 2015 -0700
README typo fix.
Squashed commit of the following:
commit 32bfa7c
Author: Erik Dubbelboer <erik@dubbelboer.com>
Date: Mon Jul 6 21:15:08 2015 +0200
Fixed grammer
Squashed commit of the following:
commit b24f69c
Author: Sisir Koppaka <sisir.koppaka@gmail.com>
Date: Mon Mar 2 22:38:45 2015 -0500
utils/hashtable/rehashing.c: Fix typos
Squashed commit of the following:
commit 4e04082
Author: Erik Dubbelboer <erik@dubbelboer.com>
Date: Mon Mar 23 08:22:21 2015 +0000
Small config file documentation improvements
Squashed commit of the following:
commit acb8773
Author: ctd1500 <ctd1500@gmail.com>
Date: Fri May 8 01:52:48 2015 -0700
Typo and grammar fixes in readme
commit 2eb75b6
Author: ctd1500 <ctd1500@gmail.com>
Date: Fri May 8 01:36:18 2015 -0700
fixed redis.conf comment
Squashed commit of the following:
commit a8249a2
Author: Masahiko Sawada <sawada.mshk@gmail.com>
Date: Fri Dec 11 11:39:52 2015 +0530
Revise correction of typos.
Squashed commit of the following:
commit 3c02028
Author: zhaojun11 <zhaojun11@jd.com>
Date: Wed Jan 17 19:05:28 2018 +0800
Fix typos include two code typos in cluster.c and latency.c
Squashed commit of the following:
commit 9dba47c
Author: q191201771 <191201771@qq.com>
Date: Sat Jan 4 11:31:04 2020 +0800
fix function listCreate comment in adlist.c
Update src/server.c
commit 2c7c2cb536e78dd211b1ac6f7bda00f0f54faaeb
Author: charpty <charpty@gmail.com>
Date: Tue May 1 23:16:59 2018 +0800
server.c typo: modules system dictionary type comment
Signed-off-by: charpty <charpty@gmail.com>
commit a8395323fb63cb59cb3591cb0f0c8edb7c29a680
Author: Itamar Haber <itamar@redislabs.com>
Date: Sun May 6 00:25:18 2018 +0300
Updates test_helper.tcl's help with undocumented options
Specifically:
* Host
* Port
* Client
commit bde6f9ced15755cd6407b4af7d601b030f36d60b
Author: wxisme <850885154@qq.com>
Date: Wed Aug 8 15:19:19 2018 +0800
fix comments in deps files
commit 3172474ba991532ab799ee1873439f3402412331
Author: wxisme <850885154@qq.com>
Date: Wed Aug 8 14:33:49 2018 +0800
fix some comments
commit 01b6f2b6858b5cf2ce4ad5092d2c746e755f53f0
Author: Thor Juhasz <thor@juhasz.pro>
Date: Sun Nov 18 14:37:41 2018 +0100
Minor fixes to comments
Found some parts a little unclear on a first read, which prompted me to have a better look at the file and fix some minor things I noticed.
Fixing minor typos and grammar. There are no changes to configuration options.
These changes are only meant to help the user better understand the explanations to the various configuration options
2020-09-10 06:43:38 -04:00
|
|
|
* size of the zipmap, so that the calling function will be able to
|
2010-03-28 17:10:01 -04:00
|
|
|
* reallocate the original zipmap to make room for more entries. */
|
2010-03-28 16:59:15 -04:00
|
|
|
static unsigned char *zipmapLookupRaw(unsigned char *zm, unsigned char *key, unsigned int klen, unsigned int *totlen) {
|
|
|
|
unsigned char *p = zm+1, *k = NULL;
|
2010-05-20 05:02:08 -04:00
|
|
|
unsigned int l,llen;
|
2010-02-27 12:07:46 -05:00
|
|
|
|
2010-05-22 09:13:09 -04:00
|
|
|
while(*p != ZIPMAP_END) {
|
2010-03-28 16:59:15 -04:00
|
|
|
unsigned char free;
|
|
|
|
|
|
|
|
/* Match or skip the key */
|
2010-05-22 09:13:09 -04:00
|
|
|
l = zipmapDecodeLength(p);
|
|
|
|
llen = zipmapEncodeLength(NULL,l);
|
2011-02-28 08:48:49 -05:00
|
|
|
if (key != NULL && k == NULL && l == klen && !memcmp(p+llen,key,l)) {
|
2010-03-28 16:59:15 -04:00
|
|
|
/* Only return when the user doesn't care
|
|
|
|
* for the total length of the zipmap. */
|
|
|
|
if (totlen != NULL) {
|
|
|
|
k = p;
|
|
|
|
} else {
|
|
|
|
return p;
|
2010-02-27 12:07:46 -05:00
|
|
|
}
|
|
|
|
}
|
2010-05-20 05:02:08 -04:00
|
|
|
p += llen+l;
|
2010-03-28 16:59:15 -04:00
|
|
|
/* Skip the value as well */
|
2010-05-22 09:13:09 -04:00
|
|
|
l = zipmapDecodeLength(p);
|
|
|
|
p += zipmapEncodeLength(NULL,l);
|
2010-03-28 16:59:15 -04:00
|
|
|
free = p[0];
|
|
|
|
p += l+1+free; /* +1 to skip the free byte */
|
2010-02-27 12:07:46 -05:00
|
|
|
}
|
|
|
|
if (totlen != NULL) *totlen = (unsigned int)(p-zm)+1;
|
2010-03-28 16:59:15 -04:00
|
|
|
return k;
|
2010-02-27 12:07:46 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
static unsigned long zipmapRequiredLength(unsigned int klen, unsigned int vlen) {
|
|
|
|
unsigned int l;
|
|
|
|
|
|
|
|
l = klen+vlen+3;
|
2010-05-22 09:13:09 -04:00
|
|
|
if (klen >= ZIPMAP_BIGLEN) l += 4;
|
|
|
|
if (vlen >= ZIPMAP_BIGLEN) l += 4;
|
2010-02-27 12:07:46 -05:00
|
|
|
return l;
|
|
|
|
}
|
|
|
|
|
2010-02-27 12:13:55 -05:00
|
|
|
/* Return the total amount used by a key (encoded length + payload) */
|
2010-02-27 12:07:46 -05:00
|
|
|
static unsigned int zipmapRawKeyLength(unsigned char *p) {
|
2010-05-22 09:13:09 -04:00
|
|
|
unsigned int l = zipmapDecodeLength(p);
|
|
|
|
return zipmapEncodeLength(NULL,l) + l;
|
2010-02-27 12:07:46 -05:00
|
|
|
}
|
|
|
|
|
2010-02-27 12:13:55 -05:00
|
|
|
/* Return the total amount used by a value
|
2010-02-27 12:07:46 -05:00
|
|
|
* (encoded length + single byte free count + payload) */
|
|
|
|
static unsigned int zipmapRawValueLength(unsigned char *p) {
|
2010-05-22 09:13:09 -04:00
|
|
|
unsigned int l = zipmapDecodeLength(p);
|
2010-02-27 12:07:46 -05:00
|
|
|
unsigned int used;
|
2014-06-26 12:48:40 -04:00
|
|
|
|
2010-05-22 09:13:09 -04:00
|
|
|
used = zipmapEncodeLength(NULL,l);
|
2010-02-27 12:07:46 -05:00
|
|
|
used += p[used] + 1 + l;
|
|
|
|
return used;
|
|
|
|
}
|
|
|
|
|
2010-03-03 10:59:44 -05:00
|
|
|
/* If 'p' points to a key, this function returns the total amount of
|
|
|
|
* bytes used to store this entry (entry = key + associated value + trailing
|
|
|
|
* free space if any). */
|
|
|
|
static unsigned int zipmapRawEntryLength(unsigned char *p) {
|
|
|
|
unsigned int l = zipmapRawKeyLength(p);
|
|
|
|
return l + zipmapRawValueLength(p+l);
|
|
|
|
}
|
|
|
|
|
2010-05-22 09:13:09 -04:00
|
|
|
static inline unsigned char *zipmapResize(unsigned char *zm, unsigned int len) {
|
|
|
|
zm = zrealloc(zm, len);
|
|
|
|
zm[len-1] = ZIPMAP_END;
|
|
|
|
return zm;
|
|
|
|
}
|
|
|
|
|
2010-03-05 08:04:17 -05:00
|
|
|
/* Set key to value, creating the key if it does not already exist.
|
|
|
|
* If 'update' is not NULL, *update is set to 1 if the key was
|
|
|
|
* already preset, otherwise to 0. */
|
|
|
|
unsigned char *zipmapSet(unsigned char *zm, unsigned char *key, unsigned int klen, unsigned char *val, unsigned int vlen, int *update) {
|
2010-04-01 08:02:22 -04:00
|
|
|
unsigned int zmlen, offset;
|
2010-03-28 16:59:15 -04:00
|
|
|
unsigned int freelen, reqlen = zipmapRequiredLength(klen,vlen);
|
2010-02-27 12:07:46 -05:00
|
|
|
unsigned int empty, vempty;
|
|
|
|
unsigned char *p;
|
2014-06-26 12:48:40 -04:00
|
|
|
|
2010-02-27 12:07:46 -05:00
|
|
|
freelen = reqlen;
|
2010-03-05 08:04:17 -05:00
|
|
|
if (update) *update = 0;
|
2010-03-28 16:59:15 -04:00
|
|
|
p = zipmapLookupRaw(zm,key,klen,&zmlen);
|
|
|
|
if (p == NULL) {
|
|
|
|
/* Key not found: enlarge */
|
2010-05-22 09:13:09 -04:00
|
|
|
zm = zipmapResize(zm, zmlen+reqlen);
|
2010-03-28 16:59:15 -04:00
|
|
|
p = zm+zmlen-1;
|
|
|
|
zmlen = zmlen+reqlen;
|
2010-03-28 17:07:32 -04:00
|
|
|
|
|
|
|
/* Increase zipmap length (this is an insert) */
|
2010-05-22 09:13:09 -04:00
|
|
|
if (zm[0] < ZIPMAP_BIGLEN) zm[0]++;
|
2010-02-27 12:07:46 -05:00
|
|
|
} else {
|
|
|
|
/* Key found. Is there enough space for the new value? */
|
|
|
|
/* Compute the total length: */
|
2010-03-05 08:04:17 -05:00
|
|
|
if (update) *update = 1;
|
2010-04-01 06:58:08 -04:00
|
|
|
freelen = zipmapRawEntryLength(p);
|
2010-02-27 12:07:46 -05:00
|
|
|
if (freelen < reqlen) {
|
2010-04-01 08:02:22 -04:00
|
|
|
/* Store the offset of this key within the current zipmap, so
|
|
|
|
* it can be resized. Then, move the tail backwards so this
|
|
|
|
* pair fits at the current position. */
|
|
|
|
offset = p-zm;
|
2010-05-22 09:13:09 -04:00
|
|
|
zm = zipmapResize(zm, zmlen-freelen+reqlen);
|
2010-04-01 08:02:22 -04:00
|
|
|
p = zm+offset;
|
|
|
|
|
|
|
|
/* The +1 in the number of bytes to be moved is caused by the
|
|
|
|
* end-of-zipmap byte. Note: the *original* zmlen is used. */
|
|
|
|
memmove(p+reqlen, p+freelen, zmlen-(offset+freelen+1));
|
|
|
|
zmlen = zmlen-freelen+reqlen;
|
2010-03-28 16:59:15 -04:00
|
|
|
freelen = reqlen;
|
2010-02-27 12:07:46 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-04-01 08:02:22 -04:00
|
|
|
/* We now have a suitable block where the key/value entry can
|
|
|
|
* be written. If there is too much free space, move the tail
|
|
|
|
* of the zipmap a few bytes to the front and shrink the zipmap,
|
|
|
|
* as we want zipmaps to be very space efficient. */
|
2010-02-27 12:07:46 -05:00
|
|
|
empty = freelen-reqlen;
|
2010-03-28 16:59:15 -04:00
|
|
|
if (empty >= ZIPMAP_VALUE_MAX_FREE) {
|
2010-04-01 08:02:22 -04:00
|
|
|
/* First, move the tail <empty> bytes to the front, then resize
|
|
|
|
* the zipmap to be <empty> bytes smaller. */
|
|
|
|
offset = p-zm;
|
|
|
|
memmove(p+reqlen, p+freelen, zmlen-(offset+freelen+1));
|
2010-03-28 16:59:15 -04:00
|
|
|
zmlen -= empty;
|
2010-05-22 09:13:09 -04:00
|
|
|
zm = zipmapResize(zm, zmlen);
|
2010-04-01 08:02:22 -04:00
|
|
|
p = zm+offset;
|
2010-02-27 12:07:46 -05:00
|
|
|
vempty = 0;
|
|
|
|
} else {
|
|
|
|
vempty = empty;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Just write the key + value and we are done. */
|
|
|
|
/* Key: */
|
2010-05-22 09:13:09 -04:00
|
|
|
p += zipmapEncodeLength(p,klen);
|
2010-02-27 12:07:46 -05:00
|
|
|
memcpy(p,key,klen);
|
|
|
|
p += klen;
|
|
|
|
/* Value: */
|
2010-05-22 09:13:09 -04:00
|
|
|
p += zipmapEncodeLength(p,vlen);
|
2010-02-27 12:07:46 -05:00
|
|
|
*p++ = vempty;
|
|
|
|
memcpy(p,val,vlen);
|
|
|
|
return zm;
|
|
|
|
}
|
|
|
|
|
2010-03-03 10:59:44 -05:00
|
|
|
/* Remove the specified key. If 'deleted' is not NULL the pointed integer is
|
|
|
|
* set to 0 if the key was not found, to 1 if it was found and deleted. */
|
|
|
|
unsigned char *zipmapDel(unsigned char *zm, unsigned char *key, unsigned int klen, int *deleted) {
|
2010-03-28 17:07:32 -04:00
|
|
|
unsigned int zmlen, freelen;
|
2010-03-28 16:59:15 -04:00
|
|
|
unsigned char *p = zipmapLookupRaw(zm,key,klen,&zmlen);
|
2010-03-03 10:59:44 -05:00
|
|
|
if (p) {
|
2010-03-28 17:07:32 -04:00
|
|
|
freelen = zipmapRawEntryLength(p);
|
2010-03-28 16:59:15 -04:00
|
|
|
memmove(p, p+freelen, zmlen-((p-zm)+freelen+1));
|
2010-05-22 09:13:09 -04:00
|
|
|
zm = zipmapResize(zm, zmlen-freelen);
|
2010-03-28 17:07:32 -04:00
|
|
|
|
|
|
|
/* Decrease zipmap length */
|
2010-05-22 09:13:09 -04:00
|
|
|
if (zm[0] < ZIPMAP_BIGLEN) zm[0]--;
|
2010-03-28 17:07:32 -04:00
|
|
|
|
2010-03-03 10:59:44 -05:00
|
|
|
if (deleted) *deleted = 1;
|
|
|
|
} else {
|
|
|
|
if (deleted) *deleted = 0;
|
|
|
|
}
|
|
|
|
return zm;
|
|
|
|
}
|
|
|
|
|
2011-11-01 15:57:51 -04:00
|
|
|
/* Call before iterating through elements via zipmapNext() */
|
2010-03-05 08:04:17 -05:00
|
|
|
unsigned char *zipmapRewind(unsigned char *zm) {
|
|
|
|
return zm+1;
|
|
|
|
}
|
|
|
|
|
2010-03-04 13:45:15 -05:00
|
|
|
/* This function is used to iterate through all the zipmap elements.
|
|
|
|
* In the first call the first argument is the pointer to the zipmap + 1.
|
|
|
|
* In the next calls what zipmapNext returns is used as first argument.
|
|
|
|
* Example:
|
|
|
|
*
|
2010-03-05 08:04:17 -05:00
|
|
|
* unsigned char *i = zipmapRewind(my_zipmap);
|
2010-03-04 13:45:15 -05:00
|
|
|
* while((i = zipmapNext(i,&key,&klen,&value,&vlen)) != NULL) {
|
|
|
|
* printf("%d bytes key at $p\n", klen, key);
|
|
|
|
* printf("%d bytes value at $p\n", vlen, value);
|
|
|
|
* }
|
|
|
|
*/
|
2010-03-05 08:04:17 -05:00
|
|
|
unsigned char *zipmapNext(unsigned char *zm, unsigned char **key, unsigned int *klen, unsigned char **value, unsigned int *vlen) {
|
2010-05-22 09:13:09 -04:00
|
|
|
if (zm[0] == ZIPMAP_END) return NULL;
|
2010-03-04 13:45:15 -05:00
|
|
|
if (key) {
|
|
|
|
*key = zm;
|
2010-05-22 09:13:09 -04:00
|
|
|
*klen = zipmapDecodeLength(zm);
|
|
|
|
*key += ZIPMAP_LEN_BYTES(*klen);
|
2010-03-04 13:45:15 -05:00
|
|
|
}
|
|
|
|
zm += zipmapRawKeyLength(zm);
|
|
|
|
if (value) {
|
|
|
|
*value = zm+1;
|
2010-05-22 09:13:09 -04:00
|
|
|
*vlen = zipmapDecodeLength(zm);
|
|
|
|
*value += ZIPMAP_LEN_BYTES(*vlen);
|
2010-03-04 13:45:15 -05:00
|
|
|
}
|
|
|
|
zm += zipmapRawValueLength(zm);
|
|
|
|
return zm;
|
|
|
|
}
|
|
|
|
|
2010-03-05 08:04:17 -05:00
|
|
|
/* Search a key and retrieve the pointer and len of the associated value.
|
|
|
|
* If the key is found the function returns 1, otherwise 0. */
|
|
|
|
int zipmapGet(unsigned char *zm, unsigned char *key, unsigned int klen, unsigned char **value, unsigned int *vlen) {
|
|
|
|
unsigned char *p;
|
|
|
|
|
2010-03-28 16:59:15 -04:00
|
|
|
if ((p = zipmapLookupRaw(zm,key,klen,NULL)) == NULL) return 0;
|
2010-03-05 08:04:17 -05:00
|
|
|
p += zipmapRawKeyLength(p);
|
2010-05-22 09:13:09 -04:00
|
|
|
*vlen = zipmapDecodeLength(p);
|
|
|
|
*value = p + ZIPMAP_LEN_BYTES(*vlen) + 1;
|
2010-03-05 08:04:17 -05:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Return 1 if the key exists, otherwise 0 is returned. */
|
|
|
|
int zipmapExists(unsigned char *zm, unsigned char *key, unsigned int klen) {
|
2010-03-28 16:59:15 -04:00
|
|
|
return zipmapLookupRaw(zm,key,klen,NULL) != NULL;
|
2010-03-05 08:04:17 -05:00
|
|
|
}
|
|
|
|
|
2010-03-08 15:33:07 -05:00
|
|
|
/* Return the number of entries inside a zipmap */
|
|
|
|
unsigned int zipmapLen(unsigned char *zm) {
|
|
|
|
unsigned int len = 0;
|
2010-05-22 09:13:09 -04:00
|
|
|
if (zm[0] < ZIPMAP_BIGLEN) {
|
2010-03-28 17:07:32 -04:00
|
|
|
len = zm[0];
|
|
|
|
} else {
|
|
|
|
unsigned char *p = zipmapRewind(zm);
|
|
|
|
while((p = zipmapNext(p,NULL,NULL,NULL,NULL)) != NULL) len++;
|
2010-03-08 15:33:07 -05:00
|
|
|
|
2010-03-28 17:07:32 -04:00
|
|
|
/* Re-store length if small enough */
|
2010-05-22 09:13:09 -04:00
|
|
|
if (len < ZIPMAP_BIGLEN) zm[0] = len;
|
2010-03-28 17:07:32 -04:00
|
|
|
}
|
2010-03-08 15:33:07 -05:00
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
2011-02-28 03:56:48 -05:00
|
|
|
/* Return the raw size in bytes of a zipmap, so that we can serialize
|
|
|
|
* the zipmap on disk (or everywhere is needed) just writing the returned
|
|
|
|
* amount of bytes of the C array starting at the zipmap pointer. */
|
|
|
|
size_t zipmapBlobLen(unsigned char *zm) {
|
2011-02-28 08:48:49 -05:00
|
|
|
unsigned int totlen;
|
|
|
|
zipmapLookupRaw(zm,NULL,0,&totlen);
|
|
|
|
return totlen;
|
2011-02-28 03:56:48 -05:00
|
|
|
}
|
|
|
|
|
Sanitize dump payload: ziplist, listpack, zipmap, intset, stream
When loading an encoded payload we will at least do a shallow validation to
check that the size that's encoded in the payload matches the size of the
allocation.
This let's us later use this encoded size to make sure the various offsets
inside encoded payload don't reach outside the allocation, if they do, we'll
assert/panic, but at least we won't segfault or smear memory.
We can also do 'deep' validation which runs on all the records of the encoded
payload and validates that they don't contain invalid offsets. This lets us
detect corruptions early and reject a RESTORE command rather than accepting
it and asserting (crashing) later when accessing that payload via some command.
configuration:
- adding ACL flag skip-sanitize-payload
- adding config sanitize-dump-payload [yes/no/clients]
For now, we don't have a good way to ensure MIGRATE in cluster resharding isn't
being slowed down by these sanitation, so i'm setting the default value to `no`,
but later on it should be set to `clients` by default.
changes:
- changing rdbReportError not to `exit` in RESTORE command
- adding a new stat to be able to later check if cluster MIGRATE isn't being
slowed down by sanitation.
2020-08-13 09:41:05 -04:00
|
|
|
/* Validate the integrity of the data stracture.
|
|
|
|
* when `deep` is 0, only the integrity of the header is validated.
|
|
|
|
* when `deep` is 1, we scan all the entries one by one. */
|
|
|
|
int zipmapValidateIntegrity(unsigned char *zm, size_t size, int deep) {
|
|
|
|
#define OUT_OF_RANGE(p) ( \
|
|
|
|
(p) < zm + 2 || \
|
|
|
|
(p) > zm + size - 1)
|
|
|
|
unsigned int l, s, e;
|
|
|
|
|
|
|
|
/* check that we can actually read the header (or ZIPMAP_END). */
|
|
|
|
if (size < 2)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* the last byte must be the terminator. */
|
|
|
|
if (zm[size-1] != ZIPMAP_END)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (!deep)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
unsigned int count = 0;
|
|
|
|
unsigned char *p = zm + 1; /* skip the count */
|
|
|
|
while(*p != ZIPMAP_END) {
|
|
|
|
/* read the field name length encoding type */
|
|
|
|
s = zipmapGetEncodedLengthSize(p);
|
|
|
|
/* make sure the entry length doesn't rech outside the edge of the zipmap */
|
|
|
|
if (OUT_OF_RANGE(p+s))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* read the field name length */
|
|
|
|
l = zipmapDecodeLength(p);
|
|
|
|
p += s; /* skip the encoded field size */
|
|
|
|
p += l; /* skip the field */
|
|
|
|
|
|
|
|
/* make sure the entry doesn't rech outside the edge of the zipmap */
|
|
|
|
if (OUT_OF_RANGE(p))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* read the value length encoding type */
|
|
|
|
s = zipmapGetEncodedLengthSize(p);
|
|
|
|
/* make sure the entry length doesn't rech outside the edge of the zipmap */
|
|
|
|
if (OUT_OF_RANGE(p+s))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* read the value length */
|
|
|
|
l = zipmapDecodeLength(p);
|
|
|
|
p += s; /* skip the encoded value size*/
|
|
|
|
e = *p++; /* skip the encoded free space (always encoded in one byte) */
|
|
|
|
p += l+e; /* skip the value and free space */
|
|
|
|
count++;
|
|
|
|
|
|
|
|
/* make sure the entry doesn't rech outside the edge of the zipmap */
|
|
|
|
if (OUT_OF_RANGE(p))
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* check that the count in the header is correct */
|
|
|
|
if (zm[0] != ZIPMAP_BIGLEN && zm[0] != count)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
#undef OUT_OF_RANGE
|
|
|
|
}
|
|
|
|
|
2014-11-12 21:58:57 -05:00
|
|
|
#ifdef REDIS_TEST
|
|
|
|
static void zipmapRepr(unsigned char *p) {
|
2010-02-27 12:07:46 -05:00
|
|
|
unsigned int l;
|
|
|
|
|
|
|
|
printf("{status %u}",*p++);
|
|
|
|
while(1) {
|
2010-05-22 09:13:09 -04:00
|
|
|
if (p[0] == ZIPMAP_END) {
|
2010-02-27 12:07:46 -05:00
|
|
|
printf("{end}");
|
|
|
|
break;
|
|
|
|
} else {
|
|
|
|
unsigned char e;
|
|
|
|
|
2010-05-22 09:13:09 -04:00
|
|
|
l = zipmapDecodeLength(p);
|
2010-02-27 12:07:46 -05:00
|
|
|
printf("{key %u}",l);
|
2010-05-22 09:13:09 -04:00
|
|
|
p += zipmapEncodeLength(NULL,l);
|
2010-11-02 06:15:09 -04:00
|
|
|
if (l != 0 && fwrite(p,l,1,stdout) == 0) perror("fwrite");
|
2010-02-27 12:07:46 -05:00
|
|
|
p += l;
|
|
|
|
|
2010-05-22 09:13:09 -04:00
|
|
|
l = zipmapDecodeLength(p);
|
2010-02-27 12:07:46 -05:00
|
|
|
printf("{value %u}",l);
|
2010-05-22 09:13:09 -04:00
|
|
|
p += zipmapEncodeLength(NULL,l);
|
2010-02-27 12:07:46 -05:00
|
|
|
e = *p++;
|
2010-11-02 06:15:09 -04:00
|
|
|
if (l != 0 && fwrite(p,l,1,stdout) == 0) perror("fwrite");
|
2010-02-27 12:13:55 -05:00
|
|
|
p += l+e;
|
2010-02-27 12:07:46 -05:00
|
|
|
if (e) {
|
|
|
|
printf("[");
|
|
|
|
while(e--) printf(".");
|
|
|
|
printf("]");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
printf("\n");
|
|
|
|
}
|
|
|
|
|
2014-11-12 21:58:57 -05:00
|
|
|
#define UNUSED(x) (void)(x)
|
2021-03-10 02:13:11 -05:00
|
|
|
int zipmapTest(int argc, char *argv[], int accurate) {
|
2010-02-27 12:07:46 -05:00
|
|
|
unsigned char *zm;
|
|
|
|
|
2014-11-12 21:58:57 -05:00
|
|
|
UNUSED(argc);
|
|
|
|
UNUSED(argv);
|
2021-03-10 02:13:11 -05:00
|
|
|
UNUSED(accurate);
|
2014-11-12 21:58:57 -05:00
|
|
|
|
2010-02-27 12:07:46 -05:00
|
|
|
zm = zipmapNew();
|
2010-03-07 17:41:48 -05:00
|
|
|
|
|
|
|
zm = zipmapSet(zm,(unsigned char*) "name",4, (unsigned char*) "foo",3,NULL);
|
|
|
|
zm = zipmapSet(zm,(unsigned char*) "surname",7, (unsigned char*) "foo",3,NULL);
|
|
|
|
zm = zipmapSet(zm,(unsigned char*) "age",3, (unsigned char*) "foo",3,NULL);
|
|
|
|
zipmapRepr(zm);
|
|
|
|
|
2010-03-05 08:04:17 -05:00
|
|
|
zm = zipmapSet(zm,(unsigned char*) "hello",5, (unsigned char*) "world!",6,NULL);
|
|
|
|
zm = zipmapSet(zm,(unsigned char*) "foo",3, (unsigned char*) "bar",3,NULL);
|
|
|
|
zm = zipmapSet(zm,(unsigned char*) "foo",3, (unsigned char*) "!",1,NULL);
|
2010-02-27 12:07:46 -05:00
|
|
|
zipmapRepr(zm);
|
2010-03-05 08:04:17 -05:00
|
|
|
zm = zipmapSet(zm,(unsigned char*) "foo",3, (unsigned char*) "12345",5,NULL);
|
2010-02-28 12:05:25 -05:00
|
|
|
zipmapRepr(zm);
|
2010-03-05 08:04:17 -05:00
|
|
|
zm = zipmapSet(zm,(unsigned char*) "new",3, (unsigned char*) "xx",2,NULL);
|
2010-03-05 19:56:16 -05:00
|
|
|
zm = zipmapSet(zm,(unsigned char*) "noval",5, (unsigned char*) "",0,NULL);
|
2010-02-28 12:05:25 -05:00
|
|
|
zipmapRepr(zm);
|
2010-03-03 10:59:44 -05:00
|
|
|
zm = zipmapDel(zm,(unsigned char*) "new",3,NULL);
|
|
|
|
zipmapRepr(zm);
|
2010-05-20 05:02:08 -04:00
|
|
|
|
|
|
|
printf("\nLook up large key:\n");
|
|
|
|
{
|
|
|
|
unsigned char buf[512];
|
|
|
|
unsigned char *value;
|
|
|
|
unsigned int vlen, i;
|
|
|
|
for (i = 0; i < 512; i++) buf[i] = 'a';
|
|
|
|
|
|
|
|
zm = zipmapSet(zm,buf,512,(unsigned char*) "long",4,NULL);
|
|
|
|
if (zipmapGet(zm,buf,512,&value,&vlen)) {
|
|
|
|
printf(" <long key> is associated to the %d bytes value: %.*s\n",
|
|
|
|
vlen, vlen, value);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-03-05 08:04:17 -05:00
|
|
|
printf("\nPerform a direct lookup:\n");
|
|
|
|
{
|
|
|
|
unsigned char *value;
|
|
|
|
unsigned int vlen;
|
|
|
|
|
|
|
|
if (zipmapGet(zm,(unsigned char*) "foo",3,&value,&vlen)) {
|
|
|
|
printf(" foo is associated to the %d bytes value: %.*s\n",
|
|
|
|
vlen, vlen, value);
|
|
|
|
}
|
|
|
|
}
|
2011-11-01 15:57:51 -04:00
|
|
|
printf("\nIterate through elements:\n");
|
2010-03-04 13:45:15 -05:00
|
|
|
{
|
2010-03-05 08:04:17 -05:00
|
|
|
unsigned char *i = zipmapRewind(zm);
|
2010-03-04 13:45:15 -05:00
|
|
|
unsigned char *key, *value;
|
|
|
|
unsigned int klen, vlen;
|
|
|
|
|
|
|
|
while((i = zipmapNext(i,&key,&klen,&value,&vlen)) != NULL) {
|
2010-03-05 08:04:17 -05:00
|
|
|
printf(" %d:%.*s => %d:%.*s\n", klen, klen, key, vlen, vlen, value);
|
2010-03-04 13:45:15 -05:00
|
|
|
}
|
|
|
|
}
|
2021-03-10 02:13:11 -05:00
|
|
|
zfree(zm);
|
2010-02-27 12:07:46 -05:00
|
|
|
return 0;
|
|
|
|
}
|
2010-03-05 08:04:17 -05:00
|
|
|
#endif
|