From b52bbf317126dbd75a2f8e98ceec4f3beb66f572 Mon Sep 17 00:00:00 2001 From: Justin Pryzby Date: Sun, 28 Nov 2021 12:08:48 -0600 Subject: [PATCH 01/10] guc.c: fix GUC flags --- src/backend/utils/misc/guc.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index e91d5a3cfd..a37ac8a287 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -1034,7 +1034,8 @@ static struct config_bool ConfigureNamesBool[] = { {"enable_incremental_sort", PGC_USERSET, QUERY_TUNING_METHOD, gettext_noop("Enables the planner's use of incremental sort steps."), - NULL + NULL, + GUC_EXPLAIN }, &enable_incremental_sort, true, @@ -3039,7 +3040,8 @@ static struct config_int ConfigureNamesInt[] = { {"bgwriter_lru_maxpages", PGC_SIGHUP, RESOURCES_BGWRITER, gettext_noop("Background writer maximum number of LRU pages to flush per round."), - NULL + NULL, + GUC_UNIT_BLOCKS }, &bgwriter_lru_maxpages, 100, 0, INT_MAX / 2, /* Same upper limit as shared_buffers */ @@ -3188,7 +3190,7 @@ static struct config_int ConfigureNamesInt[] = {"max_identifier_length", PGC_INTERNAL, PRESET_OPTIONS, gettext_noop("Shows the maximum identifier length."), NULL, - GUC_NOT_IN_SAMPLE | GUC_DISALLOW_IN_FILE + GUC_NOT_IN_SAMPLE | GUC_DISALLOW_IN_FILE | GUC_UNIT_BYTE }, &max_identifier_length, NAMEDATALEN - 1, NAMEDATALEN - 1, NAMEDATALEN - 1, @@ -3199,7 +3201,7 @@ static struct config_int ConfigureNamesInt[] = {"block_size", PGC_INTERNAL, PRESET_OPTIONS, gettext_noop("Shows the size of a disk block."), NULL, - GUC_NOT_IN_SAMPLE | GUC_DISALLOW_IN_FILE + GUC_NOT_IN_SAMPLE | GUC_DISALLOW_IN_FILE | GUC_UNIT_BYTE }, &block_size, BLCKSZ, BLCKSZ, BLCKSZ, @@ -3221,7 +3223,7 @@ static struct config_int ConfigureNamesInt[] = {"wal_block_size", PGC_INTERNAL, PRESET_OPTIONS, gettext_noop("Shows the block size in the write ahead log."), NULL, - GUC_NOT_IN_SAMPLE | GUC_DISALLOW_IN_FILE + GUC_NOT_IN_SAMPLE | GUC_DISALLOW_IN_FILE | GUC_UNIT_BYTE }, &wal_block_size, XLOG_BLCKSZ, XLOG_BLCKSZ, XLOG_BLCKSZ, @@ -3298,10 +3300,7 @@ static struct config_int ConfigureNamesInt[] = }, &autovacuum_freeze_max_age, - /* - * see pg_resetwal and vacuum_failsafe_age if you change the - * upper-limit value. - */ + /* see vacuum_failsafe_age if you change the upper-limit value. */ 200000000, 100000, 2000000000, NULL, NULL, NULL }, @@ -3403,7 +3402,7 @@ static struct config_int ConfigureNamesInt[] = }, { - {"ssl_renegotiation_limit", PGC_USERSET, CONN_AUTH_SSL, + {"ssl_renegotiation_limit", PGC_USERSET, COMPAT_OPTIONS_PREVIOUS, gettext_noop("SSL renegotiation is no longer supported; this can only be 0."), NULL, GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE | GUC_DISALLOW_IN_FILE, @@ -4837,7 +4836,8 @@ static struct config_enum ConfigureNamesEnum[] = {"trace_recovery_messages", PGC_SIGHUP, DEVELOPER_OPTIONS, gettext_noop("Enables logging of recovery-related debugging information."), gettext_noop("Each level includes all the levels that follow it. The later" - " the level, the fewer messages are sent.") + " the level, the fewer messages are sent."), + GUC_NOT_IN_SAMPLE, }, &trace_recovery_messages, -- 2.17.0