diff options
| -rw-r--r-- | .codespell/requirements.txt | 2 | ||||
| -rw-r--r-- | redis.conf | 2 | ||||
| -rw-r--r-- | src/blocked.c | 1 | ||||
| -rw-r--r-- | src/hyperloglog.c | 2 | ||||
| -rw-r--r-- | src/listpack.c | 2 | ||||
| -rw-r--r-- | src/networking.c | 4 | ||||
| -rw-r--r-- | src/script.c | 2 | ||||
| -rw-r--r-- | src/server.c | 2 | ||||
| -rw-r--r-- | src/server.h | 12 | ||||
| -rw-r--r-- | src/t_list.c | 2 | ||||
| -rw-r--r-- | tests/unit/pause.tcl | 8 | ||||
| -rw-r--r-- | tests/unit/type/list.tcl | 8 |
12 files changed, 23 insertions, 24 deletions
diff --git a/.codespell/requirements.txt b/.codespell/requirements.txt index 7c1c2ac74..407f17489 100644 --- a/.codespell/requirements.txt +++ b/.codespell/requirements.txt @@ -1 +1 @@ -codespell==2.2.2 +codespell==2.2.4 diff --git a/redis.conf b/redis.conf index 408d0c258..a58e46e5a 100644 --- a/redis.conf +++ b/redis.conf @@ -1972,7 +1972,7 @@ zset-max-listpack-entries 128 zset-max-listpack-value 64 # HyperLogLog sparse representation bytes limit. The limit includes the -# 16 bytes header. When an HyperLogLog using the sparse representation crosses +# 16 bytes header. When a HyperLogLog using the sparse representation crosses # this limit, it is converted into the dense representation. # # A value greater than 16000 is totally useless, since at that point the diff --git a/src/blocked.c b/src/blocked.c index 1f5fba01b..7fe29e198 100644 --- a/src/blocked.c +++ b/src/blocked.c @@ -612,7 +612,6 @@ void blockPostponeClient(client *c) { /* Block client due to shutdown command */ void blockClientShutdown(client *c) { blockClient(c, BLOCKED_SHUTDOWN); - /* Mark this client to execute its command */ } /* Unblock a client once a specific key became available for it. diff --git a/src/hyperloglog.c b/src/hyperloglog.c index ffe740fab..1a74f4793 100644 --- a/src/hyperloglog.c +++ b/src/hyperloglog.c @@ -144,7 +144,7 @@ * In the example the sparse representation used just 7 bytes instead * of 12k in order to represent the HLL registers. In general for low * cardinality there is a big win in terms of space efficiency, traded - * with CPU time since the sparse representation is slower to access: + * with CPU time since the sparse representation is slower to access. * * The following table shows average cardinality vs bytes used, 100 * samples per cardinality (when the set was not representable because diff --git a/src/listpack.c b/src/listpack.c index 8b3209be2..f7c867f2e 100644 --- a/src/listpack.c +++ b/src/listpack.c @@ -732,7 +732,7 @@ unsigned char *lpFind(unsigned char *lp, unsigned char *p, unsigned char *s, /* Skip entry */ skipcnt--; - /* Move to next entry, avoid use `lpNext` due to `ASSERT_INTEGRITY` in + /* Move to next entry, avoid use `lpNext` due to `lpAssertValidEntry` in * `lpNext` will call `lpBytes`, will cause performance degradation */ p = lpSkip(p); } diff --git a/src/networking.c b/src/networking.c index e8f8f93d2..9f54449c1 100644 --- a/src/networking.c +++ b/src/networking.c @@ -2458,7 +2458,7 @@ int processPendingCommandAndInputBuffer(client *c) { /* Now process client if it has more data in it's buffer. * * Note: when a master client steps into this function, - * it can always satisfy this condition, because its querbuf + * it can always satisfy this condition, because its querybuf * contains data not applied. */ if (c->querybuf && sdslen(c->querybuf) > 0) { return processInputBuffer(c); @@ -4071,7 +4071,7 @@ static inline void setIOPendingCount(int i, unsigned long count) { } void *IOThreadMain(void *myid) { - /* The ID is the thread number (from 0 to server.iothreads_num-1), and is + /* The ID is the thread number (from 0 to server.io_threads_num-1), and is * used by the thread to just manipulate a single sub-array of clients. */ long id = (unsigned long)myid; char thdname[16]; diff --git a/src/script.c b/src/script.c index f7b70bcae..2a7721065 100644 --- a/src/script.c +++ b/src/script.c @@ -160,7 +160,7 @@ int scriptPrepareForRun(scriptRunCtx *run_ctx, client *engine_client, client *ca return C_ERR; } - /* Deny writes if we're unale to persist. */ + /* Deny writes if we're unable to persist. */ int deny_write_type = writeCommandsDeniedByDiskError(); if (deny_write_type != DISK_ERROR_TYPE_NONE && !obey_client) { if (deny_write_type == DISK_ERROR_TYPE_RDB) diff --git a/src/server.c b/src/server.c index 47988dec9..3a78350ec 100644 --- a/src/server.c +++ b/src/server.c @@ -216,7 +216,7 @@ mstime_t commandTimeSnapshot(void) { * may re-open the same key multiple times, can invalidate an already * open object in a next call, if the next call will see the key expired, * while the first did not. - * This is specificlally important in the context of scripts, where we + * This is specifically important in the context of scripts, where we * pretend that time freezes. This way a key can expire only the first time * it is accessed and not in the middle of the script execution, making * propagation to slaves / AOF consistent. See issue #1525 for more info. diff --git a/src/server.h b/src/server.h index be9905677..3c6ea4a72 100644 --- a/src/server.h +++ b/src/server.h @@ -895,7 +895,7 @@ struct redisObject { void *ptr; }; -/* The a string name for an object's type as listed above +/* The string name for an object's type as listed above * Native types are checked against the OBJ_STRING, OBJ_LIST, OBJ_* defines, * and Module types have their registered name returned. */ char *getObjectTypeName(robj*); @@ -929,7 +929,7 @@ typedef struct clientReplyBlock { * | / \ * | / \ * Repl Backlog Replica_A Replica_B - * + * * Each replica or replication backlog increments only the refcount of the * 'ref_repl_buf_node' which it points to. So when replica walks to the next * node, it should first increase the next node's refcount, and when we trim @@ -1087,7 +1087,7 @@ typedef struct { need more reserved IDs use UINT64_MAX-1, -2, ... and so forth. */ -/* Replication backlog is not separate memory, it just is one consumer of +/* Replication backlog is not a separate memory, it just is one consumer of * the global replication buffer. This structure records the reference of * replication buffers. Since the replication buffer block list may be very long, * it would cost much time to search replication offset on partial resync, so @@ -1223,7 +1223,7 @@ typedef struct client { * unloaded for cleanup. Opaque for Redis Core.*/ /* If this client is in tracking mode and this field is non zero, - * invalidation messages for keys fetched by this client will be send to + * invalidation messages for keys fetched by this client will be sent to * the specified client ID. */ uint64_t client_tracking_redirection; rax *client_tracking_prefixes; /* A dictionary of prefixes we are already @@ -1786,7 +1786,7 @@ struct redisServer { char *rdb_pipe_buff; /* In diskless replication, this buffer holds data */ int rdb_pipe_bufflen; /* that was read from the rdb pipe. */ int rdb_key_save_delay; /* Delay in microseconds between keys while - * writing the RDB. (for testings). negative + * writing aof or rdb. (for testings). negative * value means fractions of microseconds (on average). */ int key_load_delay; /* Delay in microseconds between keys while * loading aof or rdb. (for testings). negative @@ -1964,7 +1964,7 @@ struct redisServer { REDISMODULE_CLUSTER_FLAG_*. */ int cluster_allow_reads_when_down; /* Are reads allowed when the cluster is down? */ - int cluster_config_file_lock_fd; /* cluster config fd, will be flock */ + int cluster_config_file_lock_fd; /* cluster config fd, will be flocked. */ unsigned long long cluster_link_msg_queue_limit_bytes; /* Memory usage limit on individual link msg queue */ int cluster_drop_packet_filter; /* Debug config that allows tactically * dropping packets of a specific type */ diff --git a/src/t_list.c b/src/t_list.c index ee5f6fd91..98c013966 100644 --- a/src/t_list.c +++ b/src/t_list.c @@ -526,7 +526,7 @@ void lpushxCommand(client *c) { pushGenericCommand(c,LIST_HEAD,1); } -/* RPUSH <key> <element> [<element> ...] */ +/* RPUSHX <key> <element> [<element> ...] */ void rpushxCommand(client *c) { pushGenericCommand(c,LIST_TAIL,1); } diff --git a/tests/unit/pause.tcl b/tests/unit/pause.tcl index 2a851bbac..e30f922e6 100644 --- a/tests/unit/pause.tcl +++ b/tests/unit/pause.tcl @@ -83,7 +83,7 @@ start_server {tags {"pause network"}} { $rd2 close } - test "Test read/admin mutli-execs are not blocked by pause RO" { + test "Test read/admin multi-execs are not blocked by pause RO" { r SET FOO BAR r client PAUSE 100000 WRITE set rr [redis_client] @@ -96,7 +96,7 @@ start_server {tags {"pause network"}} { $rr close } - test "Test write mutli-execs are blocked by pause RO" { + test "Test write multi-execs are blocked by pause RO" { set rd [redis_deferring_client] $rd MULTI assert_equal [$rd read] "OK" @@ -174,7 +174,7 @@ start_server {tags {"pause network"}} { $rr close } - test "Test read-only scripts in mutli-exec are not blocked by pause RO" { + test "Test read-only scripts in multi-exec are not blocked by pause RO" { r SET FOO BAR r client PAUSE 100000 WRITE set rr [redis_client] @@ -193,7 +193,7 @@ start_server {tags {"pause network"}} { $rr close } - test "Test write scripts in mutli-exec are blocked by pause RO" { + test "Test write scripts in multi-exec are blocked by pause RO" { set rd [redis_deferring_client] set rd2 [redis_deferring_client] diff --git a/tests/unit/type/list.tcl b/tests/unit/type/list.tcl index dad5e595a..d970b0278 100644 --- a/tests/unit/type/list.tcl +++ b/tests/unit/type/list.tcl @@ -2198,8 +2198,8 @@ foreach {pop} {BLPOP BLMPOP_RIGHT} { $rd1 BLPOP mylist 0 wait_for_blocked_clients_count 1 - # pipline on other client a list push and a blocking pop - # we should expect the fainess to be kept and have $rd1 + # pipeline on other client a list push and a blocking pop + # we should expect the fairness to be kept and have $rd1 # being unblocked set buf "" append buf "LPUSH mylist 1\r\n" @@ -2256,7 +2256,7 @@ foreach {pop} {BLPOP BLMPOP_RIGHT} { $rd3 close } - test "Blocking command acounted only once in commandstats" { + test "Blocking command accounted only once in commandstats" { # cleanup first r del mylist @@ -2279,7 +2279,7 @@ foreach {pop} {BLPOP BLMPOP_RIGHT} { $rd close } - test "Blocking command acounted only once in commandstats after timeout" { + test "Blocking command accounted only once in commandstats after timeout" { # cleanup first r del mylist |