From 13650446ac220136ed717fada3d0990298d5d87c Mon Sep 17 00:00:00 2001 From: antirez Date: Thu, 11 Jan 2018 11:35:45 +0100 Subject: [PATCH] proto-max-querybuf-len -> client-query-buffer-limit. We already had client buffer limits exported as configuration options. Stick with the naming scheme already used. See #4568. --- src/config.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/config.c b/src/config.c index e86b1c3c..eddfe1f1 100644 --- a/src/config.c +++ b/src/config.c @@ -330,7 +330,7 @@ void loadServerConfigFromString(char *config) { } } else if ((!strcasecmp(argv[0],"proto-max-bulk-len")) && argc == 2) { server.proto_max_bulk_len = memtoll(argv[1],NULL); - } else if ((!strcasecmp(argv[0],"proto-max-querybuf-len")) && argc == 2) { + } else if ((!strcasecmp(argv[0],"client-query-buffer-limit")) && argc == 2) { server.client_max_querybuf_len = memtoll(argv[1],NULL); } else if (!strcasecmp(argv[0],"lfu-log-factor") && argc == 2) { server.lfu_log_factor = atoi(argv[1]); @@ -1139,7 +1139,7 @@ void configSetCommand(client *c) { } config_set_memory_field( "proto-max-bulk-len",server.proto_max_bulk_len) { } config_set_memory_field( - "proto-max-querybuf-len",server.client_max_querybuf_len) { + "client-query-buffer-limit",server.client_max_querybuf_len) { } config_set_memory_field("repl-backlog-size",ll) { resizeReplicationBacklog(ll); } config_set_memory_field("auto-aof-rewrite-min-size",ll) { @@ -1229,7 +1229,7 @@ void configGetCommand(client *c) { /* Numerical values */ config_get_numerical_field("maxmemory",server.maxmemory); config_get_numerical_field("proto-max-bulk-len",server.proto_max_bulk_len); - config_get_numerical_field("proto-max-querybuf-len",server.client_max_querybuf_len); + config_get_numerical_field("client-query-buffer-limit",server.client_max_querybuf_len); config_get_numerical_field("maxmemory-samples",server.maxmemory_samples); config_get_numerical_field("lfu-log-factor",server.lfu_log_factor); config_get_numerical_field("lfu-decay-time",server.lfu_decay_time); @@ -2003,7 +2003,7 @@ int rewriteConfig(char *path) { rewriteConfigNumericalOption(state,"maxclients",server.maxclients,CONFIG_DEFAULT_MAX_CLIENTS); rewriteConfigBytesOption(state,"maxmemory",server.maxmemory,CONFIG_DEFAULT_MAXMEMORY); rewriteConfigBytesOption(state,"proto-max-bulk-len",server.proto_max_bulk_len,CONFIG_DEFAULT_PROTO_MAX_BULK_LEN); - rewriteConfigBytesOption(state,"proto-max-querybuf-len",server.client_max_querybuf_len,PROTO_MAX_QUERYBUF_LEN); + rewriteConfigBytesOption(state,"client-query-buffer-limit",server.client_max_querybuf_len,PROTO_MAX_QUERYBUF_LEN); rewriteConfigEnumOption(state,"maxmemory-policy",server.maxmemory_policy,maxmemory_policy_enum,CONFIG_DEFAULT_MAXMEMORY_POLICY); rewriteConfigNumericalOption(state,"maxmemory-samples",server.maxmemory_samples,CONFIG_DEFAULT_MAXMEMORY_SAMPLES); rewriteConfigNumericalOption(state,"lfu-log-factor",server.lfu_log_factor,CONFIG_DEFAULT_LFU_LOG_FACTOR);