fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-06-28 16:31:33 +00:00
Code Issues Projects Releases Wiki Activity

Clean up text throughout project

Browse Source 
- Remove trailing newlines from redis.conf
  - Fix comment misspelling
  - Clarifies zipEncodeLength usage and a C API mention (#1243, #1242)
  - Fix cluster typos (inspired by @papanikge #1507)
  - Fix rewite -> rewrite in a few places (inspired by #682)

Closes #1243, #1242, #1507
This commit is contained in:
Matt Stancliff
2014-07-31 14:51:05 -04:00
committed by antirez
parent 22e6f434f8
commit e0ffc863c6
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
redis.conf
View File

@ -180,9 +180,9 @@ dbfilename dump.rdb
# #
# The DB will be written inside this directory, with the filename specified # The DB will be written inside this directory, with the filename specified
# above using the 'dbfilename' configuration directive. # above using the 'dbfilename' configuration directive.
# #
# The Append Only File will also be created inside this directory. # The Append Only File will also be created inside this directory.
# #
# Note that you must specify a directory here, not a file name. # Note that you must specify a directory here, not a file name.
dir ./ dir ./
@ -340,7 +340,7 @@ slave-priority 100
# #
# This should stay commented out for backward compatibility and because most # This should stay commented out for backward compatibility and because most
# people do not need auth (e.g. they run their own servers). # people do not need auth (e.g. they run their own servers).
# #
# Warning: since Redis is pretty fast an outside user can try up to # Warning: since Redis is pretty fast an outside user can try up to
# 150k passwords per second against a good box. This means that you should # 150k passwords per second against a good box. This means that you should
# use a very strong password otherwise it will be very easy to break. # use a very strong password otherwise it will be very easy to break.
@ -406,14 +406,14 @@ slave-priority 100
# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory # MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
# is reached. You can select among five behaviors: # is reached. You can select among five behaviors:
# #
# volatile-lru -> remove the key with an expire set using an LRU algorithm # volatile-lru -> remove the key with an expire set using an LRU algorithm
# allkeys-lru -> remove any key according to the LRU algorithm # allkeys-lru -> remove any key according to the LRU algorithm
# volatile-random -> remove a random key with an expire set # volatile-random -> remove a random key with an expire set
# allkeys-random -> remove a random key, any key # allkeys-random -> remove a random key, any key
# volatile-ttl -> remove the key with the nearest expire time (minor TTL) # volatile-ttl -> remove the key with the nearest expire time (minor TTL)
# noeviction -> don't expire at all, just return an error on write operations # noeviction -> don't expire at all, just return an error on write operations
# #
# Note: with any of the above policies, Redis will return an error on write # Note: with any of the above policies, Redis will return an error on write
# operations, when there are no suitable keys for eviction. # operations, when there are no suitable keys for eviction.
# #
@ -503,7 +503,7 @@ appendfsync everysec
# the same as "appendfsync none". In practical terms, this means that it is # the same as "appendfsync none". In practical terms, this means that it is
# possible to lose up to 30 seconds of log in the worst scenario (with the # possible to lose up to 30 seconds of log in the worst scenario (with the
# default Linux settings). # default Linux settings).
# #
# If you have latency problems turn this to "yes". Otherwise leave it as # If you have latency problems turn this to "yes". Otherwise leave it as
# "no" that is the safest pick from the point of view of durability. # "no" that is the safest pick from the point of view of durability.
@ -512,7 +512,7 @@ no-appendfsync-on-rewrite no
# Automatic rewrite of the append only file. # Automatic rewrite of the append only file.
# Redis is able to automatically rewrite the log file implicitly calling # Redis is able to automatically rewrite the log file implicitly calling
# BGREWRITEAOF when the AOF log size grows by the specified percentage. # BGREWRITEAOF when the AOF log size grows by the specified percentage.
# #
# This is how it works: Redis remembers the size of the AOF file after the # This is how it works: Redis remembers the size of the AOF file after the
# latest rewrite (if no rewrite has happened since the restart, the size of # latest rewrite (if no rewrite has happened since the restart, the size of
# the AOF at startup is used). # the AOF at startup is used).
@ -579,7 +579,7 @@ lua-time-limit 5000
# but just the time needed to actually execute the command (this is the only # but just the time needed to actually execute the command (this is the only
# stage of command execution where the thread is blocked and can not serve # stage of command execution where the thread is blocked and can not serve
# other requests in the meantime). # other requests in the meantime).
# #
# You can configure the slow log with two parameters: one tells Redis # You can configure the slow log with two parameters: one tells Redis
# what is the execution time, in microseconds, to exceed in order for the # what is the execution time, in microseconds, to exceed in order for the
# command to get logged, and the other parameter is the length of the # command to get logged, and the other parameter is the length of the
@ -620,7 +620,7 @@ latency-monitor-threshold 0
# Redis can notify Pub/Sub clients about events happening in the key space. # Redis can notify Pub/Sub clients about events happening in the key space.
# This feature is documented at http://redis.io/topics/notifications # This feature is documented at http://redis.io/topics/notifications
# #
# For instance if keyspace events notification is enabled, and a client # For instance if keyspace events notification is enabled, and a client
# performs a DEL operation on key "foo" stored in the Database 0, two # performs a DEL operation on key "foo" stored in the Database 0, two
# messages will be published via Pub/Sub: # messages will be published via Pub/Sub:
@ -695,7 +695,7 @@ zset-max-ziplist-value 64
# #
# A value greater than 16000 is totally useless, since at that point the # A value greater than 16000 is totally useless, since at that point the
# dense representation is more memory efficient. # dense representation is more memory efficient.
# #
# The suggested value is ~ 3000 in order to have the benefits of # The suggested value is ~ 3000 in order to have the benefits of
# the space efficient encoding without slowing down too much PFADD, # the space efficient encoding without slowing down too much PFADD,
# which is O(N) with the sparse encoding. The value can be raised to # which is O(N) with the sparse encoding. The value can be raised to
@ -710,7 +710,7 @@ hll-sparse-max-bytes 3000
# that is rehashing, the more rehashing "steps" are performed, so if the # that is rehashing, the more rehashing "steps" are performed, so if the
# server is idle the rehashing is never complete and some more memory is used # server is idle the rehashing is never complete and some more memory is used
# by the hash table. # by the hash table.
# #
# The default is to use this millisecond 10 times every second in order to # The default is to use this millisecond 10 times every second in order to
# actively rehash the main dictionaries, freeing memory when possible. # actively rehash the main dictionaries, freeing memory when possible.
# #

4
src/aof.c
View File

@ -73,7 +73,7 @@ void aofRewriteBufferReset(void) {
listSetFreeMethod(server.aof_rewrite_buf_blocks,zfree); listSetFreeMethod(server.aof_rewrite_buf_blocks,zfree);
} }
/* Return the current size of the AOF rewite buffer. */ /* Return the current size of the AOF rewrite buffer. */
unsigned long aofRewriteBufferSize(void) { unsigned long aofRewriteBufferSize(void) {
listNode *ln = listLast(server.aof_rewrite_buf_blocks); listNode *ln = listLast(server.aof_rewrite_buf_blocks);
aofrwblock *block = ln ? ln->value : NULL; aofrwblock *block = ln ? ln->value : NULL;
@ -202,7 +202,7 @@ int startAppendOnly(void) {
redisLog(REDIS_WARNING,"Redis needs to enable the AOF but can't trigger a background AOF rewrite operation. Check the above logs for more info about the error."); redisLog(REDIS_WARNING,"Redis needs to enable the AOF but can't trigger a background AOF rewrite operation. Check the above logs for more info about the error.");
return REDIS_ERR; return REDIS_ERR;
} }
/* We correctly switched on AOF, now wait for the rewite to be complete /* We correctly switched on AOF, now wait for the rewrite to be complete
* in order to append data on disk. */ * in order to append data on disk. */
server.aof_state = REDIS_AOF_WAIT_REWRITE; server.aof_state = REDIS_AOF_WAIT_REWRITE;
return REDIS_OK; return REDIS_OK;

2
src/sentinel.c
View File

@ -2106,7 +2106,7 @@ void sentinelPublishReplyCallback(redisAsyncContext *c, void *reply, void *privd
* or sent directly to this sentinel via the (fake) PUBLISH command of Sentinel. * or sent directly to this sentinel via the (fake) PUBLISH command of Sentinel.
* *
* If the master name specified in the message is not known, the message is * If the master name specified in the message is not known, the message is
* discareded. */ * discarded. */
void sentinelProcessHelloMessage(char *hello, int hello_len) { void sentinelProcessHelloMessage(char *hello, int hello_len) {
/* Format is composed of 8 tokens: /* Format is composed of 8 tokens:
* 0=ip,1=port,2=runid,3=current_epoch,4=master_name, * 0=ip,1=port,2=runid,3=current_epoch,4=master_name,

2
src/util.c
View File

@ -385,7 +385,7 @@ int string2l(const char *s, size_t slen, long *lval) {
} }
/* Convert a double to a string representation. Returns the number of bytes /* Convert a double to a string representation. Returns the number of bytes
* required. The representation should always be parsable by stdtod(3). */ * required. The representation should always be parsable by strtod(3). */
int d2string(char *buf, size_t len, double value) { int d2string(char *buf, size_t len, double value) {
if (isnan(value)) { if (isnan(value)) {
len = snprintf(buf,len,"nan"); len = snprintf(buf,len,"nan");

2
src/ziplist.c
View File

@ -183,7 +183,7 @@ static unsigned int zipIntSize(unsigned char encoding) {
return 0; return 0;
} }
/* Encode the length 'l' writing it in 'p'. If p is NULL it just returns /* Encode the length 'rawlen' writing it in 'p'. If p is NULL it just returns
* the amount of bytes required to encode such a length. */ * the amount of bytes required to encode such a length. */
static unsigned int zipEncodeLength(unsigned char *p, unsigned char encoding, unsigned int rawlen) { static unsigned int zipEncodeLength(unsigned char *p, unsigned char encoding, unsigned int rawlen) {
unsigned char len = 1, buf[5]; unsigned char len = 1, buf[5];