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>...
parent 03b59cd5
...@@ -20,6 +20,10 @@ each source file that you contribute. ...@@ -20,6 +20,10 @@ each source file that you contribute.
http://stackoverflow.com/questions/tagged/redis http://stackoverflow.com/questions/tagged/redis
Issues and pull requests for documentation belong on the redis-doc repo:
https://github.com/redis/redis-doc
# How to provide a patch for a new feature # How to provide a patch for a new feature
1. If it is a major feature or a semantical change, please don't start coding 1. If it is a major feature or a semantical change, please don't start coding
......
...@@ -3,22 +3,22 @@ This README is just a fast *quick start* document. You can find more detailed do ...@@ -3,22 +3,22 @@ This README is just a fast *quick start* document. You can find more detailed do
What is Redis? What is Redis?
-------------- --------------
Redis is often referred as a *data structures* server. What this means is that Redis provides access to mutable data structures via a set of commands, which are sent using a *server-client* model with TCP sockets and a simple protocol. So different processes can query and modify the same data structures in a shared way. Redis is often referred to as a *data structures* server. What this means is that Redis provides access to mutable data structures via a set of commands, which are sent using a *server-client* model with TCP sockets and a simple protocol. So different processes can query and modify the same data structures in a shared way.
Data structures implemented into Redis have a few special properties: Data structures implemented into Redis have a few special properties:
* Redis cares to store them on disk, even if they are always served and modified into the server memory. This means that Redis is fast, but that is also non-volatile. * Redis cares to store them on disk, even if they are always served and modified into the server memory. This means that Redis is fast, but that it is also non-volatile.
* Implementation of data structures stress on memory efficiency, so data structures inside Redis will likely use less memory compared to the same data structure modeled using an high level programming language. * The implementation of data structures emphasizes memory efficiency, so data structures inside Redis will likely use less memory compared to the same data structure modelled using a high-level programming language.
* Redis offers a number of features that are natural to find in a database, like replication, tunable levels of durability, cluster, high availability. * Redis offers a number of features that are natural to find in a database, like replication, tunable levels of durability, clustering, and high availability.
Another good example is to think of Redis as a more complex version of memcached, where the operations are not just SETs and GETs, but operations to work with complex data types like Lists, Sets, ordered data structures, and so forth. Another good example is to think of Redis as a more complex version of memcached, where the operations are not just SETs and GETs, but operations that work with complex data types like Lists, Sets, ordered data structures, and so forth.
If you want to know more, this is a list of selected starting points: If you want to know more, this is a list of selected starting points:
* Introduction to Redis data types. http://redis.io/topics/data-types-intro * Introduction to Redis data types. http://redis.io/topics/data-types-intro
* Try Redis directly inside your browser. http://try.redis.io * Try Redis directly inside your browser. http://try.redis.io
* The full list of Redis commands. http://redis.io/commands * The full list of Redis commands. http://redis.io/commands
* There is much more inside the Redis official documentation. http://redis.io/documentation * There is much more inside the official Redis documentation. http://redis.io/documentation
Building Redis Building Redis
-------------- --------------
...@@ -29,7 +29,7 @@ and 64 bit systems. ...@@ -29,7 +29,7 @@ and 64 bit systems.
It may compile on Solaris derived systems (for instance SmartOS) but our It may compile on Solaris derived systems (for instance SmartOS) but our
support for this platform is *best effort* and Redis is not guaranteed to support for this platform is *best effort* and Redis is not guaranteed to
work as well as in Linux, OSX, and \*BSD there. work as well as in Linux, OSX, and \*BSD.
It is as simple as: It is as simple as:
...@@ -63,7 +63,7 @@ installed): ...@@ -63,7 +63,7 @@ installed):
Fixing build problems with dependencies or cached build options Fixing build problems with dependencies or cached build options
--------- ---------
Redis has some dependencies which are included into the `deps` directory. Redis has some dependencies which are included in the `deps` directory.
`make` does not automatically rebuild dependencies even if something in `make` does not automatically rebuild dependencies even if something in
the source code of dependencies changes. the source code of dependencies changes.
...@@ -90,7 +90,7 @@ with a 64 bit target, or the other way around, you need to perform a ...@@ -90,7 +90,7 @@ with a 64 bit target, or the other way around, you need to perform a
In case of build errors when trying to build a 32 bit binary of Redis, try In case of build errors when trying to build a 32 bit binary of Redis, try
the following steps: the following steps:
* Install the packages libc6-dev-i386 (also try g++-multilib). * Install the package libc6-dev-i386 (also try g++-multilib).
* Try using the following command line instead of `make 32bit`: * Try using the following command line instead of `make 32bit`:
`make CFLAGS="-m32 -march=native" LDFLAGS="-m32"` `make CFLAGS="-m32 -march=native" LDFLAGS="-m32"`
...@@ -114,15 +114,15 @@ To compile against jemalloc on Mac OS X systems, use: ...@@ -114,15 +114,15 @@ To compile against jemalloc on Mac OS X systems, use:
Verbose build Verbose build
------------- -------------
Redis will build with a user friendly colorized output by default. Redis will build with a user-friendly colorized output by default.
If you want to see a more verbose output use the following: If you want to see a more verbose output, use the following:
% make V=1 % make V=1
Running Redis Running Redis
------------- -------------
To run Redis with the default configuration just type: To run Redis with the default configuration, just type:
% cd src % cd src
% ./redis-server % ./redis-server
...@@ -173,7 +173,7 @@ You can find the list of all the available commands at http://redis.io/commands. ...@@ -173,7 +173,7 @@ You can find the list of all the available commands at http://redis.io/commands.
Installing Redis Installing Redis
----------------- -----------------
In order to install Redis binaries into /usr/local/bin just use: In order to install Redis binaries into /usr/local/bin, just use:
% make install % make install
...@@ -182,8 +182,8 @@ different destination. ...@@ -182,8 +182,8 @@ different destination.
Make install will just install binaries in your system, but will not configure Make install will just install binaries in your system, but will not configure
init scripts and configuration files in the appropriate place. This is not init scripts and configuration files in the appropriate place. This is not
needed if you want just to play a bit with Redis, but if you are installing needed if you just want to play a bit with Redis, but if you are installing
it the proper way for a production system, we have a script doing this it the proper way for a production system, we have a script that does this
for Ubuntu and Debian systems: for Ubuntu and Debian systems:
% cd utils % cd utils
...@@ -201,7 +201,7 @@ You'll be able to stop and start Redis using the script named ...@@ -201,7 +201,7 @@ You'll be able to stop and start Redis using the script named
Code contributions Code contributions
----------------- -----------------
Note: by contributing code to the Redis project in any form, including sending Note: By contributing code to the Redis project in any form, including sending
a pull request via Github, a code fragment or patch via private email or a pull request via Github, a code fragment or patch via private email or
public discussion groups, you agree to release your code under the terms public discussion groups, you agree to release your code under the terms
of the BSD license that you can find in the [COPYING][1] file included in the Redis of the BSD license that you can find in the [COPYING][1] file included in the Redis
...@@ -251,7 +251,7 @@ of complexity incrementally. ...@@ -251,7 +251,7 @@ of complexity incrementally.
Note: lately Redis was refactored quite a bit. Function names and file Note: lately Redis was refactored quite a bit. Function names and file
names have been changed, so you may find that this documentation reflects the names have been changed, so you may find that this documentation reflects the
`unstable` branch more closely. For instance in Redis 3.0 the `server.c` `unstable` branch more closely. For instance, in Redis 3.0 the `server.c`
and `server.h` files were named `redis.c` and `redis.h`. However the overall and `server.h` files were named `redis.c` and `redis.h`. However the overall
structure is the same. Keep in mind that all the new developments and pull structure is the same. Keep in mind that all the new developments and pull
requests should be performed against the `unstable` branch. requests should be performed against the `unstable` branch.
...@@ -296,7 +296,7 @@ The client structure defines a *connected client*: ...@@ -296,7 +296,7 @@ The client structure defines a *connected client*:
* The `fd` field is the client socket file descriptor. * The `fd` field is the client socket file descriptor.
* `argc` and `argv` are populated with the command the client is executing, so that functions implementing a given Redis command can read the arguments. * `argc` and `argv` are populated with the command the client is executing, so that functions implementing a given Redis command can read the arguments.
* `querybuf` accumulates the requests from the client, which are parsed by the Redis server according to the Redis protocol and executed by calling the implementations of the commands the client is executing. * `querybuf` accumulates the requests from the client, which are parsed by the Redis server according to the Redis protocol and executed by calling the implementations of the commands the client is executing.
* `reply` and `buf` are dynamic and static buffers that accumulate the replies the server sends to the client. These buffers are incrementally written to the socket as soon as the file descriptor is writable. * `reply` and `buf` are dynamic and static buffers that accumulate the replies the server sends to the client. These buffers are incrementally written to the socket as soon as the file descriptor is writeable.
As you can see in the client structure above, arguments in a command As you can see in the client structure above, arguments in a command
are described as `robj` structures. The following is the full `robj` are described as `robj` structures. The following is the full `robj`
...@@ -329,13 +329,13 @@ This is the entry point of the Redis server, where the `main()` function ...@@ -329,13 +329,13 @@ This is the entry point of the Redis server, where the `main()` function
is defined. The following are the most important steps in order to startup is defined. The following are the most important steps in order to startup
the Redis server. the Redis server.
* `initServerConfig()` setups the default values of the `server` structure. * `initServerConfig()` sets up the default values of the `server` structure.
* `initServer()` allocates the data structures needed to operate, setup the listening socket, and so forth. * `initServer()` allocates the data structures needed to operate, setup the listening socket, and so forth.
* `aeMain()` starts the event loop which listens for new connections. * `aeMain()` starts the event loop which listens for new connections.
There are two special functions called periodically by the event loop: There are two special functions called periodically by the event loop:
1. `serverCron()` is called periodically (according to `server.hz` frequency), and performs tasks that must be performed from time to time, like checking for timedout clients. 1. `serverCron()` is called periodically (according to `server.hz` frequency), and performs tasks that must be performed from time to time, like checking for timed out clients.
2. `beforeSleep()` is called every time the event loop fired, Redis served a few requests, and is returning back into the event loop. 2. `beforeSleep()` is called every time the event loop fired, Redis served a few requests, and is returning back into the event loop.
Inside server.c you can find code that handles other vital things of the Redis server: Inside server.c you can find code that handles other vital things of the Redis server:
...@@ -352,16 +352,16 @@ This file defines all the I/O functions with clients, masters and replicas ...@@ -352,16 +352,16 @@ This file defines all the I/O functions with clients, masters and replicas
(which in Redis are just special clients): (which in Redis are just special clients):
* `createClient()` allocates and initializes a new client. * `createClient()` allocates and initializes a new client.
* the `addReply*()` family of functions are used by commands implementations in order to append data to the client structure, that will be transmitted to the client as a reply for a given command executed. * the `addReply*()` family of functions are used by command implementations in order to append data to the client structure, that will be transmitted to the client as a reply for a given command executed.
* `writeToClient()` transmits the data pending in the output buffers to the client and is called by the *writable event handler* `sendReplyToClient()`. * `writeToClient()` transmits the data pending in the output buffers to the client and is called by the *writable event handler* `sendReplyToClient()`.
* `readQueryFromClient()` is the *readable event handler* and accumulates data from read from the client into the query buffer. * `readQueryFromClient()` is the *readable event handler* and accumulates data read from the client into the query buffer.
* `processInputBuffer()` is the entry point in order to parse the client query buffer according to the Redis protocol. Once commands are ready to be processed, it calls `processCommand()` which is defined inside `server.c` in order to actually execute the command. * `processInputBuffer()` is the entry point in order to parse the client query buffer according to the Redis protocol. Once commands are ready to be processed, it calls `processCommand()` which is defined inside `server.c` in order to actually execute the command.
* `freeClient()` deallocates, disconnects and removes a client. * `freeClient()` deallocates, disconnects and removes a client.
aof.c and rdb.c aof.c and rdb.c
--- ---
As you can guess from the names these files implement the RDB and AOF As you can guess from the names, these files implement the RDB and AOF
persistence for Redis. Redis uses a persistence model based on the `fork()` persistence for Redis. Redis uses a persistence model based on the `fork()`
system call in order to create a thread with the same (shared) memory system call in order to create a thread with the same (shared) memory
content of the main Redis thread. This secondary thread dumps the content content of the main Redis thread. This secondary thread dumps the content
...@@ -373,13 +373,13 @@ The implementation inside `aof.c` has additional functions in order to ...@@ -373,13 +373,13 @@ The implementation inside `aof.c` has additional functions in order to
implement an API that allows commands to append new commands into the AOF implement an API that allows commands to append new commands into the AOF
file as clients execute them. file as clients execute them.
The `call()` function defined inside `server.c` is responsible to call The `call()` function defined inside `server.c` is responsible for calling
the functions that in turn will write the commands into the AOF. the functions that in turn will write the commands into the AOF.
db.c db.c
--- ---
Certain Redis commands operate on specific data types, others are general. Certain Redis commands operate on specific data types; others are general.
Examples of generic commands are `DEL` and `EXPIRE`. They operate on keys Examples of generic commands are `DEL` and `EXPIRE`. They operate on keys
and not on their values specifically. All those generic commands are and not on their values specifically. All those generic commands are
defined inside `db.c`. defined inside `db.c`.
...@@ -387,7 +387,7 @@ defined inside `db.c`. ...@@ -387,7 +387,7 @@ defined inside `db.c`.
Moreover `db.c` implements an API in order to perform certain operations Moreover `db.c` implements an API in order to perform certain operations
on the Redis dataset without directly accessing the internal data structures. on the Redis dataset without directly accessing the internal data structures.
The most important functions inside `db.c` which are used in many commands The most important functions inside `db.c` which are used in many command
implementations are the following: implementations are the following:
* `lookupKeyRead()` and `lookupKeyWrite()` are used in order to get a pointer to the value associated to a given key, or `NULL` if the key does not exist. * `lookupKeyRead()` and `lookupKeyWrite()` are used in order to get a pointer to the value associated to a given key, or `NULL` if the key does not exist.
...@@ -405,7 +405,7 @@ The `robj` structure defining Redis objects was already described. Inside ...@@ -405,7 +405,7 @@ The `robj` structure defining Redis objects was already described. Inside
a basic level, like functions to allocate new objects, handle the reference a basic level, like functions to allocate new objects, handle the reference
counting and so forth. Notable functions inside this file: counting and so forth. Notable functions inside this file:
* `incrRefcount()` and `decrRefCount()` are used in order to increment or decrement an object reference count. When it drops to 0 the object is finally freed. * `incrRefCount()` and `decrRefCount()` are used in order to increment or decrement an object reference count. When it drops to 0 the object is finally freed.
* `createObject()` allocates a new object. There are also specialized functions to allocate string objects having a specific content, like `createStringObjectFromLongLong()` and similar functions. * `createObject()` allocates a new object. There are also specialized functions to allocate string objects having a specific content, like `createStringObjectFromLongLong()` and similar functions.
This file also implements the `OBJECT` command. This file also implements the `OBJECT` command.
...@@ -429,12 +429,12 @@ replicas, or to continue the replication after a disconnection. ...@@ -429,12 +429,12 @@ replicas, or to continue the replication after a disconnection.
Other C files Other C files
--- ---
* `t_hash.c`, `t_list.c`, `t_set.c`, `t_string.c`, `t_zset.c` and `t_stream.c` contains the implementation of the Redis data types. They implement both an API to access a given data type, and the client commands implementations for these data types. * `t_hash.c`, `t_list.c`, `t_set.c`, `t_string.c`, `t_zset.c` and `t_stream.c` contains the implementation of the Redis data types. They implement both an API to access a given data type, and the client command implementations for these data types.
* `ae.c` implements the Redis event loop, it's a self contained library which is simple to read and understand. * `ae.c` implements the Redis event loop, it's a self contained library which is simple to read and understand.
* `sds.c` is the Redis string library, check http://github.com/antirez/sds for more information. * `sds.c` is the Redis string library, check http://github.com/antirez/sds for more information.
* `anet.c` is a library to use POSIX networking in a simpler way compared to the raw interface exposed by the kernel. * `anet.c` is a library to use POSIX networking in a simpler way compared to the raw interface exposed by the kernel.
* `dict.c` is an implementation of a non-blocking hash table which rehashes incrementally. * `dict.c` is an implementation of a non-blocking hash table which rehashes incrementally.
* `scripting.c` implements Lua scripting. It is completely self contained from the rest of the Redis implementation and is simple enough to understand if you are familar with the Lua API. * `scripting.c` implements Lua scripting. It is completely self-contained and isolated from the rest of the Redis implementation and is simple enough to understand if you are familiar with the Lua API.
* `cluster.c` implements the Redis Cluster. Probably a good read only after being very familiar with the rest of the Redis code base. If you want to read `cluster.c` make sure to read the [Redis Cluster specification][3]. * `cluster.c` implements the Redis Cluster. Probably a good read only after being very familiar with the rest of the Redis code base. If you want to read `cluster.c` make sure to read the [Redis Cluster specification][3].
[3]: http://redis.io/topics/cluster-spec [3]: http://redis.io/topics/cluster-spec
...@@ -460,12 +460,12 @@ top comment inside `server.c`. ...@@ -460,12 +460,12 @@ top comment inside `server.c`.
After the command operates in some way, it returns a reply to the client, After the command operates in some way, it returns a reply to the client,
usually using `addReply()` or a similar function defined inside `networking.c`. usually using `addReply()` or a similar function defined inside `networking.c`.
There are tons of commands implementations inside the Redis source code There are tons of command implementations inside the Redis source code
that can serve as examples of actual commands implementations. To write that can serve as examples of actual commands implementations. Writing
a few toy commands can be a good exercise to familiarize with the code base. a few toy commands can be a good exercise to get familiar with the code base.
There are also many other files not described here, but it is useless to There are also many other files not described here, but it is useless to
cover everything. We want to just help you with the first steps. cover everything. We just want to help you with the first steps.
Eventually you'll find your way inside the Redis code base :-) Eventually you'll find your way inside the Redis code base :-)
Enjoy! Enjoy!
...@@ -21,7 +21,7 @@ just following tose steps: ...@@ -21,7 +21,7 @@ just following tose steps:
1. Remove the jemalloc directory. 1. Remove the jemalloc directory.
2. Substitute it with the new jemalloc source tree. 2. Substitute it with the new jemalloc source tree.
3. Edit the Makefile localted in the same directory as the README you are 3. Edit the Makefile located in the same directory as the README you are
reading, and change the --with-version in the Jemalloc configure script reading, and change the --with-version in the Jemalloc configure script
options with the version you are using. This is required because otherwise options with the version you are using. This is required because otherwise
Jemalloc configuration script is broken and will not work nested in another Jemalloc configuration script is broken and will not work nested in another
...@@ -33,7 +33,7 @@ If you want to upgrade Jemalloc while also providing support for ...@@ -33,7 +33,7 @@ If you want to upgrade Jemalloc while also providing support for
active defragmentation, in addition to the above steps you need to perform active defragmentation, in addition to the above steps you need to perform
the following additional steps: the following additional steps:
5. In Jemalloc three, file `include/jemalloc/jemalloc_macros.h.in`, make sure 5. In Jemalloc tree, file `include/jemalloc/jemalloc_macros.h.in`, make sure
to add `#define JEMALLOC_FRAG_HINT`. to add `#define JEMALLOC_FRAG_HINT`.
6. Implement the function `je_get_defrag_hint()` inside `src/jemalloc.c`. You 6. Implement the function `je_get_defrag_hint()` inside `src/jemalloc.c`. You
can see how it is implemented in the current Jemalloc source tree shipped can see how it is implemented in the current Jemalloc source tree shipped
...@@ -49,7 +49,7 @@ Hiredis uses the SDS string library, that must be the same version used inside R ...@@ -49,7 +49,7 @@ Hiredis uses the SDS string library, that must be the same version used inside R
1. Check with diff if hiredis API changed and what impact it could have in Redis. 1. Check with diff if hiredis API changed and what impact it could have in Redis.
2. Make sure that the SDS library inside Hiredis and inside Redis are compatible. 2. Make sure that the SDS library inside Hiredis and inside Redis are compatible.
3. After the upgrade, run the Redis Sentinel test. 3. After the upgrade, run the Redis Sentinel test.
4. Check manually that redis-cli and redis-benchmark behave as expecteed, since we have no tests for CLI utilities currently. 4. Check manually that redis-cli and redis-benchmark behave as expected, since we have no tests for CLI utilities currently.
Linenoise Linenoise
--- ---
...@@ -77,6 +77,6 @@ and our version: ...@@ -77,6 +77,6 @@ and our version:
1. Makefile is modified to allow a different compiler than GCC. 1. Makefile is modified to allow a different compiler than GCC.
2. We have the implementation source code, and directly link to the following external libraries: `lua_cjson.o`, `lua_struct.o`, `lua_cmsgpack.o` and `lua_bit.o`. 2. We have the implementation source code, and directly link to the following external libraries: `lua_cjson.o`, `lua_struct.o`, `lua_cmsgpack.o` and `lua_bit.o`.
3. There is a security fix in `ldo.c`, line 498: The check for `LUA_SIGNATURE[0]` is removed in order toa void direct bytecode execution. 3. There is a security fix in `ldo.c`, line 498: The check for `LUA_SIGNATURE[0]` is removed in order to avoid direct bytecode execution.
...@@ -625,7 +625,7 @@ static void refreshMultiLine(struct linenoiseState *l) { ...@@ -625,7 +625,7 @@ static void refreshMultiLine(struct linenoiseState *l) {
rpos2 = (plen+l->pos+l->cols)/l->cols; /* current cursor relative row. */ rpos2 = (plen+l->pos+l->cols)/l->cols; /* current cursor relative row. */
lndebug("rpos2 %d", rpos2); lndebug("rpos2 %d", rpos2);
/* Go up till we reach the expected positon. */ /* Go up till we reach the expected position. */
if (rows-rpos2 > 0) { if (rows-rpos2 > 0) {
lndebug("go-up %d", rows-rpos2); lndebug("go-up %d", rows-rpos2);
snprintf(seq,64,"\x1b[%dA", rows-rpos2); snprintf(seq,64,"\x1b[%dA", rows-rpos2);
...@@ -767,7 +767,7 @@ void linenoiseEditBackspace(struct linenoiseState *l) { ...@@ -767,7 +767,7 @@ void linenoiseEditBackspace(struct linenoiseState *l) {
} }
} }
/* Delete the previosu word, maintaining the cursor at the start of the /* Delete the previous word, maintaining the cursor at the start of the
* current word. */ * current word. */
void linenoiseEditDeletePrevWord(struct linenoiseState *l) { void linenoiseEditDeletePrevWord(struct linenoiseState *l) {
size_t old_pos = l->pos; size_t old_pos = l->pos;
......
This diff is collapsed.
...@@ -259,6 +259,6 @@ sentinel deny-scripts-reconfig yes ...@@ -259,6 +259,6 @@ sentinel deny-scripts-reconfig yes
# SENTINEL SET can also be used in order to perform this configuration at runtime. # SENTINEL SET can also be used in order to perform this configuration at runtime.
# #
# In order to set a command back to its original name (undo the renaming), it # In order to set a command back to its original name (undo the renaming), it
# is possible to just rename a command to itsef: # is possible to just rename a command to itself:
# #
# SENTINEL rename-command mymaster CONFIG CONFIG # SENTINEL rename-command mymaster CONFIG CONFIG
...@@ -289,7 +289,7 @@ void ACLFreeUserAndKillClients(user *u) { ...@@ -289,7 +289,7 @@ void ACLFreeUserAndKillClients(user *u) {
while ((ln = listNext(&li)) != NULL) { while ((ln = listNext(&li)) != NULL) {
client *c = listNodeValue(ln); client *c = listNodeValue(ln);
if (c->user == u) { if (c->user == u) {
/* We'll free the conenction asynchronously, so /* We'll free the connection asynchronously, so
* in theory to set a different user is not needed. * in theory to set a different user is not needed.
* However if there are bugs in Redis, soon or later * However if there are bugs in Redis, soon or later
* this may result in some security hole: it's much * this may result in some security hole: it's much
......
...@@ -34,8 +34,9 @@ ...@@ -34,8 +34,9 @@
#include "zmalloc.h" #include "zmalloc.h"
/* Create a new list. The created list can be freed with /* Create a new list. The created list can be freed with
* AlFreeList(), but private value of every node need to be freed * listRelease(), but private value of every node need to be freed
* by the user before to call AlFreeList(). * by the user before to call listRelease(), or by setting a free method using
* listSetFreeMethod.
* *
* On error, NULL is returned. Otherwise the pointer to the new list. */ * On error, NULL is returned. Otherwise the pointer to the new list. */
list *listCreate(void) list *listCreate(void)
...@@ -217,8 +218,8 @@ void listRewindTail(list *list, listIter *li) { ...@@ -217,8 +218,8 @@ void listRewindTail(list *list, listIter *li) {
* listDelNode(), but not to remove other elements. * listDelNode(), but not to remove other elements.
* *
* The function returns a pointer to the next element of the list, * The function returns a pointer to the next element of the list,
* or NULL if there are no more elements, so the classical usage patter * or NULL if there are no more elements, so the classical usage
* is: * pattern is:
* *
* iter = listGetIterator(list,<direction>); * iter = listGetIterator(list,<direction>);
* while ((node = listNext(iter)) != NULL) { * while ((node = listNext(iter)) != NULL) {
......
...@@ -457,7 +457,7 @@ int aeProcessEvents(aeEventLoop *eventLoop, int flags) ...@@ -457,7 +457,7 @@ int aeProcessEvents(aeEventLoop *eventLoop, int flags)
int fired = 0; /* Number of events fired for current fd. */ int fired = 0; /* Number of events fired for current fd. */
/* Normally we execute the readable event first, and the writable /* Normally we execute the readable event first, and the writable
* event laster. This is useful as sometimes we may be able * event later. This is useful as sometimes we may be able
* to serve the reply of a query immediately after processing the * to serve the reply of a query immediately after processing the
* query. * query.
* *
...@@ -465,7 +465,7 @@ int aeProcessEvents(aeEventLoop *eventLoop, int flags) ...@@ -465,7 +465,7 @@ int aeProcessEvents(aeEventLoop *eventLoop, int flags)
* asking us to do the reverse: never fire the writable event * asking us to do the reverse: never fire the writable event
* after the readable. In such a case, we invert the calls. * after the readable. In such a case, we invert the calls.
* This is useful when, for instance, we want to do things * This is useful when, for instance, we want to do things
* in the beforeSleep() hook, like fsynching a file to disk, * in the beforeSleep() hook, like fsyncing a file to disk,
* before replying to a client. */ * before replying to a client. */
int invert = fe->mask & AE_BARRIER; int invert = fe->mask & AE_BARRIER;
......
...@@ -232,7 +232,7 @@ static void aeApiDelEvent(aeEventLoop *eventLoop, int fd, int mask) { ...@@ -232,7 +232,7 @@ static void aeApiDelEvent(aeEventLoop *eventLoop, int fd, int mask) {
/* /*
* ENOMEM is a potentially transient condition, but the kernel won't * ENOMEM is a potentially transient condition, but the kernel won't
* generally return it unless things are really bad. EAGAIN indicates * generally return it unless things are really bad. EAGAIN indicates
* we've reached an resource limit, for which it doesn't make sense to * we've reached a resource limit, for which it doesn't make sense to
* retry (counter-intuitively). All other errors indicate a bug. In any * retry (counter-intuitively). All other errors indicate a bug. In any
* of these cases, the best we can do is to abort. * of these cases, the best we can do is to abort.
*/ */
......
...@@ -544,7 +544,7 @@ sds catAppendOnlyGenericCommand(sds dst, int argc, robj **argv) { ...@@ -544,7 +544,7 @@ sds catAppendOnlyGenericCommand(sds dst, int argc, robj **argv) {
return dst; return dst;
} }
/* Create the sds representation of an PEXPIREAT command, using /* Create the sds representation of a PEXPIREAT command, using
* 'seconds' as time to live and 'cmd' to understand what command * 'seconds' as time to live and 'cmd' to understand what command
* we are translating into a PEXPIREAT. * we are translating into a PEXPIREAT.
* *
...@@ -1818,7 +1818,7 @@ void backgroundRewriteDoneHandler(int exitcode, int bysignal) { ...@@ -1818,7 +1818,7 @@ void backgroundRewriteDoneHandler(int exitcode, int bysignal) {
"Background AOF rewrite terminated with error"); "Background AOF rewrite terminated with error");
} else { } else {
/* 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.aof_lastbgrewrite_status = C_ERR; server.aof_lastbgrewrite_status = C_ERR;
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
* *
* Never use return value from the macros, instead use the AtomicGetIncr() * Never use return value from the macros, instead use the AtomicGetIncr()
* if you need to get the current value and increment it atomically, like * if you need to get the current value and increment it atomically, like
* in the followign example: * in the following example:
* *
* long oldvalue; * long oldvalue;
* atomicGetIncr(myvar,oldvalue,1); * atomicGetIncr(myvar,oldvalue,1);
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
/* Count number of bits set in the binary array pointed by 's' and long /* Count number of bits set in the binary array pointed by 's' and long
* 'count' bytes. The implementation of this function is required to * 'count' bytes. The implementation of this function is required to
* work with a input string length up to 512 MB. */ * work with an input string length up to 512 MB. */
size_t redisPopcount(void *s, long count) { size_t redisPopcount(void *s, long count) {
size_t bits = 0; size_t bits = 0;
unsigned char *p = s; unsigned char *p = s;
...@@ -107,7 +107,7 @@ long redisBitpos(void *s, unsigned long count, int bit) { ...@@ -107,7 +107,7 @@ long redisBitpos(void *s, unsigned long count, int bit) {
int found; int found;
/* Process whole words first, seeking for first word that is not /* Process whole words first, seeking for first word that is not
* all ones or all zeros respectively if we are lookig for zeros * all ones or all zeros respectively if we are looking for zeros
* or ones. This is much faster with large strings having contiguous * or ones. This is much faster with large strings having contiguous
* blocks of 1 or 0 bits compared to the vanilla bit per bit processing. * blocks of 1 or 0 bits compared to the vanilla bit per bit processing.
* *
...@@ -496,7 +496,7 @@ robj *lookupStringForBitCommand(client *c, size_t maxbit) { ...@@ -496,7 +496,7 @@ robj *lookupStringForBitCommand(client *c, size_t maxbit) {
* in 'len'. The user is required to pass (likely stack allocated) buffer * in 'len'. The user is required to pass (likely stack allocated) buffer
* 'llbuf' of at least LONG_STR_SIZE bytes. Such a buffer is used in the case * 'llbuf' of at least LONG_STR_SIZE bytes. Such a buffer is used in the case
* the object is integer encoded in order to provide the representation * the object is integer encoded in order to provide the representation
* without usign heap allocation. * without using heap allocation.
* *
* The function returns the pointer to the object array of bytes representing * The function returns the pointer to the object array of bytes representing
* the string it contains, that may be a pointer to 'llbuf' or to the * the string it contains, that may be a pointer to 'llbuf' or to the
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
* to 0, no timeout is processed). * to 0, no timeout is processed).
* It usually just needs to send a reply to the client. * It usually just needs to send a reply to the client.
* *
* When implementing a new type of blocking opeation, the implementation * When implementing a new type of blocking operation, the implementation
* should modify unblockClient() and replyToBlockedClientTimedOut() in order * should modify unblockClient() and replyToBlockedClientTimedOut() in order
* to handle the btype-specific behavior of this two functions. * to handle the btype-specific behavior of this two functions.
* If the blocking operation waits for certain keys to change state, the * If the blocking operation waits for certain keys to change state, the
...@@ -118,7 +118,7 @@ void processUnblockedClients(void) { ...@@ -118,7 +118,7 @@ void processUnblockedClients(void) {
/* This function will schedule the client for reprocessing at a safe time. /* This function will schedule the client for reprocessing at a safe time.
* *
* This is useful when a client was blocked for some reason (blocking opeation, * This is useful when a client was blocked for some reason (blocking operation,
* CLIENT PAUSE, or whatever), because it may end with some accumulated query * CLIENT PAUSE, or whatever), because it may end with some accumulated query
* buffer that needs to be processed ASAP: * buffer that needs to be processed ASAP:
* *
......
...@@ -377,7 +377,7 @@ void clusterSaveConfigOrDie(int do_fsync) { ...@@ -377,7 +377,7 @@ void clusterSaveConfigOrDie(int do_fsync) {
} }
} }
/* Lock the cluster config using flock(), and leaks the file descritor used to /* Lock the cluster config using flock(), and leaks the file descriptor used to
* acquire the lock so that the file will be locked forever. * acquire the lock so that the file will be locked forever.
* *
* This works because we always update nodes.conf with a new version * This works because we always update nodes.conf with a new version
...@@ -544,13 +544,13 @@ void clusterInit(void) { ...@@ -544,13 +544,13 @@ void clusterInit(void) {
/* Reset a node performing a soft or hard reset: /* Reset a node performing a soft or hard reset:
* *
* 1) All other nodes are forget. * 1) All other nodes are forgotten.
* 2) All the assigned / open slots are released. * 2) All the assigned / open slots are released.
* 3) If the node is a slave, it turns into a master. * 3) If the node is a slave, it turns into a master.
* 5) Only for hard reset: a new Node ID is generated. * 4) Only for hard reset: a new Node ID is generated.
* 6) Only for hard reset: currentEpoch and configEpoch are set to 0. * 5) Only for hard reset: currentEpoch and configEpoch are set to 0.
* 7) The new configuration is saved and the cluster state updated. * 6) The new configuration is saved and the cluster state updated.
* 8) If the node was a slave, the whole data set is flushed away. */ * 7) If the node was a slave, the whole data set is flushed away. */
void clusterReset(int hard) { void clusterReset(int hard) {
dictIterator *di; dictIterator *di;
dictEntry *de; dictEntry *de;
...@@ -646,7 +646,7 @@ static void clusterConnAcceptHandler(connection *conn) { ...@@ -646,7 +646,7 @@ static void clusterConnAcceptHandler(connection *conn) {
/* Create a link object we use to handle the connection. /* Create a link object we use to handle the connection.
* It gets passed to the readable handler when data is available. * It gets passed to the readable handler when data is available.
* Initiallly the link->node pointer is set to NULL as we don't know * Initially the link->node pointer is set to NULL as we don't know
* which node is, but the right node is references once we know the * which node is, but the right node is references once we know the
* node identity. */ * node identity. */
link = createClusterLink(NULL); link = createClusterLink(NULL);
...@@ -1060,7 +1060,7 @@ uint64_t clusterGetMaxEpoch(void) { ...@@ -1060,7 +1060,7 @@ uint64_t clusterGetMaxEpoch(void) {
* 3) Persist the configuration on disk before sending packets with the * 3) Persist the configuration on disk before sending packets with the
* new configuration. * new configuration.
* *
* If the new config epoch is generated and assigend, C_OK is returned, * If the new config epoch is generated and assigned, C_OK is returned,
* otherwise C_ERR is returned (since the node has already the greatest * otherwise C_ERR is returned (since the node has already the greatest
* configuration around) and no operation is performed. * configuration around) and no operation is performed.
* *
...@@ -1133,7 +1133,7 @@ int clusterBumpConfigEpochWithoutConsensus(void) { ...@@ -1133,7 +1133,7 @@ int clusterBumpConfigEpochWithoutConsensus(void) {
* *
* In general we want a system that eventually always ends with different * In general we want a system that eventually always ends with different
* masters having different configuration epochs whatever happened, since * masters having different configuration epochs whatever happened, since
* nothign is worse than a split-brain condition in a distributed system. * nothing is worse than a split-brain condition in a distributed system.
* *
* BEHAVIOR * BEHAVIOR
* *
...@@ -1192,7 +1192,7 @@ void clusterHandleConfigEpochCollision(clusterNode *sender) { ...@@ -1192,7 +1192,7 @@ void clusterHandleConfigEpochCollision(clusterNode *sender) {
* entries from the black list. This is an O(N) operation but it is not a * entries from the black list. This is an O(N) operation but it is not a
* problem since add / exists operations are called very infrequently and * problem since add / exists operations are called very infrequently and
* the hash table is supposed to contain very little elements at max. * the hash table is supposed to contain very little elements at max.
* However without the cleanup during long uptimes and with some automated * However without the cleanup during long uptime and with some automated
* node add/removal procedures, entries could accumulate. */ * node add/removal procedures, entries could accumulate. */
void clusterBlacklistCleanup(void) { void clusterBlacklistCleanup(void) {
dictIterator *di; dictIterator *di;
...@@ -1346,12 +1346,12 @@ int clusterHandshakeInProgress(char *ip, int port, int cport) { ...@@ -1346,12 +1346,12 @@ int clusterHandshakeInProgress(char *ip, int port, int cport) {
return de != NULL; return de != NULL;
} }
/* Start an handshake with the specified address if there is not one /* Start a handshake with the specified address if there is not one
* already in progress. Returns non-zero if the handshake was actually * already in progress. Returns non-zero if the handshake was actually
* started. On error zero is returned and errno is set to one of the * started. On error zero is returned and errno is set to one of the
* following values: * following values:
* *
* EAGAIN - There is already an handshake in progress for this address. * EAGAIN - There is already a handshake in progress for this address.
* EINVAL - IP or port are not valid. */ * EINVAL - IP or port are not valid. */
int clusterStartHandshake(char *ip, int port, int cport) { int clusterStartHandshake(char *ip, int port, int cport) {
clusterNode *n; clusterNode *n;
...@@ -1793,7 +1793,7 @@ int clusterProcessPacket(clusterLink *link) { ...@@ -1793,7 +1793,7 @@ int clusterProcessPacket(clusterLink *link) {
if (sender) sender->data_received = now; if (sender) sender->data_received = now;
if (sender && !nodeInHandshake(sender)) { if (sender && !nodeInHandshake(sender)) {
/* Update our curretEpoch if we see a newer epoch in the cluster. */ /* Update our currentEpoch if we see a newer epoch in the cluster. */
senderCurrentEpoch = ntohu64(hdr->currentEpoch); senderCurrentEpoch = ntohu64(hdr->currentEpoch);
senderConfigEpoch = ntohu64(hdr->configEpoch); senderConfigEpoch = ntohu64(hdr->configEpoch);
if (senderCurrentEpoch > server.cluster->currentEpoch) if (senderCurrentEpoch > server.cluster->currentEpoch)
...@@ -2480,7 +2480,7 @@ void clusterSetGossipEntry(clusterMsg *hdr, int i, clusterNode *n) { ...@@ -2480,7 +2480,7 @@ void clusterSetGossipEntry(clusterMsg *hdr, int i, clusterNode *n) {
} }
/* Send a PING or PONG packet to the specified node, making sure to add enough /* Send a PING or PONG packet to the specified node, making sure to add enough
* gossip informations. */ * gossip information. */
void clusterSendPing(clusterLink *link, int type) { void clusterSendPing(clusterLink *link, int type) {
unsigned char *buf; unsigned char *buf;
clusterMsg *hdr; clusterMsg *hdr;
...@@ -2500,7 +2500,7 @@ void clusterSendPing(clusterLink *link, int type) { ...@@ -2500,7 +2500,7 @@ void clusterSendPing(clusterLink *link, int type) {
* node_timeout we exchange with each other node at least 4 packets * node_timeout we exchange with each other node at least 4 packets
* (we ping in the worst case in node_timeout/2 time, and we also * (we ping in the worst case in node_timeout/2 time, and we also
* receive two pings from the host), we have a total of 8 packets * receive two pings from the host), we have a total of 8 packets
* in the node_timeout*2 falure reports validity time. So we have * in the node_timeout*2 failure reports validity time. So we have
* that, for a single PFAIL node, we can expect to receive the following * that, for a single PFAIL node, we can expect to receive the following
* number of failure reports (in the specified window of time): * number of failure reports (in the specified window of time):
* *
...@@ -2527,7 +2527,7 @@ void clusterSendPing(clusterLink *link, int type) { ...@@ -2527,7 +2527,7 @@ void clusterSendPing(clusterLink *link, int type) {
* faster to propagate to go from PFAIL to FAIL state. */ * faster to propagate to go from PFAIL to FAIL state. */
int pfail_wanted = server.cluster->stats_pfail_nodes; int pfail_wanted = server.cluster->stats_pfail_nodes;
/* Compute the maxium totlen to allocate our buffer. We'll fix the totlen /* Compute the maximum totlen to allocate our buffer. We'll fix the totlen
* later according to the number of gossip sections we really were able * later according to the number of gossip sections we really were able
* to put inside the packet. */ * to put inside the packet. */
totlen = sizeof(clusterMsg)-sizeof(union clusterMsgData); totlen = sizeof(clusterMsg)-sizeof(union clusterMsgData);
...@@ -2564,7 +2564,7 @@ void clusterSendPing(clusterLink *link, int type) { ...@@ -2564,7 +2564,7 @@ void clusterSendPing(clusterLink *link, int type) {
if (this->flags & (CLUSTER_NODE_HANDSHAKE|CLUSTER_NODE_NOADDR) || if (this->flags & (CLUSTER_NODE_HANDSHAKE|CLUSTER_NODE_NOADDR) ||
(this->link == NULL && this->numslots == 0)) (this->link == NULL && this->numslots == 0))
{ {
freshnodes--; /* Tecnically not correct, but saves CPU. */ freshnodes--; /* Technically not correct, but saves CPU. */
continue; continue;
} }
...@@ -3149,7 +3149,7 @@ void clusterHandleSlaveFailover(void) { ...@@ -3149,7 +3149,7 @@ void clusterHandleSlaveFailover(void) {
} }
} }
/* If the previous failover attempt timedout and the retry time has /* If the previous failover attempt timeout and the retry time has
* elapsed, we can setup a new one. */ * elapsed, we can setup a new one. */
if (auth_age > auth_retry_time) { if (auth_age > auth_retry_time) {
server.cluster->failover_auth_time = mstime() + server.cluster->failover_auth_time = mstime() +
...@@ -3255,7 +3255,7 @@ void clusterHandleSlaveFailover(void) { ...@@ -3255,7 +3255,7 @@ void clusterHandleSlaveFailover(void) {
* *
* Slave migration is the process that allows a slave of a master that is * Slave migration is the process that allows a slave of a master that is
* already covered by at least another slave, to "migrate" to a master that * already covered by at least another slave, to "migrate" to a master that
* is orpaned, that is, left with no working slaves. * is orphaned, that is, left with no working slaves.
* ------------------------------------------------------------------------- */ * ------------------------------------------------------------------------- */
/* This function is responsible to decide if this replica should be migrated /* This function is responsible to decide if this replica should be migrated
...@@ -3272,7 +3272,7 @@ void clusterHandleSlaveFailover(void) { ...@@ -3272,7 +3272,7 @@ void clusterHandleSlaveFailover(void) {
* the nodes anyway, so we spend time into clusterHandleSlaveMigration() * the nodes anyway, so we spend time into clusterHandleSlaveMigration()
* if definitely needed. * if definitely needed.
* *
* The fuction is called with a pre-computed max_slaves, that is the max * The function is called with a pre-computed max_slaves, that is the max
* number of working (not in FAIL state) slaves for a single master. * number of working (not in FAIL state) slaves for a single master.
* *
* Additional conditions for migration are examined inside the function. * Additional conditions for migration are examined inside the function.
...@@ -3391,7 +3391,7 @@ void clusterHandleSlaveMigration(int max_slaves) { ...@@ -3391,7 +3391,7 @@ void clusterHandleSlaveMigration(int max_slaves) {
* data loss due to the asynchronous master-slave replication. * data loss due to the asynchronous master-slave replication.
* -------------------------------------------------------------------------- */ * -------------------------------------------------------------------------- */
/* Reset the manual failover state. This works for both masters and slavesa /* Reset the manual failover state. This works for both masters and slaves
* as all the state about manual failover is cleared. * as all the state about manual failover is cleared.
* *
* The function can be used both to initialize the manual failover state at * The function can be used both to initialize the manual failover state at
...@@ -3683,7 +3683,7 @@ void clusterCron(void) { ...@@ -3683,7 +3683,7 @@ void clusterCron(void) {
replicationSetMaster(myself->slaveof->ip, myself->slaveof->port); replicationSetMaster(myself->slaveof->ip, myself->slaveof->port);
} }
/* Abourt a manual failover if the timeout is reached. */ /* Abort a manual failover if the timeout is reached. */
manualFailoverCheckTimeout(); manualFailoverCheckTimeout();
if (nodeIsSlave(myself)) { if (nodeIsSlave(myself)) {
...@@ -3788,12 +3788,12 @@ int clusterNodeSetSlotBit(clusterNode *n, int slot) { ...@@ -3788,12 +3788,12 @@ int clusterNodeSetSlotBit(clusterNode *n, int slot) {
* target for replicas migration, if and only if at least one of * target for replicas migration, if and only if at least one of
* the other masters has slaves right now. * the other masters has slaves right now.
* *
* Normally masters are valid targerts of replica migration if: * Normally masters are valid targets of replica migration if:
* 1. The used to have slaves (but no longer have). * 1. The used to have slaves (but no longer have).
* 2. They are slaves failing over a master that used to have slaves. * 2. They are slaves failing over a master that used to have slaves.
* *
* However new masters with slots assigned are considered valid * However new masters with slots assigned are considered valid
* migration tagets if the rest of the cluster is not a slave-less. * migration targets if the rest of the cluster is not a slave-less.
* *
* See https://github.com/antirez/redis/issues/3043 for more info. */ * See https://github.com/antirez/redis/issues/3043 for more info. */
if (n->numslots == 1 && clusterMastersHaveSlaves()) if (n->numslots == 1 && clusterMastersHaveSlaves())
...@@ -3977,7 +3977,7 @@ void clusterUpdateState(void) { ...@@ -3977,7 +3977,7 @@ void clusterUpdateState(void) {
* A) If no other node is in charge according to the current cluster * A) If no other node is in charge according to the current cluster
* configuration, we add these slots to our node. * configuration, we add these slots to our node.
* B) If according to our config other nodes are already in charge for * B) If according to our config other nodes are already in charge for
* this lots, we set the slots as IMPORTING from our point of view * this slots, we set the slots as IMPORTING from our point of view
* in order to justify we have those slots, and in order to make * in order to justify we have those slots, and in order to make
* redis-trib aware of the issue, so that it can try to fix it. * redis-trib aware of the issue, so that it can try to fix it.
* 2) If we find data in a DB different than DB0 we return C_ERR to * 2) If we find data in a DB different than DB0 we return C_ERR to
...@@ -4507,7 +4507,7 @@ NULL ...@@ -4507,7 +4507,7 @@ NULL
} }
/* If this slot is in migrating status but we have no keys /* If this slot is in migrating status but we have no keys
* for it assigning the slot to another node will clear * for it assigning the slot to another node will clear
* the migratig status. */ * the migrating status. */
if (countKeysInSlot(slot) == 0 && if (countKeysInSlot(slot) == 0 &&
server.cluster->migrating_slots_to[slot]) server.cluster->migrating_slots_to[slot])
server.cluster->migrating_slots_to[slot] = NULL; server.cluster->migrating_slots_to[slot] = NULL;
...@@ -4852,7 +4852,7 @@ NULL ...@@ -4852,7 +4852,7 @@ NULL
server.cluster->currentEpoch = epoch; server.cluster->currentEpoch = epoch;
/* No need to fsync the config here since in the unlucky event /* No need to fsync the config here since in the unlucky event
* of a failure to persist the config, the conflict resolution code * of a failure to persist the config, the conflict resolution code
* will assign an unique config to this node. */ * will assign a unique config to this node. */
clusterDoBeforeSleep(CLUSTER_TODO_UPDATE_STATE| clusterDoBeforeSleep(CLUSTER_TODO_UPDATE_STATE|
CLUSTER_TODO_SAVE_CONFIG); CLUSTER_TODO_SAVE_CONFIG);
addReply(c,shared.ok); addReply(c,shared.ok);
...@@ -4900,7 +4900,7 @@ void createDumpPayload(rio *payload, robj *o, robj *key) { ...@@ -4900,7 +4900,7 @@ void createDumpPayload(rio *payload, robj *o, robj *key) {
unsigned char buf[2]; unsigned char buf[2];
uint64_t crc; uint64_t crc;
/* Serialize the object in a RDB-like format. It consist of an object type /* Serialize the object in an RDB-like format. It consist of an object type
* byte followed by the serialized object. This is understood by RESTORE. */ * byte followed by the serialized object. This is understood by RESTORE. */
rioInitWithBuffer(payload,sdsempty()); rioInitWithBuffer(payload,sdsempty());
serverAssert(rdbSaveObjectType(payload,o)); serverAssert(rdbSaveObjectType(payload,o));
...@@ -5567,7 +5567,7 @@ void readwriteCommand(client *c) { ...@@ -5567,7 +5567,7 @@ void readwriteCommand(client *c) {
* resharding in progress). * resharding in progress).
* *
* On success the function returns the node that is able to serve the request. * On success the function returns the node that is able to serve the request.
* If the node is not 'myself' a redirection must be perfomed. The kind of * If the node is not 'myself' a redirection must be performed. The kind of
* redirection is specified setting the integer passed by reference * redirection is specified setting the integer passed by reference
* 'error_code', which will be set to CLUSTER_REDIR_ASK or * 'error_code', which will be set to CLUSTER_REDIR_ASK or
* CLUSTER_REDIR_MOVED. * CLUSTER_REDIR_MOVED.
...@@ -5694,7 +5694,7 @@ clusterNode *getNodeByQuery(client *c, struct redisCommand *cmd, robj **argv, in ...@@ -5694,7 +5694,7 @@ clusterNode *getNodeByQuery(client *c, struct redisCommand *cmd, robj **argv, in
} }
} }
/* Migarting / Improrting slot? Count keys we don't have. */ /* Migrating / Importing slot? Count keys we don't have. */
if ((migrating_slot || importing_slot) && if ((migrating_slot || importing_slot) &&
lookupKeyRead(&server.db[0],thiskey) == NULL) lookupKeyRead(&server.db[0],thiskey) == NULL)
{ {
...@@ -5763,7 +5763,7 @@ clusterNode *getNodeByQuery(client *c, struct redisCommand *cmd, robj **argv, in ...@@ -5763,7 +5763,7 @@ clusterNode *getNodeByQuery(client *c, struct redisCommand *cmd, robj **argv, in
} }
/* Handle the read-only client case reading from a slave: if this /* Handle the read-only client case reading from a slave: if this
* node is a slave and the request is about an hash slot our master * node is a slave and the request is about a hash slot our master
* is serving, we can reply without redirection. */ * is serving, we can reply without redirection. */
int is_readonly_command = (c->cmd->flags & CMD_READONLY) || int is_readonly_command = (c->cmd->flags & CMD_READONLY) ||
(c->cmd->proc == execCommand && !(c->mstate.cmd_inv_flags & CMD_READONLY)); (c->cmd->proc == execCommand && !(c->mstate.cmd_inv_flags & CMD_READONLY));
...@@ -5777,7 +5777,7 @@ clusterNode *getNodeByQuery(client *c, struct redisCommand *cmd, robj **argv, in ...@@ -5777,7 +5777,7 @@ clusterNode *getNodeByQuery(client *c, struct redisCommand *cmd, robj **argv, in
} }
/* Base case: just return the right node. However if this node is not /* Base case: just return the right node. However if this node is not
* myself, set error_code to MOVED since we need to issue a rediretion. */ * myself, set error_code to MOVED since we need to issue a redirection. */
if (n != myself && error_code) *error_code = CLUSTER_REDIR_MOVED; if (n != myself && error_code) *error_code = CLUSTER_REDIR_MOVED;
return n; return n;
} }
...@@ -5823,7 +5823,7 @@ void clusterRedirectClient(client *c, clusterNode *n, int hashslot, int error_co ...@@ -5823,7 +5823,7 @@ void clusterRedirectClient(client *c, clusterNode *n, int hashslot, int error_co
* 3) The client may remain blocked forever (or up to the max timeout time) * 3) The client may remain blocked forever (or up to the max timeout time)
* waiting for a key change that will never happen. * waiting for a key change that will never happen.
* *
* If the client is found to be blocked into an hash slot this node no * If the client is found to be blocked into a hash slot this node no
* longer handles, the client is sent a redirection error, and the function * longer handles, the client is sent a redirection error, and the function
* returns 1. Otherwise 0 is returned and no operation is performed. */ * returns 1. Otherwise 0 is returned and no operation is performed. */
int clusterRedirectBlockedClientIfNeeded(client *c) { int clusterRedirectBlockedClientIfNeeded(client *c) {
......
...@@ -51,8 +51,8 @@ typedef struct clusterLink { ...@@ -51,8 +51,8 @@ typedef struct clusterLink {
#define CLUSTER_NODE_HANDSHAKE 32 /* We have still to exchange the first ping */ #define CLUSTER_NODE_HANDSHAKE 32 /* We have still to exchange the first ping */
#define CLUSTER_NODE_NOADDR 64 /* We don't know the address of this node */ #define CLUSTER_NODE_NOADDR 64 /* We don't know the address of this node */
#define CLUSTER_NODE_MEET 128 /* Send a MEET message to this node */ #define CLUSTER_NODE_MEET 128 /* Send a MEET message to this node */
#define CLUSTER_NODE_MIGRATE_TO 256 /* Master elegible for replica migration. */ #define CLUSTER_NODE_MIGRATE_TO 256 /* Master eligible for replica migration. */
#define CLUSTER_NODE_NOFAILOVER 512 /* Slave will not try to failver. */ #define CLUSTER_NODE_NOFAILOVER 512 /* Slave will not try to failover. */
#define CLUSTER_NODE_NULL_NAME "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000" #define CLUSTER_NODE_NULL_NAME "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"
#define nodeIsMaster(n) ((n)->flags & CLUSTER_NODE_MASTER) #define nodeIsMaster(n) ((n)->flags & CLUSTER_NODE_MASTER)
...@@ -164,10 +164,10 @@ typedef struct clusterState { ...@@ -164,10 +164,10 @@ typedef struct clusterState {
clusterNode *mf_slave; /* Slave performing the manual failover. */ clusterNode *mf_slave; /* Slave performing the manual failover. */
/* Manual failover state of slave. */ /* Manual failover state of slave. */
long long mf_master_offset; /* Master offset the slave needs to start MF long long mf_master_offset; /* Master offset the slave needs to start MF
or zero if stil not received. */ or zero if still not received. */
int mf_can_start; /* If non-zero signal that the manual failover int mf_can_start; /* If non-zero signal that the manual failover
can start requesting masters vote. */ can start requesting masters vote. */
/* The followign fields are used by masters to take state on elections. */ /* The following fields are used by masters to take state on elections. */
uint64_t lastVoteEpoch; /* Epoch of the last vote granted. */ uint64_t lastVoteEpoch; /* Epoch of the last vote granted. */
int todo_before_sleep; /* Things to do in clusterBeforeSleep(). */ int todo_before_sleep; /* Things to do in clusterBeforeSleep(). */
/* Messages received and sent by type. */ /* Messages received and sent by type. */
......
...@@ -1279,7 +1279,7 @@ void rewriteConfigNumericalOption(struct rewriteConfigState *state, const char * ...@@ -1279,7 +1279,7 @@ void rewriteConfigNumericalOption(struct rewriteConfigState *state, const char *
rewriteConfigRewriteLine(state,option,line,force); rewriteConfigRewriteLine(state,option,line,force);
} }
/* Rewrite a octal option. */ /* Rewrite an octal option. */
void rewriteConfigOctalOption(struct rewriteConfigState *state, char *option, int value, int defvalue) { void rewriteConfigOctalOption(struct rewriteConfigState *state, char *option, int value, int defvalue) {
int force = value != defvalue; int force = value != defvalue;
sds line = sdscatprintf(sdsempty(),"%s %o",option,value); sds line = sdscatprintf(sdsempty(),"%s %o",option,value);
...@@ -2097,7 +2097,7 @@ static int isValidAOFfilename(char *val, char **err) { ...@@ -2097,7 +2097,7 @@ static int isValidAOFfilename(char *val, char **err) {
static int updateHZ(long long val, long long prev, char **err) { static int updateHZ(long long val, long long prev, char **err) {
UNUSED(prev); UNUSED(prev);
UNUSED(err); UNUSED(err);
/* Hz is more an hint from the user, so we accept values out of range /* Hz is more a hint from the user, so we accept values out of range
* but cap them to reasonable values. */ * but cap them to reasonable values. */
server.config_hz = val; server.config_hz = val;
if (server.config_hz < CONFIG_MIN_HZ) server.config_hz = CONFIG_MIN_HZ; if (server.config_hz < CONFIG_MIN_HZ) server.config_hz = CONFIG_MIN_HZ;
...@@ -2115,7 +2115,7 @@ static int updateJemallocBgThread(int val, int prev, char **err) { ...@@ -2115,7 +2115,7 @@ static int updateJemallocBgThread(int val, int prev, char **err) {
static int updateReplBacklogSize(long long val, long long prev, char **err) { static int updateReplBacklogSize(long long val, long long prev, char **err) {
/* resizeReplicationBacklog sets server.repl_backlog_size, and relies on /* resizeReplicationBacklog sets server.repl_backlog_size, and relies on
* being able to tell when the size changes, so restore prev becore calling it. */ * being able to tell when the size changes, so restore prev before calling it. */
UNUSED(err); UNUSED(err);
server.repl_backlog_size = prev; server.repl_backlog_size = prev;
resizeReplicationBacklog(val); resizeReplicationBacklog(val);
......
...@@ -166,7 +166,7 @@ void setproctitle(const char *fmt, ...); ...@@ -166,7 +166,7 @@ void setproctitle(const char *fmt, ...);
#endif /* BYTE_ORDER */ #endif /* BYTE_ORDER */
/* Sometimes after including an OS-specific header that defines the /* Sometimes after including an OS-specific header that defines the
* endianess we end with __BYTE_ORDER but not with BYTE_ORDER that is what * endianness we end with __BYTE_ORDER but not with BYTE_ORDER that is what
* the Redis code uses. In this case let's define everything without the * the Redis code uses. In this case let's define everything without the
* underscores. */ * underscores. */
#ifndef BYTE_ORDER #ifndef BYTE_ORDER
......
...@@ -106,7 +106,7 @@ static inline int connAccept(connection *conn, ConnectionCallbackFunc accept_han ...@@ -106,7 +106,7 @@ static inline int connAccept(connection *conn, ConnectionCallbackFunc accept_han
} }
/* Establish a connection. The connect_handler will be called when the connection /* Establish a connection. The connect_handler will be called when the connection
* is established, or if an error has occured. * is established, or if an error has occurred.
* *
* The connection handler will be responsible to set up any read/write handlers * The connection handler will be responsible to set up any read/write handlers
* as needed. * as needed.
...@@ -168,7 +168,7 @@ static inline int connSetReadHandler(connection *conn, ConnectionCallbackFunc fu ...@@ -168,7 +168,7 @@ static inline int connSetReadHandler(connection *conn, ConnectionCallbackFunc fu
/* Set a write handler, and possibly enable a write barrier, this flag is /* Set a write handler, and possibly enable a write barrier, this flag is
* cleared when write handler is changed or removed. * cleared when write handler is changed or removed.
* With barroer enabled, we never fire the event if the read handler already * With barrier enabled, we never fire the event if the read handler already
* fired in the same event loop iteration. Useful when you want to persist * fired in the same event loop iteration. Useful when you want to persist
* things to disk before sending replies, and want to do that in a group fashion. */ * things to disk before sending replies, and want to do that in a group fashion. */
static inline int connSetWriteHandlerWithBarrier(connection *conn, ConnectionCallbackFunc func, int barrier) { static inline int connSetWriteHandlerWithBarrier(connection *conn, ConnectionCallbackFunc func, int barrier) {
......
...@@ -116,7 +116,7 @@ robj *lookupKeyReadWithFlags(redisDb *db, robj *key, int flags) { ...@@ -116,7 +116,7 @@ robj *lookupKeyReadWithFlags(redisDb *db, robj *key, int flags) {
* However, if the command caller is not the master, and as additional * However, if the command caller is not the master, and as additional
* safety measure, the command invoked is a read-only command, we can * safety measure, the command invoked is a read-only command, we can
* safely return NULL here, and provide a more consistent behavior * safely return NULL here, and provide a more consistent behavior
* to clients accessign expired values in a read-only fashion, that * to clients accessing expired values in a read-only fashion, that
* will say the key as non existing. * will say the key as non existing.
* *
* Notably this covers GETs when slaves are used to scale reads. */ * Notably this covers GETs when slaves are used to scale reads. */
...@@ -374,7 +374,7 @@ robj *dbUnshareStringValue(redisDb *db, robj *key, robj *o) { ...@@ -374,7 +374,7 @@ robj *dbUnshareStringValue(redisDb *db, robj *key, robj *o) {
* firing module events. * firing module events.
* and the function to return ASAP. * and the function to return ASAP.
* *
* On success the fuction returns the number of keys removed from the * On success the function returns the number of keys removed from the
* database(s). Otherwise -1 is returned in the specific case the * database(s). Otherwise -1 is returned in the specific case the
* DB number is out of range, and errno is set to EINVAL. */ * DB number is out of range, and errno is set to EINVAL. */
long long emptyDbGeneric(redisDb *dbarray, int dbnum, int flags, void(callback)(void*)) { long long emptyDbGeneric(redisDb *dbarray, int dbnum, int flags, void(callback)(void*)) {
...@@ -866,7 +866,7 @@ void scanGenericCommand(client *c, robj *o, unsigned long cursor) { ...@@ -866,7 +866,7 @@ void scanGenericCommand(client *c, robj *o, unsigned long cursor) {
/* Filter element if it is an expired key. */ /* Filter element if it is an expired key. */
if (!filter && o == NULL && expireIfNeeded(c->db, kobj)) filter = 1; if (!filter && o == NULL && expireIfNeeded(c->db, kobj)) filter = 1;
/* Remove the element and its associted value if needed. */ /* Remove the element and its associated value if needed. */
if (filter) { if (filter) {
decrRefCount(kobj); decrRefCount(kobj);
listDelNode(keys, node); listDelNode(keys, node);
...@@ -1367,7 +1367,7 @@ int *getKeysUsingCommandTable(struct redisCommand *cmd,robj **argv, int argc, in ...@@ -1367,7 +1367,7 @@ int *getKeysUsingCommandTable(struct redisCommand *cmd,robj **argv, int argc, in
/* Return all the arguments that are keys in the command passed via argc / argv. /* Return all the arguments that are keys in the command passed via argc / argv.
* *
* The command returns the positions of all the key arguments inside the array, * The command returns the positions of all the key arguments inside the array,
* so the actual return value is an heap allocated array of integers. The * so the actual return value is a heap allocated array of integers. The
* length of the array is returned by reference into *numkeys. * length of the array is returned by reference into *numkeys.
* *
* 'cmd' must be point to the corresponding entry into the redisCommand * 'cmd' must be point to the corresponding entry into the redisCommand
......
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