slipenkomk/valkey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CONFIG REWRITE: old development comments removed.

Browse Source
This commit is contained in:
antirez 2013-12-19 15:30:06 +01:00
parent b221e13dac
commit 3b9cf3ed3a
1 changed files with 4 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/config.c
View File

@ -1126,41 +1126,13 @@ void configGetCommand(redisClient *c) {
* CONFIG REWRITE implementation * CONFIG REWRITE implementation
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
/* IGNORE:
*
* rename-command
* include
*
* Special handling:
*
* notify-keyspace-events
* client-output-buffer-limit
* save
* appendonly
* appendfsync
* dir
* maxmemory-policy
* loglevel
* unixsocketperm
* slaveof
*
* Type of config directives:
*
* CUSTOM
* VERBATIM
* YESNO
* L
* LL
*
*/
#define REDIS_CONFIG_REWRITE_SIGNATURE "# Generated by CONFIG REWRITE" #define REDIS_CONFIG_REWRITE_SIGNATURE "# Generated by CONFIG REWRITE"
/* We use the following dictionary type to store where a configuration /* We use the following dictionary type to store where a configuration
* option is mentioned in the old configuration file, so it's * option is mentioned in the old configuration file, so it's
* like "maxmemory" -> list of line numbers (first line is zero). */ * like "maxmemory" -> list of line numbers (first line is zero). */
unsigned int dictSdsHash(const void *key); unsigned int dictSdsCaseHash(const void *key);
int dictSdsKeyCompare(void *privdata, const void *key1, const void *key2); int dictSdsKeyCaseCompare(void *privdata, const void *key1, const void *key2);
void dictSdsDestructor(void *privdata, void *val); void dictSdsDestructor(void *privdata, void *val);
void dictListDestructor(void *privdata, void *val); void dictListDestructor(void *privdata, void *val);
@ -1220,7 +1192,7 @@ void rewriteConfigAddLineNumberToOption(struct rewriteConfigState *state, sds op
void rewriteConfigMarkAsProcessed(struct rewriteConfigState *state, char *option) { void rewriteConfigMarkAsProcessed(struct rewriteConfigState *state, char *option) {
sds opt = sdsnew(option); sds opt = sdsnew(option);
if (dictAdd(state->rewritten,opt) != DICT_OK) sdsfree(opt); if (dictAdd(state->rewritten,opt,NULL) != DICT_OK) sdsfree(opt);
} }
/* Read the old file, split it into lines to populate a newly created /* Read the old file, split it into lines to populate a newly created
@ -1617,7 +1589,7 @@ void rewriteConfigRemoveOrphaned(struct rewriteConfigState *state) {
/* Don't blank lines about options the rewrite process /* Don't blank lines about options the rewrite process
* don't understand. */ * don't understand. */
if (dictFetch(state->rewritten,option) == NULL) { if (dictFetchValue(state->rewritten,option) == NULL) {
redisLog(REDIS_DEBUG,"Not rewritten option: %s", option); redisLog(REDIS_DEBUG,"Not rewritten option: %s", option);
continue; continue;
} }