hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Maxrows: documentation update and use of MXS_MODULE_PARAM_SIZE for max_resultset_size parameter

Browse Source 
max_resultset_size parameter now uses MXS_MODULE_PARAM_SIZE and
config_get_size

Documentation change follows the change.
This commit is contained in:
MassimilianoPinto
2017-04-03 16:01:59 +02:00
parent 6ef90bf9b6
commit 0c3f9ffa2e
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Documentation/Filters/Maxrows.md
View File

@ -46,14 +46,16 @@ The default value is `-1`.
#### `max_resultset_size` #### `max_resultset_size`
Specifies the maximum size a resultset can have, measured in kibibytes, Specifies the maximum size a resultset can have in order
in order to be sent to the client. A resultset larger than this, will to be sent to the client. A resultset larger than this, will
not be sent: an empty resultset will be sent instead. not be sent: an empty resultset will be sent instead.
The size can be specified as described
[here](../Getting-Started/Configuration-Guide.md#sizes).
``` ```
max_resultset_size=128 max_resultset_size=128Ki
``` ```
The default value is 64. The default value is 64Ki
#### `max_resultset_return` #### `max_resultset_return`

7
server/modules/filter/maxrows/maxrows.c
View File

@ -131,7 +131,7 @@ MXS_MODULE* MXS_CREATE_MODULE()
}, },
{ {
"max_resultset_size", "max_resultset_size",
MXS_MODULE_PARAM_COUNT, MXS_MODULE_PARAM_SIZE,
MAXROWS_DEFAULT_MAX_RESULTSET_SIZE MAXROWS_DEFAULT_MAX_RESULTSET_SIZE
}, },
{ {
@ -244,8 +244,8 @@ static MXS_FILTER *createInstance(const char *name,
cinstance->name = name; cinstance->name = name;
cinstance->config.max_resultset_rows = config_get_integer(params, cinstance->config.max_resultset_rows = config_get_integer(params,
"max_resultset_rows"); "max_resultset_rows");
cinstance->config.max_resultset_size = config_get_integer(params, cinstance->config.max_resultset_size = config_get_size(params,
"max_resultset_size"); "max_resultset_size");
cinstance->config.m_return = config_get_enum(params, cinstance->config.m_return = config_get_enum(params,
"max_resultset_return", "max_resultset_return",
return_option_values); return_option_values);
@ -1226,6 +1226,7 @@ static int send_maxrows_reply_limit(MAXROWS_SESSION_DATA *csdata)
default: default:
MXS_ERROR("MaxRows config value not expected!"); MXS_ERROR("MaxRows config value not expected!");
ss_dassert(!true); ss_dassert(!true);
return 0;
break; break;
} }
} }