diff options
| author | David Rowley <drowley@postgresql.org> | 2023-04-11 19:36:34 +1200 |
|---|---|---|
| committer | David Rowley <drowley@postgresql.org> | 2023-04-11 19:36:34 +1200 |
| commit | 68a2a437f46716efd54d177edf9dbcc9916c903b (patch) | |
| tree | 6bba2a5b264216f0efa912af8edf61b6d1e63a31 /src/backend | |
| parent | d866f0374ca688937b905fbebfcc2c5f8dc88b54 (diff) | |
| download | postgresql-68a2a437f46716efd54d177edf9dbcc9916c903b.tar.gz | |
Improve ereports for VACUUM's BUFFER_USAGE_LIMIT option
There's no need to check if opt->arg is NULL since defGetString() already
does that and raises an ERROR if it is. Let's just remove that check.
Also, combine the two remaining ERRORs into a single check. It seems
better to give an indication about what sort of values we're looking for
rather than just to state that the value given isn't valid. Make
BUFFER_USAGE_LIMIT uppercase in this ERROR message too. It's already
upper case in one other error message, so make that consistent.
Reported-by: Kyotaro Horiguchi
Discussion: https://postgr.es/m/20230411.102335.1643720544536884844.horikyota.ntt@gmail.com
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/commands/vacuum.c | 33 |
1 files changed, 8 insertions, 25 deletions
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c index 873209d946..a843f9ad92 100644 --- a/src/backend/commands/vacuum.c +++ b/src/backend/commands/vacuum.c @@ -195,38 +195,21 @@ ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel) int result; char *vac_buffer_size; - if (opt->arg == NULL) - { - ereport(ERROR, - (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("buffer_usage_limit option requires a valid value"), - parser_errposition(pstate, opt->location))); - } - vac_buffer_size = defGetString(opt); - if (!parse_int(vac_buffer_size, &result, GUC_UNIT_KB, &hintmsg)) - { - ereport(ERROR, - (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("value: \"%s\": is invalid for buffer_usage_limit", - vac_buffer_size), - hintmsg ? errhint("%s", _(hintmsg)) : 0)); - } - /* - * Check that the specified size falls within the hard upper and - * lower limits if it is not 0. We explicitly disallow -1 since - * that behavior can be obtained by not specifying - * BUFFER_USAGE_LIMIT. + * Check that the specified value is valid and the size falls + * within the hard upper and lower limits if it is not 0. */ - if (result != 0 && - (result < MIN_BAS_VAC_RING_SIZE_KB || result > MAX_BAS_VAC_RING_SIZE_KB)) + if (!parse_int(vac_buffer_size, &result, GUC_UNIT_KB, &hintmsg) || + (result != 0 && + (result < MIN_BAS_VAC_RING_SIZE_KB || result > MAX_BAS_VAC_RING_SIZE_KB))) { ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("buffer_usage_limit option must be 0 or between %d kB and %d kB", - MIN_BAS_VAC_RING_SIZE_KB, MAX_BAS_VAC_RING_SIZE_KB))); + errmsg("BUFFER_USAGE_LIMIT option must be 0 or between %d kB and %d kB", + MIN_BAS_VAC_RING_SIZE_KB, MAX_BAS_VAC_RING_SIZE_KB), + hintmsg ? errhint("%s", _(hintmsg)) : 0)); } ring_size = result; |