agora inbox for [email protected]  

help / color / mirror / Atom feed

[PATCH 3/5] Fix handling of NULLs in MCV items and constants
180+ messages / 4 participants
[nested] [flat]

* [PATCH 3/5] Fix handling of NULLs in MCV items and constants
@ 2019-07-15 00:00 Tomas Vondra <[email protected]>
  0 siblings, 0 replies; 180+ messages in thread

From: Tomas Vondra @ 2019-07-15 00:00 UTC (permalink / raw)

There were two issues in how the extended statistics handled NULL values
in opclauses. Firstly, the code was oblivious to the possibility that
Const may be NULL (constisnull=true) in which case the constvalue is
undefined. We need to treat this as a mismatch, and not call the proc.

Secondly, the MCV item itself may contain NULL values too - the code
already did check that, and updated the match bitmap accordingly, but
failed to ensure we won't call the operator procedure anyway.

This fixes both issues by extending the existing check so that it looks
at constisnull too, and making sure it skips calling the procedure.

Discussion: https://postgr.es/m/8736jdhbhc.fsf%40ansel.ydns.eu
---
 src/backend/statistics/mcv.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/backend/statistics/mcv.c b/src/backend/statistics/mcv.c
index 865981bbb4..77daa647e2 100644
--- a/src/backend/statistics/mcv.c
+++ b/src/backend/statistics/mcv.c
@@ -1593,12 +1593,18 @@ mcv_get_match_bitmap(PlannerInfo *root, List *clauses,
 					MCVItem    *item = &mcvlist->items[i];
 
 					/*
-					 * For AND-lists, we can also mark NULL items as 'no
-					 * match' (and then skip them). For OR-lists this is not
-					 * possible.
+					 * When the MCV item or the Const value is NULL we can treat
+					 * this as a mismatch. We must not call the operator proc
+					 * because of strictness.
 					 */
-					if ((!is_or) && item->isnull[idx])
-						matches[i] = false;
+					if (item->isnull[idx] || cst->constisnull)
+					{
+						/* we only care about AND, because OR can't change */
+						if (!is_or)
+							matches[i] = false;
+
+						continue;
+					}
 
 					/* skip MCV items that were already ruled out */
 					if ((!is_or) && (matches[i] == false))
-- 
2.20.1


--ztxiowpcs6gwvnvh
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
 filename="0004-Refactor-simplify-evaluation-of-MCV-bitmap.patch"



^ permalink  raw  reply  [nested|flat] 180+ messages in thread

* [PATCH] Track DEALLOCATE statements in pg_stat_activity
@ 2023-08-14 10:59 Dagfinn Ilmari Mannsåker <[email protected]>
  0 siblings, 0 replies; 180+ messages in thread

From: Dagfinn Ilmari Mannsåker @ 2023-08-14 10:59 UTC (permalink / raw)

Treat the statement name as a constant when jumbling.
---
 .../pg_stat_statements/expected/utility.out   | 40 +++++++++++++++++++
 .../pg_stat_statements/pg_stat_statements.c   |  8 +---
 contrib/pg_stat_statements/sql/utility.sql    | 13 ++++++
 src/backend/parser/gram.y                     |  4 ++
 src/include/nodes/parsenodes.h                |  6 ++-
 5 files changed, 63 insertions(+), 8 deletions(-)

diff --git a/contrib/pg_stat_statements/expected/utility.out b/contrib/pg_stat_statements/expected/utility.out
index 93735d5d85..3681374869 100644
--- a/contrib/pg_stat_statements/expected/utility.out
+++ b/contrib/pg_stat_statements/expected/utility.out
@@ -472,6 +472,46 @@ SELECT pg_stat_statements_reset();
  
 (1 row)
 
+-- Execution statements
+SELECT 1 as a;
+ a 
+---
+ 1
+(1 row)
+
+PREPARE stat_select AS SELECT $1 AS a;
+EXECUTE stat_select (1);
+ a 
+---
+ 1
+(1 row)
+
+DEALLOCATE stat_select;
+PREPARE stat_select AS SELECT $1 AS a;
+EXECUTE stat_select (2);
+ a 
+---
+ 2
+(1 row)
+
+DEALLOCATE PREPARE stat_select;
+DEALLOCATE ALL;
+DEALLOCATE PREPARE ALL;
+SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
+ calls | rows |                 query                 
+-------+------+---------------------------------------
+     4 |    0 | DEALLOCATE $1
+     2 |    2 | PREPARE stat_select AS SELECT $1 AS a
+     1 |    1 | SELECT $1 as a
+     1 |    1 | SELECT pg_stat_statements_reset()
+(4 rows)
+
+SELECT pg_stat_statements_reset();
+ pg_stat_statements_reset 
+--------------------------
+ 
+(1 row)
+
 -- SET statements.
 -- These use two different strings, still they count as one entry.
 SET work_mem = '1MB';
diff --git a/contrib/pg_stat_statements/pg_stat_statements.c b/contrib/pg_stat_statements/pg_stat_statements.c
index 55b957d251..06b65aeef5 100644
--- a/contrib/pg_stat_statements/pg_stat_statements.c
+++ b/contrib/pg_stat_statements/pg_stat_statements.c
@@ -104,8 +104,7 @@ static const uint32 PGSS_PG_MAJOR_VERSION = PG_VERSION_NUM / 100;
  * ignores.
  */
 #define PGSS_HANDLED_UTILITY(n)		(!IsA(n, ExecuteStmt) && \
-									!IsA(n, PrepareStmt) && \
-									!IsA(n, DeallocateStmt))
+									!IsA(n, PrepareStmt))
 
 /*
  * Extension version number, for supporting older extension versions' objects
@@ -830,8 +829,7 @@ pgss_post_parse_analyze(ParseState *pstate, Query *query, JumbleState *jstate)
 
 	/*
 	 * Clear queryId for prepared statements related utility, as those will
-	 * inherit from the underlying statement's one (except DEALLOCATE which is
-	 * entirely untracked).
+	 * inherit from the underlying statement's one.
 	 */
 	if (query->utilityStmt)
 	{
@@ -1116,8 +1114,6 @@ pgss_ProcessUtility(PlannedStmt *pstmt, const char *queryString,
 	 * calculated from the query tree) would be used to accumulate costs of
 	 * ensuing EXECUTEs.  This would be confusing, and inconsistent with other
 	 * cases where planning time is not included at all.
-	 *
-	 * Likewise, we don't track execution of DEALLOCATE.
 	 */
 	if (pgss_track_utility && pgss_enabled(exec_nested_level) &&
 		PGSS_HANDLED_UTILITY(parsetree))
diff --git a/contrib/pg_stat_statements/sql/utility.sql b/contrib/pg_stat_statements/sql/utility.sql
index 87666d9135..5f7d4a467f 100644
--- a/contrib/pg_stat_statements/sql/utility.sql
+++ b/contrib/pg_stat_statements/sql/utility.sql
@@ -237,6 +237,19 @@ DROP DOMAIN domain_stats;
 SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
 SELECT pg_stat_statements_reset();
 
+-- Execution statements
+SELECT 1 as a;
+PREPARE stat_select AS SELECT $1 AS a;
+EXECUTE stat_select (1);
+DEALLOCATE stat_select;
+PREPARE stat_select AS SELECT $1 AS a;
+EXECUTE stat_select (2);
+DEALLOCATE PREPARE stat_select;
+DEALLOCATE ALL;
+DEALLOCATE PREPARE ALL;
+SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
+SELECT pg_stat_statements_reset();
+
 -- SET statements.
 -- These use two different strings, still they count as one entry.
 SET work_mem = '1MB';
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index b3bdf947b6..680c7f3683 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -11936,6 +11936,7 @@ DeallocateStmt: DEALLOCATE name
 						DeallocateStmt *n = makeNode(DeallocateStmt);
 
 						n->name = $2;
+						n->location = @2;
 						$$ = (Node *) n;
 					}
 				| DEALLOCATE PREPARE name
@@ -11943,6 +11944,7 @@ DeallocateStmt: DEALLOCATE name
 						DeallocateStmt *n = makeNode(DeallocateStmt);
 
 						n->name = $3;
+						n->location = @3;
 						$$ = (Node *) n;
 					}
 				| DEALLOCATE ALL
@@ -11950,6 +11952,7 @@ DeallocateStmt: DEALLOCATE name
 						DeallocateStmt *n = makeNode(DeallocateStmt);
 
 						n->name = NULL;
+						n->location = -1;
 						$$ = (Node *) n;
 					}
 				| DEALLOCATE PREPARE ALL
@@ -11957,6 +11960,7 @@ DeallocateStmt: DEALLOCATE name
 						DeallocateStmt *n = makeNode(DeallocateStmt);
 
 						n->name = NULL;
+						n->location = -1;
 						$$ = (Node *) n;
 					}
 		;
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
index 2565348303..b7aeebe3b4 100644
--- a/src/include/nodes/parsenodes.h
+++ b/src/include/nodes/parsenodes.h
@@ -3925,8 +3925,10 @@ typedef struct ExecuteStmt
 typedef struct DeallocateStmt
 {
 	NodeTag		type;
-	char	   *name;			/* The name of the plan to remove */
-	/* NULL means DEALLOCATE ALL */
+	/* The name of the plan to remove.  NULL means DEALLOCATE ALL. */
+	char	   *name pg_node_attr(query_jumble_ignore);
+	/* token location, or -1 if unknown */
+	int			location pg_node_attr(query_jumble_location);
 } DeallocateStmt;
 
 /*
-- 
2.39.2


--=-=-=--





^ permalink  raw  reply  [nested|flat] 180+ messages in thread

* [PATCH] Track DEALLOCATE statements in pg_stat_activity
@ 2023-08-14 10:59 Dagfinn Ilmari Mannsåker <[email protected]>
  0 siblings, 0 replies; 180+ messages in thread

From: Dagfinn Ilmari Mannsåker @ 2023-08-14 10:59 UTC (permalink / raw)

Treat the statement name as a constant when jumbling.
---
 .../pg_stat_statements/expected/utility.out   | 40 +++++++++++++++++++
 .../pg_stat_statements/pg_stat_statements.c   |  8 +---
 contrib/pg_stat_statements/sql/utility.sql    | 13 ++++++
 src/backend/parser/gram.y                     |  4 ++
 src/include/nodes/parsenodes.h                |  6 ++-
 5 files changed, 63 insertions(+), 8 deletions(-)

diff --git a/contrib/pg_stat_statements/expected/utility.out b/contrib/pg_stat_statements/expected/utility.out
index 93735d5d85..3681374869 100644
--- a/contrib/pg_stat_statements/expected/utility.out
+++ b/contrib/pg_stat_statements/expected/utility.out
@@ -472,6 +472,46 @@ SELECT pg_stat_statements_reset();
  
 (1 row)
 
+-- Execution statements
+SELECT 1 as a;
+ a 
+---
+ 1
+(1 row)
+
+PREPARE stat_select AS SELECT $1 AS a;
+EXECUTE stat_select (1);
+ a 
+---
+ 1
+(1 row)
+
+DEALLOCATE stat_select;
+PREPARE stat_select AS SELECT $1 AS a;
+EXECUTE stat_select (2);
+ a 
+---
+ 2
+(1 row)
+
+DEALLOCATE PREPARE stat_select;
+DEALLOCATE ALL;
+DEALLOCATE PREPARE ALL;
+SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
+ calls | rows |                 query                 
+-------+------+---------------------------------------
+     4 |    0 | DEALLOCATE $1
+     2 |    2 | PREPARE stat_select AS SELECT $1 AS a
+     1 |    1 | SELECT $1 as a
+     1 |    1 | SELECT pg_stat_statements_reset()
+(4 rows)
+
+SELECT pg_stat_statements_reset();
+ pg_stat_statements_reset 
+--------------------------
+ 
+(1 row)
+
 -- SET statements.
 -- These use two different strings, still they count as one entry.
 SET work_mem = '1MB';
diff --git a/contrib/pg_stat_statements/pg_stat_statements.c b/contrib/pg_stat_statements/pg_stat_statements.c
index 55b957d251..06b65aeef5 100644
--- a/contrib/pg_stat_statements/pg_stat_statements.c
+++ b/contrib/pg_stat_statements/pg_stat_statements.c
@@ -104,8 +104,7 @@ static const uint32 PGSS_PG_MAJOR_VERSION = PG_VERSION_NUM / 100;
  * ignores.
  */
 #define PGSS_HANDLED_UTILITY(n)		(!IsA(n, ExecuteStmt) && \
-									!IsA(n, PrepareStmt) && \
-									!IsA(n, DeallocateStmt))
+									!IsA(n, PrepareStmt))
 
 /*
  * Extension version number, for supporting older extension versions' objects
@@ -830,8 +829,7 @@ pgss_post_parse_analyze(ParseState *pstate, Query *query, JumbleState *jstate)
 
 	/*
 	 * Clear queryId for prepared statements related utility, as those will
-	 * inherit from the underlying statement's one (except DEALLOCATE which is
-	 * entirely untracked).
+	 * inherit from the underlying statement's one.
 	 */
 	if (query->utilityStmt)
 	{
@@ -1116,8 +1114,6 @@ pgss_ProcessUtility(PlannedStmt *pstmt, const char *queryString,
 	 * calculated from the query tree) would be used to accumulate costs of
 	 * ensuing EXECUTEs.  This would be confusing, and inconsistent with other
 	 * cases where planning time is not included at all.
-	 *
-	 * Likewise, we don't track execution of DEALLOCATE.
 	 */
 	if (pgss_track_utility && pgss_enabled(exec_nested_level) &&
 		PGSS_HANDLED_UTILITY(parsetree))
diff --git a/contrib/pg_stat_statements/sql/utility.sql b/contrib/pg_stat_statements/sql/utility.sql
index 87666d9135..5f7d4a467f 100644
--- a/contrib/pg_stat_statements/sql/utility.sql
+++ b/contrib/pg_stat_statements/sql/utility.sql
@@ -237,6 +237,19 @@ DROP DOMAIN domain_stats;
 SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
 SELECT pg_stat_statements_reset();
 
+-- Execution statements
+SELECT 1 as a;
+PREPARE stat_select AS SELECT $1 AS a;
+EXECUTE stat_select (1);
+DEALLOCATE stat_select;
+PREPARE stat_select AS SELECT $1 AS a;
+EXECUTE stat_select (2);
+DEALLOCATE PREPARE stat_select;
+DEALLOCATE ALL;
+DEALLOCATE PREPARE ALL;
+SELECT calls, rows, query FROM pg_stat_statements ORDER BY query COLLATE "C";
+SELECT pg_stat_statements_reset();
+
 -- SET statements.
 -- These use two different strings, still they count as one entry.
 SET work_mem = '1MB';
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index b3bdf947b6..680c7f3683 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -11936,6 +11936,7 @@ DeallocateStmt: DEALLOCATE name
 						DeallocateStmt *n = makeNode(DeallocateStmt);
 
 						n->name = $2;
+						n->location = @2;
 						$$ = (Node *) n;
 					}
 				| DEALLOCATE PREPARE name
@@ -11943,6 +11944,7 @@ DeallocateStmt: DEALLOCATE name
 						DeallocateStmt *n = makeNode(DeallocateStmt);
 
 						n->name = $3;
+						n->location = @3;
 						$$ = (Node *) n;
 					}
 				| DEALLOCATE ALL
@@ -11950,6 +11952,7 @@ DeallocateStmt: DEALLOCATE name
 						DeallocateStmt *n = makeNode(DeallocateStmt);
 
 						n->name = NULL;
+						n->location = -1;
 						$$ = (Node *) n;
 					}
 				| DEALLOCATE PREPARE ALL
@@ -11957,6 +11960,7 @@ DeallocateStmt: DEALLOCATE name
 						DeallocateStmt *n = makeNode(DeallocateStmt);
 
 						n->name = NULL;
+						n->location = -1;
 						$$ = (Node *) n;
 					}
 		;
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
index 2565348303..b7aeebe3b4 100644
--- a/src/include/nodes/parsenodes.h
+++ b/src/include/nodes/parsenodes.h
@@ -3925,8 +3925,10 @@ typedef struct ExecuteStmt
 typedef struct DeallocateStmt
 {
 	NodeTag		type;
-	char	   *name;			/* The name of the plan to remove */
-	/* NULL means DEALLOCATE ALL */
+	/* The name of the plan to remove.  NULL means DEALLOCATE ALL. */
+	char	   *name pg_node_attr(query_jumble_ignore);
+	/* token location, or -1 if unknown */
+	int			location pg_node_attr(query_jumble_location);
 } DeallocateStmt;
 
 /*
-- 
2.39.2


--=-=-=--





^ permalink  raw  reply  [nested|flat] 180+ messages in thread

* [PATCH 2/2] Apply the same technique to PrintNewControlValues too
@ 2026-01-31 15:01 Álvaro Herrera <[email protected]>
  0 siblings, 0 replies; 180+ messages in thread

From: Álvaro Herrera @ 2026-01-31 15:01 UTC (permalink / raw)

---
 src/bin/pg_resetwal/entries.h     |  60 +++++++--------
 src/bin/pg_resetwal/pg_resetwal.c | 121 ++++++++++++++++++++----------
 2 files changed, 110 insertions(+), 71 deletions(-)

diff --git a/src/bin/pg_resetwal/entries.h b/src/bin/pg_resetwal/entries.h
index 6b7686da83a..25f2c49b3a8 100644
--- a/src/bin/pg_resetwal/entries.h
+++ b/src/bin/pg_resetwal/entries.h
@@ -1,62 +1,62 @@
-CONTROLDATA_LINE("pg_control version number",
+CONTROLDATA_LINE(CD_CONTROL_VERSION, "pg_control version number",
 				 "%u", ControlFile.pg_control_version)
-CONTROLDATA_LINE("Catalog version number",
+CONTROLDATA_LINE(CD_CATALOG_VERSION, "Catalog version number",
 				 "%u", ControlFile.catalog_version_no)
-CONTROLDATA_LINE("Database system identifier",
+CONTROLDATA_LINE(CD_SYSTEM_IDENTIFIER, "Database system identifier",
 				 "%" PRIu64, ControlFile.system_identifier)
-CONTROLDATA_LINE("Latest checkpoint's TimeLineID",
+CONTROLDATA_LINE(CD_CKPT_TIMELINE, "Latest checkpoint's TimeLineID",
 				 "%u", ControlFile.checkPointCopy.ThisTimeLineID)
-CONTROLDATA_LINE("Latest checkpoint's full_page_writes",
+CONTROLDATA_LINE(CD_CKPT_FPW, "Latest checkpoint's full_page_writes",
 				 "%s", (ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off")))
-CONTROLDATA_LINE("Latest checkpoint's NextXID",
+CONTROLDATA_LINE(CD_CKPT_NEXTXID, "Latest checkpoint's NextXID",
 				 "%u:%u", EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid), XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid))
-CONTROLDATA_LINE("Latest checkpoint's NextOID",
+CONTROLDATA_LINE(CD_CKPT_NEXTOID, "Latest checkpoint's NextOID",
 				 "%u", ControlFile.checkPointCopy.nextOid)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiXactId",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXID, "Latest checkpoint's NextMultiXactId",
 				 "%u", ControlFile.checkPointCopy.nextMulti)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiOffset",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXOFF, "Latest checkpoint's NextMultiOffset",
 				 "%" PRIu64, ControlFile.checkPointCopy.nextMultiOffset)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID, "Latest checkpoint's oldestXID",
 				 "%u", ControlFile.checkPointCopy.oldestXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID_DB, "Latest checkpoint's oldestXID's DB",
 				 "%u", ControlFile.checkPointCopy.oldestXidDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestActiveXID",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_ACTIVEXID, "Latest checkpoint's oldestActiveXID",
 				 "%u", ControlFile.checkPointCopy.oldestActiveXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestMultiXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI, "Latest checkpoint's oldestMultiXid",
 				 "%u", ControlFile.checkPointCopy.oldestMulti)
-CONTROLDATA_LINE("Latest checkpoint's oldestMulti's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI_DB, "Latest checkpoint's oldestMulti's DB",
 				 "%u", ControlFile.checkPointCopy.oldestMultiDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_COMMITTS_XID, "Latest checkpoint's oldestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.oldestCommitTsXid)
-CONTROLDATA_LINE("Latest checkpoint's newestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_NEWEST_COMMITTS_XID, "Latest checkpoint's newestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.newestCommitTsXid)
-CONTROLDATA_LINE("Maximum data alignment",
+CONTROLDATA_LINE(CD_MAXALIGN, "Maximum data alignment",
 				 "%u", ControlFile.maxAlign)
-CONTROLDATA_LINE("Database block size",
+CONTROLDATA_LINE(CD_BLCKSZ, "Database block size",
 				 "%u", ControlFile.blcksz)
-CONTROLDATA_LINE("Blocks per segment of large relation",
+CONTROLDATA_LINE(CD_RELSEG_SZ, "Blocks per segment of large relation",
 				 "%u", ControlFile.relseg_size)
-CONTROLDATA_LINE("Pages per SLRU segment",
+CONTROLDATA_LINE(CD_SLRU_PPS, "Pages per SLRU segment",
 				 "%u", ControlFile.slru_pages_per_segment)
-CONTROLDATA_LINE("WAL block size",
+CONTROLDATA_LINE(CD_WAL_BLCKSZ, "WAL block size",
 				 "%u", ControlFile.xlog_blcksz)
-CONTROLDATA_LINE("Bytes per WAL segment",
+CONTROLDATA_LINE(CD_WAL_SEGSIZE, "Bytes per WAL segment",
 				 "%u", ControlFile.xlog_seg_size)
-CONTROLDATA_LINE("Maximum length of identifiers",
+CONTROLDATA_LINE(CD_WAL_NAMEDATALEN, "Maximum length of identifiers",
 				 "%u", ControlFile.nameDataLen)
-CONTROLDATA_LINE("Maximum columns in an index",
+CONTROLDATA_LINE(CD_INDEX_MAX_KEYS, "Maximum columns in an index",
 				 "%u", ControlFile.indexMaxKeys)
-CONTROLDATA_LINE("Maximum size of a TOAST chunk",
+CONTROLDATA_LINE(CD_TOAST_MAXCHUNKSZ, "Maximum size of a TOAST chunk",
 				 "%u", ControlFile.toast_max_chunk_size)
-CONTROLDATA_LINE("Size of a large-object chunk",
+CONTROLDATA_LINE(CD_LO_BLKSZ, "Size of a large-object chunk",
 				 "%u", ControlFile.loblksize)
 
 /* This is no longer configurable, but users may still expect to see it: */
-CONTROLDATA_LINE("Date/time type storage",
+CONTROLDATA_LINE(CD_DATETIME_INT64, "Date/time type storage",
 				 "%s", _("64-bit integers"))
-CONTROLDATA_LINE("Float8 argument passing",
+CONTROLDATA_LINE(CD_FLOAT8_ARGS, "Float8 argument passing",
 				 "%s", ControlFile.float8ByVal ? _("by value") : _("by reference"))
-CONTROLDATA_LINE("Data page checksum version",
+CONTROLDATA_LINE(CD_CHECKSUMS, "Data page checksum version",
 				 "%u", ControlFile.data_checksum_version)
-CONTROLDATA_LINE("Default char data signedness",
+CONTROLDATA_LINE(CD_CHAR_SIGNEDNESS, "Default char data signedness",
 				 "%s", ControlFile.default_char_signedness ? _("signed") : _("unsigned"))
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index fb17b6f80e0..23bf1c62183 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -55,6 +55,7 @@
 #include "common/restricted_token.h"
 #include "common/string.h"
 #include "fe_utils/option_utils.h"
+#include "fe_utils/simple_list.h"
 #include "fe_utils/version.h"
 #include "getopt_long.h"
 #include "mb/pg_wchar.h"
@@ -119,6 +120,14 @@ static int	internal_wcswidth(const char *pwcs, size_t len, int encoding);
 static uint32 strtouint32_strict(const char *restrict s, char **restrict endptr, int base);
 static uint64 strtouint64_strict(const char *restrict s, char **restrict endptr, int base);
 
+/* Define the string enums */
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	symbol,
+enum ControldataStrings {
+#include "entries.h"
+};
+#undef CONTROLDATA_LINE
+
 
 int
 main(int argc, char *argv[])
@@ -768,7 +777,7 @@ PrintControlValues(bool guessed)
 	 * First, determine the maximum length of the description of all entries,
 	 * some or all of which might be translated.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	thislen = internal_wcswidth(_(description),			\
 								strlen(_(description)),	\
 								encoding);				\
@@ -781,7 +790,7 @@ PrintControlValues(bool guessed)
 	 * Print each line: the possibly-translated description, then some padding
 	 * spaces according to its display width, then the value.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	{													\
 		int		thisstrlen;								\
 														\
@@ -807,69 +816,99 @@ static void
 PrintNewControlValues(void)
 {
 	char		fname[MAXFNAMELEN];
+	int			encoding = pg_get_encoding_from_locale(NULL, true);
+	SimpleOidList	toprint = {NULL, NULL};
+	int			maxlen = 0;
+	int			thislen;
 
 	/* This will be always printed in order to keep format same. */
 	printf(_("\n\nValues to be changed:\n\n"));
 
-	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
-				 newXlogSegNo, WalSegSz);
-	printf(_("First log segment after reset:        %s\n"), fname);
-
 	if (mxids_given)
 	{
-		printf(_("NextMultiXactId:                      %u\n"),
-			   ControlFile.checkPointCopy.nextMulti);
-		printf(_("OldestMultiXid:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestMulti);
-		printf(_("OldestMulti's DB:                     %u\n"),
-			   ControlFile.checkPointCopy.oldestMultiDB);
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI_DB);
 	}
 
 	if (next_mxoff_given)
-	{
-		printf(_("NextMultiOffset:                      %" PRIu64 "\n"),
-			   ControlFile.checkPointCopy.nextMultiOffset);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXOFF);
 
 	if (next_oid_given)
-	{
-		printf(_("NextOID:                              %u\n"),
-			   ControlFile.checkPointCopy.nextOid);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTOID);
 
 	if (next_xid_given)
-	{
-		printf(_("NextXID:                              %u\n"),
-			   XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTXID);
 
 	if (oldest_xid_given)
 	{
-		printf(_("OldestXID:                            %u\n"),
-			   ControlFile.checkPointCopy.oldestXid);
-		printf(_("OldestXID's DB:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestXidDB);
-	}
-
-	if (next_xid_epoch_given)
-	{
-		printf(_("NextXID epoch:                        %u\n"),
-			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID_DB);
 	}
 
 	if (commit_ts_xids_given)
 	{
-		printf(_("oldestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.oldestCommitTsXid);
-		printf(_("newestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.newestCommitTsXid);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_COMMITTS_XID);
+		simple_oid_list_append(&toprint, CD_CKPT_NEWEST_COMMITTS_XID);
 	}
 
 	if (wal_segsize_given)
-	{
-		printf(_("Bytes per WAL segment:                %u\n"),
-			   ControlFile.xlog_seg_size);
+		simple_oid_list_append(&toprint, CD_WAL_SEGSIZE);
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{															\
+	thislen = internal_wcswidth(_(description),					\
+								strlen(_(description)),			\
+								encoding);						\
+	if (thislen > maxlen)										\
+		maxlen = thislen;										\
 	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
+
+
+	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
+				 newXlogSegNo, WalSegSz);
+
+	/* We print this one inconditionally */
+	{
+		char *str = "First log segment after reset";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%s\n", _(str), maxlen - thislen + 2, " ", fname);
+	}
+
+	/* We print the XID epoch in a degenerate case */
+	if (next_xid_epoch_given)
+	{
+		char *str = "NextXID epoch";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%u\n", _(str), maxlen - thislen + 2, " ",
+			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+
+	}
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{													\
+		int		thisstrlen;								\
+														\
+		thisstrlen = strlen(_(description));			\
+		thislen = internal_wcswidth(_(description),		\
+									thisstrlen,			\
+									encoding);			\
+		printf("%s:%*s" fmt "\n",						\
+			   _(description),							\
+			   maxlen - thislen + 2,					\
+			   " ",										\
+			   __VA_ARGS__);							\
+	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
 }
 
 
-- 
2.47.3


--m4rixdodkhrlzpzv--





^ permalink  raw  reply  [nested|flat] 180+ messages in thread

* [PATCH 2/2] Apply the same technique to PrintNewControlValues too
@ 2026-01-31 15:01 Álvaro Herrera <[email protected]>
  0 siblings, 0 replies; 180+ messages in thread

From: Álvaro Herrera @ 2026-01-31 15:01 UTC (permalink / raw)

---
 src/bin/pg_resetwal/entries.h     |  60 +++++++--------
 src/bin/pg_resetwal/pg_resetwal.c | 121 ++++++++++++++++++++----------
 2 files changed, 110 insertions(+), 71 deletions(-)

diff --git a/src/bin/pg_resetwal/entries.h b/src/bin/pg_resetwal/entries.h
index 6b7686da83a..25f2c49b3a8 100644
--- a/src/bin/pg_resetwal/entries.h
+++ b/src/bin/pg_resetwal/entries.h
@@ -1,62 +1,62 @@
-CONTROLDATA_LINE("pg_control version number",
+CONTROLDATA_LINE(CD_CONTROL_VERSION, "pg_control version number",
 				 "%u", ControlFile.pg_control_version)
-CONTROLDATA_LINE("Catalog version number",
+CONTROLDATA_LINE(CD_CATALOG_VERSION, "Catalog version number",
 				 "%u", ControlFile.catalog_version_no)
-CONTROLDATA_LINE("Database system identifier",
+CONTROLDATA_LINE(CD_SYSTEM_IDENTIFIER, "Database system identifier",
 				 "%" PRIu64, ControlFile.system_identifier)
-CONTROLDATA_LINE("Latest checkpoint's TimeLineID",
+CONTROLDATA_LINE(CD_CKPT_TIMELINE, "Latest checkpoint's TimeLineID",
 				 "%u", ControlFile.checkPointCopy.ThisTimeLineID)
-CONTROLDATA_LINE("Latest checkpoint's full_page_writes",
+CONTROLDATA_LINE(CD_CKPT_FPW, "Latest checkpoint's full_page_writes",
 				 "%s", (ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off")))
-CONTROLDATA_LINE("Latest checkpoint's NextXID",
+CONTROLDATA_LINE(CD_CKPT_NEXTXID, "Latest checkpoint's NextXID",
 				 "%u:%u", EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid), XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid))
-CONTROLDATA_LINE("Latest checkpoint's NextOID",
+CONTROLDATA_LINE(CD_CKPT_NEXTOID, "Latest checkpoint's NextOID",
 				 "%u", ControlFile.checkPointCopy.nextOid)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiXactId",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXID, "Latest checkpoint's NextMultiXactId",
 				 "%u", ControlFile.checkPointCopy.nextMulti)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiOffset",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXOFF, "Latest checkpoint's NextMultiOffset",
 				 "%" PRIu64, ControlFile.checkPointCopy.nextMultiOffset)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID, "Latest checkpoint's oldestXID",
 				 "%u", ControlFile.checkPointCopy.oldestXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID_DB, "Latest checkpoint's oldestXID's DB",
 				 "%u", ControlFile.checkPointCopy.oldestXidDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestActiveXID",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_ACTIVEXID, "Latest checkpoint's oldestActiveXID",
 				 "%u", ControlFile.checkPointCopy.oldestActiveXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestMultiXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI, "Latest checkpoint's oldestMultiXid",
 				 "%u", ControlFile.checkPointCopy.oldestMulti)
-CONTROLDATA_LINE("Latest checkpoint's oldestMulti's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI_DB, "Latest checkpoint's oldestMulti's DB",
 				 "%u", ControlFile.checkPointCopy.oldestMultiDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_COMMITTS_XID, "Latest checkpoint's oldestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.oldestCommitTsXid)
-CONTROLDATA_LINE("Latest checkpoint's newestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_NEWEST_COMMITTS_XID, "Latest checkpoint's newestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.newestCommitTsXid)
-CONTROLDATA_LINE("Maximum data alignment",
+CONTROLDATA_LINE(CD_MAXALIGN, "Maximum data alignment",
 				 "%u", ControlFile.maxAlign)
-CONTROLDATA_LINE("Database block size",
+CONTROLDATA_LINE(CD_BLCKSZ, "Database block size",
 				 "%u", ControlFile.blcksz)
-CONTROLDATA_LINE("Blocks per segment of large relation",
+CONTROLDATA_LINE(CD_RELSEG_SZ, "Blocks per segment of large relation",
 				 "%u", ControlFile.relseg_size)
-CONTROLDATA_LINE("Pages per SLRU segment",
+CONTROLDATA_LINE(CD_SLRU_PPS, "Pages per SLRU segment",
 				 "%u", ControlFile.slru_pages_per_segment)
-CONTROLDATA_LINE("WAL block size",
+CONTROLDATA_LINE(CD_WAL_BLCKSZ, "WAL block size",
 				 "%u", ControlFile.xlog_blcksz)
-CONTROLDATA_LINE("Bytes per WAL segment",
+CONTROLDATA_LINE(CD_WAL_SEGSIZE, "Bytes per WAL segment",
 				 "%u", ControlFile.xlog_seg_size)
-CONTROLDATA_LINE("Maximum length of identifiers",
+CONTROLDATA_LINE(CD_WAL_NAMEDATALEN, "Maximum length of identifiers",
 				 "%u", ControlFile.nameDataLen)
-CONTROLDATA_LINE("Maximum columns in an index",
+CONTROLDATA_LINE(CD_INDEX_MAX_KEYS, "Maximum columns in an index",
 				 "%u", ControlFile.indexMaxKeys)
-CONTROLDATA_LINE("Maximum size of a TOAST chunk",
+CONTROLDATA_LINE(CD_TOAST_MAXCHUNKSZ, "Maximum size of a TOAST chunk",
 				 "%u", ControlFile.toast_max_chunk_size)
-CONTROLDATA_LINE("Size of a large-object chunk",
+CONTROLDATA_LINE(CD_LO_BLKSZ, "Size of a large-object chunk",
 				 "%u", ControlFile.loblksize)
 
 /* This is no longer configurable, but users may still expect to see it: */
-CONTROLDATA_LINE("Date/time type storage",
+CONTROLDATA_LINE(CD_DATETIME_INT64, "Date/time type storage",
 				 "%s", _("64-bit integers"))
-CONTROLDATA_LINE("Float8 argument passing",
+CONTROLDATA_LINE(CD_FLOAT8_ARGS, "Float8 argument passing",
 				 "%s", ControlFile.float8ByVal ? _("by value") : _("by reference"))
-CONTROLDATA_LINE("Data page checksum version",
+CONTROLDATA_LINE(CD_CHECKSUMS, "Data page checksum version",
 				 "%u", ControlFile.data_checksum_version)
-CONTROLDATA_LINE("Default char data signedness",
+CONTROLDATA_LINE(CD_CHAR_SIGNEDNESS, "Default char data signedness",
 				 "%s", ControlFile.default_char_signedness ? _("signed") : _("unsigned"))
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index fb17b6f80e0..23bf1c62183 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -55,6 +55,7 @@
 #include "common/restricted_token.h"
 #include "common/string.h"
 #include "fe_utils/option_utils.h"
+#include "fe_utils/simple_list.h"
 #include "fe_utils/version.h"
 #include "getopt_long.h"
 #include "mb/pg_wchar.h"
@@ -119,6 +120,14 @@ static int	internal_wcswidth(const char *pwcs, size_t len, int encoding);
 static uint32 strtouint32_strict(const char *restrict s, char **restrict endptr, int base);
 static uint64 strtouint64_strict(const char *restrict s, char **restrict endptr, int base);
 
+/* Define the string enums */
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	symbol,
+enum ControldataStrings {
+#include "entries.h"
+};
+#undef CONTROLDATA_LINE
+
 
 int
 main(int argc, char *argv[])
@@ -768,7 +777,7 @@ PrintControlValues(bool guessed)
 	 * First, determine the maximum length of the description of all entries,
 	 * some or all of which might be translated.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	thislen = internal_wcswidth(_(description),			\
 								strlen(_(description)),	\
 								encoding);				\
@@ -781,7 +790,7 @@ PrintControlValues(bool guessed)
 	 * Print each line: the possibly-translated description, then some padding
 	 * spaces according to its display width, then the value.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	{													\
 		int		thisstrlen;								\
 														\
@@ -807,69 +816,99 @@ static void
 PrintNewControlValues(void)
 {
 	char		fname[MAXFNAMELEN];
+	int			encoding = pg_get_encoding_from_locale(NULL, true);
+	SimpleOidList	toprint = {NULL, NULL};
+	int			maxlen = 0;
+	int			thislen;
 
 	/* This will be always printed in order to keep format same. */
 	printf(_("\n\nValues to be changed:\n\n"));
 
-	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
-				 newXlogSegNo, WalSegSz);
-	printf(_("First log segment after reset:        %s\n"), fname);
-
 	if (mxids_given)
 	{
-		printf(_("NextMultiXactId:                      %u\n"),
-			   ControlFile.checkPointCopy.nextMulti);
-		printf(_("OldestMultiXid:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestMulti);
-		printf(_("OldestMulti's DB:                     %u\n"),
-			   ControlFile.checkPointCopy.oldestMultiDB);
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI_DB);
 	}
 
 	if (next_mxoff_given)
-	{
-		printf(_("NextMultiOffset:                      %" PRIu64 "\n"),
-			   ControlFile.checkPointCopy.nextMultiOffset);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXOFF);
 
 	if (next_oid_given)
-	{
-		printf(_("NextOID:                              %u\n"),
-			   ControlFile.checkPointCopy.nextOid);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTOID);
 
 	if (next_xid_given)
-	{
-		printf(_("NextXID:                              %u\n"),
-			   XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTXID);
 
 	if (oldest_xid_given)
 	{
-		printf(_("OldestXID:                            %u\n"),
-			   ControlFile.checkPointCopy.oldestXid);
-		printf(_("OldestXID's DB:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestXidDB);
-	}
-
-	if (next_xid_epoch_given)
-	{
-		printf(_("NextXID epoch:                        %u\n"),
-			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID_DB);
 	}
 
 	if (commit_ts_xids_given)
 	{
-		printf(_("oldestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.oldestCommitTsXid);
-		printf(_("newestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.newestCommitTsXid);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_COMMITTS_XID);
+		simple_oid_list_append(&toprint, CD_CKPT_NEWEST_COMMITTS_XID);
 	}
 
 	if (wal_segsize_given)
-	{
-		printf(_("Bytes per WAL segment:                %u\n"),
-			   ControlFile.xlog_seg_size);
+		simple_oid_list_append(&toprint, CD_WAL_SEGSIZE);
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{															\
+	thislen = internal_wcswidth(_(description),					\
+								strlen(_(description)),			\
+								encoding);						\
+	if (thislen > maxlen)										\
+		maxlen = thislen;										\
 	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
+
+
+	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
+				 newXlogSegNo, WalSegSz);
+
+	/* We print this one inconditionally */
+	{
+		char *str = "First log segment after reset";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%s\n", _(str), maxlen - thislen + 2, " ", fname);
+	}
+
+	/* We print the XID epoch in a degenerate case */
+	if (next_xid_epoch_given)
+	{
+		char *str = "NextXID epoch";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%u\n", _(str), maxlen - thislen + 2, " ",
+			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+
+	}
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{													\
+		int		thisstrlen;								\
+														\
+		thisstrlen = strlen(_(description));			\
+		thislen = internal_wcswidth(_(description),		\
+									thisstrlen,			\
+									encoding);			\
+		printf("%s:%*s" fmt "\n",						\
+			   _(description),							\
+			   maxlen - thislen + 2,					\
+			   " ",										\
+			   __VA_ARGS__);							\
+	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
 }
 
 
-- 
2.47.3


--m4rixdodkhrlzpzv--





^ permalink  raw  reply  [nested|flat] 180+ messages in thread

* [PATCH 2/2] Apply the same technique to PrintNewControlValues too
@ 2026-01-31 15:01 Álvaro Herrera <[email protected]>
  0 siblings, 0 replies; 180+ messages in thread

From: Álvaro Herrera @ 2026-01-31 15:01 UTC (permalink / raw)

---
 src/bin/pg_resetwal/entries.h     |  60 +++++++--------
 src/bin/pg_resetwal/pg_resetwal.c | 121 ++++++++++++++++++++----------
 2 files changed, 110 insertions(+), 71 deletions(-)

diff --git a/src/bin/pg_resetwal/entries.h b/src/bin/pg_resetwal/entries.h
index 6b7686da83a..25f2c49b3a8 100644
--- a/src/bin/pg_resetwal/entries.h
+++ b/src/bin/pg_resetwal/entries.h
@@ -1,62 +1,62 @@
-CONTROLDATA_LINE("pg_control version number",
+CONTROLDATA_LINE(CD_CONTROL_VERSION, "pg_control version number",
 				 "%u", ControlFile.pg_control_version)
-CONTROLDATA_LINE("Catalog version number",
+CONTROLDATA_LINE(CD_CATALOG_VERSION, "Catalog version number",
 				 "%u", ControlFile.catalog_version_no)
-CONTROLDATA_LINE("Database system identifier",
+CONTROLDATA_LINE(CD_SYSTEM_IDENTIFIER, "Database system identifier",
 				 "%" PRIu64, ControlFile.system_identifier)
-CONTROLDATA_LINE("Latest checkpoint's TimeLineID",
+CONTROLDATA_LINE(CD_CKPT_TIMELINE, "Latest checkpoint's TimeLineID",
 				 "%u", ControlFile.checkPointCopy.ThisTimeLineID)
-CONTROLDATA_LINE("Latest checkpoint's full_page_writes",
+CONTROLDATA_LINE(CD_CKPT_FPW, "Latest checkpoint's full_page_writes",
 				 "%s", (ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off")))
-CONTROLDATA_LINE("Latest checkpoint's NextXID",
+CONTROLDATA_LINE(CD_CKPT_NEXTXID, "Latest checkpoint's NextXID",
 				 "%u:%u", EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid), XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid))
-CONTROLDATA_LINE("Latest checkpoint's NextOID",
+CONTROLDATA_LINE(CD_CKPT_NEXTOID, "Latest checkpoint's NextOID",
 				 "%u", ControlFile.checkPointCopy.nextOid)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiXactId",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXID, "Latest checkpoint's NextMultiXactId",
 				 "%u", ControlFile.checkPointCopy.nextMulti)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiOffset",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXOFF, "Latest checkpoint's NextMultiOffset",
 				 "%" PRIu64, ControlFile.checkPointCopy.nextMultiOffset)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID, "Latest checkpoint's oldestXID",
 				 "%u", ControlFile.checkPointCopy.oldestXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID_DB, "Latest checkpoint's oldestXID's DB",
 				 "%u", ControlFile.checkPointCopy.oldestXidDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestActiveXID",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_ACTIVEXID, "Latest checkpoint's oldestActiveXID",
 				 "%u", ControlFile.checkPointCopy.oldestActiveXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestMultiXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI, "Latest checkpoint's oldestMultiXid",
 				 "%u", ControlFile.checkPointCopy.oldestMulti)
-CONTROLDATA_LINE("Latest checkpoint's oldestMulti's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI_DB, "Latest checkpoint's oldestMulti's DB",
 				 "%u", ControlFile.checkPointCopy.oldestMultiDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_COMMITTS_XID, "Latest checkpoint's oldestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.oldestCommitTsXid)
-CONTROLDATA_LINE("Latest checkpoint's newestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_NEWEST_COMMITTS_XID, "Latest checkpoint's newestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.newestCommitTsXid)
-CONTROLDATA_LINE("Maximum data alignment",
+CONTROLDATA_LINE(CD_MAXALIGN, "Maximum data alignment",
 				 "%u", ControlFile.maxAlign)
-CONTROLDATA_LINE("Database block size",
+CONTROLDATA_LINE(CD_BLCKSZ, "Database block size",
 				 "%u", ControlFile.blcksz)
-CONTROLDATA_LINE("Blocks per segment of large relation",
+CONTROLDATA_LINE(CD_RELSEG_SZ, "Blocks per segment of large relation",
 				 "%u", ControlFile.relseg_size)
-CONTROLDATA_LINE("Pages per SLRU segment",
+CONTROLDATA_LINE(CD_SLRU_PPS, "Pages per SLRU segment",
 				 "%u", ControlFile.slru_pages_per_segment)
-CONTROLDATA_LINE("WAL block size",
+CONTROLDATA_LINE(CD_WAL_BLCKSZ, "WAL block size",
 				 "%u", ControlFile.xlog_blcksz)
-CONTROLDATA_LINE("Bytes per WAL segment",
+CONTROLDATA_LINE(CD_WAL_SEGSIZE, "Bytes per WAL segment",
 				 "%u", ControlFile.xlog_seg_size)
-CONTROLDATA_LINE("Maximum length of identifiers",
+CONTROLDATA_LINE(CD_WAL_NAMEDATALEN, "Maximum length of identifiers",
 				 "%u", ControlFile.nameDataLen)
-CONTROLDATA_LINE("Maximum columns in an index",
+CONTROLDATA_LINE(CD_INDEX_MAX_KEYS, "Maximum columns in an index",
 				 "%u", ControlFile.indexMaxKeys)
-CONTROLDATA_LINE("Maximum size of a TOAST chunk",
+CONTROLDATA_LINE(CD_TOAST_MAXCHUNKSZ, "Maximum size of a TOAST chunk",
 				 "%u", ControlFile.toast_max_chunk_size)
-CONTROLDATA_LINE("Size of a large-object chunk",
+CONTROLDATA_LINE(CD_LO_BLKSZ, "Size of a large-object chunk",
 				 "%u", ControlFile.loblksize)
 
 /* This is no longer configurable, but users may still expect to see it: */
-CONTROLDATA_LINE("Date/time type storage",
+CONTROLDATA_LINE(CD_DATETIME_INT64, "Date/time type storage",
 				 "%s", _("64-bit integers"))
-CONTROLDATA_LINE("Float8 argument passing",
+CONTROLDATA_LINE(CD_FLOAT8_ARGS, "Float8 argument passing",
 				 "%s", ControlFile.float8ByVal ? _("by value") : _("by reference"))
-CONTROLDATA_LINE("Data page checksum version",
+CONTROLDATA_LINE(CD_CHECKSUMS, "Data page checksum version",
 				 "%u", ControlFile.data_checksum_version)
-CONTROLDATA_LINE("Default char data signedness",
+CONTROLDATA_LINE(CD_CHAR_SIGNEDNESS, "Default char data signedness",
 				 "%s", ControlFile.default_char_signedness ? _("signed") : _("unsigned"))
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index fb17b6f80e0..23bf1c62183 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -55,6 +55,7 @@
 #include "common/restricted_token.h"
 #include "common/string.h"
 #include "fe_utils/option_utils.h"
+#include "fe_utils/simple_list.h"
 #include "fe_utils/version.h"
 #include "getopt_long.h"
 #include "mb/pg_wchar.h"
@@ -119,6 +120,14 @@ static int	internal_wcswidth(const char *pwcs, size_t len, int encoding);
 static uint32 strtouint32_strict(const char *restrict s, char **restrict endptr, int base);
 static uint64 strtouint64_strict(const char *restrict s, char **restrict endptr, int base);
 
+/* Define the string enums */
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	symbol,
+enum ControldataStrings {
+#include "entries.h"
+};
+#undef CONTROLDATA_LINE
+
 
 int
 main(int argc, char *argv[])
@@ -768,7 +777,7 @@ PrintControlValues(bool guessed)
 	 * First, determine the maximum length of the description of all entries,
 	 * some or all of which might be translated.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	thislen = internal_wcswidth(_(description),			\
 								strlen(_(description)),	\
 								encoding);				\
@@ -781,7 +790,7 @@ PrintControlValues(bool guessed)
 	 * Print each line: the possibly-translated description, then some padding
 	 * spaces according to its display width, then the value.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	{													\
 		int		thisstrlen;								\
 														\
@@ -807,69 +816,99 @@ static void
 PrintNewControlValues(void)
 {
 	char		fname[MAXFNAMELEN];
+	int			encoding = pg_get_encoding_from_locale(NULL, true);
+	SimpleOidList	toprint = {NULL, NULL};
+	int			maxlen = 0;
+	int			thislen;
 
 	/* This will be always printed in order to keep format same. */
 	printf(_("\n\nValues to be changed:\n\n"));
 
-	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
-				 newXlogSegNo, WalSegSz);
-	printf(_("First log segment after reset:        %s\n"), fname);
-
 	if (mxids_given)
 	{
-		printf(_("NextMultiXactId:                      %u\n"),
-			   ControlFile.checkPointCopy.nextMulti);
-		printf(_("OldestMultiXid:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestMulti);
-		printf(_("OldestMulti's DB:                     %u\n"),
-			   ControlFile.checkPointCopy.oldestMultiDB);
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI_DB);
 	}
 
 	if (next_mxoff_given)
-	{
-		printf(_("NextMultiOffset:                      %" PRIu64 "\n"),
-			   ControlFile.checkPointCopy.nextMultiOffset);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXOFF);
 
 	if (next_oid_given)
-	{
-		printf(_("NextOID:                              %u\n"),
-			   ControlFile.checkPointCopy.nextOid);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTOID);
 
 	if (next_xid_given)
-	{
-		printf(_("NextXID:                              %u\n"),
-			   XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTXID);
 
 	if (oldest_xid_given)
 	{
-		printf(_("OldestXID:                            %u\n"),
-			   ControlFile.checkPointCopy.oldestXid);
-		printf(_("OldestXID's DB:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestXidDB);
-	}
-
-	if (next_xid_epoch_given)
-	{
-		printf(_("NextXID epoch:                        %u\n"),
-			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID_DB);
 	}
 
 	if (commit_ts_xids_given)
 	{
-		printf(_("oldestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.oldestCommitTsXid);
-		printf(_("newestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.newestCommitTsXid);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_COMMITTS_XID);
+		simple_oid_list_append(&toprint, CD_CKPT_NEWEST_COMMITTS_XID);
 	}
 
 	if (wal_segsize_given)
-	{
-		printf(_("Bytes per WAL segment:                %u\n"),
-			   ControlFile.xlog_seg_size);
+		simple_oid_list_append(&toprint, CD_WAL_SEGSIZE);
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{															\
+	thislen = internal_wcswidth(_(description),					\
+								strlen(_(description)),			\
+								encoding);						\
+	if (thislen > maxlen)										\
+		maxlen = thislen;										\
 	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
+
+
+	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
+				 newXlogSegNo, WalSegSz);
+
+	/* We print this one inconditionally */
+	{
+		char *str = "First log segment after reset";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%s\n", _(str), maxlen - thislen + 2, " ", fname);
+	}
+
+	/* We print the XID epoch in a degenerate case */
+	if (next_xid_epoch_given)
+	{
+		char *str = "NextXID epoch";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%u\n", _(str), maxlen - thislen + 2, " ",
+			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+
+	}
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{													\
+		int		thisstrlen;								\
+														\
+		thisstrlen = strlen(_(description));			\
+		thislen = internal_wcswidth(_(description),		\
+									thisstrlen,			\
+									encoding);			\
+		printf("%s:%*s" fmt "\n",						\
+			   _(description),							\
+			   maxlen - thislen + 2,					\
+			   " ",										\
+			   __VA_ARGS__);							\
+	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
 }
 
 
-- 
2.47.3


--m4rixdodkhrlzpzv--





^ permalink  raw  reply  [nested|flat] 180+ messages in thread

* [PATCH 2/2] Apply the same technique to PrintNewControlValues too
@ 2026-01-31 15:01 Álvaro Herrera <[email protected]>
  0 siblings, 0 replies; 180+ messages in thread

From: Álvaro Herrera @ 2026-01-31 15:01 UTC (permalink / raw)

---
 src/bin/pg_resetwal/entries.h     |  60 +++++++--------
 src/bin/pg_resetwal/pg_resetwal.c | 121 ++++++++++++++++++++----------
 2 files changed, 110 insertions(+), 71 deletions(-)

diff --git a/src/bin/pg_resetwal/entries.h b/src/bin/pg_resetwal/entries.h
index 6b7686da83a..25f2c49b3a8 100644
--- a/src/bin/pg_resetwal/entries.h
+++ b/src/bin/pg_resetwal/entries.h
@@ -1,62 +1,62 @@
-CONTROLDATA_LINE("pg_control version number",
+CONTROLDATA_LINE(CD_CONTROL_VERSION, "pg_control version number",
 				 "%u", ControlFile.pg_control_version)
-CONTROLDATA_LINE("Catalog version number",
+CONTROLDATA_LINE(CD_CATALOG_VERSION, "Catalog version number",
 				 "%u", ControlFile.catalog_version_no)
-CONTROLDATA_LINE("Database system identifier",
+CONTROLDATA_LINE(CD_SYSTEM_IDENTIFIER, "Database system identifier",
 				 "%" PRIu64, ControlFile.system_identifier)
-CONTROLDATA_LINE("Latest checkpoint's TimeLineID",
+CONTROLDATA_LINE(CD_CKPT_TIMELINE, "Latest checkpoint's TimeLineID",
 				 "%u", ControlFile.checkPointCopy.ThisTimeLineID)
-CONTROLDATA_LINE("Latest checkpoint's full_page_writes",
+CONTROLDATA_LINE(CD_CKPT_FPW, "Latest checkpoint's full_page_writes",
 				 "%s", (ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off")))
-CONTROLDATA_LINE("Latest checkpoint's NextXID",
+CONTROLDATA_LINE(CD_CKPT_NEXTXID, "Latest checkpoint's NextXID",
 				 "%u:%u", EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid), XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid))
-CONTROLDATA_LINE("Latest checkpoint's NextOID",
+CONTROLDATA_LINE(CD_CKPT_NEXTOID, "Latest checkpoint's NextOID",
 				 "%u", ControlFile.checkPointCopy.nextOid)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiXactId",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXID, "Latest checkpoint's NextMultiXactId",
 				 "%u", ControlFile.checkPointCopy.nextMulti)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiOffset",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXOFF, "Latest checkpoint's NextMultiOffset",
 				 "%" PRIu64, ControlFile.checkPointCopy.nextMultiOffset)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID, "Latest checkpoint's oldestXID",
 				 "%u", ControlFile.checkPointCopy.oldestXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID_DB, "Latest checkpoint's oldestXID's DB",
 				 "%u", ControlFile.checkPointCopy.oldestXidDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestActiveXID",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_ACTIVEXID, "Latest checkpoint's oldestActiveXID",
 				 "%u", ControlFile.checkPointCopy.oldestActiveXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestMultiXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI, "Latest checkpoint's oldestMultiXid",
 				 "%u", ControlFile.checkPointCopy.oldestMulti)
-CONTROLDATA_LINE("Latest checkpoint's oldestMulti's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI_DB, "Latest checkpoint's oldestMulti's DB",
 				 "%u", ControlFile.checkPointCopy.oldestMultiDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_COMMITTS_XID, "Latest checkpoint's oldestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.oldestCommitTsXid)
-CONTROLDATA_LINE("Latest checkpoint's newestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_NEWEST_COMMITTS_XID, "Latest checkpoint's newestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.newestCommitTsXid)
-CONTROLDATA_LINE("Maximum data alignment",
+CONTROLDATA_LINE(CD_MAXALIGN, "Maximum data alignment",
 				 "%u", ControlFile.maxAlign)
-CONTROLDATA_LINE("Database block size",
+CONTROLDATA_LINE(CD_BLCKSZ, "Database block size",
 				 "%u", ControlFile.blcksz)
-CONTROLDATA_LINE("Blocks per segment of large relation",
+CONTROLDATA_LINE(CD_RELSEG_SZ, "Blocks per segment of large relation",
 				 "%u", ControlFile.relseg_size)
-CONTROLDATA_LINE("Pages per SLRU segment",
+CONTROLDATA_LINE(CD_SLRU_PPS, "Pages per SLRU segment",
 				 "%u", ControlFile.slru_pages_per_segment)
-CONTROLDATA_LINE("WAL block size",
+CONTROLDATA_LINE(CD_WAL_BLCKSZ, "WAL block size",
 				 "%u", ControlFile.xlog_blcksz)
-CONTROLDATA_LINE("Bytes per WAL segment",
+CONTROLDATA_LINE(CD_WAL_SEGSIZE, "Bytes per WAL segment",
 				 "%u", ControlFile.xlog_seg_size)
-CONTROLDATA_LINE("Maximum length of identifiers",
+CONTROLDATA_LINE(CD_WAL_NAMEDATALEN, "Maximum length of identifiers",
 				 "%u", ControlFile.nameDataLen)
-CONTROLDATA_LINE("Maximum columns in an index",
+CONTROLDATA_LINE(CD_INDEX_MAX_KEYS, "Maximum columns in an index",
 				 "%u", ControlFile.indexMaxKeys)
-CONTROLDATA_LINE("Maximum size of a TOAST chunk",
+CONTROLDATA_LINE(CD_TOAST_MAXCHUNKSZ, "Maximum size of a TOAST chunk",
 				 "%u", ControlFile.toast_max_chunk_size)
-CONTROLDATA_LINE("Size of a large-object chunk",
+CONTROLDATA_LINE(CD_LO_BLKSZ, "Size of a large-object chunk",
 				 "%u", ControlFile.loblksize)
 
 /* This is no longer configurable, but users may still expect to see it: */
-CONTROLDATA_LINE("Date/time type storage",
+CONTROLDATA_LINE(CD_DATETIME_INT64, "Date/time type storage",
 				 "%s", _("64-bit integers"))
-CONTROLDATA_LINE("Float8 argument passing",
+CONTROLDATA_LINE(CD_FLOAT8_ARGS, "Float8 argument passing",
 				 "%s", ControlFile.float8ByVal ? _("by value") : _("by reference"))
-CONTROLDATA_LINE("Data page checksum version",
+CONTROLDATA_LINE(CD_CHECKSUMS, "Data page checksum version",
 				 "%u", ControlFile.data_checksum_version)
-CONTROLDATA_LINE("Default char data signedness",
+CONTROLDATA_LINE(CD_CHAR_SIGNEDNESS, "Default char data signedness",
 				 "%s", ControlFile.default_char_signedness ? _("signed") : _("unsigned"))
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index fb17b6f80e0..23bf1c62183 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -55,6 +55,7 @@
 #include "common/restricted_token.h"
 #include "common/string.h"
 #include "fe_utils/option_utils.h"
+#include "fe_utils/simple_list.h"
 #include "fe_utils/version.h"
 #include "getopt_long.h"
 #include "mb/pg_wchar.h"
@@ -119,6 +120,14 @@ static int	internal_wcswidth(const char *pwcs, size_t len, int encoding);
 static uint32 strtouint32_strict(const char *restrict s, char **restrict endptr, int base);
 static uint64 strtouint64_strict(const char *restrict s, char **restrict endptr, int base);
 
+/* Define the string enums */
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	symbol,
+enum ControldataStrings {
+#include "entries.h"
+};
+#undef CONTROLDATA_LINE
+
 
 int
 main(int argc, char *argv[])
@@ -768,7 +777,7 @@ PrintControlValues(bool guessed)
 	 * First, determine the maximum length of the description of all entries,
 	 * some or all of which might be translated.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	thislen = internal_wcswidth(_(description),			\
 								strlen(_(description)),	\
 								encoding);				\
@@ -781,7 +790,7 @@ PrintControlValues(bool guessed)
 	 * Print each line: the possibly-translated description, then some padding
 	 * spaces according to its display width, then the value.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	{													\
 		int		thisstrlen;								\
 														\
@@ -807,69 +816,99 @@ static void
 PrintNewControlValues(void)
 {
 	char		fname[MAXFNAMELEN];
+	int			encoding = pg_get_encoding_from_locale(NULL, true);
+	SimpleOidList	toprint = {NULL, NULL};
+	int			maxlen = 0;
+	int			thislen;
 
 	/* This will be always printed in order to keep format same. */
 	printf(_("\n\nValues to be changed:\n\n"));
 
-	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
-				 newXlogSegNo, WalSegSz);
-	printf(_("First log segment after reset:        %s\n"), fname);
-
 	if (mxids_given)
 	{
-		printf(_("NextMultiXactId:                      %u\n"),
-			   ControlFile.checkPointCopy.nextMulti);
-		printf(_("OldestMultiXid:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestMulti);
-		printf(_("OldestMulti's DB:                     %u\n"),
-			   ControlFile.checkPointCopy.oldestMultiDB);
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI_DB);
 	}
 
 	if (next_mxoff_given)
-	{
-		printf(_("NextMultiOffset:                      %" PRIu64 "\n"),
-			   ControlFile.checkPointCopy.nextMultiOffset);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXOFF);
 
 	if (next_oid_given)
-	{
-		printf(_("NextOID:                              %u\n"),
-			   ControlFile.checkPointCopy.nextOid);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTOID);
 
 	if (next_xid_given)
-	{
-		printf(_("NextXID:                              %u\n"),
-			   XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTXID);
 
 	if (oldest_xid_given)
 	{
-		printf(_("OldestXID:                            %u\n"),
-			   ControlFile.checkPointCopy.oldestXid);
-		printf(_("OldestXID's DB:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestXidDB);
-	}
-
-	if (next_xid_epoch_given)
-	{
-		printf(_("NextXID epoch:                        %u\n"),
-			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID_DB);
 	}
 
 	if (commit_ts_xids_given)
 	{
-		printf(_("oldestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.oldestCommitTsXid);
-		printf(_("newestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.newestCommitTsXid);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_COMMITTS_XID);
+		simple_oid_list_append(&toprint, CD_CKPT_NEWEST_COMMITTS_XID);
 	}
 
 	if (wal_segsize_given)
-	{
-		printf(_("Bytes per WAL segment:                %u\n"),
-			   ControlFile.xlog_seg_size);
+		simple_oid_list_append(&toprint, CD_WAL_SEGSIZE);
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{															\
+	thislen = internal_wcswidth(_(description),					\
+								strlen(_(description)),			\
+								encoding);						\
+	if (thislen > maxlen)										\
+		maxlen = thislen;										\
 	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
+
+
+	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
+				 newXlogSegNo, WalSegSz);
+
+	/* We print this one inconditionally */
+	{
+		char *str = "First log segment after reset";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%s\n", _(str), maxlen - thislen + 2, " ", fname);
+	}
+
+	/* We print the XID epoch in a degenerate case */
+	if (next_xid_epoch_given)
+	{
+		char *str = "NextXID epoch";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%u\n", _(str), maxlen - thislen + 2, " ",
+			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+
+	}
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{													\
+		int		thisstrlen;								\
+														\
+		thisstrlen = strlen(_(description));			\
+		thislen = internal_wcswidth(_(description),		\
+									thisstrlen,			\
+									encoding);			\
+		printf("%s:%*s" fmt "\n",						\
+			   _(description),							\
+			   maxlen - thislen + 2,					\
+			   " ",										\
+			   __VA_ARGS__);							\
+	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
 }
 
 
-- 
2.47.3


--m4rixdodkhrlzpzv--





^ permalink  raw  reply  [nested|flat] 180+ messages in thread

* [PATCH 2/2] Apply the same technique to PrintNewControlValues too
@ 2026-01-31 15:01 Álvaro Herrera <[email protected]>
  0 siblings, 0 replies; 180+ messages in thread

From: Álvaro Herrera @ 2026-01-31 15:01 UTC (permalink / raw)

---
 src/bin/pg_resetwal/entries.h     |  60 +++++++--------
 src/bin/pg_resetwal/pg_resetwal.c | 121 ++++++++++++++++++++----------
 2 files changed, 110 insertions(+), 71 deletions(-)

diff --git a/src/bin/pg_resetwal/entries.h b/src/bin/pg_resetwal/entries.h
index 6b7686da83a..25f2c49b3a8 100644
--- a/src/bin/pg_resetwal/entries.h
+++ b/src/bin/pg_resetwal/entries.h
@@ -1,62 +1,62 @@
-CONTROLDATA_LINE("pg_control version number",
+CONTROLDATA_LINE(CD_CONTROL_VERSION, "pg_control version number",
 				 "%u", ControlFile.pg_control_version)
-CONTROLDATA_LINE("Catalog version number",
+CONTROLDATA_LINE(CD_CATALOG_VERSION, "Catalog version number",
 				 "%u", ControlFile.catalog_version_no)
-CONTROLDATA_LINE("Database system identifier",
+CONTROLDATA_LINE(CD_SYSTEM_IDENTIFIER, "Database system identifier",
 				 "%" PRIu64, ControlFile.system_identifier)
-CONTROLDATA_LINE("Latest checkpoint's TimeLineID",
+CONTROLDATA_LINE(CD_CKPT_TIMELINE, "Latest checkpoint's TimeLineID",
 				 "%u", ControlFile.checkPointCopy.ThisTimeLineID)
-CONTROLDATA_LINE("Latest checkpoint's full_page_writes",
+CONTROLDATA_LINE(CD_CKPT_FPW, "Latest checkpoint's full_page_writes",
 				 "%s", (ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off")))
-CONTROLDATA_LINE("Latest checkpoint's NextXID",
+CONTROLDATA_LINE(CD_CKPT_NEXTXID, "Latest checkpoint's NextXID",
 				 "%u:%u", EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid), XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid))
-CONTROLDATA_LINE("Latest checkpoint's NextOID",
+CONTROLDATA_LINE(CD_CKPT_NEXTOID, "Latest checkpoint's NextOID",
 				 "%u", ControlFile.checkPointCopy.nextOid)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiXactId",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXID, "Latest checkpoint's NextMultiXactId",
 				 "%u", ControlFile.checkPointCopy.nextMulti)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiOffset",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXOFF, "Latest checkpoint's NextMultiOffset",
 				 "%" PRIu64, ControlFile.checkPointCopy.nextMultiOffset)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID, "Latest checkpoint's oldestXID",
 				 "%u", ControlFile.checkPointCopy.oldestXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID_DB, "Latest checkpoint's oldestXID's DB",
 				 "%u", ControlFile.checkPointCopy.oldestXidDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestActiveXID",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_ACTIVEXID, "Latest checkpoint's oldestActiveXID",
 				 "%u", ControlFile.checkPointCopy.oldestActiveXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestMultiXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI, "Latest checkpoint's oldestMultiXid",
 				 "%u", ControlFile.checkPointCopy.oldestMulti)
-CONTROLDATA_LINE("Latest checkpoint's oldestMulti's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI_DB, "Latest checkpoint's oldestMulti's DB",
 				 "%u", ControlFile.checkPointCopy.oldestMultiDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_COMMITTS_XID, "Latest checkpoint's oldestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.oldestCommitTsXid)
-CONTROLDATA_LINE("Latest checkpoint's newestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_NEWEST_COMMITTS_XID, "Latest checkpoint's newestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.newestCommitTsXid)
-CONTROLDATA_LINE("Maximum data alignment",
+CONTROLDATA_LINE(CD_MAXALIGN, "Maximum data alignment",
 				 "%u", ControlFile.maxAlign)
-CONTROLDATA_LINE("Database block size",
+CONTROLDATA_LINE(CD_BLCKSZ, "Database block size",
 				 "%u", ControlFile.blcksz)
-CONTROLDATA_LINE("Blocks per segment of large relation",
+CONTROLDATA_LINE(CD_RELSEG_SZ, "Blocks per segment of large relation",
 				 "%u", ControlFile.relseg_size)
-CONTROLDATA_LINE("Pages per SLRU segment",
+CONTROLDATA_LINE(CD_SLRU_PPS, "Pages per SLRU segment",
 				 "%u", ControlFile.slru_pages_per_segment)
-CONTROLDATA_LINE("WAL block size",
+CONTROLDATA_LINE(CD_WAL_BLCKSZ, "WAL block size",
 				 "%u", ControlFile.xlog_blcksz)
-CONTROLDATA_LINE("Bytes per WAL segment",
+CONTROLDATA_LINE(CD_WAL_SEGSIZE, "Bytes per WAL segment",
 				 "%u", ControlFile.xlog_seg_size)
-CONTROLDATA_LINE("Maximum length of identifiers",
+CONTROLDATA_LINE(CD_WAL_NAMEDATALEN, "Maximum length of identifiers",
 				 "%u", ControlFile.nameDataLen)
-CONTROLDATA_LINE("Maximum columns in an index",
+CONTROLDATA_LINE(CD_INDEX_MAX_KEYS, "Maximum columns in an index",
 				 "%u", ControlFile.indexMaxKeys)
-CONTROLDATA_LINE("Maximum size of a TOAST chunk",
+CONTROLDATA_LINE(CD_TOAST_MAXCHUNKSZ, "Maximum size of a TOAST chunk",
 				 "%u", ControlFile.toast_max_chunk_size)
-CONTROLDATA_LINE("Size of a large-object chunk",
+CONTROLDATA_LINE(CD_LO_BLKSZ, "Size of a large-object chunk",
 				 "%u", ControlFile.loblksize)
 
 /* This is no longer configurable, but users may still expect to see it: */
-CONTROLDATA_LINE("Date/time type storage",
+CONTROLDATA_LINE(CD_DATETIME_INT64, "Date/time type storage",
 				 "%s", _("64-bit integers"))
-CONTROLDATA_LINE("Float8 argument passing",
+CONTROLDATA_LINE(CD_FLOAT8_ARGS, "Float8 argument passing",
 				 "%s", ControlFile.float8ByVal ? _("by value") : _("by reference"))
-CONTROLDATA_LINE("Data page checksum version",
+CONTROLDATA_LINE(CD_CHECKSUMS, "Data page checksum version",
 				 "%u", ControlFile.data_checksum_version)
-CONTROLDATA_LINE("Default char data signedness",
+CONTROLDATA_LINE(CD_CHAR_SIGNEDNESS, "Default char data signedness",
 				 "%s", ControlFile.default_char_signedness ? _("signed") : _("unsigned"))
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index fb17b6f80e0..23bf1c62183 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -55,6 +55,7 @@
 #include "common/restricted_token.h"
 #include "common/string.h"
 #include "fe_utils/option_utils.h"
+#include "fe_utils/simple_list.h"
 #include "fe_utils/version.h"
 #include "getopt_long.h"
 #include "mb/pg_wchar.h"
@@ -119,6 +120,14 @@ static int	internal_wcswidth(const char *pwcs, size_t len, int encoding);
 static uint32 strtouint32_strict(const char *restrict s, char **restrict endptr, int base);
 static uint64 strtouint64_strict(const char *restrict s, char **restrict endptr, int base);
 
+/* Define the string enums */
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	symbol,
+enum ControldataStrings {
+#include "entries.h"
+};
+#undef CONTROLDATA_LINE
+
 
 int
 main(int argc, char *argv[])
@@ -768,7 +777,7 @@ PrintControlValues(bool guessed)
 	 * First, determine the maximum length of the description of all entries,
 	 * some or all of which might be translated.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	thislen = internal_wcswidth(_(description),			\
 								strlen(_(description)),	\
 								encoding);				\
@@ -781,7 +790,7 @@ PrintControlValues(bool guessed)
 	 * Print each line: the possibly-translated description, then some padding
 	 * spaces according to its display width, then the value.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	{													\
 		int		thisstrlen;								\
 														\
@@ -807,69 +816,99 @@ static void
 PrintNewControlValues(void)
 {
 	char		fname[MAXFNAMELEN];
+	int			encoding = pg_get_encoding_from_locale(NULL, true);
+	SimpleOidList	toprint = {NULL, NULL};
+	int			maxlen = 0;
+	int			thislen;
 
 	/* This will be always printed in order to keep format same. */
 	printf(_("\n\nValues to be changed:\n\n"));
 
-	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
-				 newXlogSegNo, WalSegSz);
-	printf(_("First log segment after reset:        %s\n"), fname);
-
 	if (mxids_given)
 	{
-		printf(_("NextMultiXactId:                      %u\n"),
-			   ControlFile.checkPointCopy.nextMulti);
-		printf(_("OldestMultiXid:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestMulti);
-		printf(_("OldestMulti's DB:                     %u\n"),
-			   ControlFile.checkPointCopy.oldestMultiDB);
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI_DB);
 	}
 
 	if (next_mxoff_given)
-	{
-		printf(_("NextMultiOffset:                      %" PRIu64 "\n"),
-			   ControlFile.checkPointCopy.nextMultiOffset);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXOFF);
 
 	if (next_oid_given)
-	{
-		printf(_("NextOID:                              %u\n"),
-			   ControlFile.checkPointCopy.nextOid);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTOID);
 
 	if (next_xid_given)
-	{
-		printf(_("NextXID:                              %u\n"),
-			   XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTXID);
 
 	if (oldest_xid_given)
 	{
-		printf(_("OldestXID:                            %u\n"),
-			   ControlFile.checkPointCopy.oldestXid);
-		printf(_("OldestXID's DB:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestXidDB);
-	}
-
-	if (next_xid_epoch_given)
-	{
-		printf(_("NextXID epoch:                        %u\n"),
-			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID_DB);
 	}
 
 	if (commit_ts_xids_given)
 	{
-		printf(_("oldestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.oldestCommitTsXid);
-		printf(_("newestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.newestCommitTsXid);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_COMMITTS_XID);
+		simple_oid_list_append(&toprint, CD_CKPT_NEWEST_COMMITTS_XID);
 	}
 
 	if (wal_segsize_given)
-	{
-		printf(_("Bytes per WAL segment:                %u\n"),
-			   ControlFile.xlog_seg_size);
+		simple_oid_list_append(&toprint, CD_WAL_SEGSIZE);
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{															\
+	thislen = internal_wcswidth(_(description),					\
+								strlen(_(description)),			\
+								encoding);						\
+	if (thislen > maxlen)										\
+		maxlen = thislen;										\
 	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
+
+
+	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
+				 newXlogSegNo, WalSegSz);
+
+	/* We print this one inconditionally */
+	{
+		char *str = "First log segment after reset";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%s\n", _(str), maxlen - thislen + 2, " ", fname);
+	}
+
+	/* We print the XID epoch in a degenerate case */
+	if (next_xid_epoch_given)
+	{
+		char *str = "NextXID epoch";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%u\n", _(str), maxlen - thislen + 2, " ",
+			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+
+	}
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{													\
+		int		thisstrlen;								\
+														\
+		thisstrlen = strlen(_(description));			\
+		thislen = internal_wcswidth(_(description),		\
+									thisstrlen,			\
+									encoding);			\
+		printf("%s:%*s" fmt "\n",						\
+			   _(description),							\
+			   maxlen - thislen + 2,					\
+			   " ",										\
+			   __VA_ARGS__);							\
+	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
 }
 
 
-- 
2.47.3


--m4rixdodkhrlzpzv--





^ permalink  raw  reply  [nested|flat] 180+ messages in thread

* [PATCH 2/2] Apply the same technique to PrintNewControlValues too
@ 2026-01-31 15:01 Álvaro Herrera <[email protected]>
  0 siblings, 0 replies; 180+ messages in thread

From: Álvaro Herrera @ 2026-01-31 15:01 UTC (permalink / raw)

---
 src/bin/pg_resetwal/entries.h     |  60 +++++++--------
 src/bin/pg_resetwal/pg_resetwal.c | 121 ++++++++++++++++++++----------
 2 files changed, 110 insertions(+), 71 deletions(-)

diff --git a/src/bin/pg_resetwal/entries.h b/src/bin/pg_resetwal/entries.h
index 6b7686da83a..25f2c49b3a8 100644
--- a/src/bin/pg_resetwal/entries.h
+++ b/src/bin/pg_resetwal/entries.h
@@ -1,62 +1,62 @@
-CONTROLDATA_LINE("pg_control version number",
+CONTROLDATA_LINE(CD_CONTROL_VERSION, "pg_control version number",
 				 "%u", ControlFile.pg_control_version)
-CONTROLDATA_LINE("Catalog version number",
+CONTROLDATA_LINE(CD_CATALOG_VERSION, "Catalog version number",
 				 "%u", ControlFile.catalog_version_no)
-CONTROLDATA_LINE("Database system identifier",
+CONTROLDATA_LINE(CD_SYSTEM_IDENTIFIER, "Database system identifier",
 				 "%" PRIu64, ControlFile.system_identifier)
-CONTROLDATA_LINE("Latest checkpoint's TimeLineID",
+CONTROLDATA_LINE(CD_CKPT_TIMELINE, "Latest checkpoint's TimeLineID",
 				 "%u", ControlFile.checkPointCopy.ThisTimeLineID)
-CONTROLDATA_LINE("Latest checkpoint's full_page_writes",
+CONTROLDATA_LINE(CD_CKPT_FPW, "Latest checkpoint's full_page_writes",
 				 "%s", (ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off")))
-CONTROLDATA_LINE("Latest checkpoint's NextXID",
+CONTROLDATA_LINE(CD_CKPT_NEXTXID, "Latest checkpoint's NextXID",
 				 "%u:%u", EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid), XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid))
-CONTROLDATA_LINE("Latest checkpoint's NextOID",
+CONTROLDATA_LINE(CD_CKPT_NEXTOID, "Latest checkpoint's NextOID",
 				 "%u", ControlFile.checkPointCopy.nextOid)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiXactId",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXID, "Latest checkpoint's NextMultiXactId",
 				 "%u", ControlFile.checkPointCopy.nextMulti)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiOffset",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXOFF, "Latest checkpoint's NextMultiOffset",
 				 "%" PRIu64, ControlFile.checkPointCopy.nextMultiOffset)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID, "Latest checkpoint's oldestXID",
 				 "%u", ControlFile.checkPointCopy.oldestXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID_DB, "Latest checkpoint's oldestXID's DB",
 				 "%u", ControlFile.checkPointCopy.oldestXidDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestActiveXID",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_ACTIVEXID, "Latest checkpoint's oldestActiveXID",
 				 "%u", ControlFile.checkPointCopy.oldestActiveXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestMultiXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI, "Latest checkpoint's oldestMultiXid",
 				 "%u", ControlFile.checkPointCopy.oldestMulti)
-CONTROLDATA_LINE("Latest checkpoint's oldestMulti's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI_DB, "Latest checkpoint's oldestMulti's DB",
 				 "%u", ControlFile.checkPointCopy.oldestMultiDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_COMMITTS_XID, "Latest checkpoint's oldestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.oldestCommitTsXid)
-CONTROLDATA_LINE("Latest checkpoint's newestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_NEWEST_COMMITTS_XID, "Latest checkpoint's newestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.newestCommitTsXid)
-CONTROLDATA_LINE("Maximum data alignment",
+CONTROLDATA_LINE(CD_MAXALIGN, "Maximum data alignment",
 				 "%u", ControlFile.maxAlign)
-CONTROLDATA_LINE("Database block size",
+CONTROLDATA_LINE(CD_BLCKSZ, "Database block size",
 				 "%u", ControlFile.blcksz)
-CONTROLDATA_LINE("Blocks per segment of large relation",
+CONTROLDATA_LINE(CD_RELSEG_SZ, "Blocks per segment of large relation",
 				 "%u", ControlFile.relseg_size)
-CONTROLDATA_LINE("Pages per SLRU segment",
+CONTROLDATA_LINE(CD_SLRU_PPS, "Pages per SLRU segment",
 				 "%u", ControlFile.slru_pages_per_segment)
-CONTROLDATA_LINE("WAL block size",
+CONTROLDATA_LINE(CD_WAL_BLCKSZ, "WAL block size",
 				 "%u", ControlFile.xlog_blcksz)
-CONTROLDATA_LINE("Bytes per WAL segment",
+CONTROLDATA_LINE(CD_WAL_SEGSIZE, "Bytes per WAL segment",
 				 "%u", ControlFile.xlog_seg_size)
-CONTROLDATA_LINE("Maximum length of identifiers",
+CONTROLDATA_LINE(CD_WAL_NAMEDATALEN, "Maximum length of identifiers",
 				 "%u", ControlFile.nameDataLen)
-CONTROLDATA_LINE("Maximum columns in an index",
+CONTROLDATA_LINE(CD_INDEX_MAX_KEYS, "Maximum columns in an index",
 				 "%u", ControlFile.indexMaxKeys)
-CONTROLDATA_LINE("Maximum size of a TOAST chunk",
+CONTROLDATA_LINE(CD_TOAST_MAXCHUNKSZ, "Maximum size of a TOAST chunk",
 				 "%u", ControlFile.toast_max_chunk_size)
-CONTROLDATA_LINE("Size of a large-object chunk",
+CONTROLDATA_LINE(CD_LO_BLKSZ, "Size of a large-object chunk",
 				 "%u", ControlFile.loblksize)
 
 /* This is no longer configurable, but users may still expect to see it: */
-CONTROLDATA_LINE("Date/time type storage",
+CONTROLDATA_LINE(CD_DATETIME_INT64, "Date/time type storage",
 				 "%s", _("64-bit integers"))
-CONTROLDATA_LINE("Float8 argument passing",
+CONTROLDATA_LINE(CD_FLOAT8_ARGS, "Float8 argument passing",
 				 "%s", ControlFile.float8ByVal ? _("by value") : _("by reference"))
-CONTROLDATA_LINE("Data page checksum version",
+CONTROLDATA_LINE(CD_CHECKSUMS, "Data page checksum version",
 				 "%u", ControlFile.data_checksum_version)
-CONTROLDATA_LINE("Default char data signedness",
+CONTROLDATA_LINE(CD_CHAR_SIGNEDNESS, "Default char data signedness",
 				 "%s", ControlFile.default_char_signedness ? _("signed") : _("unsigned"))
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index fb17b6f80e0..23bf1c62183 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -55,6 +55,7 @@
 #include "common/restricted_token.h"
 #include "common/string.h"
 #include "fe_utils/option_utils.h"
+#include "fe_utils/simple_list.h"
 #include "fe_utils/version.h"
 #include "getopt_long.h"
 #include "mb/pg_wchar.h"
@@ -119,6 +120,14 @@ static int	internal_wcswidth(const char *pwcs, size_t len, int encoding);
 static uint32 strtouint32_strict(const char *restrict s, char **restrict endptr, int base);
 static uint64 strtouint64_strict(const char *restrict s, char **restrict endptr, int base);
 
+/* Define the string enums */
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	symbol,
+enum ControldataStrings {
+#include "entries.h"
+};
+#undef CONTROLDATA_LINE
+
 
 int
 main(int argc, char *argv[])
@@ -768,7 +777,7 @@ PrintControlValues(bool guessed)
 	 * First, determine the maximum length of the description of all entries,
 	 * some or all of which might be translated.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	thislen = internal_wcswidth(_(description),			\
 								strlen(_(description)),	\
 								encoding);				\
@@ -781,7 +790,7 @@ PrintControlValues(bool guessed)
 	 * Print each line: the possibly-translated description, then some padding
 	 * spaces according to its display width, then the value.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	{													\
 		int		thisstrlen;								\
 														\
@@ -807,69 +816,99 @@ static void
 PrintNewControlValues(void)
 {
 	char		fname[MAXFNAMELEN];
+	int			encoding = pg_get_encoding_from_locale(NULL, true);
+	SimpleOidList	toprint = {NULL, NULL};
+	int			maxlen = 0;
+	int			thislen;
 
 	/* This will be always printed in order to keep format same. */
 	printf(_("\n\nValues to be changed:\n\n"));
 
-	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
-				 newXlogSegNo, WalSegSz);
-	printf(_("First log segment after reset:        %s\n"), fname);
-
 	if (mxids_given)
 	{
-		printf(_("NextMultiXactId:                      %u\n"),
-			   ControlFile.checkPointCopy.nextMulti);
-		printf(_("OldestMultiXid:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestMulti);
-		printf(_("OldestMulti's DB:                     %u\n"),
-			   ControlFile.checkPointCopy.oldestMultiDB);
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI_DB);
 	}
 
 	if (next_mxoff_given)
-	{
-		printf(_("NextMultiOffset:                      %" PRIu64 "\n"),
-			   ControlFile.checkPointCopy.nextMultiOffset);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXOFF);
 
 	if (next_oid_given)
-	{
-		printf(_("NextOID:                              %u\n"),
-			   ControlFile.checkPointCopy.nextOid);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTOID);
 
 	if (next_xid_given)
-	{
-		printf(_("NextXID:                              %u\n"),
-			   XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTXID);
 
 	if (oldest_xid_given)
 	{
-		printf(_("OldestXID:                            %u\n"),
-			   ControlFile.checkPointCopy.oldestXid);
-		printf(_("OldestXID's DB:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestXidDB);
-	}
-
-	if (next_xid_epoch_given)
-	{
-		printf(_("NextXID epoch:                        %u\n"),
-			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID_DB);
 	}
 
 	if (commit_ts_xids_given)
 	{
-		printf(_("oldestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.oldestCommitTsXid);
-		printf(_("newestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.newestCommitTsXid);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_COMMITTS_XID);
+		simple_oid_list_append(&toprint, CD_CKPT_NEWEST_COMMITTS_XID);
 	}
 
 	if (wal_segsize_given)
-	{
-		printf(_("Bytes per WAL segment:                %u\n"),
-			   ControlFile.xlog_seg_size);
+		simple_oid_list_append(&toprint, CD_WAL_SEGSIZE);
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{															\
+	thislen = internal_wcswidth(_(description),					\
+								strlen(_(description)),			\
+								encoding);						\
+	if (thislen > maxlen)										\
+		maxlen = thislen;										\
 	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
+
+
+	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
+				 newXlogSegNo, WalSegSz);
+
+	/* We print this one inconditionally */
+	{
+		char *str = "First log segment after reset";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%s\n", _(str), maxlen - thislen + 2, " ", fname);
+	}
+
+	/* We print the XID epoch in a degenerate case */
+	if (next_xid_epoch_given)
+	{
+		char *str = "NextXID epoch";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%u\n", _(str), maxlen - thislen + 2, " ",
+			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+
+	}
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{													\
+		int		thisstrlen;								\
+														\
+		thisstrlen = strlen(_(description));			\
+		thislen = internal_wcswidth(_(description),		\
+									thisstrlen,			\
+									encoding);			\
+		printf("%s:%*s" fmt "\n",						\
+			   _(description),							\
+			   maxlen - thislen + 2,					\
+			   " ",										\
+			   __VA_ARGS__);							\
+	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
 }
 
 
-- 
2.47.3


--m4rixdodkhrlzpzv--





^ permalink  raw  reply  [nested|flat] 180+ messages in thread

* [PATCH 2/2] Apply the same technique to PrintNewControlValues too
@ 2026-01-31 15:01 Álvaro Herrera <[email protected]>
  0 siblings, 0 replies; 180+ messages in thread

From: Álvaro Herrera @ 2026-01-31 15:01 UTC (permalink / raw)

---
 src/bin/pg_resetwal/entries.h     |  60 +++++++--------
 src/bin/pg_resetwal/pg_resetwal.c | 121 ++++++++++++++++++++----------
 2 files changed, 110 insertions(+), 71 deletions(-)

diff --git a/src/bin/pg_resetwal/entries.h b/src/bin/pg_resetwal/entries.h
index 6b7686da83a..25f2c49b3a8 100644
--- a/src/bin/pg_resetwal/entries.h
+++ b/src/bin/pg_resetwal/entries.h
@@ -1,62 +1,62 @@
-CONTROLDATA_LINE("pg_control version number",
+CONTROLDATA_LINE(CD_CONTROL_VERSION, "pg_control version number",
 				 "%u", ControlFile.pg_control_version)
-CONTROLDATA_LINE("Catalog version number",
+CONTROLDATA_LINE(CD_CATALOG_VERSION, "Catalog version number",
 				 "%u", ControlFile.catalog_version_no)
-CONTROLDATA_LINE("Database system identifier",
+CONTROLDATA_LINE(CD_SYSTEM_IDENTIFIER, "Database system identifier",
 				 "%" PRIu64, ControlFile.system_identifier)
-CONTROLDATA_LINE("Latest checkpoint's TimeLineID",
+CONTROLDATA_LINE(CD_CKPT_TIMELINE, "Latest checkpoint's TimeLineID",
 				 "%u", ControlFile.checkPointCopy.ThisTimeLineID)
-CONTROLDATA_LINE("Latest checkpoint's full_page_writes",
+CONTROLDATA_LINE(CD_CKPT_FPW, "Latest checkpoint's full_page_writes",
 				 "%s", (ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off")))
-CONTROLDATA_LINE("Latest checkpoint's NextXID",
+CONTROLDATA_LINE(CD_CKPT_NEXTXID, "Latest checkpoint's NextXID",
 				 "%u:%u", EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid), XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid))
-CONTROLDATA_LINE("Latest checkpoint's NextOID",
+CONTROLDATA_LINE(CD_CKPT_NEXTOID, "Latest checkpoint's NextOID",
 				 "%u", ControlFile.checkPointCopy.nextOid)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiXactId",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXID, "Latest checkpoint's NextMultiXactId",
 				 "%u", ControlFile.checkPointCopy.nextMulti)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiOffset",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXOFF, "Latest checkpoint's NextMultiOffset",
 				 "%" PRIu64, ControlFile.checkPointCopy.nextMultiOffset)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID, "Latest checkpoint's oldestXID",
 				 "%u", ControlFile.checkPointCopy.oldestXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID_DB, "Latest checkpoint's oldestXID's DB",
 				 "%u", ControlFile.checkPointCopy.oldestXidDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestActiveXID",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_ACTIVEXID, "Latest checkpoint's oldestActiveXID",
 				 "%u", ControlFile.checkPointCopy.oldestActiveXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestMultiXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI, "Latest checkpoint's oldestMultiXid",
 				 "%u", ControlFile.checkPointCopy.oldestMulti)
-CONTROLDATA_LINE("Latest checkpoint's oldestMulti's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI_DB, "Latest checkpoint's oldestMulti's DB",
 				 "%u", ControlFile.checkPointCopy.oldestMultiDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_COMMITTS_XID, "Latest checkpoint's oldestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.oldestCommitTsXid)
-CONTROLDATA_LINE("Latest checkpoint's newestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_NEWEST_COMMITTS_XID, "Latest checkpoint's newestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.newestCommitTsXid)
-CONTROLDATA_LINE("Maximum data alignment",
+CONTROLDATA_LINE(CD_MAXALIGN, "Maximum data alignment",
 				 "%u", ControlFile.maxAlign)
-CONTROLDATA_LINE("Database block size",
+CONTROLDATA_LINE(CD_BLCKSZ, "Database block size",
 				 "%u", ControlFile.blcksz)
-CONTROLDATA_LINE("Blocks per segment of large relation",
+CONTROLDATA_LINE(CD_RELSEG_SZ, "Blocks per segment of large relation",
 				 "%u", ControlFile.relseg_size)
-CONTROLDATA_LINE("Pages per SLRU segment",
+CONTROLDATA_LINE(CD_SLRU_PPS, "Pages per SLRU segment",
 				 "%u", ControlFile.slru_pages_per_segment)
-CONTROLDATA_LINE("WAL block size",
+CONTROLDATA_LINE(CD_WAL_BLCKSZ, "WAL block size",
 				 "%u", ControlFile.xlog_blcksz)
-CONTROLDATA_LINE("Bytes per WAL segment",
+CONTROLDATA_LINE(CD_WAL_SEGSIZE, "Bytes per WAL segment",
 				 "%u", ControlFile.xlog_seg_size)
-CONTROLDATA_LINE("Maximum length of identifiers",
+CONTROLDATA_LINE(CD_WAL_NAMEDATALEN, "Maximum length of identifiers",
 				 "%u", ControlFile.nameDataLen)
-CONTROLDATA_LINE("Maximum columns in an index",
+CONTROLDATA_LINE(CD_INDEX_MAX_KEYS, "Maximum columns in an index",
 				 "%u", ControlFile.indexMaxKeys)
-CONTROLDATA_LINE("Maximum size of a TOAST chunk",
+CONTROLDATA_LINE(CD_TOAST_MAXCHUNKSZ, "Maximum size of a TOAST chunk",
 				 "%u", ControlFile.toast_max_chunk_size)
-CONTROLDATA_LINE("Size of a large-object chunk",
+CONTROLDATA_LINE(CD_LO_BLKSZ, "Size of a large-object chunk",
 				 "%u", ControlFile.loblksize)
 
 /* This is no longer configurable, but users may still expect to see it: */
-CONTROLDATA_LINE("Date/time type storage",
+CONTROLDATA_LINE(CD_DATETIME_INT64, "Date/time type storage",
 				 "%s", _("64-bit integers"))
-CONTROLDATA_LINE("Float8 argument passing",
+CONTROLDATA_LINE(CD_FLOAT8_ARGS, "Float8 argument passing",
 				 "%s", ControlFile.float8ByVal ? _("by value") : _("by reference"))
-CONTROLDATA_LINE("Data page checksum version",
+CONTROLDATA_LINE(CD_CHECKSUMS, "Data page checksum version",
 				 "%u", ControlFile.data_checksum_version)
-CONTROLDATA_LINE("Default char data signedness",
+CONTROLDATA_LINE(CD_CHAR_SIGNEDNESS, "Default char data signedness",
 				 "%s", ControlFile.default_char_signedness ? _("signed") : _("unsigned"))
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index fb17b6f80e0..23bf1c62183 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -55,6 +55,7 @@
 #include "common/restricted_token.h"
 #include "common/string.h"
 #include "fe_utils/option_utils.h"
+#include "fe_utils/simple_list.h"
 #include "fe_utils/version.h"
 #include "getopt_long.h"
 #include "mb/pg_wchar.h"
@@ -119,6 +120,14 @@ static int	internal_wcswidth(const char *pwcs, size_t len, int encoding);
 static uint32 strtouint32_strict(const char *restrict s, char **restrict endptr, int base);
 static uint64 strtouint64_strict(const char *restrict s, char **restrict endptr, int base);
 
+/* Define the string enums */
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	symbol,
+enum ControldataStrings {
+#include "entries.h"
+};
+#undef CONTROLDATA_LINE
+
 
 int
 main(int argc, char *argv[])
@@ -768,7 +777,7 @@ PrintControlValues(bool guessed)
 	 * First, determine the maximum length of the description of all entries,
 	 * some or all of which might be translated.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	thislen = internal_wcswidth(_(description),			\
 								strlen(_(description)),	\
 								encoding);				\
@@ -781,7 +790,7 @@ PrintControlValues(bool guessed)
 	 * Print each line: the possibly-translated description, then some padding
 	 * spaces according to its display width, then the value.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	{													\
 		int		thisstrlen;								\
 														\
@@ -807,69 +816,99 @@ static void
 PrintNewControlValues(void)
 {
 	char		fname[MAXFNAMELEN];
+	int			encoding = pg_get_encoding_from_locale(NULL, true);
+	SimpleOidList	toprint = {NULL, NULL};
+	int			maxlen = 0;
+	int			thislen;
 
 	/* This will be always printed in order to keep format same. */
 	printf(_("\n\nValues to be changed:\n\n"));
 
-	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
-				 newXlogSegNo, WalSegSz);
-	printf(_("First log segment after reset:        %s\n"), fname);
-
 	if (mxids_given)
 	{
-		printf(_("NextMultiXactId:                      %u\n"),
-			   ControlFile.checkPointCopy.nextMulti);
-		printf(_("OldestMultiXid:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestMulti);
-		printf(_("OldestMulti's DB:                     %u\n"),
-			   ControlFile.checkPointCopy.oldestMultiDB);
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI_DB);
 	}
 
 	if (next_mxoff_given)
-	{
-		printf(_("NextMultiOffset:                      %" PRIu64 "\n"),
-			   ControlFile.checkPointCopy.nextMultiOffset);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXOFF);
 
 	if (next_oid_given)
-	{
-		printf(_("NextOID:                              %u\n"),
-			   ControlFile.checkPointCopy.nextOid);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTOID);
 
 	if (next_xid_given)
-	{
-		printf(_("NextXID:                              %u\n"),
-			   XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTXID);
 
 	if (oldest_xid_given)
 	{
-		printf(_("OldestXID:                            %u\n"),
-			   ControlFile.checkPointCopy.oldestXid);
-		printf(_("OldestXID's DB:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestXidDB);
-	}
-
-	if (next_xid_epoch_given)
-	{
-		printf(_("NextXID epoch:                        %u\n"),
-			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID_DB);
 	}
 
 	if (commit_ts_xids_given)
 	{
-		printf(_("oldestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.oldestCommitTsXid);
-		printf(_("newestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.newestCommitTsXid);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_COMMITTS_XID);
+		simple_oid_list_append(&toprint, CD_CKPT_NEWEST_COMMITTS_XID);
 	}
 
 	if (wal_segsize_given)
-	{
-		printf(_("Bytes per WAL segment:                %u\n"),
-			   ControlFile.xlog_seg_size);
+		simple_oid_list_append(&toprint, CD_WAL_SEGSIZE);
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{															\
+	thislen = internal_wcswidth(_(description),					\
+								strlen(_(description)),			\
+								encoding);						\
+	if (thislen > maxlen)										\
+		maxlen = thislen;										\
 	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
+
+
+	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
+				 newXlogSegNo, WalSegSz);
+
+	/* We print this one inconditionally */
+	{
+		char *str = "First log segment after reset";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%s\n", _(str), maxlen - thislen + 2, " ", fname);
+	}
+
+	/* We print the XID epoch in a degenerate case */
+	if (next_xid_epoch_given)
+	{
+		char *str = "NextXID epoch";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%u\n", _(str), maxlen - thislen + 2, " ",
+			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+
+	}
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{													\
+		int		thisstrlen;								\
+														\
+		thisstrlen = strlen(_(description));			\
+		thislen = internal_wcswidth(_(description),		\
+									thisstrlen,			\
+									encoding);			\
+		printf("%s:%*s" fmt "\n",						\
+			   _(description),							\
+			   maxlen - thislen + 2,					\
+			   " ",										\
+			   __VA_ARGS__);							\
+	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
 }
 
 
-- 
2.47.3


--m4rixdodkhrlzpzv--





^ permalink  raw  reply  [nested|flat] 180+ messages in thread

* [PATCH 2/2] Apply the same technique to PrintNewControlValues too
@ 2026-01-31 15:01 Álvaro Herrera <[email protected]>
  0 siblings, 0 replies; 180+ messages in thread

From: Álvaro Herrera @ 2026-01-31 15:01 UTC (permalink / raw)

---
 src/bin/pg_resetwal/entries.h     |  60 +++++++--------
 src/bin/pg_resetwal/pg_resetwal.c | 121 ++++++++++++++++++++----------
 2 files changed, 110 insertions(+), 71 deletions(-)

diff --git a/src/bin/pg_resetwal/entries.h b/src/bin/pg_resetwal/entries.h
index 6b7686da83a..25f2c49b3a8 100644
--- a/src/bin/pg_resetwal/entries.h
+++ b/src/bin/pg_resetwal/entries.h
@@ -1,62 +1,62 @@
-CONTROLDATA_LINE("pg_control version number",
+CONTROLDATA_LINE(CD_CONTROL_VERSION, "pg_control version number",
 				 "%u", ControlFile.pg_control_version)
-CONTROLDATA_LINE("Catalog version number",
+CONTROLDATA_LINE(CD_CATALOG_VERSION, "Catalog version number",
 				 "%u", ControlFile.catalog_version_no)
-CONTROLDATA_LINE("Database system identifier",
+CONTROLDATA_LINE(CD_SYSTEM_IDENTIFIER, "Database system identifier",
 				 "%" PRIu64, ControlFile.system_identifier)
-CONTROLDATA_LINE("Latest checkpoint's TimeLineID",
+CONTROLDATA_LINE(CD_CKPT_TIMELINE, "Latest checkpoint's TimeLineID",
 				 "%u", ControlFile.checkPointCopy.ThisTimeLineID)
-CONTROLDATA_LINE("Latest checkpoint's full_page_writes",
+CONTROLDATA_LINE(CD_CKPT_FPW, "Latest checkpoint's full_page_writes",
 				 "%s", (ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off")))
-CONTROLDATA_LINE("Latest checkpoint's NextXID",
+CONTROLDATA_LINE(CD_CKPT_NEXTXID, "Latest checkpoint's NextXID",
 				 "%u:%u", EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid), XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid))
-CONTROLDATA_LINE("Latest checkpoint's NextOID",
+CONTROLDATA_LINE(CD_CKPT_NEXTOID, "Latest checkpoint's NextOID",
 				 "%u", ControlFile.checkPointCopy.nextOid)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiXactId",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXID, "Latest checkpoint's NextMultiXactId",
 				 "%u", ControlFile.checkPointCopy.nextMulti)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiOffset",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXOFF, "Latest checkpoint's NextMultiOffset",
 				 "%" PRIu64, ControlFile.checkPointCopy.nextMultiOffset)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID, "Latest checkpoint's oldestXID",
 				 "%u", ControlFile.checkPointCopy.oldestXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID_DB, "Latest checkpoint's oldestXID's DB",
 				 "%u", ControlFile.checkPointCopy.oldestXidDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestActiveXID",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_ACTIVEXID, "Latest checkpoint's oldestActiveXID",
 				 "%u", ControlFile.checkPointCopy.oldestActiveXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestMultiXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI, "Latest checkpoint's oldestMultiXid",
 				 "%u", ControlFile.checkPointCopy.oldestMulti)
-CONTROLDATA_LINE("Latest checkpoint's oldestMulti's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI_DB, "Latest checkpoint's oldestMulti's DB",
 				 "%u", ControlFile.checkPointCopy.oldestMultiDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_COMMITTS_XID, "Latest checkpoint's oldestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.oldestCommitTsXid)
-CONTROLDATA_LINE("Latest checkpoint's newestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_NEWEST_COMMITTS_XID, "Latest checkpoint's newestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.newestCommitTsXid)
-CONTROLDATA_LINE("Maximum data alignment",
+CONTROLDATA_LINE(CD_MAXALIGN, "Maximum data alignment",
 				 "%u", ControlFile.maxAlign)
-CONTROLDATA_LINE("Database block size",
+CONTROLDATA_LINE(CD_BLCKSZ, "Database block size",
 				 "%u", ControlFile.blcksz)
-CONTROLDATA_LINE("Blocks per segment of large relation",
+CONTROLDATA_LINE(CD_RELSEG_SZ, "Blocks per segment of large relation",
 				 "%u", ControlFile.relseg_size)
-CONTROLDATA_LINE("Pages per SLRU segment",
+CONTROLDATA_LINE(CD_SLRU_PPS, "Pages per SLRU segment",
 				 "%u", ControlFile.slru_pages_per_segment)
-CONTROLDATA_LINE("WAL block size",
+CONTROLDATA_LINE(CD_WAL_BLCKSZ, "WAL block size",
 				 "%u", ControlFile.xlog_blcksz)
-CONTROLDATA_LINE("Bytes per WAL segment",
+CONTROLDATA_LINE(CD_WAL_SEGSIZE, "Bytes per WAL segment",
 				 "%u", ControlFile.xlog_seg_size)
-CONTROLDATA_LINE("Maximum length of identifiers",
+CONTROLDATA_LINE(CD_WAL_NAMEDATALEN, "Maximum length of identifiers",
 				 "%u", ControlFile.nameDataLen)
-CONTROLDATA_LINE("Maximum columns in an index",
+CONTROLDATA_LINE(CD_INDEX_MAX_KEYS, "Maximum columns in an index",
 				 "%u", ControlFile.indexMaxKeys)
-CONTROLDATA_LINE("Maximum size of a TOAST chunk",
+CONTROLDATA_LINE(CD_TOAST_MAXCHUNKSZ, "Maximum size of a TOAST chunk",
 				 "%u", ControlFile.toast_max_chunk_size)
-CONTROLDATA_LINE("Size of a large-object chunk",
+CONTROLDATA_LINE(CD_LO_BLKSZ, "Size of a large-object chunk",
 				 "%u", ControlFile.loblksize)
 
 /* This is no longer configurable, but users may still expect to see it: */
-CONTROLDATA_LINE("Date/time type storage",
+CONTROLDATA_LINE(CD_DATETIME_INT64, "Date/time type storage",
 				 "%s", _("64-bit integers"))
-CONTROLDATA_LINE("Float8 argument passing",
+CONTROLDATA_LINE(CD_FLOAT8_ARGS, "Float8 argument passing",
 				 "%s", ControlFile.float8ByVal ? _("by value") : _("by reference"))
-CONTROLDATA_LINE("Data page checksum version",
+CONTROLDATA_LINE(CD_CHECKSUMS, "Data page checksum version",
 				 "%u", ControlFile.data_checksum_version)
-CONTROLDATA_LINE("Default char data signedness",
+CONTROLDATA_LINE(CD_CHAR_SIGNEDNESS, "Default char data signedness",
 				 "%s", ControlFile.default_char_signedness ? _("signed") : _("unsigned"))
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index fb17b6f80e0..23bf1c62183 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -55,6 +55,7 @@
 #include "common/restricted_token.h"
 #include "common/string.h"
 #include "fe_utils/option_utils.h"
+#include "fe_utils/simple_list.h"
 #include "fe_utils/version.h"
 #include "getopt_long.h"
 #include "mb/pg_wchar.h"
@@ -119,6 +120,14 @@ static int	internal_wcswidth(const char *pwcs, size_t len, int encoding);
 static uint32 strtouint32_strict(const char *restrict s, char **restrict endptr, int base);
 static uint64 strtouint64_strict(const char *restrict s, char **restrict endptr, int base);
 
+/* Define the string enums */
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	symbol,
+enum ControldataStrings {
+#include "entries.h"
+};
+#undef CONTROLDATA_LINE
+
 
 int
 main(int argc, char *argv[])
@@ -768,7 +777,7 @@ PrintControlValues(bool guessed)
 	 * First, determine the maximum length of the description of all entries,
 	 * some or all of which might be translated.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	thislen = internal_wcswidth(_(description),			\
 								strlen(_(description)),	\
 								encoding);				\
@@ -781,7 +790,7 @@ PrintControlValues(bool guessed)
 	 * Print each line: the possibly-translated description, then some padding
 	 * spaces according to its display width, then the value.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	{													\
 		int		thisstrlen;								\
 														\
@@ -807,69 +816,99 @@ static void
 PrintNewControlValues(void)
 {
 	char		fname[MAXFNAMELEN];
+	int			encoding = pg_get_encoding_from_locale(NULL, true);
+	SimpleOidList	toprint = {NULL, NULL};
+	int			maxlen = 0;
+	int			thislen;
 
 	/* This will be always printed in order to keep format same. */
 	printf(_("\n\nValues to be changed:\n\n"));
 
-	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
-				 newXlogSegNo, WalSegSz);
-	printf(_("First log segment after reset:        %s\n"), fname);
-
 	if (mxids_given)
 	{
-		printf(_("NextMultiXactId:                      %u\n"),
-			   ControlFile.checkPointCopy.nextMulti);
-		printf(_("OldestMultiXid:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestMulti);
-		printf(_("OldestMulti's DB:                     %u\n"),
-			   ControlFile.checkPointCopy.oldestMultiDB);
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI_DB);
 	}
 
 	if (next_mxoff_given)
-	{
-		printf(_("NextMultiOffset:                      %" PRIu64 "\n"),
-			   ControlFile.checkPointCopy.nextMultiOffset);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXOFF);
 
 	if (next_oid_given)
-	{
-		printf(_("NextOID:                              %u\n"),
-			   ControlFile.checkPointCopy.nextOid);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTOID);
 
 	if (next_xid_given)
-	{
-		printf(_("NextXID:                              %u\n"),
-			   XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTXID);
 
 	if (oldest_xid_given)
 	{
-		printf(_("OldestXID:                            %u\n"),
-			   ControlFile.checkPointCopy.oldestXid);
-		printf(_("OldestXID's DB:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestXidDB);
-	}
-
-	if (next_xid_epoch_given)
-	{
-		printf(_("NextXID epoch:                        %u\n"),
-			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID_DB);
 	}
 
 	if (commit_ts_xids_given)
 	{
-		printf(_("oldestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.oldestCommitTsXid);
-		printf(_("newestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.newestCommitTsXid);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_COMMITTS_XID);
+		simple_oid_list_append(&toprint, CD_CKPT_NEWEST_COMMITTS_XID);
 	}
 
 	if (wal_segsize_given)
-	{
-		printf(_("Bytes per WAL segment:                %u\n"),
-			   ControlFile.xlog_seg_size);
+		simple_oid_list_append(&toprint, CD_WAL_SEGSIZE);
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{															\
+	thislen = internal_wcswidth(_(description),					\
+								strlen(_(description)),			\
+								encoding);						\
+	if (thislen > maxlen)										\
+		maxlen = thislen;										\
 	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
+
+
+	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
+				 newXlogSegNo, WalSegSz);
+
+	/* We print this one inconditionally */
+	{
+		char *str = "First log segment after reset";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%s\n", _(str), maxlen - thislen + 2, " ", fname);
+	}
+
+	/* We print the XID epoch in a degenerate case */
+	if (next_xid_epoch_given)
+	{
+		char *str = "NextXID epoch";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%u\n", _(str), maxlen - thislen + 2, " ",
+			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+
+	}
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{													\
+		int		thisstrlen;								\
+														\
+		thisstrlen = strlen(_(description));			\
+		thislen = internal_wcswidth(_(description),		\
+									thisstrlen,			\
+									encoding);			\
+		printf("%s:%*s" fmt "\n",						\
+			   _(description),							\
+			   maxlen - thislen + 2,					\
+			   " ",										\
+			   __VA_ARGS__);							\
+	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
 }
 
 
-- 
2.47.3


--m4rixdodkhrlzpzv--





^ permalink  raw  reply  [nested|flat] 180+ messages in thread

* [PATCH 2/2] Apply the same technique to PrintNewControlValues too
@ 2026-01-31 15:01 Álvaro Herrera <[email protected]>
  0 siblings, 0 replies; 180+ messages in thread

From: Álvaro Herrera @ 2026-01-31 15:01 UTC (permalink / raw)

---
 src/bin/pg_resetwal/entries.h     |  60 +++++++--------
 src/bin/pg_resetwal/pg_resetwal.c | 121 ++++++++++++++++++++----------
 2 files changed, 110 insertions(+), 71 deletions(-)

diff --git a/src/bin/pg_resetwal/entries.h b/src/bin/pg_resetwal/entries.h
index 6b7686da83a..25f2c49b3a8 100644
--- a/src/bin/pg_resetwal/entries.h
+++ b/src/bin/pg_resetwal/entries.h
@@ -1,62 +1,62 @@
-CONTROLDATA_LINE("pg_control version number",
+CONTROLDATA_LINE(CD_CONTROL_VERSION, "pg_control version number",
 				 "%u", ControlFile.pg_control_version)
-CONTROLDATA_LINE("Catalog version number",
+CONTROLDATA_LINE(CD_CATALOG_VERSION, "Catalog version number",
 				 "%u", ControlFile.catalog_version_no)
-CONTROLDATA_LINE("Database system identifier",
+CONTROLDATA_LINE(CD_SYSTEM_IDENTIFIER, "Database system identifier",
 				 "%" PRIu64, ControlFile.system_identifier)
-CONTROLDATA_LINE("Latest checkpoint's TimeLineID",
+CONTROLDATA_LINE(CD_CKPT_TIMELINE, "Latest checkpoint's TimeLineID",
 				 "%u", ControlFile.checkPointCopy.ThisTimeLineID)
-CONTROLDATA_LINE("Latest checkpoint's full_page_writes",
+CONTROLDATA_LINE(CD_CKPT_FPW, "Latest checkpoint's full_page_writes",
 				 "%s", (ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off")))
-CONTROLDATA_LINE("Latest checkpoint's NextXID",
+CONTROLDATA_LINE(CD_CKPT_NEXTXID, "Latest checkpoint's NextXID",
 				 "%u:%u", EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid), XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid))
-CONTROLDATA_LINE("Latest checkpoint's NextOID",
+CONTROLDATA_LINE(CD_CKPT_NEXTOID, "Latest checkpoint's NextOID",
 				 "%u", ControlFile.checkPointCopy.nextOid)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiXactId",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXID, "Latest checkpoint's NextMultiXactId",
 				 "%u", ControlFile.checkPointCopy.nextMulti)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiOffset",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXOFF, "Latest checkpoint's NextMultiOffset",
 				 "%" PRIu64, ControlFile.checkPointCopy.nextMultiOffset)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID, "Latest checkpoint's oldestXID",
 				 "%u", ControlFile.checkPointCopy.oldestXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID_DB, "Latest checkpoint's oldestXID's DB",
 				 "%u", ControlFile.checkPointCopy.oldestXidDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestActiveXID",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_ACTIVEXID, "Latest checkpoint's oldestActiveXID",
 				 "%u", ControlFile.checkPointCopy.oldestActiveXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestMultiXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI, "Latest checkpoint's oldestMultiXid",
 				 "%u", ControlFile.checkPointCopy.oldestMulti)
-CONTROLDATA_LINE("Latest checkpoint's oldestMulti's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI_DB, "Latest checkpoint's oldestMulti's DB",
 				 "%u", ControlFile.checkPointCopy.oldestMultiDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_COMMITTS_XID, "Latest checkpoint's oldestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.oldestCommitTsXid)
-CONTROLDATA_LINE("Latest checkpoint's newestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_NEWEST_COMMITTS_XID, "Latest checkpoint's newestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.newestCommitTsXid)
-CONTROLDATA_LINE("Maximum data alignment",
+CONTROLDATA_LINE(CD_MAXALIGN, "Maximum data alignment",
 				 "%u", ControlFile.maxAlign)
-CONTROLDATA_LINE("Database block size",
+CONTROLDATA_LINE(CD_BLCKSZ, "Database block size",
 				 "%u", ControlFile.blcksz)
-CONTROLDATA_LINE("Blocks per segment of large relation",
+CONTROLDATA_LINE(CD_RELSEG_SZ, "Blocks per segment of large relation",
 				 "%u", ControlFile.relseg_size)
-CONTROLDATA_LINE("Pages per SLRU segment",
+CONTROLDATA_LINE(CD_SLRU_PPS, "Pages per SLRU segment",
 				 "%u", ControlFile.slru_pages_per_segment)
-CONTROLDATA_LINE("WAL block size",
+CONTROLDATA_LINE(CD_WAL_BLCKSZ, "WAL block size",
 				 "%u", ControlFile.xlog_blcksz)
-CONTROLDATA_LINE("Bytes per WAL segment",
+CONTROLDATA_LINE(CD_WAL_SEGSIZE, "Bytes per WAL segment",
 				 "%u", ControlFile.xlog_seg_size)
-CONTROLDATA_LINE("Maximum length of identifiers",
+CONTROLDATA_LINE(CD_WAL_NAMEDATALEN, "Maximum length of identifiers",
 				 "%u", ControlFile.nameDataLen)
-CONTROLDATA_LINE("Maximum columns in an index",
+CONTROLDATA_LINE(CD_INDEX_MAX_KEYS, "Maximum columns in an index",
 				 "%u", ControlFile.indexMaxKeys)
-CONTROLDATA_LINE("Maximum size of a TOAST chunk",
+CONTROLDATA_LINE(CD_TOAST_MAXCHUNKSZ, "Maximum size of a TOAST chunk",
 				 "%u", ControlFile.toast_max_chunk_size)
-CONTROLDATA_LINE("Size of a large-object chunk",
+CONTROLDATA_LINE(CD_LO_BLKSZ, "Size of a large-object chunk",
 				 "%u", ControlFile.loblksize)
 
 /* This is no longer configurable, but users may still expect to see it: */
-CONTROLDATA_LINE("Date/time type storage",
+CONTROLDATA_LINE(CD_DATETIME_INT64, "Date/time type storage",
 				 "%s", _("64-bit integers"))
-CONTROLDATA_LINE("Float8 argument passing",
+CONTROLDATA_LINE(CD_FLOAT8_ARGS, "Float8 argument passing",
 				 "%s", ControlFile.float8ByVal ? _("by value") : _("by reference"))
-CONTROLDATA_LINE("Data page checksum version",
+CONTROLDATA_LINE(CD_CHECKSUMS, "Data page checksum version",
 				 "%u", ControlFile.data_checksum_version)
-CONTROLDATA_LINE("Default char data signedness",
+CONTROLDATA_LINE(CD_CHAR_SIGNEDNESS, "Default char data signedness",
 				 "%s", ControlFile.default_char_signedness ? _("signed") : _("unsigned"))
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index fb17b6f80e0..23bf1c62183 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -55,6 +55,7 @@
 #include "common/restricted_token.h"
 #include "common/string.h"
 #include "fe_utils/option_utils.h"
+#include "fe_utils/simple_list.h"
 #include "fe_utils/version.h"
 #include "getopt_long.h"
 #include "mb/pg_wchar.h"
@@ -119,6 +120,14 @@ static int	internal_wcswidth(const char *pwcs, size_t len, int encoding);
 static uint32 strtouint32_strict(const char *restrict s, char **restrict endptr, int base);
 static uint64 strtouint64_strict(const char *restrict s, char **restrict endptr, int base);
 
+/* Define the string enums */
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	symbol,
+enum ControldataStrings {
+#include "entries.h"
+};
+#undef CONTROLDATA_LINE
+
 
 int
 main(int argc, char *argv[])
@@ -768,7 +777,7 @@ PrintControlValues(bool guessed)
 	 * First, determine the maximum length of the description of all entries,
 	 * some or all of which might be translated.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	thislen = internal_wcswidth(_(description),			\
 								strlen(_(description)),	\
 								encoding);				\
@@ -781,7 +790,7 @@ PrintControlValues(bool guessed)
 	 * Print each line: the possibly-translated description, then some padding
 	 * spaces according to its display width, then the value.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	{													\
 		int		thisstrlen;								\
 														\
@@ -807,69 +816,99 @@ static void
 PrintNewControlValues(void)
 {
 	char		fname[MAXFNAMELEN];
+	int			encoding = pg_get_encoding_from_locale(NULL, true);
+	SimpleOidList	toprint = {NULL, NULL};
+	int			maxlen = 0;
+	int			thislen;
 
 	/* This will be always printed in order to keep format same. */
 	printf(_("\n\nValues to be changed:\n\n"));
 
-	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
-				 newXlogSegNo, WalSegSz);
-	printf(_("First log segment after reset:        %s\n"), fname);
-
 	if (mxids_given)
 	{
-		printf(_("NextMultiXactId:                      %u\n"),
-			   ControlFile.checkPointCopy.nextMulti);
-		printf(_("OldestMultiXid:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestMulti);
-		printf(_("OldestMulti's DB:                     %u\n"),
-			   ControlFile.checkPointCopy.oldestMultiDB);
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI_DB);
 	}
 
 	if (next_mxoff_given)
-	{
-		printf(_("NextMultiOffset:                      %" PRIu64 "\n"),
-			   ControlFile.checkPointCopy.nextMultiOffset);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXOFF);
 
 	if (next_oid_given)
-	{
-		printf(_("NextOID:                              %u\n"),
-			   ControlFile.checkPointCopy.nextOid);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTOID);
 
 	if (next_xid_given)
-	{
-		printf(_("NextXID:                              %u\n"),
-			   XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTXID);
 
 	if (oldest_xid_given)
 	{
-		printf(_("OldestXID:                            %u\n"),
-			   ControlFile.checkPointCopy.oldestXid);
-		printf(_("OldestXID's DB:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestXidDB);
-	}
-
-	if (next_xid_epoch_given)
-	{
-		printf(_("NextXID epoch:                        %u\n"),
-			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID_DB);
 	}
 
 	if (commit_ts_xids_given)
 	{
-		printf(_("oldestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.oldestCommitTsXid);
-		printf(_("newestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.newestCommitTsXid);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_COMMITTS_XID);
+		simple_oid_list_append(&toprint, CD_CKPT_NEWEST_COMMITTS_XID);
 	}
 
 	if (wal_segsize_given)
-	{
-		printf(_("Bytes per WAL segment:                %u\n"),
-			   ControlFile.xlog_seg_size);
+		simple_oid_list_append(&toprint, CD_WAL_SEGSIZE);
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{															\
+	thislen = internal_wcswidth(_(description),					\
+								strlen(_(description)),			\
+								encoding);						\
+	if (thislen > maxlen)										\
+		maxlen = thislen;										\
 	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
+
+
+	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
+				 newXlogSegNo, WalSegSz);
+
+	/* We print this one inconditionally */
+	{
+		char *str = "First log segment after reset";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%s\n", _(str), maxlen - thislen + 2, " ", fname);
+	}
+
+	/* We print the XID epoch in a degenerate case */
+	if (next_xid_epoch_given)
+	{
+		char *str = "NextXID epoch";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%u\n", _(str), maxlen - thislen + 2, " ",
+			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+
+	}
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{													\
+		int		thisstrlen;								\
+														\
+		thisstrlen = strlen(_(description));			\
+		thislen = internal_wcswidth(_(description),		\
+									thisstrlen,			\
+									encoding);			\
+		printf("%s:%*s" fmt "\n",						\
+			   _(description),							\
+			   maxlen - thislen + 2,					\
+			   " ",										\
+			   __VA_ARGS__);							\
+	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
 }
 
 
-- 
2.47.3


--m4rixdodkhrlzpzv--





^ permalink  raw  reply  [nested|flat] 180+ messages in thread

* [PATCH 2/2] Apply the same technique to PrintNewControlValues too
@ 2026-01-31 15:01 Álvaro Herrera <[email protected]>
  0 siblings, 0 replies; 180+ messages in thread

From: Álvaro Herrera @ 2026-01-31 15:01 UTC (permalink / raw)

---
 src/bin/pg_resetwal/entries.h     |  60 +++++++--------
 src/bin/pg_resetwal/pg_resetwal.c | 121 ++++++++++++++++++++----------
 2 files changed, 110 insertions(+), 71 deletions(-)

diff --git a/src/bin/pg_resetwal/entries.h b/src/bin/pg_resetwal/entries.h
index 6b7686da83a..25f2c49b3a8 100644
--- a/src/bin/pg_resetwal/entries.h
+++ b/src/bin/pg_resetwal/entries.h
@@ -1,62 +1,62 @@
-CONTROLDATA_LINE("pg_control version number",
+CONTROLDATA_LINE(CD_CONTROL_VERSION, "pg_control version number",
 				 "%u", ControlFile.pg_control_version)
-CONTROLDATA_LINE("Catalog version number",
+CONTROLDATA_LINE(CD_CATALOG_VERSION, "Catalog version number",
 				 "%u", ControlFile.catalog_version_no)
-CONTROLDATA_LINE("Database system identifier",
+CONTROLDATA_LINE(CD_SYSTEM_IDENTIFIER, "Database system identifier",
 				 "%" PRIu64, ControlFile.system_identifier)
-CONTROLDATA_LINE("Latest checkpoint's TimeLineID",
+CONTROLDATA_LINE(CD_CKPT_TIMELINE, "Latest checkpoint's TimeLineID",
 				 "%u", ControlFile.checkPointCopy.ThisTimeLineID)
-CONTROLDATA_LINE("Latest checkpoint's full_page_writes",
+CONTROLDATA_LINE(CD_CKPT_FPW, "Latest checkpoint's full_page_writes",
 				 "%s", (ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off")))
-CONTROLDATA_LINE("Latest checkpoint's NextXID",
+CONTROLDATA_LINE(CD_CKPT_NEXTXID, "Latest checkpoint's NextXID",
 				 "%u:%u", EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid), XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid))
-CONTROLDATA_LINE("Latest checkpoint's NextOID",
+CONTROLDATA_LINE(CD_CKPT_NEXTOID, "Latest checkpoint's NextOID",
 				 "%u", ControlFile.checkPointCopy.nextOid)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiXactId",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXID, "Latest checkpoint's NextMultiXactId",
 				 "%u", ControlFile.checkPointCopy.nextMulti)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiOffset",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXOFF, "Latest checkpoint's NextMultiOffset",
 				 "%" PRIu64, ControlFile.checkPointCopy.nextMultiOffset)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID, "Latest checkpoint's oldestXID",
 				 "%u", ControlFile.checkPointCopy.oldestXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID_DB, "Latest checkpoint's oldestXID's DB",
 				 "%u", ControlFile.checkPointCopy.oldestXidDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestActiveXID",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_ACTIVEXID, "Latest checkpoint's oldestActiveXID",
 				 "%u", ControlFile.checkPointCopy.oldestActiveXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestMultiXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI, "Latest checkpoint's oldestMultiXid",
 				 "%u", ControlFile.checkPointCopy.oldestMulti)
-CONTROLDATA_LINE("Latest checkpoint's oldestMulti's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI_DB, "Latest checkpoint's oldestMulti's DB",
 				 "%u", ControlFile.checkPointCopy.oldestMultiDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_COMMITTS_XID, "Latest checkpoint's oldestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.oldestCommitTsXid)
-CONTROLDATA_LINE("Latest checkpoint's newestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_NEWEST_COMMITTS_XID, "Latest checkpoint's newestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.newestCommitTsXid)
-CONTROLDATA_LINE("Maximum data alignment",
+CONTROLDATA_LINE(CD_MAXALIGN, "Maximum data alignment",
 				 "%u", ControlFile.maxAlign)
-CONTROLDATA_LINE("Database block size",
+CONTROLDATA_LINE(CD_BLCKSZ, "Database block size",
 				 "%u", ControlFile.blcksz)
-CONTROLDATA_LINE("Blocks per segment of large relation",
+CONTROLDATA_LINE(CD_RELSEG_SZ, "Blocks per segment of large relation",
 				 "%u", ControlFile.relseg_size)
-CONTROLDATA_LINE("Pages per SLRU segment",
+CONTROLDATA_LINE(CD_SLRU_PPS, "Pages per SLRU segment",
 				 "%u", ControlFile.slru_pages_per_segment)
-CONTROLDATA_LINE("WAL block size",
+CONTROLDATA_LINE(CD_WAL_BLCKSZ, "WAL block size",
 				 "%u", ControlFile.xlog_blcksz)
-CONTROLDATA_LINE("Bytes per WAL segment",
+CONTROLDATA_LINE(CD_WAL_SEGSIZE, "Bytes per WAL segment",
 				 "%u", ControlFile.xlog_seg_size)
-CONTROLDATA_LINE("Maximum length of identifiers",
+CONTROLDATA_LINE(CD_WAL_NAMEDATALEN, "Maximum length of identifiers",
 				 "%u", ControlFile.nameDataLen)
-CONTROLDATA_LINE("Maximum columns in an index",
+CONTROLDATA_LINE(CD_INDEX_MAX_KEYS, "Maximum columns in an index",
 				 "%u", ControlFile.indexMaxKeys)
-CONTROLDATA_LINE("Maximum size of a TOAST chunk",
+CONTROLDATA_LINE(CD_TOAST_MAXCHUNKSZ, "Maximum size of a TOAST chunk",
 				 "%u", ControlFile.toast_max_chunk_size)
-CONTROLDATA_LINE("Size of a large-object chunk",
+CONTROLDATA_LINE(CD_LO_BLKSZ, "Size of a large-object chunk",
 				 "%u", ControlFile.loblksize)
 
 /* This is no longer configurable, but users may still expect to see it: */
-CONTROLDATA_LINE("Date/time type storage",
+CONTROLDATA_LINE(CD_DATETIME_INT64, "Date/time type storage",
 				 "%s", _("64-bit integers"))
-CONTROLDATA_LINE("Float8 argument passing",
+CONTROLDATA_LINE(CD_FLOAT8_ARGS, "Float8 argument passing",
 				 "%s", ControlFile.float8ByVal ? _("by value") : _("by reference"))
-CONTROLDATA_LINE("Data page checksum version",
+CONTROLDATA_LINE(CD_CHECKSUMS, "Data page checksum version",
 				 "%u", ControlFile.data_checksum_version)
-CONTROLDATA_LINE("Default char data signedness",
+CONTROLDATA_LINE(CD_CHAR_SIGNEDNESS, "Default char data signedness",
 				 "%s", ControlFile.default_char_signedness ? _("signed") : _("unsigned"))
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index fb17b6f80e0..23bf1c62183 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -55,6 +55,7 @@
 #include "common/restricted_token.h"
 #include "common/string.h"
 #include "fe_utils/option_utils.h"
+#include "fe_utils/simple_list.h"
 #include "fe_utils/version.h"
 #include "getopt_long.h"
 #include "mb/pg_wchar.h"
@@ -119,6 +120,14 @@ static int	internal_wcswidth(const char *pwcs, size_t len, int encoding);
 static uint32 strtouint32_strict(const char *restrict s, char **restrict endptr, int base);
 static uint64 strtouint64_strict(const char *restrict s, char **restrict endptr, int base);
 
+/* Define the string enums */
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	symbol,
+enum ControldataStrings {
+#include "entries.h"
+};
+#undef CONTROLDATA_LINE
+
 
 int
 main(int argc, char *argv[])
@@ -768,7 +777,7 @@ PrintControlValues(bool guessed)
 	 * First, determine the maximum length of the description of all entries,
 	 * some or all of which might be translated.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	thislen = internal_wcswidth(_(description),			\
 								strlen(_(description)),	\
 								encoding);				\
@@ -781,7 +790,7 @@ PrintControlValues(bool guessed)
 	 * Print each line: the possibly-translated description, then some padding
 	 * spaces according to its display width, then the value.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	{													\
 		int		thisstrlen;								\
 														\
@@ -807,69 +816,99 @@ static void
 PrintNewControlValues(void)
 {
 	char		fname[MAXFNAMELEN];
+	int			encoding = pg_get_encoding_from_locale(NULL, true);
+	SimpleOidList	toprint = {NULL, NULL};
+	int			maxlen = 0;
+	int			thislen;
 
 	/* This will be always printed in order to keep format same. */
 	printf(_("\n\nValues to be changed:\n\n"));
 
-	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
-				 newXlogSegNo, WalSegSz);
-	printf(_("First log segment after reset:        %s\n"), fname);
-
 	if (mxids_given)
 	{
-		printf(_("NextMultiXactId:                      %u\n"),
-			   ControlFile.checkPointCopy.nextMulti);
-		printf(_("OldestMultiXid:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestMulti);
-		printf(_("OldestMulti's DB:                     %u\n"),
-			   ControlFile.checkPointCopy.oldestMultiDB);
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI_DB);
 	}
 
 	if (next_mxoff_given)
-	{
-		printf(_("NextMultiOffset:                      %" PRIu64 "\n"),
-			   ControlFile.checkPointCopy.nextMultiOffset);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXOFF);
 
 	if (next_oid_given)
-	{
-		printf(_("NextOID:                              %u\n"),
-			   ControlFile.checkPointCopy.nextOid);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTOID);
 
 	if (next_xid_given)
-	{
-		printf(_("NextXID:                              %u\n"),
-			   XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTXID);
 
 	if (oldest_xid_given)
 	{
-		printf(_("OldestXID:                            %u\n"),
-			   ControlFile.checkPointCopy.oldestXid);
-		printf(_("OldestXID's DB:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestXidDB);
-	}
-
-	if (next_xid_epoch_given)
-	{
-		printf(_("NextXID epoch:                        %u\n"),
-			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID_DB);
 	}
 
 	if (commit_ts_xids_given)
 	{
-		printf(_("oldestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.oldestCommitTsXid);
-		printf(_("newestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.newestCommitTsXid);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_COMMITTS_XID);
+		simple_oid_list_append(&toprint, CD_CKPT_NEWEST_COMMITTS_XID);
 	}
 
 	if (wal_segsize_given)
-	{
-		printf(_("Bytes per WAL segment:                %u\n"),
-			   ControlFile.xlog_seg_size);
+		simple_oid_list_append(&toprint, CD_WAL_SEGSIZE);
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{															\
+	thislen = internal_wcswidth(_(description),					\
+								strlen(_(description)),			\
+								encoding);						\
+	if (thislen > maxlen)										\
+		maxlen = thislen;										\
 	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
+
+
+	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
+				 newXlogSegNo, WalSegSz);
+
+	/* We print this one inconditionally */
+	{
+		char *str = "First log segment after reset";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%s\n", _(str), maxlen - thislen + 2, " ", fname);
+	}
+
+	/* We print the XID epoch in a degenerate case */
+	if (next_xid_epoch_given)
+	{
+		char *str = "NextXID epoch";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%u\n", _(str), maxlen - thislen + 2, " ",
+			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+
+	}
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{													\
+		int		thisstrlen;								\
+														\
+		thisstrlen = strlen(_(description));			\
+		thislen = internal_wcswidth(_(description),		\
+									thisstrlen,			\
+									encoding);			\
+		printf("%s:%*s" fmt "\n",						\
+			   _(description),							\
+			   maxlen - thislen + 2,					\
+			   " ",										\
+			   __VA_ARGS__);							\
+	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
 }
 
 
-- 
2.47.3


--m4rixdodkhrlzpzv--





^ permalink  raw  reply  [nested|flat] 180+ messages in thread

* [PATCH 2/2] Apply the same technique to PrintNewControlValues too
@ 2026-01-31 15:01 Álvaro Herrera <[email protected]>
  0 siblings, 0 replies; 180+ messages in thread

From: Álvaro Herrera @ 2026-01-31 15:01 UTC (permalink / raw)

---
 src/bin/pg_resetwal/entries.h     |  60 +++++++--------
 src/bin/pg_resetwal/pg_resetwal.c | 121 ++++++++++++++++++++----------
 2 files changed, 110 insertions(+), 71 deletions(-)

diff --git a/src/bin/pg_resetwal/entries.h b/src/bin/pg_resetwal/entries.h
index 6b7686da83a..25f2c49b3a8 100644
--- a/src/bin/pg_resetwal/entries.h
+++ b/src/bin/pg_resetwal/entries.h
@@ -1,62 +1,62 @@
-CONTROLDATA_LINE("pg_control version number",
+CONTROLDATA_LINE(CD_CONTROL_VERSION, "pg_control version number",
 				 "%u", ControlFile.pg_control_version)
-CONTROLDATA_LINE("Catalog version number",
+CONTROLDATA_LINE(CD_CATALOG_VERSION, "Catalog version number",
 				 "%u", ControlFile.catalog_version_no)
-CONTROLDATA_LINE("Database system identifier",
+CONTROLDATA_LINE(CD_SYSTEM_IDENTIFIER, "Database system identifier",
 				 "%" PRIu64, ControlFile.system_identifier)
-CONTROLDATA_LINE("Latest checkpoint's TimeLineID",
+CONTROLDATA_LINE(CD_CKPT_TIMELINE, "Latest checkpoint's TimeLineID",
 				 "%u", ControlFile.checkPointCopy.ThisTimeLineID)
-CONTROLDATA_LINE("Latest checkpoint's full_page_writes",
+CONTROLDATA_LINE(CD_CKPT_FPW, "Latest checkpoint's full_page_writes",
 				 "%s", (ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off")))
-CONTROLDATA_LINE("Latest checkpoint's NextXID",
+CONTROLDATA_LINE(CD_CKPT_NEXTXID, "Latest checkpoint's NextXID",
 				 "%u:%u", EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid), XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid))
-CONTROLDATA_LINE("Latest checkpoint's NextOID",
+CONTROLDATA_LINE(CD_CKPT_NEXTOID, "Latest checkpoint's NextOID",
 				 "%u", ControlFile.checkPointCopy.nextOid)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiXactId",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXID, "Latest checkpoint's NextMultiXactId",
 				 "%u", ControlFile.checkPointCopy.nextMulti)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiOffset",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXOFF, "Latest checkpoint's NextMultiOffset",
 				 "%" PRIu64, ControlFile.checkPointCopy.nextMultiOffset)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID, "Latest checkpoint's oldestXID",
 				 "%u", ControlFile.checkPointCopy.oldestXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID_DB, "Latest checkpoint's oldestXID's DB",
 				 "%u", ControlFile.checkPointCopy.oldestXidDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestActiveXID",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_ACTIVEXID, "Latest checkpoint's oldestActiveXID",
 				 "%u", ControlFile.checkPointCopy.oldestActiveXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestMultiXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI, "Latest checkpoint's oldestMultiXid",
 				 "%u", ControlFile.checkPointCopy.oldestMulti)
-CONTROLDATA_LINE("Latest checkpoint's oldestMulti's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI_DB, "Latest checkpoint's oldestMulti's DB",
 				 "%u", ControlFile.checkPointCopy.oldestMultiDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_COMMITTS_XID, "Latest checkpoint's oldestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.oldestCommitTsXid)
-CONTROLDATA_LINE("Latest checkpoint's newestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_NEWEST_COMMITTS_XID, "Latest checkpoint's newestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.newestCommitTsXid)
-CONTROLDATA_LINE("Maximum data alignment",
+CONTROLDATA_LINE(CD_MAXALIGN, "Maximum data alignment",
 				 "%u", ControlFile.maxAlign)
-CONTROLDATA_LINE("Database block size",
+CONTROLDATA_LINE(CD_BLCKSZ, "Database block size",
 				 "%u", ControlFile.blcksz)
-CONTROLDATA_LINE("Blocks per segment of large relation",
+CONTROLDATA_LINE(CD_RELSEG_SZ, "Blocks per segment of large relation",
 				 "%u", ControlFile.relseg_size)
-CONTROLDATA_LINE("Pages per SLRU segment",
+CONTROLDATA_LINE(CD_SLRU_PPS, "Pages per SLRU segment",
 				 "%u", ControlFile.slru_pages_per_segment)
-CONTROLDATA_LINE("WAL block size",
+CONTROLDATA_LINE(CD_WAL_BLCKSZ, "WAL block size",
 				 "%u", ControlFile.xlog_blcksz)
-CONTROLDATA_LINE("Bytes per WAL segment",
+CONTROLDATA_LINE(CD_WAL_SEGSIZE, "Bytes per WAL segment",
 				 "%u", ControlFile.xlog_seg_size)
-CONTROLDATA_LINE("Maximum length of identifiers",
+CONTROLDATA_LINE(CD_WAL_NAMEDATALEN, "Maximum length of identifiers",
 				 "%u", ControlFile.nameDataLen)
-CONTROLDATA_LINE("Maximum columns in an index",
+CONTROLDATA_LINE(CD_INDEX_MAX_KEYS, "Maximum columns in an index",
 				 "%u", ControlFile.indexMaxKeys)
-CONTROLDATA_LINE("Maximum size of a TOAST chunk",
+CONTROLDATA_LINE(CD_TOAST_MAXCHUNKSZ, "Maximum size of a TOAST chunk",
 				 "%u", ControlFile.toast_max_chunk_size)
-CONTROLDATA_LINE("Size of a large-object chunk",
+CONTROLDATA_LINE(CD_LO_BLKSZ, "Size of a large-object chunk",
 				 "%u", ControlFile.loblksize)
 
 /* This is no longer configurable, but users may still expect to see it: */
-CONTROLDATA_LINE("Date/time type storage",
+CONTROLDATA_LINE(CD_DATETIME_INT64, "Date/time type storage",
 				 "%s", _("64-bit integers"))
-CONTROLDATA_LINE("Float8 argument passing",
+CONTROLDATA_LINE(CD_FLOAT8_ARGS, "Float8 argument passing",
 				 "%s", ControlFile.float8ByVal ? _("by value") : _("by reference"))
-CONTROLDATA_LINE("Data page checksum version",
+CONTROLDATA_LINE(CD_CHECKSUMS, "Data page checksum version",
 				 "%u", ControlFile.data_checksum_version)
-CONTROLDATA_LINE("Default char data signedness",
+CONTROLDATA_LINE(CD_CHAR_SIGNEDNESS, "Default char data signedness",
 				 "%s", ControlFile.default_char_signedness ? _("signed") : _("unsigned"))
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index fb17b6f80e0..23bf1c62183 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -55,6 +55,7 @@
 #include "common/restricted_token.h"
 #include "common/string.h"
 #include "fe_utils/option_utils.h"
+#include "fe_utils/simple_list.h"
 #include "fe_utils/version.h"
 #include "getopt_long.h"
 #include "mb/pg_wchar.h"
@@ -119,6 +120,14 @@ static int	internal_wcswidth(const char *pwcs, size_t len, int encoding);
 static uint32 strtouint32_strict(const char *restrict s, char **restrict endptr, int base);
 static uint64 strtouint64_strict(const char *restrict s, char **restrict endptr, int base);
 
+/* Define the string enums */
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	symbol,
+enum ControldataStrings {
+#include "entries.h"
+};
+#undef CONTROLDATA_LINE
+
 
 int
 main(int argc, char *argv[])
@@ -768,7 +777,7 @@ PrintControlValues(bool guessed)
 	 * First, determine the maximum length of the description of all entries,
 	 * some or all of which might be translated.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	thislen = internal_wcswidth(_(description),			\
 								strlen(_(description)),	\
 								encoding);				\
@@ -781,7 +790,7 @@ PrintControlValues(bool guessed)
 	 * Print each line: the possibly-translated description, then some padding
 	 * spaces according to its display width, then the value.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	{													\
 		int		thisstrlen;								\
 														\
@@ -807,69 +816,99 @@ static void
 PrintNewControlValues(void)
 {
 	char		fname[MAXFNAMELEN];
+	int			encoding = pg_get_encoding_from_locale(NULL, true);
+	SimpleOidList	toprint = {NULL, NULL};
+	int			maxlen = 0;
+	int			thislen;
 
 	/* This will be always printed in order to keep format same. */
 	printf(_("\n\nValues to be changed:\n\n"));
 
-	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
-				 newXlogSegNo, WalSegSz);
-	printf(_("First log segment after reset:        %s\n"), fname);
-
 	if (mxids_given)
 	{
-		printf(_("NextMultiXactId:                      %u\n"),
-			   ControlFile.checkPointCopy.nextMulti);
-		printf(_("OldestMultiXid:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestMulti);
-		printf(_("OldestMulti's DB:                     %u\n"),
-			   ControlFile.checkPointCopy.oldestMultiDB);
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI_DB);
 	}
 
 	if (next_mxoff_given)
-	{
-		printf(_("NextMultiOffset:                      %" PRIu64 "\n"),
-			   ControlFile.checkPointCopy.nextMultiOffset);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXOFF);
 
 	if (next_oid_given)
-	{
-		printf(_("NextOID:                              %u\n"),
-			   ControlFile.checkPointCopy.nextOid);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTOID);
 
 	if (next_xid_given)
-	{
-		printf(_("NextXID:                              %u\n"),
-			   XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTXID);
 
 	if (oldest_xid_given)
 	{
-		printf(_("OldestXID:                            %u\n"),
-			   ControlFile.checkPointCopy.oldestXid);
-		printf(_("OldestXID's DB:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestXidDB);
-	}
-
-	if (next_xid_epoch_given)
-	{
-		printf(_("NextXID epoch:                        %u\n"),
-			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID_DB);
 	}
 
 	if (commit_ts_xids_given)
 	{
-		printf(_("oldestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.oldestCommitTsXid);
-		printf(_("newestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.newestCommitTsXid);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_COMMITTS_XID);
+		simple_oid_list_append(&toprint, CD_CKPT_NEWEST_COMMITTS_XID);
 	}
 
 	if (wal_segsize_given)
-	{
-		printf(_("Bytes per WAL segment:                %u\n"),
-			   ControlFile.xlog_seg_size);
+		simple_oid_list_append(&toprint, CD_WAL_SEGSIZE);
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{															\
+	thislen = internal_wcswidth(_(description),					\
+								strlen(_(description)),			\
+								encoding);						\
+	if (thislen > maxlen)										\
+		maxlen = thislen;										\
 	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
+
+
+	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
+				 newXlogSegNo, WalSegSz);
+
+	/* We print this one inconditionally */
+	{
+		char *str = "First log segment after reset";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%s\n", _(str), maxlen - thislen + 2, " ", fname);
+	}
+
+	/* We print the XID epoch in a degenerate case */
+	if (next_xid_epoch_given)
+	{
+		char *str = "NextXID epoch";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%u\n", _(str), maxlen - thislen + 2, " ",
+			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+
+	}
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{													\
+		int		thisstrlen;								\
+														\
+		thisstrlen = strlen(_(description));			\
+		thislen = internal_wcswidth(_(description),		\
+									thisstrlen,			\
+									encoding);			\
+		printf("%s:%*s" fmt "\n",						\
+			   _(description),							\
+			   maxlen - thislen + 2,					\
+			   " ",										\
+			   __VA_ARGS__);							\
+	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
 }
 
 
-- 
2.47.3


--m4rixdodkhrlzpzv--





^ permalink  raw  reply  [nested|flat] 180+ messages in thread

* [PATCH 2/2] Apply the same technique to PrintNewControlValues too
@ 2026-01-31 15:01 Álvaro Herrera <[email protected]>
  0 siblings, 0 replies; 180+ messages in thread

From: Álvaro Herrera @ 2026-01-31 15:01 UTC (permalink / raw)

---
 src/bin/pg_resetwal/entries.h     |  60 +++++++--------
 src/bin/pg_resetwal/pg_resetwal.c | 121 ++++++++++++++++++++----------
 2 files changed, 110 insertions(+), 71 deletions(-)

diff --git a/src/bin/pg_resetwal/entries.h b/src/bin/pg_resetwal/entries.h
index 6b7686da83a..25f2c49b3a8 100644
--- a/src/bin/pg_resetwal/entries.h
+++ b/src/bin/pg_resetwal/entries.h
@@ -1,62 +1,62 @@
-CONTROLDATA_LINE("pg_control version number",
+CONTROLDATA_LINE(CD_CONTROL_VERSION, "pg_control version number",
 				 "%u", ControlFile.pg_control_version)
-CONTROLDATA_LINE("Catalog version number",
+CONTROLDATA_LINE(CD_CATALOG_VERSION, "Catalog version number",
 				 "%u", ControlFile.catalog_version_no)
-CONTROLDATA_LINE("Database system identifier",
+CONTROLDATA_LINE(CD_SYSTEM_IDENTIFIER, "Database system identifier",
 				 "%" PRIu64, ControlFile.system_identifier)
-CONTROLDATA_LINE("Latest checkpoint's TimeLineID",
+CONTROLDATA_LINE(CD_CKPT_TIMELINE, "Latest checkpoint's TimeLineID",
 				 "%u", ControlFile.checkPointCopy.ThisTimeLineID)
-CONTROLDATA_LINE("Latest checkpoint's full_page_writes",
+CONTROLDATA_LINE(CD_CKPT_FPW, "Latest checkpoint's full_page_writes",
 				 "%s", (ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off")))
-CONTROLDATA_LINE("Latest checkpoint's NextXID",
+CONTROLDATA_LINE(CD_CKPT_NEXTXID, "Latest checkpoint's NextXID",
 				 "%u:%u", EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid), XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid))
-CONTROLDATA_LINE("Latest checkpoint's NextOID",
+CONTROLDATA_LINE(CD_CKPT_NEXTOID, "Latest checkpoint's NextOID",
 				 "%u", ControlFile.checkPointCopy.nextOid)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiXactId",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXID, "Latest checkpoint's NextMultiXactId",
 				 "%u", ControlFile.checkPointCopy.nextMulti)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiOffset",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXOFF, "Latest checkpoint's NextMultiOffset",
 				 "%" PRIu64, ControlFile.checkPointCopy.nextMultiOffset)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID, "Latest checkpoint's oldestXID",
 				 "%u", ControlFile.checkPointCopy.oldestXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID_DB, "Latest checkpoint's oldestXID's DB",
 				 "%u", ControlFile.checkPointCopy.oldestXidDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestActiveXID",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_ACTIVEXID, "Latest checkpoint's oldestActiveXID",
 				 "%u", ControlFile.checkPointCopy.oldestActiveXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestMultiXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI, "Latest checkpoint's oldestMultiXid",
 				 "%u", ControlFile.checkPointCopy.oldestMulti)
-CONTROLDATA_LINE("Latest checkpoint's oldestMulti's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI_DB, "Latest checkpoint's oldestMulti's DB",
 				 "%u", ControlFile.checkPointCopy.oldestMultiDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_COMMITTS_XID, "Latest checkpoint's oldestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.oldestCommitTsXid)
-CONTROLDATA_LINE("Latest checkpoint's newestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_NEWEST_COMMITTS_XID, "Latest checkpoint's newestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.newestCommitTsXid)
-CONTROLDATA_LINE("Maximum data alignment",
+CONTROLDATA_LINE(CD_MAXALIGN, "Maximum data alignment",
 				 "%u", ControlFile.maxAlign)
-CONTROLDATA_LINE("Database block size",
+CONTROLDATA_LINE(CD_BLCKSZ, "Database block size",
 				 "%u", ControlFile.blcksz)
-CONTROLDATA_LINE("Blocks per segment of large relation",
+CONTROLDATA_LINE(CD_RELSEG_SZ, "Blocks per segment of large relation",
 				 "%u", ControlFile.relseg_size)
-CONTROLDATA_LINE("Pages per SLRU segment",
+CONTROLDATA_LINE(CD_SLRU_PPS, "Pages per SLRU segment",
 				 "%u", ControlFile.slru_pages_per_segment)
-CONTROLDATA_LINE("WAL block size",
+CONTROLDATA_LINE(CD_WAL_BLCKSZ, "WAL block size",
 				 "%u", ControlFile.xlog_blcksz)
-CONTROLDATA_LINE("Bytes per WAL segment",
+CONTROLDATA_LINE(CD_WAL_SEGSIZE, "Bytes per WAL segment",
 				 "%u", ControlFile.xlog_seg_size)
-CONTROLDATA_LINE("Maximum length of identifiers",
+CONTROLDATA_LINE(CD_WAL_NAMEDATALEN, "Maximum length of identifiers",
 				 "%u", ControlFile.nameDataLen)
-CONTROLDATA_LINE("Maximum columns in an index",
+CONTROLDATA_LINE(CD_INDEX_MAX_KEYS, "Maximum columns in an index",
 				 "%u", ControlFile.indexMaxKeys)
-CONTROLDATA_LINE("Maximum size of a TOAST chunk",
+CONTROLDATA_LINE(CD_TOAST_MAXCHUNKSZ, "Maximum size of a TOAST chunk",
 				 "%u", ControlFile.toast_max_chunk_size)
-CONTROLDATA_LINE("Size of a large-object chunk",
+CONTROLDATA_LINE(CD_LO_BLKSZ, "Size of a large-object chunk",
 				 "%u", ControlFile.loblksize)
 
 /* This is no longer configurable, but users may still expect to see it: */
-CONTROLDATA_LINE("Date/time type storage",
+CONTROLDATA_LINE(CD_DATETIME_INT64, "Date/time type storage",
 				 "%s", _("64-bit integers"))
-CONTROLDATA_LINE("Float8 argument passing",
+CONTROLDATA_LINE(CD_FLOAT8_ARGS, "Float8 argument passing",
 				 "%s", ControlFile.float8ByVal ? _("by value") : _("by reference"))
-CONTROLDATA_LINE("Data page checksum version",
+CONTROLDATA_LINE(CD_CHECKSUMS, "Data page checksum version",
 				 "%u", ControlFile.data_checksum_version)
-CONTROLDATA_LINE("Default char data signedness",
+CONTROLDATA_LINE(CD_CHAR_SIGNEDNESS, "Default char data signedness",
 				 "%s", ControlFile.default_char_signedness ? _("signed") : _("unsigned"))
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index fb17b6f80e0..23bf1c62183 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -55,6 +55,7 @@
 #include "common/restricted_token.h"
 #include "common/string.h"
 #include "fe_utils/option_utils.h"
+#include "fe_utils/simple_list.h"
 #include "fe_utils/version.h"
 #include "getopt_long.h"
 #include "mb/pg_wchar.h"
@@ -119,6 +120,14 @@ static int	internal_wcswidth(const char *pwcs, size_t len, int encoding);
 static uint32 strtouint32_strict(const char *restrict s, char **restrict endptr, int base);
 static uint64 strtouint64_strict(const char *restrict s, char **restrict endptr, int base);
 
+/* Define the string enums */
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	symbol,
+enum ControldataStrings {
+#include "entries.h"
+};
+#undef CONTROLDATA_LINE
+
 
 int
 main(int argc, char *argv[])
@@ -768,7 +777,7 @@ PrintControlValues(bool guessed)
 	 * First, determine the maximum length of the description of all entries,
 	 * some or all of which might be translated.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	thislen = internal_wcswidth(_(description),			\
 								strlen(_(description)),	\
 								encoding);				\
@@ -781,7 +790,7 @@ PrintControlValues(bool guessed)
 	 * Print each line: the possibly-translated description, then some padding
 	 * spaces according to its display width, then the value.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	{													\
 		int		thisstrlen;								\
 														\
@@ -807,69 +816,99 @@ static void
 PrintNewControlValues(void)
 {
 	char		fname[MAXFNAMELEN];
+	int			encoding = pg_get_encoding_from_locale(NULL, true);
+	SimpleOidList	toprint = {NULL, NULL};
+	int			maxlen = 0;
+	int			thislen;
 
 	/* This will be always printed in order to keep format same. */
 	printf(_("\n\nValues to be changed:\n\n"));
 
-	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
-				 newXlogSegNo, WalSegSz);
-	printf(_("First log segment after reset:        %s\n"), fname);
-
 	if (mxids_given)
 	{
-		printf(_("NextMultiXactId:                      %u\n"),
-			   ControlFile.checkPointCopy.nextMulti);
-		printf(_("OldestMultiXid:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestMulti);
-		printf(_("OldestMulti's DB:                     %u\n"),
-			   ControlFile.checkPointCopy.oldestMultiDB);
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI_DB);
 	}
 
 	if (next_mxoff_given)
-	{
-		printf(_("NextMultiOffset:                      %" PRIu64 "\n"),
-			   ControlFile.checkPointCopy.nextMultiOffset);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXOFF);
 
 	if (next_oid_given)
-	{
-		printf(_("NextOID:                              %u\n"),
-			   ControlFile.checkPointCopy.nextOid);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTOID);
 
 	if (next_xid_given)
-	{
-		printf(_("NextXID:                              %u\n"),
-			   XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTXID);
 
 	if (oldest_xid_given)
 	{
-		printf(_("OldestXID:                            %u\n"),
-			   ControlFile.checkPointCopy.oldestXid);
-		printf(_("OldestXID's DB:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestXidDB);
-	}
-
-	if (next_xid_epoch_given)
-	{
-		printf(_("NextXID epoch:                        %u\n"),
-			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID_DB);
 	}
 
 	if (commit_ts_xids_given)
 	{
-		printf(_("oldestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.oldestCommitTsXid);
-		printf(_("newestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.newestCommitTsXid);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_COMMITTS_XID);
+		simple_oid_list_append(&toprint, CD_CKPT_NEWEST_COMMITTS_XID);
 	}
 
 	if (wal_segsize_given)
-	{
-		printf(_("Bytes per WAL segment:                %u\n"),
-			   ControlFile.xlog_seg_size);
+		simple_oid_list_append(&toprint, CD_WAL_SEGSIZE);
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{															\
+	thislen = internal_wcswidth(_(description),					\
+								strlen(_(description)),			\
+								encoding);						\
+	if (thislen > maxlen)										\
+		maxlen = thislen;										\
 	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
+
+
+	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
+				 newXlogSegNo, WalSegSz);
+
+	/* We print this one inconditionally */
+	{
+		char *str = "First log segment after reset";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%s\n", _(str), maxlen - thislen + 2, " ", fname);
+	}
+
+	/* We print the XID epoch in a degenerate case */
+	if (next_xid_epoch_given)
+	{
+		char *str = "NextXID epoch";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%u\n", _(str), maxlen - thislen + 2, " ",
+			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+
+	}
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{													\
+		int		thisstrlen;								\
+														\
+		thisstrlen = strlen(_(description));			\
+		thislen = internal_wcswidth(_(description),		\
+									thisstrlen,			\
+									encoding);			\
+		printf("%s:%*s" fmt "\n",						\
+			   _(description),							\
+			   maxlen - thislen + 2,					\
+			   " ",										\
+			   __VA_ARGS__);							\
+	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
 }
 
 
-- 
2.47.3


--m4rixdodkhrlzpzv--





^ permalink  raw  reply  [nested|flat] 180+ messages in thread

* [PATCH 2/2] Apply the same technique to PrintNewControlValues too
@ 2026-01-31 15:01 Álvaro Herrera <[email protected]>
  0 siblings, 0 replies; 180+ messages in thread

From: Álvaro Herrera @ 2026-01-31 15:01 UTC (permalink / raw)

---
 src/bin/pg_resetwal/entries.h     |  60 +++++++--------
 src/bin/pg_resetwal/pg_resetwal.c | 121 ++++++++++++++++++++----------
 2 files changed, 110 insertions(+), 71 deletions(-)

diff --git a/src/bin/pg_resetwal/entries.h b/src/bin/pg_resetwal/entries.h
index 6b7686da83a..25f2c49b3a8 100644
--- a/src/bin/pg_resetwal/entries.h
+++ b/src/bin/pg_resetwal/entries.h
@@ -1,62 +1,62 @@
-CONTROLDATA_LINE("pg_control version number",
+CONTROLDATA_LINE(CD_CONTROL_VERSION, "pg_control version number",
 				 "%u", ControlFile.pg_control_version)
-CONTROLDATA_LINE("Catalog version number",
+CONTROLDATA_LINE(CD_CATALOG_VERSION, "Catalog version number",
 				 "%u", ControlFile.catalog_version_no)
-CONTROLDATA_LINE("Database system identifier",
+CONTROLDATA_LINE(CD_SYSTEM_IDENTIFIER, "Database system identifier",
 				 "%" PRIu64, ControlFile.system_identifier)
-CONTROLDATA_LINE("Latest checkpoint's TimeLineID",
+CONTROLDATA_LINE(CD_CKPT_TIMELINE, "Latest checkpoint's TimeLineID",
 				 "%u", ControlFile.checkPointCopy.ThisTimeLineID)
-CONTROLDATA_LINE("Latest checkpoint's full_page_writes",
+CONTROLDATA_LINE(CD_CKPT_FPW, "Latest checkpoint's full_page_writes",
 				 "%s", (ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off")))
-CONTROLDATA_LINE("Latest checkpoint's NextXID",
+CONTROLDATA_LINE(CD_CKPT_NEXTXID, "Latest checkpoint's NextXID",
 				 "%u:%u", EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid), XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid))
-CONTROLDATA_LINE("Latest checkpoint's NextOID",
+CONTROLDATA_LINE(CD_CKPT_NEXTOID, "Latest checkpoint's NextOID",
 				 "%u", ControlFile.checkPointCopy.nextOid)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiXactId",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXID, "Latest checkpoint's NextMultiXactId",
 				 "%u", ControlFile.checkPointCopy.nextMulti)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiOffset",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXOFF, "Latest checkpoint's NextMultiOffset",
 				 "%" PRIu64, ControlFile.checkPointCopy.nextMultiOffset)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID, "Latest checkpoint's oldestXID",
 				 "%u", ControlFile.checkPointCopy.oldestXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID_DB, "Latest checkpoint's oldestXID's DB",
 				 "%u", ControlFile.checkPointCopy.oldestXidDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestActiveXID",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_ACTIVEXID, "Latest checkpoint's oldestActiveXID",
 				 "%u", ControlFile.checkPointCopy.oldestActiveXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestMultiXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI, "Latest checkpoint's oldestMultiXid",
 				 "%u", ControlFile.checkPointCopy.oldestMulti)
-CONTROLDATA_LINE("Latest checkpoint's oldestMulti's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI_DB, "Latest checkpoint's oldestMulti's DB",
 				 "%u", ControlFile.checkPointCopy.oldestMultiDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_COMMITTS_XID, "Latest checkpoint's oldestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.oldestCommitTsXid)
-CONTROLDATA_LINE("Latest checkpoint's newestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_NEWEST_COMMITTS_XID, "Latest checkpoint's newestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.newestCommitTsXid)
-CONTROLDATA_LINE("Maximum data alignment",
+CONTROLDATA_LINE(CD_MAXALIGN, "Maximum data alignment",
 				 "%u", ControlFile.maxAlign)
-CONTROLDATA_LINE("Database block size",
+CONTROLDATA_LINE(CD_BLCKSZ, "Database block size",
 				 "%u", ControlFile.blcksz)
-CONTROLDATA_LINE("Blocks per segment of large relation",
+CONTROLDATA_LINE(CD_RELSEG_SZ, "Blocks per segment of large relation",
 				 "%u", ControlFile.relseg_size)
-CONTROLDATA_LINE("Pages per SLRU segment",
+CONTROLDATA_LINE(CD_SLRU_PPS, "Pages per SLRU segment",
 				 "%u", ControlFile.slru_pages_per_segment)
-CONTROLDATA_LINE("WAL block size",
+CONTROLDATA_LINE(CD_WAL_BLCKSZ, "WAL block size",
 				 "%u", ControlFile.xlog_blcksz)
-CONTROLDATA_LINE("Bytes per WAL segment",
+CONTROLDATA_LINE(CD_WAL_SEGSIZE, "Bytes per WAL segment",
 				 "%u", ControlFile.xlog_seg_size)
-CONTROLDATA_LINE("Maximum length of identifiers",
+CONTROLDATA_LINE(CD_WAL_NAMEDATALEN, "Maximum length of identifiers",
 				 "%u", ControlFile.nameDataLen)
-CONTROLDATA_LINE("Maximum columns in an index",
+CONTROLDATA_LINE(CD_INDEX_MAX_KEYS, "Maximum columns in an index",
 				 "%u", ControlFile.indexMaxKeys)
-CONTROLDATA_LINE("Maximum size of a TOAST chunk",
+CONTROLDATA_LINE(CD_TOAST_MAXCHUNKSZ, "Maximum size of a TOAST chunk",
 				 "%u", ControlFile.toast_max_chunk_size)
-CONTROLDATA_LINE("Size of a large-object chunk",
+CONTROLDATA_LINE(CD_LO_BLKSZ, "Size of a large-object chunk",
 				 "%u", ControlFile.loblksize)
 
 /* This is no longer configurable, but users may still expect to see it: */
-CONTROLDATA_LINE("Date/time type storage",
+CONTROLDATA_LINE(CD_DATETIME_INT64, "Date/time type storage",
 				 "%s", _("64-bit integers"))
-CONTROLDATA_LINE("Float8 argument passing",
+CONTROLDATA_LINE(CD_FLOAT8_ARGS, "Float8 argument passing",
 				 "%s", ControlFile.float8ByVal ? _("by value") : _("by reference"))
-CONTROLDATA_LINE("Data page checksum version",
+CONTROLDATA_LINE(CD_CHECKSUMS, "Data page checksum version",
 				 "%u", ControlFile.data_checksum_version)
-CONTROLDATA_LINE("Default char data signedness",
+CONTROLDATA_LINE(CD_CHAR_SIGNEDNESS, "Default char data signedness",
 				 "%s", ControlFile.default_char_signedness ? _("signed") : _("unsigned"))
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index fb17b6f80e0..23bf1c62183 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -55,6 +55,7 @@
 #include "common/restricted_token.h"
 #include "common/string.h"
 #include "fe_utils/option_utils.h"
+#include "fe_utils/simple_list.h"
 #include "fe_utils/version.h"
 #include "getopt_long.h"
 #include "mb/pg_wchar.h"
@@ -119,6 +120,14 @@ static int	internal_wcswidth(const char *pwcs, size_t len, int encoding);
 static uint32 strtouint32_strict(const char *restrict s, char **restrict endptr, int base);
 static uint64 strtouint64_strict(const char *restrict s, char **restrict endptr, int base);
 
+/* Define the string enums */
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	symbol,
+enum ControldataStrings {
+#include "entries.h"
+};
+#undef CONTROLDATA_LINE
+
 
 int
 main(int argc, char *argv[])
@@ -768,7 +777,7 @@ PrintControlValues(bool guessed)
 	 * First, determine the maximum length of the description of all entries,
 	 * some or all of which might be translated.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	thislen = internal_wcswidth(_(description),			\
 								strlen(_(description)),	\
 								encoding);				\
@@ -781,7 +790,7 @@ PrintControlValues(bool guessed)
 	 * Print each line: the possibly-translated description, then some padding
 	 * spaces according to its display width, then the value.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	{													\
 		int		thisstrlen;								\
 														\
@@ -807,69 +816,99 @@ static void
 PrintNewControlValues(void)
 {
 	char		fname[MAXFNAMELEN];
+	int			encoding = pg_get_encoding_from_locale(NULL, true);
+	SimpleOidList	toprint = {NULL, NULL};
+	int			maxlen = 0;
+	int			thislen;
 
 	/* This will be always printed in order to keep format same. */
 	printf(_("\n\nValues to be changed:\n\n"));
 
-	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
-				 newXlogSegNo, WalSegSz);
-	printf(_("First log segment after reset:        %s\n"), fname);
-
 	if (mxids_given)
 	{
-		printf(_("NextMultiXactId:                      %u\n"),
-			   ControlFile.checkPointCopy.nextMulti);
-		printf(_("OldestMultiXid:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestMulti);
-		printf(_("OldestMulti's DB:                     %u\n"),
-			   ControlFile.checkPointCopy.oldestMultiDB);
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI_DB);
 	}
 
 	if (next_mxoff_given)
-	{
-		printf(_("NextMultiOffset:                      %" PRIu64 "\n"),
-			   ControlFile.checkPointCopy.nextMultiOffset);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXOFF);
 
 	if (next_oid_given)
-	{
-		printf(_("NextOID:                              %u\n"),
-			   ControlFile.checkPointCopy.nextOid);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTOID);
 
 	if (next_xid_given)
-	{
-		printf(_("NextXID:                              %u\n"),
-			   XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTXID);
 
 	if (oldest_xid_given)
 	{
-		printf(_("OldestXID:                            %u\n"),
-			   ControlFile.checkPointCopy.oldestXid);
-		printf(_("OldestXID's DB:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestXidDB);
-	}
-
-	if (next_xid_epoch_given)
-	{
-		printf(_("NextXID epoch:                        %u\n"),
-			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID_DB);
 	}
 
 	if (commit_ts_xids_given)
 	{
-		printf(_("oldestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.oldestCommitTsXid);
-		printf(_("newestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.newestCommitTsXid);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_COMMITTS_XID);
+		simple_oid_list_append(&toprint, CD_CKPT_NEWEST_COMMITTS_XID);
 	}
 
 	if (wal_segsize_given)
-	{
-		printf(_("Bytes per WAL segment:                %u\n"),
-			   ControlFile.xlog_seg_size);
+		simple_oid_list_append(&toprint, CD_WAL_SEGSIZE);
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{															\
+	thislen = internal_wcswidth(_(description),					\
+								strlen(_(description)),			\
+								encoding);						\
+	if (thislen > maxlen)										\
+		maxlen = thislen;										\
 	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
+
+
+	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
+				 newXlogSegNo, WalSegSz);
+
+	/* We print this one inconditionally */
+	{
+		char *str = "First log segment after reset";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%s\n", _(str), maxlen - thislen + 2, " ", fname);
+	}
+
+	/* We print the XID epoch in a degenerate case */
+	if (next_xid_epoch_given)
+	{
+		char *str = "NextXID epoch";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%u\n", _(str), maxlen - thislen + 2, " ",
+			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+
+	}
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{													\
+		int		thisstrlen;								\
+														\
+		thisstrlen = strlen(_(description));			\
+		thislen = internal_wcswidth(_(description),		\
+									thisstrlen,			\
+									encoding);			\
+		printf("%s:%*s" fmt "\n",						\
+			   _(description),							\
+			   maxlen - thislen + 2,					\
+			   " ",										\
+			   __VA_ARGS__);							\
+	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
 }
 
 
-- 
2.47.3


--m4rixdodkhrlzpzv--





^ permalink  raw  reply  [nested|flat] 180+ messages in thread

* [PATCH 2/2] Apply the same technique to PrintNewControlValues too
@ 2026-01-31 15:01 Álvaro Herrera <[email protected]>
  0 siblings, 0 replies; 180+ messages in thread

From: Álvaro Herrera @ 2026-01-31 15:01 UTC (permalink / raw)

---
 src/bin/pg_resetwal/entries.h     |  60 +++++++--------
 src/bin/pg_resetwal/pg_resetwal.c | 121 ++++++++++++++++++++----------
 2 files changed, 110 insertions(+), 71 deletions(-)

diff --git a/src/bin/pg_resetwal/entries.h b/src/bin/pg_resetwal/entries.h
index 6b7686da83a..25f2c49b3a8 100644
--- a/src/bin/pg_resetwal/entries.h
+++ b/src/bin/pg_resetwal/entries.h
@@ -1,62 +1,62 @@
-CONTROLDATA_LINE("pg_control version number",
+CONTROLDATA_LINE(CD_CONTROL_VERSION, "pg_control version number",
 				 "%u", ControlFile.pg_control_version)
-CONTROLDATA_LINE("Catalog version number",
+CONTROLDATA_LINE(CD_CATALOG_VERSION, "Catalog version number",
 				 "%u", ControlFile.catalog_version_no)
-CONTROLDATA_LINE("Database system identifier",
+CONTROLDATA_LINE(CD_SYSTEM_IDENTIFIER, "Database system identifier",
 				 "%" PRIu64, ControlFile.system_identifier)
-CONTROLDATA_LINE("Latest checkpoint's TimeLineID",
+CONTROLDATA_LINE(CD_CKPT_TIMELINE, "Latest checkpoint's TimeLineID",
 				 "%u", ControlFile.checkPointCopy.ThisTimeLineID)
-CONTROLDATA_LINE("Latest checkpoint's full_page_writes",
+CONTROLDATA_LINE(CD_CKPT_FPW, "Latest checkpoint's full_page_writes",
 				 "%s", (ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off")))
-CONTROLDATA_LINE("Latest checkpoint's NextXID",
+CONTROLDATA_LINE(CD_CKPT_NEXTXID, "Latest checkpoint's NextXID",
 				 "%u:%u", EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid), XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid))
-CONTROLDATA_LINE("Latest checkpoint's NextOID",
+CONTROLDATA_LINE(CD_CKPT_NEXTOID, "Latest checkpoint's NextOID",
 				 "%u", ControlFile.checkPointCopy.nextOid)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiXactId",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXID, "Latest checkpoint's NextMultiXactId",
 				 "%u", ControlFile.checkPointCopy.nextMulti)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiOffset",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXOFF, "Latest checkpoint's NextMultiOffset",
 				 "%" PRIu64, ControlFile.checkPointCopy.nextMultiOffset)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID, "Latest checkpoint's oldestXID",
 				 "%u", ControlFile.checkPointCopy.oldestXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID_DB, "Latest checkpoint's oldestXID's DB",
 				 "%u", ControlFile.checkPointCopy.oldestXidDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestActiveXID",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_ACTIVEXID, "Latest checkpoint's oldestActiveXID",
 				 "%u", ControlFile.checkPointCopy.oldestActiveXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestMultiXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI, "Latest checkpoint's oldestMultiXid",
 				 "%u", ControlFile.checkPointCopy.oldestMulti)
-CONTROLDATA_LINE("Latest checkpoint's oldestMulti's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI_DB, "Latest checkpoint's oldestMulti's DB",
 				 "%u", ControlFile.checkPointCopy.oldestMultiDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_COMMITTS_XID, "Latest checkpoint's oldestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.oldestCommitTsXid)
-CONTROLDATA_LINE("Latest checkpoint's newestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_NEWEST_COMMITTS_XID, "Latest checkpoint's newestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.newestCommitTsXid)
-CONTROLDATA_LINE("Maximum data alignment",
+CONTROLDATA_LINE(CD_MAXALIGN, "Maximum data alignment",
 				 "%u", ControlFile.maxAlign)
-CONTROLDATA_LINE("Database block size",
+CONTROLDATA_LINE(CD_BLCKSZ, "Database block size",
 				 "%u", ControlFile.blcksz)
-CONTROLDATA_LINE("Blocks per segment of large relation",
+CONTROLDATA_LINE(CD_RELSEG_SZ, "Blocks per segment of large relation",
 				 "%u", ControlFile.relseg_size)
-CONTROLDATA_LINE("Pages per SLRU segment",
+CONTROLDATA_LINE(CD_SLRU_PPS, "Pages per SLRU segment",
 				 "%u", ControlFile.slru_pages_per_segment)
-CONTROLDATA_LINE("WAL block size",
+CONTROLDATA_LINE(CD_WAL_BLCKSZ, "WAL block size",
 				 "%u", ControlFile.xlog_blcksz)
-CONTROLDATA_LINE("Bytes per WAL segment",
+CONTROLDATA_LINE(CD_WAL_SEGSIZE, "Bytes per WAL segment",
 				 "%u", ControlFile.xlog_seg_size)
-CONTROLDATA_LINE("Maximum length of identifiers",
+CONTROLDATA_LINE(CD_WAL_NAMEDATALEN, "Maximum length of identifiers",
 				 "%u", ControlFile.nameDataLen)
-CONTROLDATA_LINE("Maximum columns in an index",
+CONTROLDATA_LINE(CD_INDEX_MAX_KEYS, "Maximum columns in an index",
 				 "%u", ControlFile.indexMaxKeys)
-CONTROLDATA_LINE("Maximum size of a TOAST chunk",
+CONTROLDATA_LINE(CD_TOAST_MAXCHUNKSZ, "Maximum size of a TOAST chunk",
 				 "%u", ControlFile.toast_max_chunk_size)
-CONTROLDATA_LINE("Size of a large-object chunk",
+CONTROLDATA_LINE(CD_LO_BLKSZ, "Size of a large-object chunk",
 				 "%u", ControlFile.loblksize)
 
 /* This is no longer configurable, but users may still expect to see it: */
-CONTROLDATA_LINE("Date/time type storage",
+CONTROLDATA_LINE(CD_DATETIME_INT64, "Date/time type storage",
 				 "%s", _("64-bit integers"))
-CONTROLDATA_LINE("Float8 argument passing",
+CONTROLDATA_LINE(CD_FLOAT8_ARGS, "Float8 argument passing",
 				 "%s", ControlFile.float8ByVal ? _("by value") : _("by reference"))
-CONTROLDATA_LINE("Data page checksum version",
+CONTROLDATA_LINE(CD_CHECKSUMS, "Data page checksum version",
 				 "%u", ControlFile.data_checksum_version)
-CONTROLDATA_LINE("Default char data signedness",
+CONTROLDATA_LINE(CD_CHAR_SIGNEDNESS, "Default char data signedness",
 				 "%s", ControlFile.default_char_signedness ? _("signed") : _("unsigned"))
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index fb17b6f80e0..23bf1c62183 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -55,6 +55,7 @@
 #include "common/restricted_token.h"
 #include "common/string.h"
 #include "fe_utils/option_utils.h"
+#include "fe_utils/simple_list.h"
 #include "fe_utils/version.h"
 #include "getopt_long.h"
 #include "mb/pg_wchar.h"
@@ -119,6 +120,14 @@ static int	internal_wcswidth(const char *pwcs, size_t len, int encoding);
 static uint32 strtouint32_strict(const char *restrict s, char **restrict endptr, int base);
 static uint64 strtouint64_strict(const char *restrict s, char **restrict endptr, int base);
 
+/* Define the string enums */
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	symbol,
+enum ControldataStrings {
+#include "entries.h"
+};
+#undef CONTROLDATA_LINE
+
 
 int
 main(int argc, char *argv[])
@@ -768,7 +777,7 @@ PrintControlValues(bool guessed)
 	 * First, determine the maximum length of the description of all entries,
 	 * some or all of which might be translated.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	thislen = internal_wcswidth(_(description),			\
 								strlen(_(description)),	\
 								encoding);				\
@@ -781,7 +790,7 @@ PrintControlValues(bool guessed)
 	 * Print each line: the possibly-translated description, then some padding
 	 * spaces according to its display width, then the value.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	{													\
 		int		thisstrlen;								\
 														\
@@ -807,69 +816,99 @@ static void
 PrintNewControlValues(void)
 {
 	char		fname[MAXFNAMELEN];
+	int			encoding = pg_get_encoding_from_locale(NULL, true);
+	SimpleOidList	toprint = {NULL, NULL};
+	int			maxlen = 0;
+	int			thislen;
 
 	/* This will be always printed in order to keep format same. */
 	printf(_("\n\nValues to be changed:\n\n"));
 
-	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
-				 newXlogSegNo, WalSegSz);
-	printf(_("First log segment after reset:        %s\n"), fname);
-
 	if (mxids_given)
 	{
-		printf(_("NextMultiXactId:                      %u\n"),
-			   ControlFile.checkPointCopy.nextMulti);
-		printf(_("OldestMultiXid:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestMulti);
-		printf(_("OldestMulti's DB:                     %u\n"),
-			   ControlFile.checkPointCopy.oldestMultiDB);
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI_DB);
 	}
 
 	if (next_mxoff_given)
-	{
-		printf(_("NextMultiOffset:                      %" PRIu64 "\n"),
-			   ControlFile.checkPointCopy.nextMultiOffset);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXOFF);
 
 	if (next_oid_given)
-	{
-		printf(_("NextOID:                              %u\n"),
-			   ControlFile.checkPointCopy.nextOid);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTOID);
 
 	if (next_xid_given)
-	{
-		printf(_("NextXID:                              %u\n"),
-			   XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTXID);
 
 	if (oldest_xid_given)
 	{
-		printf(_("OldestXID:                            %u\n"),
-			   ControlFile.checkPointCopy.oldestXid);
-		printf(_("OldestXID's DB:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestXidDB);
-	}
-
-	if (next_xid_epoch_given)
-	{
-		printf(_("NextXID epoch:                        %u\n"),
-			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID_DB);
 	}
 
 	if (commit_ts_xids_given)
 	{
-		printf(_("oldestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.oldestCommitTsXid);
-		printf(_("newestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.newestCommitTsXid);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_COMMITTS_XID);
+		simple_oid_list_append(&toprint, CD_CKPT_NEWEST_COMMITTS_XID);
 	}
 
 	if (wal_segsize_given)
-	{
-		printf(_("Bytes per WAL segment:                %u\n"),
-			   ControlFile.xlog_seg_size);
+		simple_oid_list_append(&toprint, CD_WAL_SEGSIZE);
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{															\
+	thislen = internal_wcswidth(_(description),					\
+								strlen(_(description)),			\
+								encoding);						\
+	if (thislen > maxlen)										\
+		maxlen = thislen;										\
 	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
+
+
+	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
+				 newXlogSegNo, WalSegSz);
+
+	/* We print this one inconditionally */
+	{
+		char *str = "First log segment after reset";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%s\n", _(str), maxlen - thislen + 2, " ", fname);
+	}
+
+	/* We print the XID epoch in a degenerate case */
+	if (next_xid_epoch_given)
+	{
+		char *str = "NextXID epoch";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%u\n", _(str), maxlen - thislen + 2, " ",
+			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+
+	}
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{													\
+		int		thisstrlen;								\
+														\
+		thisstrlen = strlen(_(description));			\
+		thislen = internal_wcswidth(_(description),		\
+									thisstrlen,			\
+									encoding);			\
+		printf("%s:%*s" fmt "\n",						\
+			   _(description),							\
+			   maxlen - thislen + 2,					\
+			   " ",										\
+			   __VA_ARGS__);							\
+	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
 }
 
 
-- 
2.47.3


--m4rixdodkhrlzpzv--





^ permalink  raw  reply  [nested|flat] 180+ messages in thread

* [PATCH 2/2] Apply the same technique to PrintNewControlValues too
@ 2026-01-31 15:01 Álvaro Herrera <[email protected]>
  0 siblings, 0 replies; 180+ messages in thread

From: Álvaro Herrera @ 2026-01-31 15:01 UTC (permalink / raw)

---
 src/bin/pg_resetwal/entries.h     |  60 +++++++--------
 src/bin/pg_resetwal/pg_resetwal.c | 121 ++++++++++++++++++++----------
 2 files changed, 110 insertions(+), 71 deletions(-)

diff --git a/src/bin/pg_resetwal/entries.h b/src/bin/pg_resetwal/entries.h
index 6b7686da83a..25f2c49b3a8 100644
--- a/src/bin/pg_resetwal/entries.h
+++ b/src/bin/pg_resetwal/entries.h
@@ -1,62 +1,62 @@
-CONTROLDATA_LINE("pg_control version number",
+CONTROLDATA_LINE(CD_CONTROL_VERSION, "pg_control version number",
 				 "%u", ControlFile.pg_control_version)
-CONTROLDATA_LINE("Catalog version number",
+CONTROLDATA_LINE(CD_CATALOG_VERSION, "Catalog version number",
 				 "%u", ControlFile.catalog_version_no)
-CONTROLDATA_LINE("Database system identifier",
+CONTROLDATA_LINE(CD_SYSTEM_IDENTIFIER, "Database system identifier",
 				 "%" PRIu64, ControlFile.system_identifier)
-CONTROLDATA_LINE("Latest checkpoint's TimeLineID",
+CONTROLDATA_LINE(CD_CKPT_TIMELINE, "Latest checkpoint's TimeLineID",
 				 "%u", ControlFile.checkPointCopy.ThisTimeLineID)
-CONTROLDATA_LINE("Latest checkpoint's full_page_writes",
+CONTROLDATA_LINE(CD_CKPT_FPW, "Latest checkpoint's full_page_writes",
 				 "%s", (ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off")))
-CONTROLDATA_LINE("Latest checkpoint's NextXID",
+CONTROLDATA_LINE(CD_CKPT_NEXTXID, "Latest checkpoint's NextXID",
 				 "%u:%u", EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid), XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid))
-CONTROLDATA_LINE("Latest checkpoint's NextOID",
+CONTROLDATA_LINE(CD_CKPT_NEXTOID, "Latest checkpoint's NextOID",
 				 "%u", ControlFile.checkPointCopy.nextOid)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiXactId",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXID, "Latest checkpoint's NextMultiXactId",
 				 "%u", ControlFile.checkPointCopy.nextMulti)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiOffset",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXOFF, "Latest checkpoint's NextMultiOffset",
 				 "%" PRIu64, ControlFile.checkPointCopy.nextMultiOffset)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID, "Latest checkpoint's oldestXID",
 				 "%u", ControlFile.checkPointCopy.oldestXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID_DB, "Latest checkpoint's oldestXID's DB",
 				 "%u", ControlFile.checkPointCopy.oldestXidDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestActiveXID",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_ACTIVEXID, "Latest checkpoint's oldestActiveXID",
 				 "%u", ControlFile.checkPointCopy.oldestActiveXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestMultiXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI, "Latest checkpoint's oldestMultiXid",
 				 "%u", ControlFile.checkPointCopy.oldestMulti)
-CONTROLDATA_LINE("Latest checkpoint's oldestMulti's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI_DB, "Latest checkpoint's oldestMulti's DB",
 				 "%u", ControlFile.checkPointCopy.oldestMultiDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_COMMITTS_XID, "Latest checkpoint's oldestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.oldestCommitTsXid)
-CONTROLDATA_LINE("Latest checkpoint's newestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_NEWEST_COMMITTS_XID, "Latest checkpoint's newestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.newestCommitTsXid)
-CONTROLDATA_LINE("Maximum data alignment",
+CONTROLDATA_LINE(CD_MAXALIGN, "Maximum data alignment",
 				 "%u", ControlFile.maxAlign)
-CONTROLDATA_LINE("Database block size",
+CONTROLDATA_LINE(CD_BLCKSZ, "Database block size",
 				 "%u", ControlFile.blcksz)
-CONTROLDATA_LINE("Blocks per segment of large relation",
+CONTROLDATA_LINE(CD_RELSEG_SZ, "Blocks per segment of large relation",
 				 "%u", ControlFile.relseg_size)
-CONTROLDATA_LINE("Pages per SLRU segment",
+CONTROLDATA_LINE(CD_SLRU_PPS, "Pages per SLRU segment",
 				 "%u", ControlFile.slru_pages_per_segment)
-CONTROLDATA_LINE("WAL block size",
+CONTROLDATA_LINE(CD_WAL_BLCKSZ, "WAL block size",
 				 "%u", ControlFile.xlog_blcksz)
-CONTROLDATA_LINE("Bytes per WAL segment",
+CONTROLDATA_LINE(CD_WAL_SEGSIZE, "Bytes per WAL segment",
 				 "%u", ControlFile.xlog_seg_size)
-CONTROLDATA_LINE("Maximum length of identifiers",
+CONTROLDATA_LINE(CD_WAL_NAMEDATALEN, "Maximum length of identifiers",
 				 "%u", ControlFile.nameDataLen)
-CONTROLDATA_LINE("Maximum columns in an index",
+CONTROLDATA_LINE(CD_INDEX_MAX_KEYS, "Maximum columns in an index",
 				 "%u", ControlFile.indexMaxKeys)
-CONTROLDATA_LINE("Maximum size of a TOAST chunk",
+CONTROLDATA_LINE(CD_TOAST_MAXCHUNKSZ, "Maximum size of a TOAST chunk",
 				 "%u", ControlFile.toast_max_chunk_size)
-CONTROLDATA_LINE("Size of a large-object chunk",
+CONTROLDATA_LINE(CD_LO_BLKSZ, "Size of a large-object chunk",
 				 "%u", ControlFile.loblksize)
 
 /* This is no longer configurable, but users may still expect to see it: */
-CONTROLDATA_LINE("Date/time type storage",
+CONTROLDATA_LINE(CD_DATETIME_INT64, "Date/time type storage",
 				 "%s", _("64-bit integers"))
-CONTROLDATA_LINE("Float8 argument passing",
+CONTROLDATA_LINE(CD_FLOAT8_ARGS, "Float8 argument passing",
 				 "%s", ControlFile.float8ByVal ? _("by value") : _("by reference"))
-CONTROLDATA_LINE("Data page checksum version",
+CONTROLDATA_LINE(CD_CHECKSUMS, "Data page checksum version",
 				 "%u", ControlFile.data_checksum_version)
-CONTROLDATA_LINE("Default char data signedness",
+CONTROLDATA_LINE(CD_CHAR_SIGNEDNESS, "Default char data signedness",
 				 "%s", ControlFile.default_char_signedness ? _("signed") : _("unsigned"))
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index fb17b6f80e0..23bf1c62183 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -55,6 +55,7 @@
 #include "common/restricted_token.h"
 #include "common/string.h"
 #include "fe_utils/option_utils.h"
+#include "fe_utils/simple_list.h"
 #include "fe_utils/version.h"
 #include "getopt_long.h"
 #include "mb/pg_wchar.h"
@@ -119,6 +120,14 @@ static int	internal_wcswidth(const char *pwcs, size_t len, int encoding);
 static uint32 strtouint32_strict(const char *restrict s, char **restrict endptr, int base);
 static uint64 strtouint64_strict(const char *restrict s, char **restrict endptr, int base);
 
+/* Define the string enums */
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	symbol,
+enum ControldataStrings {
+#include "entries.h"
+};
+#undef CONTROLDATA_LINE
+
 
 int
 main(int argc, char *argv[])
@@ -768,7 +777,7 @@ PrintControlValues(bool guessed)
 	 * First, determine the maximum length of the description of all entries,
 	 * some or all of which might be translated.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	thislen = internal_wcswidth(_(description),			\
 								strlen(_(description)),	\
 								encoding);				\
@@ -781,7 +790,7 @@ PrintControlValues(bool guessed)
 	 * Print each line: the possibly-translated description, then some padding
 	 * spaces according to its display width, then the value.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	{													\
 		int		thisstrlen;								\
 														\
@@ -807,69 +816,99 @@ static void
 PrintNewControlValues(void)
 {
 	char		fname[MAXFNAMELEN];
+	int			encoding = pg_get_encoding_from_locale(NULL, true);
+	SimpleOidList	toprint = {NULL, NULL};
+	int			maxlen = 0;
+	int			thislen;
 
 	/* This will be always printed in order to keep format same. */
 	printf(_("\n\nValues to be changed:\n\n"));
 
-	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
-				 newXlogSegNo, WalSegSz);
-	printf(_("First log segment after reset:        %s\n"), fname);
-
 	if (mxids_given)
 	{
-		printf(_("NextMultiXactId:                      %u\n"),
-			   ControlFile.checkPointCopy.nextMulti);
-		printf(_("OldestMultiXid:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestMulti);
-		printf(_("OldestMulti's DB:                     %u\n"),
-			   ControlFile.checkPointCopy.oldestMultiDB);
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI_DB);
 	}
 
 	if (next_mxoff_given)
-	{
-		printf(_("NextMultiOffset:                      %" PRIu64 "\n"),
-			   ControlFile.checkPointCopy.nextMultiOffset);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXOFF);
 
 	if (next_oid_given)
-	{
-		printf(_("NextOID:                              %u\n"),
-			   ControlFile.checkPointCopy.nextOid);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTOID);
 
 	if (next_xid_given)
-	{
-		printf(_("NextXID:                              %u\n"),
-			   XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTXID);
 
 	if (oldest_xid_given)
 	{
-		printf(_("OldestXID:                            %u\n"),
-			   ControlFile.checkPointCopy.oldestXid);
-		printf(_("OldestXID's DB:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestXidDB);
-	}
-
-	if (next_xid_epoch_given)
-	{
-		printf(_("NextXID epoch:                        %u\n"),
-			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID_DB);
 	}
 
 	if (commit_ts_xids_given)
 	{
-		printf(_("oldestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.oldestCommitTsXid);
-		printf(_("newestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.newestCommitTsXid);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_COMMITTS_XID);
+		simple_oid_list_append(&toprint, CD_CKPT_NEWEST_COMMITTS_XID);
 	}
 
 	if (wal_segsize_given)
-	{
-		printf(_("Bytes per WAL segment:                %u\n"),
-			   ControlFile.xlog_seg_size);
+		simple_oid_list_append(&toprint, CD_WAL_SEGSIZE);
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{															\
+	thislen = internal_wcswidth(_(description),					\
+								strlen(_(description)),			\
+								encoding);						\
+	if (thislen > maxlen)										\
+		maxlen = thislen;										\
 	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
+
+
+	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
+				 newXlogSegNo, WalSegSz);
+
+	/* We print this one inconditionally */
+	{
+		char *str = "First log segment after reset";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%s\n", _(str), maxlen - thislen + 2, " ", fname);
+	}
+
+	/* We print the XID epoch in a degenerate case */
+	if (next_xid_epoch_given)
+	{
+		char *str = "NextXID epoch";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%u\n", _(str), maxlen - thislen + 2, " ",
+			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+
+	}
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{													\
+		int		thisstrlen;								\
+														\
+		thisstrlen = strlen(_(description));			\
+		thislen = internal_wcswidth(_(description),		\
+									thisstrlen,			\
+									encoding);			\
+		printf("%s:%*s" fmt "\n",						\
+			   _(description),							\
+			   maxlen - thislen + 2,					\
+			   " ",										\
+			   __VA_ARGS__);							\
+	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
 }
 
 
-- 
2.47.3


--m4rixdodkhrlzpzv--





^ permalink  raw  reply  [nested|flat] 180+ messages in thread

* [PATCH 2/2] Apply the same technique to PrintNewControlValues too
@ 2026-01-31 15:01 Álvaro Herrera <[email protected]>
  0 siblings, 0 replies; 180+ messages in thread

From: Álvaro Herrera @ 2026-01-31 15:01 UTC (permalink / raw)

---
 src/bin/pg_resetwal/entries.h     |  60 +++++++--------
 src/bin/pg_resetwal/pg_resetwal.c | 121 ++++++++++++++++++++----------
 2 files changed, 110 insertions(+), 71 deletions(-)

diff --git a/src/bin/pg_resetwal/entries.h b/src/bin/pg_resetwal/entries.h
index 6b7686da83a..25f2c49b3a8 100644
--- a/src/bin/pg_resetwal/entries.h
+++ b/src/bin/pg_resetwal/entries.h
@@ -1,62 +1,62 @@
-CONTROLDATA_LINE("pg_control version number",
+CONTROLDATA_LINE(CD_CONTROL_VERSION, "pg_control version number",
 				 "%u", ControlFile.pg_control_version)
-CONTROLDATA_LINE("Catalog version number",
+CONTROLDATA_LINE(CD_CATALOG_VERSION, "Catalog version number",
 				 "%u", ControlFile.catalog_version_no)
-CONTROLDATA_LINE("Database system identifier",
+CONTROLDATA_LINE(CD_SYSTEM_IDENTIFIER, "Database system identifier",
 				 "%" PRIu64, ControlFile.system_identifier)
-CONTROLDATA_LINE("Latest checkpoint's TimeLineID",
+CONTROLDATA_LINE(CD_CKPT_TIMELINE, "Latest checkpoint's TimeLineID",
 				 "%u", ControlFile.checkPointCopy.ThisTimeLineID)
-CONTROLDATA_LINE("Latest checkpoint's full_page_writes",
+CONTROLDATA_LINE(CD_CKPT_FPW, "Latest checkpoint's full_page_writes",
 				 "%s", (ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off")))
-CONTROLDATA_LINE("Latest checkpoint's NextXID",
+CONTROLDATA_LINE(CD_CKPT_NEXTXID, "Latest checkpoint's NextXID",
 				 "%u:%u", EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid), XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid))
-CONTROLDATA_LINE("Latest checkpoint's NextOID",
+CONTROLDATA_LINE(CD_CKPT_NEXTOID, "Latest checkpoint's NextOID",
 				 "%u", ControlFile.checkPointCopy.nextOid)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiXactId",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXID, "Latest checkpoint's NextMultiXactId",
 				 "%u", ControlFile.checkPointCopy.nextMulti)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiOffset",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXOFF, "Latest checkpoint's NextMultiOffset",
 				 "%" PRIu64, ControlFile.checkPointCopy.nextMultiOffset)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID, "Latest checkpoint's oldestXID",
 				 "%u", ControlFile.checkPointCopy.oldestXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID_DB, "Latest checkpoint's oldestXID's DB",
 				 "%u", ControlFile.checkPointCopy.oldestXidDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestActiveXID",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_ACTIVEXID, "Latest checkpoint's oldestActiveXID",
 				 "%u", ControlFile.checkPointCopy.oldestActiveXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestMultiXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI, "Latest checkpoint's oldestMultiXid",
 				 "%u", ControlFile.checkPointCopy.oldestMulti)
-CONTROLDATA_LINE("Latest checkpoint's oldestMulti's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI_DB, "Latest checkpoint's oldestMulti's DB",
 				 "%u", ControlFile.checkPointCopy.oldestMultiDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_COMMITTS_XID, "Latest checkpoint's oldestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.oldestCommitTsXid)
-CONTROLDATA_LINE("Latest checkpoint's newestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_NEWEST_COMMITTS_XID, "Latest checkpoint's newestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.newestCommitTsXid)
-CONTROLDATA_LINE("Maximum data alignment",
+CONTROLDATA_LINE(CD_MAXALIGN, "Maximum data alignment",
 				 "%u", ControlFile.maxAlign)
-CONTROLDATA_LINE("Database block size",
+CONTROLDATA_LINE(CD_BLCKSZ, "Database block size",
 				 "%u", ControlFile.blcksz)
-CONTROLDATA_LINE("Blocks per segment of large relation",
+CONTROLDATA_LINE(CD_RELSEG_SZ, "Blocks per segment of large relation",
 				 "%u", ControlFile.relseg_size)
-CONTROLDATA_LINE("Pages per SLRU segment",
+CONTROLDATA_LINE(CD_SLRU_PPS, "Pages per SLRU segment",
 				 "%u", ControlFile.slru_pages_per_segment)
-CONTROLDATA_LINE("WAL block size",
+CONTROLDATA_LINE(CD_WAL_BLCKSZ, "WAL block size",
 				 "%u", ControlFile.xlog_blcksz)
-CONTROLDATA_LINE("Bytes per WAL segment",
+CONTROLDATA_LINE(CD_WAL_SEGSIZE, "Bytes per WAL segment",
 				 "%u", ControlFile.xlog_seg_size)
-CONTROLDATA_LINE("Maximum length of identifiers",
+CONTROLDATA_LINE(CD_WAL_NAMEDATALEN, "Maximum length of identifiers",
 				 "%u", ControlFile.nameDataLen)
-CONTROLDATA_LINE("Maximum columns in an index",
+CONTROLDATA_LINE(CD_INDEX_MAX_KEYS, "Maximum columns in an index",
 				 "%u", ControlFile.indexMaxKeys)
-CONTROLDATA_LINE("Maximum size of a TOAST chunk",
+CONTROLDATA_LINE(CD_TOAST_MAXCHUNKSZ, "Maximum size of a TOAST chunk",
 				 "%u", ControlFile.toast_max_chunk_size)
-CONTROLDATA_LINE("Size of a large-object chunk",
+CONTROLDATA_LINE(CD_LO_BLKSZ, "Size of a large-object chunk",
 				 "%u", ControlFile.loblksize)
 
 /* This is no longer configurable, but users may still expect to see it: */
-CONTROLDATA_LINE("Date/time type storage",
+CONTROLDATA_LINE(CD_DATETIME_INT64, "Date/time type storage",
 				 "%s", _("64-bit integers"))
-CONTROLDATA_LINE("Float8 argument passing",
+CONTROLDATA_LINE(CD_FLOAT8_ARGS, "Float8 argument passing",
 				 "%s", ControlFile.float8ByVal ? _("by value") : _("by reference"))
-CONTROLDATA_LINE("Data page checksum version",
+CONTROLDATA_LINE(CD_CHECKSUMS, "Data page checksum version",
 				 "%u", ControlFile.data_checksum_version)
-CONTROLDATA_LINE("Default char data signedness",
+CONTROLDATA_LINE(CD_CHAR_SIGNEDNESS, "Default char data signedness",
 				 "%s", ControlFile.default_char_signedness ? _("signed") : _("unsigned"))
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index fb17b6f80e0..23bf1c62183 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -55,6 +55,7 @@
 #include "common/restricted_token.h"
 #include "common/string.h"
 #include "fe_utils/option_utils.h"
+#include "fe_utils/simple_list.h"
 #include "fe_utils/version.h"
 #include "getopt_long.h"
 #include "mb/pg_wchar.h"
@@ -119,6 +120,14 @@ static int	internal_wcswidth(const char *pwcs, size_t len, int encoding);
 static uint32 strtouint32_strict(const char *restrict s, char **restrict endptr, int base);
 static uint64 strtouint64_strict(const char *restrict s, char **restrict endptr, int base);
 
+/* Define the string enums */
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	symbol,
+enum ControldataStrings {
+#include "entries.h"
+};
+#undef CONTROLDATA_LINE
+
 
 int
 main(int argc, char *argv[])
@@ -768,7 +777,7 @@ PrintControlValues(bool guessed)
 	 * First, determine the maximum length of the description of all entries,
 	 * some or all of which might be translated.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	thislen = internal_wcswidth(_(description),			\
 								strlen(_(description)),	\
 								encoding);				\
@@ -781,7 +790,7 @@ PrintControlValues(bool guessed)
 	 * Print each line: the possibly-translated description, then some padding
 	 * spaces according to its display width, then the value.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	{													\
 		int		thisstrlen;								\
 														\
@@ -807,69 +816,99 @@ static void
 PrintNewControlValues(void)
 {
 	char		fname[MAXFNAMELEN];
+	int			encoding = pg_get_encoding_from_locale(NULL, true);
+	SimpleOidList	toprint = {NULL, NULL};
+	int			maxlen = 0;
+	int			thislen;
 
 	/* This will be always printed in order to keep format same. */
 	printf(_("\n\nValues to be changed:\n\n"));
 
-	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
-				 newXlogSegNo, WalSegSz);
-	printf(_("First log segment after reset:        %s\n"), fname);
-
 	if (mxids_given)
 	{
-		printf(_("NextMultiXactId:                      %u\n"),
-			   ControlFile.checkPointCopy.nextMulti);
-		printf(_("OldestMultiXid:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestMulti);
-		printf(_("OldestMulti's DB:                     %u\n"),
-			   ControlFile.checkPointCopy.oldestMultiDB);
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI_DB);
 	}
 
 	if (next_mxoff_given)
-	{
-		printf(_("NextMultiOffset:                      %" PRIu64 "\n"),
-			   ControlFile.checkPointCopy.nextMultiOffset);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXOFF);
 
 	if (next_oid_given)
-	{
-		printf(_("NextOID:                              %u\n"),
-			   ControlFile.checkPointCopy.nextOid);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTOID);
 
 	if (next_xid_given)
-	{
-		printf(_("NextXID:                              %u\n"),
-			   XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTXID);
 
 	if (oldest_xid_given)
 	{
-		printf(_("OldestXID:                            %u\n"),
-			   ControlFile.checkPointCopy.oldestXid);
-		printf(_("OldestXID's DB:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestXidDB);
-	}
-
-	if (next_xid_epoch_given)
-	{
-		printf(_("NextXID epoch:                        %u\n"),
-			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID_DB);
 	}
 
 	if (commit_ts_xids_given)
 	{
-		printf(_("oldestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.oldestCommitTsXid);
-		printf(_("newestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.newestCommitTsXid);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_COMMITTS_XID);
+		simple_oid_list_append(&toprint, CD_CKPT_NEWEST_COMMITTS_XID);
 	}
 
 	if (wal_segsize_given)
-	{
-		printf(_("Bytes per WAL segment:                %u\n"),
-			   ControlFile.xlog_seg_size);
+		simple_oid_list_append(&toprint, CD_WAL_SEGSIZE);
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{															\
+	thislen = internal_wcswidth(_(description),					\
+								strlen(_(description)),			\
+								encoding);						\
+	if (thislen > maxlen)										\
+		maxlen = thislen;										\
 	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
+
+
+	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
+				 newXlogSegNo, WalSegSz);
+
+	/* We print this one inconditionally */
+	{
+		char *str = "First log segment after reset";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%s\n", _(str), maxlen - thislen + 2, " ", fname);
+	}
+
+	/* We print the XID epoch in a degenerate case */
+	if (next_xid_epoch_given)
+	{
+		char *str = "NextXID epoch";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%u\n", _(str), maxlen - thislen + 2, " ",
+			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+
+	}
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{													\
+		int		thisstrlen;								\
+														\
+		thisstrlen = strlen(_(description));			\
+		thislen = internal_wcswidth(_(description),		\
+									thisstrlen,			\
+									encoding);			\
+		printf("%s:%*s" fmt "\n",						\
+			   _(description),							\
+			   maxlen - thislen + 2,					\
+			   " ",										\
+			   __VA_ARGS__);							\
+	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
 }
 
 
-- 
2.47.3


--m4rixdodkhrlzpzv--





^ permalink  raw  reply  [nested|flat] 180+ messages in thread

* [PATCH 2/2] Apply the same technique to PrintNewControlValues too
@ 2026-01-31 15:01 Álvaro Herrera <[email protected]>
  0 siblings, 0 replies; 180+ messages in thread

From: Álvaro Herrera @ 2026-01-31 15:01 UTC (permalink / raw)

---
 src/bin/pg_resetwal/entries.h     |  60 +++++++--------
 src/bin/pg_resetwal/pg_resetwal.c | 121 ++++++++++++++++++++----------
 2 files changed, 110 insertions(+), 71 deletions(-)

diff --git a/src/bin/pg_resetwal/entries.h b/src/bin/pg_resetwal/entries.h
index 6b7686da83a..25f2c49b3a8 100644
--- a/src/bin/pg_resetwal/entries.h
+++ b/src/bin/pg_resetwal/entries.h
@@ -1,62 +1,62 @@
-CONTROLDATA_LINE("pg_control version number",
+CONTROLDATA_LINE(CD_CONTROL_VERSION, "pg_control version number",
 				 "%u", ControlFile.pg_control_version)
-CONTROLDATA_LINE("Catalog version number",
+CONTROLDATA_LINE(CD_CATALOG_VERSION, "Catalog version number",
 				 "%u", ControlFile.catalog_version_no)
-CONTROLDATA_LINE("Database system identifier",
+CONTROLDATA_LINE(CD_SYSTEM_IDENTIFIER, "Database system identifier",
 				 "%" PRIu64, ControlFile.system_identifier)
-CONTROLDATA_LINE("Latest checkpoint's TimeLineID",
+CONTROLDATA_LINE(CD_CKPT_TIMELINE, "Latest checkpoint's TimeLineID",
 				 "%u", ControlFile.checkPointCopy.ThisTimeLineID)
-CONTROLDATA_LINE("Latest checkpoint's full_page_writes",
+CONTROLDATA_LINE(CD_CKPT_FPW, "Latest checkpoint's full_page_writes",
 				 "%s", (ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off")))
-CONTROLDATA_LINE("Latest checkpoint's NextXID",
+CONTROLDATA_LINE(CD_CKPT_NEXTXID, "Latest checkpoint's NextXID",
 				 "%u:%u", EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid), XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid))
-CONTROLDATA_LINE("Latest checkpoint's NextOID",
+CONTROLDATA_LINE(CD_CKPT_NEXTOID, "Latest checkpoint's NextOID",
 				 "%u", ControlFile.checkPointCopy.nextOid)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiXactId",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXID, "Latest checkpoint's NextMultiXactId",
 				 "%u", ControlFile.checkPointCopy.nextMulti)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiOffset",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXOFF, "Latest checkpoint's NextMultiOffset",
 				 "%" PRIu64, ControlFile.checkPointCopy.nextMultiOffset)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID, "Latest checkpoint's oldestXID",
 				 "%u", ControlFile.checkPointCopy.oldestXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID_DB, "Latest checkpoint's oldestXID's DB",
 				 "%u", ControlFile.checkPointCopy.oldestXidDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestActiveXID",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_ACTIVEXID, "Latest checkpoint's oldestActiveXID",
 				 "%u", ControlFile.checkPointCopy.oldestActiveXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestMultiXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI, "Latest checkpoint's oldestMultiXid",
 				 "%u", ControlFile.checkPointCopy.oldestMulti)
-CONTROLDATA_LINE("Latest checkpoint's oldestMulti's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI_DB, "Latest checkpoint's oldestMulti's DB",
 				 "%u", ControlFile.checkPointCopy.oldestMultiDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_COMMITTS_XID, "Latest checkpoint's oldestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.oldestCommitTsXid)
-CONTROLDATA_LINE("Latest checkpoint's newestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_NEWEST_COMMITTS_XID, "Latest checkpoint's newestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.newestCommitTsXid)
-CONTROLDATA_LINE("Maximum data alignment",
+CONTROLDATA_LINE(CD_MAXALIGN, "Maximum data alignment",
 				 "%u", ControlFile.maxAlign)
-CONTROLDATA_LINE("Database block size",
+CONTROLDATA_LINE(CD_BLCKSZ, "Database block size",
 				 "%u", ControlFile.blcksz)
-CONTROLDATA_LINE("Blocks per segment of large relation",
+CONTROLDATA_LINE(CD_RELSEG_SZ, "Blocks per segment of large relation",
 				 "%u", ControlFile.relseg_size)
-CONTROLDATA_LINE("Pages per SLRU segment",
+CONTROLDATA_LINE(CD_SLRU_PPS, "Pages per SLRU segment",
 				 "%u", ControlFile.slru_pages_per_segment)
-CONTROLDATA_LINE("WAL block size",
+CONTROLDATA_LINE(CD_WAL_BLCKSZ, "WAL block size",
 				 "%u", ControlFile.xlog_blcksz)
-CONTROLDATA_LINE("Bytes per WAL segment",
+CONTROLDATA_LINE(CD_WAL_SEGSIZE, "Bytes per WAL segment",
 				 "%u", ControlFile.xlog_seg_size)
-CONTROLDATA_LINE("Maximum length of identifiers",
+CONTROLDATA_LINE(CD_WAL_NAMEDATALEN, "Maximum length of identifiers",
 				 "%u", ControlFile.nameDataLen)
-CONTROLDATA_LINE("Maximum columns in an index",
+CONTROLDATA_LINE(CD_INDEX_MAX_KEYS, "Maximum columns in an index",
 				 "%u", ControlFile.indexMaxKeys)
-CONTROLDATA_LINE("Maximum size of a TOAST chunk",
+CONTROLDATA_LINE(CD_TOAST_MAXCHUNKSZ, "Maximum size of a TOAST chunk",
 				 "%u", ControlFile.toast_max_chunk_size)
-CONTROLDATA_LINE("Size of a large-object chunk",
+CONTROLDATA_LINE(CD_LO_BLKSZ, "Size of a large-object chunk",
 				 "%u", ControlFile.loblksize)
 
 /* This is no longer configurable, but users may still expect to see it: */
-CONTROLDATA_LINE("Date/time type storage",
+CONTROLDATA_LINE(CD_DATETIME_INT64, "Date/time type storage",
 				 "%s", _("64-bit integers"))
-CONTROLDATA_LINE("Float8 argument passing",
+CONTROLDATA_LINE(CD_FLOAT8_ARGS, "Float8 argument passing",
 				 "%s", ControlFile.float8ByVal ? _("by value") : _("by reference"))
-CONTROLDATA_LINE("Data page checksum version",
+CONTROLDATA_LINE(CD_CHECKSUMS, "Data page checksum version",
 				 "%u", ControlFile.data_checksum_version)
-CONTROLDATA_LINE("Default char data signedness",
+CONTROLDATA_LINE(CD_CHAR_SIGNEDNESS, "Default char data signedness",
 				 "%s", ControlFile.default_char_signedness ? _("signed") : _("unsigned"))
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index fb17b6f80e0..23bf1c62183 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -55,6 +55,7 @@
 #include "common/restricted_token.h"
 #include "common/string.h"
 #include "fe_utils/option_utils.h"
+#include "fe_utils/simple_list.h"
 #include "fe_utils/version.h"
 #include "getopt_long.h"
 #include "mb/pg_wchar.h"
@@ -119,6 +120,14 @@ static int	internal_wcswidth(const char *pwcs, size_t len, int encoding);
 static uint32 strtouint32_strict(const char *restrict s, char **restrict endptr, int base);
 static uint64 strtouint64_strict(const char *restrict s, char **restrict endptr, int base);
 
+/* Define the string enums */
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	symbol,
+enum ControldataStrings {
+#include "entries.h"
+};
+#undef CONTROLDATA_LINE
+
 
 int
 main(int argc, char *argv[])
@@ -768,7 +777,7 @@ PrintControlValues(bool guessed)
 	 * First, determine the maximum length of the description of all entries,
 	 * some or all of which might be translated.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	thislen = internal_wcswidth(_(description),			\
 								strlen(_(description)),	\
 								encoding);				\
@@ -781,7 +790,7 @@ PrintControlValues(bool guessed)
 	 * Print each line: the possibly-translated description, then some padding
 	 * spaces according to its display width, then the value.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	{													\
 		int		thisstrlen;								\
 														\
@@ -807,69 +816,99 @@ static void
 PrintNewControlValues(void)
 {
 	char		fname[MAXFNAMELEN];
+	int			encoding = pg_get_encoding_from_locale(NULL, true);
+	SimpleOidList	toprint = {NULL, NULL};
+	int			maxlen = 0;
+	int			thislen;
 
 	/* This will be always printed in order to keep format same. */
 	printf(_("\n\nValues to be changed:\n\n"));
 
-	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
-				 newXlogSegNo, WalSegSz);
-	printf(_("First log segment after reset:        %s\n"), fname);
-
 	if (mxids_given)
 	{
-		printf(_("NextMultiXactId:                      %u\n"),
-			   ControlFile.checkPointCopy.nextMulti);
-		printf(_("OldestMultiXid:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestMulti);
-		printf(_("OldestMulti's DB:                     %u\n"),
-			   ControlFile.checkPointCopy.oldestMultiDB);
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI_DB);
 	}
 
 	if (next_mxoff_given)
-	{
-		printf(_("NextMultiOffset:                      %" PRIu64 "\n"),
-			   ControlFile.checkPointCopy.nextMultiOffset);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXOFF);
 
 	if (next_oid_given)
-	{
-		printf(_("NextOID:                              %u\n"),
-			   ControlFile.checkPointCopy.nextOid);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTOID);
 
 	if (next_xid_given)
-	{
-		printf(_("NextXID:                              %u\n"),
-			   XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTXID);
 
 	if (oldest_xid_given)
 	{
-		printf(_("OldestXID:                            %u\n"),
-			   ControlFile.checkPointCopy.oldestXid);
-		printf(_("OldestXID's DB:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestXidDB);
-	}
-
-	if (next_xid_epoch_given)
-	{
-		printf(_("NextXID epoch:                        %u\n"),
-			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID_DB);
 	}
 
 	if (commit_ts_xids_given)
 	{
-		printf(_("oldestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.oldestCommitTsXid);
-		printf(_("newestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.newestCommitTsXid);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_COMMITTS_XID);
+		simple_oid_list_append(&toprint, CD_CKPT_NEWEST_COMMITTS_XID);
 	}
 
 	if (wal_segsize_given)
-	{
-		printf(_("Bytes per WAL segment:                %u\n"),
-			   ControlFile.xlog_seg_size);
+		simple_oid_list_append(&toprint, CD_WAL_SEGSIZE);
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{															\
+	thislen = internal_wcswidth(_(description),					\
+								strlen(_(description)),			\
+								encoding);						\
+	if (thislen > maxlen)										\
+		maxlen = thislen;										\
 	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
+
+
+	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
+				 newXlogSegNo, WalSegSz);
+
+	/* We print this one inconditionally */
+	{
+		char *str = "First log segment after reset";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%s\n", _(str), maxlen - thislen + 2, " ", fname);
+	}
+
+	/* We print the XID epoch in a degenerate case */
+	if (next_xid_epoch_given)
+	{
+		char *str = "NextXID epoch";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%u\n", _(str), maxlen - thislen + 2, " ",
+			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+
+	}
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{													\
+		int		thisstrlen;								\
+														\
+		thisstrlen = strlen(_(description));			\
+		thislen = internal_wcswidth(_(description),		\
+									thisstrlen,			\
+									encoding);			\
+		printf("%s:%*s" fmt "\n",						\
+			   _(description),							\
+			   maxlen - thislen + 2,					\
+			   " ",										\
+			   __VA_ARGS__);							\
+	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
 }
 
 
-- 
2.47.3


--m4rixdodkhrlzpzv--





^ permalink  raw  reply  [nested|flat] 180+ messages in thread

* [PATCH 2/2] Apply the same technique to PrintNewControlValues too
@ 2026-01-31 15:01 Álvaro Herrera <[email protected]>
  0 siblings, 0 replies; 180+ messages in thread

From: Álvaro Herrera @ 2026-01-31 15:01 UTC (permalink / raw)

---
 src/bin/pg_resetwal/entries.h     |  60 +++++++--------
 src/bin/pg_resetwal/pg_resetwal.c | 121 ++++++++++++++++++++----------
 2 files changed, 110 insertions(+), 71 deletions(-)

diff --git a/src/bin/pg_resetwal/entries.h b/src/bin/pg_resetwal/entries.h
index 6b7686da83a..25f2c49b3a8 100644
--- a/src/bin/pg_resetwal/entries.h
+++ b/src/bin/pg_resetwal/entries.h
@@ -1,62 +1,62 @@
-CONTROLDATA_LINE("pg_control version number",
+CONTROLDATA_LINE(CD_CONTROL_VERSION, "pg_control version number",
 				 "%u", ControlFile.pg_control_version)
-CONTROLDATA_LINE("Catalog version number",
+CONTROLDATA_LINE(CD_CATALOG_VERSION, "Catalog version number",
 				 "%u", ControlFile.catalog_version_no)
-CONTROLDATA_LINE("Database system identifier",
+CONTROLDATA_LINE(CD_SYSTEM_IDENTIFIER, "Database system identifier",
 				 "%" PRIu64, ControlFile.system_identifier)
-CONTROLDATA_LINE("Latest checkpoint's TimeLineID",
+CONTROLDATA_LINE(CD_CKPT_TIMELINE, "Latest checkpoint's TimeLineID",
 				 "%u", ControlFile.checkPointCopy.ThisTimeLineID)
-CONTROLDATA_LINE("Latest checkpoint's full_page_writes",
+CONTROLDATA_LINE(CD_CKPT_FPW, "Latest checkpoint's full_page_writes",
 				 "%s", (ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off")))
-CONTROLDATA_LINE("Latest checkpoint's NextXID",
+CONTROLDATA_LINE(CD_CKPT_NEXTXID, "Latest checkpoint's NextXID",
 				 "%u:%u", EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid), XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid))
-CONTROLDATA_LINE("Latest checkpoint's NextOID",
+CONTROLDATA_LINE(CD_CKPT_NEXTOID, "Latest checkpoint's NextOID",
 				 "%u", ControlFile.checkPointCopy.nextOid)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiXactId",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXID, "Latest checkpoint's NextMultiXactId",
 				 "%u", ControlFile.checkPointCopy.nextMulti)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiOffset",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXOFF, "Latest checkpoint's NextMultiOffset",
 				 "%" PRIu64, ControlFile.checkPointCopy.nextMultiOffset)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID, "Latest checkpoint's oldestXID",
 				 "%u", ControlFile.checkPointCopy.oldestXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID_DB, "Latest checkpoint's oldestXID's DB",
 				 "%u", ControlFile.checkPointCopy.oldestXidDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestActiveXID",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_ACTIVEXID, "Latest checkpoint's oldestActiveXID",
 				 "%u", ControlFile.checkPointCopy.oldestActiveXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestMultiXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI, "Latest checkpoint's oldestMultiXid",
 				 "%u", ControlFile.checkPointCopy.oldestMulti)
-CONTROLDATA_LINE("Latest checkpoint's oldestMulti's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI_DB, "Latest checkpoint's oldestMulti's DB",
 				 "%u", ControlFile.checkPointCopy.oldestMultiDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_COMMITTS_XID, "Latest checkpoint's oldestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.oldestCommitTsXid)
-CONTROLDATA_LINE("Latest checkpoint's newestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_NEWEST_COMMITTS_XID, "Latest checkpoint's newestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.newestCommitTsXid)
-CONTROLDATA_LINE("Maximum data alignment",
+CONTROLDATA_LINE(CD_MAXALIGN, "Maximum data alignment",
 				 "%u", ControlFile.maxAlign)
-CONTROLDATA_LINE("Database block size",
+CONTROLDATA_LINE(CD_BLCKSZ, "Database block size",
 				 "%u", ControlFile.blcksz)
-CONTROLDATA_LINE("Blocks per segment of large relation",
+CONTROLDATA_LINE(CD_RELSEG_SZ, "Blocks per segment of large relation",
 				 "%u", ControlFile.relseg_size)
-CONTROLDATA_LINE("Pages per SLRU segment",
+CONTROLDATA_LINE(CD_SLRU_PPS, "Pages per SLRU segment",
 				 "%u", ControlFile.slru_pages_per_segment)
-CONTROLDATA_LINE("WAL block size",
+CONTROLDATA_LINE(CD_WAL_BLCKSZ, "WAL block size",
 				 "%u", ControlFile.xlog_blcksz)
-CONTROLDATA_LINE("Bytes per WAL segment",
+CONTROLDATA_LINE(CD_WAL_SEGSIZE, "Bytes per WAL segment",
 				 "%u", ControlFile.xlog_seg_size)
-CONTROLDATA_LINE("Maximum length of identifiers",
+CONTROLDATA_LINE(CD_WAL_NAMEDATALEN, "Maximum length of identifiers",
 				 "%u", ControlFile.nameDataLen)
-CONTROLDATA_LINE("Maximum columns in an index",
+CONTROLDATA_LINE(CD_INDEX_MAX_KEYS, "Maximum columns in an index",
 				 "%u", ControlFile.indexMaxKeys)
-CONTROLDATA_LINE("Maximum size of a TOAST chunk",
+CONTROLDATA_LINE(CD_TOAST_MAXCHUNKSZ, "Maximum size of a TOAST chunk",
 				 "%u", ControlFile.toast_max_chunk_size)
-CONTROLDATA_LINE("Size of a large-object chunk",
+CONTROLDATA_LINE(CD_LO_BLKSZ, "Size of a large-object chunk",
 				 "%u", ControlFile.loblksize)
 
 /* This is no longer configurable, but users may still expect to see it: */
-CONTROLDATA_LINE("Date/time type storage",
+CONTROLDATA_LINE(CD_DATETIME_INT64, "Date/time type storage",
 				 "%s", _("64-bit integers"))
-CONTROLDATA_LINE("Float8 argument passing",
+CONTROLDATA_LINE(CD_FLOAT8_ARGS, "Float8 argument passing",
 				 "%s", ControlFile.float8ByVal ? _("by value") : _("by reference"))
-CONTROLDATA_LINE("Data page checksum version",
+CONTROLDATA_LINE(CD_CHECKSUMS, "Data page checksum version",
 				 "%u", ControlFile.data_checksum_version)
-CONTROLDATA_LINE("Default char data signedness",
+CONTROLDATA_LINE(CD_CHAR_SIGNEDNESS, "Default char data signedness",
 				 "%s", ControlFile.default_char_signedness ? _("signed") : _("unsigned"))
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index fb17b6f80e0..23bf1c62183 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -55,6 +55,7 @@
 #include "common/restricted_token.h"
 #include "common/string.h"
 #include "fe_utils/option_utils.h"
+#include "fe_utils/simple_list.h"
 #include "fe_utils/version.h"
 #include "getopt_long.h"
 #include "mb/pg_wchar.h"
@@ -119,6 +120,14 @@ static int	internal_wcswidth(const char *pwcs, size_t len, int encoding);
 static uint32 strtouint32_strict(const char *restrict s, char **restrict endptr, int base);
 static uint64 strtouint64_strict(const char *restrict s, char **restrict endptr, int base);
 
+/* Define the string enums */
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	symbol,
+enum ControldataStrings {
+#include "entries.h"
+};
+#undef CONTROLDATA_LINE
+
 
 int
 main(int argc, char *argv[])
@@ -768,7 +777,7 @@ PrintControlValues(bool guessed)
 	 * First, determine the maximum length of the description of all entries,
 	 * some or all of which might be translated.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	thislen = internal_wcswidth(_(description),			\
 								strlen(_(description)),	\
 								encoding);				\
@@ -781,7 +790,7 @@ PrintControlValues(bool guessed)
 	 * Print each line: the possibly-translated description, then some padding
 	 * spaces according to its display width, then the value.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	{													\
 		int		thisstrlen;								\
 														\
@@ -807,69 +816,99 @@ static void
 PrintNewControlValues(void)
 {
 	char		fname[MAXFNAMELEN];
+	int			encoding = pg_get_encoding_from_locale(NULL, true);
+	SimpleOidList	toprint = {NULL, NULL};
+	int			maxlen = 0;
+	int			thislen;
 
 	/* This will be always printed in order to keep format same. */
 	printf(_("\n\nValues to be changed:\n\n"));
 
-	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
-				 newXlogSegNo, WalSegSz);
-	printf(_("First log segment after reset:        %s\n"), fname);
-
 	if (mxids_given)
 	{
-		printf(_("NextMultiXactId:                      %u\n"),
-			   ControlFile.checkPointCopy.nextMulti);
-		printf(_("OldestMultiXid:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestMulti);
-		printf(_("OldestMulti's DB:                     %u\n"),
-			   ControlFile.checkPointCopy.oldestMultiDB);
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI_DB);
 	}
 
 	if (next_mxoff_given)
-	{
-		printf(_("NextMultiOffset:                      %" PRIu64 "\n"),
-			   ControlFile.checkPointCopy.nextMultiOffset);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXOFF);
 
 	if (next_oid_given)
-	{
-		printf(_("NextOID:                              %u\n"),
-			   ControlFile.checkPointCopy.nextOid);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTOID);
 
 	if (next_xid_given)
-	{
-		printf(_("NextXID:                              %u\n"),
-			   XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTXID);
 
 	if (oldest_xid_given)
 	{
-		printf(_("OldestXID:                            %u\n"),
-			   ControlFile.checkPointCopy.oldestXid);
-		printf(_("OldestXID's DB:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestXidDB);
-	}
-
-	if (next_xid_epoch_given)
-	{
-		printf(_("NextXID epoch:                        %u\n"),
-			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID_DB);
 	}
 
 	if (commit_ts_xids_given)
 	{
-		printf(_("oldestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.oldestCommitTsXid);
-		printf(_("newestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.newestCommitTsXid);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_COMMITTS_XID);
+		simple_oid_list_append(&toprint, CD_CKPT_NEWEST_COMMITTS_XID);
 	}
 
 	if (wal_segsize_given)
-	{
-		printf(_("Bytes per WAL segment:                %u\n"),
-			   ControlFile.xlog_seg_size);
+		simple_oid_list_append(&toprint, CD_WAL_SEGSIZE);
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{															\
+	thislen = internal_wcswidth(_(description),					\
+								strlen(_(description)),			\
+								encoding);						\
+	if (thislen > maxlen)										\
+		maxlen = thislen;										\
 	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
+
+
+	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
+				 newXlogSegNo, WalSegSz);
+
+	/* We print this one inconditionally */
+	{
+		char *str = "First log segment after reset";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%s\n", _(str), maxlen - thislen + 2, " ", fname);
+	}
+
+	/* We print the XID epoch in a degenerate case */
+	if (next_xid_epoch_given)
+	{
+		char *str = "NextXID epoch";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%u\n", _(str), maxlen - thislen + 2, " ",
+			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+
+	}
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{													\
+		int		thisstrlen;								\
+														\
+		thisstrlen = strlen(_(description));			\
+		thislen = internal_wcswidth(_(description),		\
+									thisstrlen,			\
+									encoding);			\
+		printf("%s:%*s" fmt "\n",						\
+			   _(description),							\
+			   maxlen - thislen + 2,					\
+			   " ",										\
+			   __VA_ARGS__);							\
+	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
 }
 
 
-- 
2.47.3


--m4rixdodkhrlzpzv--





^ permalink  raw  reply  [nested|flat] 180+ messages in thread

* [PATCH 2/2] Apply the same technique to PrintNewControlValues too
@ 2026-01-31 15:01 Álvaro Herrera <[email protected]>
  0 siblings, 0 replies; 180+ messages in thread

From: Álvaro Herrera @ 2026-01-31 15:01 UTC (permalink / raw)

---
 src/bin/pg_resetwal/entries.h     |  60 +++++++--------
 src/bin/pg_resetwal/pg_resetwal.c | 121 ++++++++++++++++++++----------
 2 files changed, 110 insertions(+), 71 deletions(-)

diff --git a/src/bin/pg_resetwal/entries.h b/src/bin/pg_resetwal/entries.h
index 6b7686da83a..25f2c49b3a8 100644
--- a/src/bin/pg_resetwal/entries.h
+++ b/src/bin/pg_resetwal/entries.h
@@ -1,62 +1,62 @@
-CONTROLDATA_LINE("pg_control version number",
+CONTROLDATA_LINE(CD_CONTROL_VERSION, "pg_control version number",
 				 "%u", ControlFile.pg_control_version)
-CONTROLDATA_LINE("Catalog version number",
+CONTROLDATA_LINE(CD_CATALOG_VERSION, "Catalog version number",
 				 "%u", ControlFile.catalog_version_no)
-CONTROLDATA_LINE("Database system identifier",
+CONTROLDATA_LINE(CD_SYSTEM_IDENTIFIER, "Database system identifier",
 				 "%" PRIu64, ControlFile.system_identifier)
-CONTROLDATA_LINE("Latest checkpoint's TimeLineID",
+CONTROLDATA_LINE(CD_CKPT_TIMELINE, "Latest checkpoint's TimeLineID",
 				 "%u", ControlFile.checkPointCopy.ThisTimeLineID)
-CONTROLDATA_LINE("Latest checkpoint's full_page_writes",
+CONTROLDATA_LINE(CD_CKPT_FPW, "Latest checkpoint's full_page_writes",
 				 "%s", (ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off")))
-CONTROLDATA_LINE("Latest checkpoint's NextXID",
+CONTROLDATA_LINE(CD_CKPT_NEXTXID, "Latest checkpoint's NextXID",
 				 "%u:%u", EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid), XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid))
-CONTROLDATA_LINE("Latest checkpoint's NextOID",
+CONTROLDATA_LINE(CD_CKPT_NEXTOID, "Latest checkpoint's NextOID",
 				 "%u", ControlFile.checkPointCopy.nextOid)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiXactId",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXID, "Latest checkpoint's NextMultiXactId",
 				 "%u", ControlFile.checkPointCopy.nextMulti)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiOffset",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXOFF, "Latest checkpoint's NextMultiOffset",
 				 "%" PRIu64, ControlFile.checkPointCopy.nextMultiOffset)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID, "Latest checkpoint's oldestXID",
 				 "%u", ControlFile.checkPointCopy.oldestXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID_DB, "Latest checkpoint's oldestXID's DB",
 				 "%u", ControlFile.checkPointCopy.oldestXidDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestActiveXID",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_ACTIVEXID, "Latest checkpoint's oldestActiveXID",
 				 "%u", ControlFile.checkPointCopy.oldestActiveXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestMultiXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI, "Latest checkpoint's oldestMultiXid",
 				 "%u", ControlFile.checkPointCopy.oldestMulti)
-CONTROLDATA_LINE("Latest checkpoint's oldestMulti's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI_DB, "Latest checkpoint's oldestMulti's DB",
 				 "%u", ControlFile.checkPointCopy.oldestMultiDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_COMMITTS_XID, "Latest checkpoint's oldestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.oldestCommitTsXid)
-CONTROLDATA_LINE("Latest checkpoint's newestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_NEWEST_COMMITTS_XID, "Latest checkpoint's newestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.newestCommitTsXid)
-CONTROLDATA_LINE("Maximum data alignment",
+CONTROLDATA_LINE(CD_MAXALIGN, "Maximum data alignment",
 				 "%u", ControlFile.maxAlign)
-CONTROLDATA_LINE("Database block size",
+CONTROLDATA_LINE(CD_BLCKSZ, "Database block size",
 				 "%u", ControlFile.blcksz)
-CONTROLDATA_LINE("Blocks per segment of large relation",
+CONTROLDATA_LINE(CD_RELSEG_SZ, "Blocks per segment of large relation",
 				 "%u", ControlFile.relseg_size)
-CONTROLDATA_LINE("Pages per SLRU segment",
+CONTROLDATA_LINE(CD_SLRU_PPS, "Pages per SLRU segment",
 				 "%u", ControlFile.slru_pages_per_segment)
-CONTROLDATA_LINE("WAL block size",
+CONTROLDATA_LINE(CD_WAL_BLCKSZ, "WAL block size",
 				 "%u", ControlFile.xlog_blcksz)
-CONTROLDATA_LINE("Bytes per WAL segment",
+CONTROLDATA_LINE(CD_WAL_SEGSIZE, "Bytes per WAL segment",
 				 "%u", ControlFile.xlog_seg_size)
-CONTROLDATA_LINE("Maximum length of identifiers",
+CONTROLDATA_LINE(CD_WAL_NAMEDATALEN, "Maximum length of identifiers",
 				 "%u", ControlFile.nameDataLen)
-CONTROLDATA_LINE("Maximum columns in an index",
+CONTROLDATA_LINE(CD_INDEX_MAX_KEYS, "Maximum columns in an index",
 				 "%u", ControlFile.indexMaxKeys)
-CONTROLDATA_LINE("Maximum size of a TOAST chunk",
+CONTROLDATA_LINE(CD_TOAST_MAXCHUNKSZ, "Maximum size of a TOAST chunk",
 				 "%u", ControlFile.toast_max_chunk_size)
-CONTROLDATA_LINE("Size of a large-object chunk",
+CONTROLDATA_LINE(CD_LO_BLKSZ, "Size of a large-object chunk",
 				 "%u", ControlFile.loblksize)
 
 /* This is no longer configurable, but users may still expect to see it: */
-CONTROLDATA_LINE("Date/time type storage",
+CONTROLDATA_LINE(CD_DATETIME_INT64, "Date/time type storage",
 				 "%s", _("64-bit integers"))
-CONTROLDATA_LINE("Float8 argument passing",
+CONTROLDATA_LINE(CD_FLOAT8_ARGS, "Float8 argument passing",
 				 "%s", ControlFile.float8ByVal ? _("by value") : _("by reference"))
-CONTROLDATA_LINE("Data page checksum version",
+CONTROLDATA_LINE(CD_CHECKSUMS, "Data page checksum version",
 				 "%u", ControlFile.data_checksum_version)
-CONTROLDATA_LINE("Default char data signedness",
+CONTROLDATA_LINE(CD_CHAR_SIGNEDNESS, "Default char data signedness",
 				 "%s", ControlFile.default_char_signedness ? _("signed") : _("unsigned"))
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index fb17b6f80e0..23bf1c62183 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -55,6 +55,7 @@
 #include "common/restricted_token.h"
 #include "common/string.h"
 #include "fe_utils/option_utils.h"
+#include "fe_utils/simple_list.h"
 #include "fe_utils/version.h"
 #include "getopt_long.h"
 #include "mb/pg_wchar.h"
@@ -119,6 +120,14 @@ static int	internal_wcswidth(const char *pwcs, size_t len, int encoding);
 static uint32 strtouint32_strict(const char *restrict s, char **restrict endptr, int base);
 static uint64 strtouint64_strict(const char *restrict s, char **restrict endptr, int base);
 
+/* Define the string enums */
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	symbol,
+enum ControldataStrings {
+#include "entries.h"
+};
+#undef CONTROLDATA_LINE
+
 
 int
 main(int argc, char *argv[])
@@ -768,7 +777,7 @@ PrintControlValues(bool guessed)
 	 * First, determine the maximum length of the description of all entries,
 	 * some or all of which might be translated.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	thislen = internal_wcswidth(_(description),			\
 								strlen(_(description)),	\
 								encoding);				\
@@ -781,7 +790,7 @@ PrintControlValues(bool guessed)
 	 * Print each line: the possibly-translated description, then some padding
 	 * spaces according to its display width, then the value.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	{													\
 		int		thisstrlen;								\
 														\
@@ -807,69 +816,99 @@ static void
 PrintNewControlValues(void)
 {
 	char		fname[MAXFNAMELEN];
+	int			encoding = pg_get_encoding_from_locale(NULL, true);
+	SimpleOidList	toprint = {NULL, NULL};
+	int			maxlen = 0;
+	int			thislen;
 
 	/* This will be always printed in order to keep format same. */
 	printf(_("\n\nValues to be changed:\n\n"));
 
-	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
-				 newXlogSegNo, WalSegSz);
-	printf(_("First log segment after reset:        %s\n"), fname);
-
 	if (mxids_given)
 	{
-		printf(_("NextMultiXactId:                      %u\n"),
-			   ControlFile.checkPointCopy.nextMulti);
-		printf(_("OldestMultiXid:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestMulti);
-		printf(_("OldestMulti's DB:                     %u\n"),
-			   ControlFile.checkPointCopy.oldestMultiDB);
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI_DB);
 	}
 
 	if (next_mxoff_given)
-	{
-		printf(_("NextMultiOffset:                      %" PRIu64 "\n"),
-			   ControlFile.checkPointCopy.nextMultiOffset);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXOFF);
 
 	if (next_oid_given)
-	{
-		printf(_("NextOID:                              %u\n"),
-			   ControlFile.checkPointCopy.nextOid);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTOID);
 
 	if (next_xid_given)
-	{
-		printf(_("NextXID:                              %u\n"),
-			   XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTXID);
 
 	if (oldest_xid_given)
 	{
-		printf(_("OldestXID:                            %u\n"),
-			   ControlFile.checkPointCopy.oldestXid);
-		printf(_("OldestXID's DB:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestXidDB);
-	}
-
-	if (next_xid_epoch_given)
-	{
-		printf(_("NextXID epoch:                        %u\n"),
-			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID_DB);
 	}
 
 	if (commit_ts_xids_given)
 	{
-		printf(_("oldestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.oldestCommitTsXid);
-		printf(_("newestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.newestCommitTsXid);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_COMMITTS_XID);
+		simple_oid_list_append(&toprint, CD_CKPT_NEWEST_COMMITTS_XID);
 	}
 
 	if (wal_segsize_given)
-	{
-		printf(_("Bytes per WAL segment:                %u\n"),
-			   ControlFile.xlog_seg_size);
+		simple_oid_list_append(&toprint, CD_WAL_SEGSIZE);
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{															\
+	thislen = internal_wcswidth(_(description),					\
+								strlen(_(description)),			\
+								encoding);						\
+	if (thislen > maxlen)										\
+		maxlen = thislen;										\
 	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
+
+
+	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
+				 newXlogSegNo, WalSegSz);
+
+	/* We print this one inconditionally */
+	{
+		char *str = "First log segment after reset";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%s\n", _(str), maxlen - thislen + 2, " ", fname);
+	}
+
+	/* We print the XID epoch in a degenerate case */
+	if (next_xid_epoch_given)
+	{
+		char *str = "NextXID epoch";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%u\n", _(str), maxlen - thislen + 2, " ",
+			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+
+	}
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{													\
+		int		thisstrlen;								\
+														\
+		thisstrlen = strlen(_(description));			\
+		thislen = internal_wcswidth(_(description),		\
+									thisstrlen,			\
+									encoding);			\
+		printf("%s:%*s" fmt "\n",						\
+			   _(description),							\
+			   maxlen - thislen + 2,					\
+			   " ",										\
+			   __VA_ARGS__);							\
+	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
 }
 
 
-- 
2.47.3


--m4rixdodkhrlzpzv--





^ permalink  raw  reply  [nested|flat] 180+ messages in thread

* [PATCH 2/2] Apply the same technique to PrintNewControlValues too
@ 2026-01-31 15:01 Álvaro Herrera <[email protected]>
  0 siblings, 0 replies; 180+ messages in thread

From: Álvaro Herrera @ 2026-01-31 15:01 UTC (permalink / raw)

---
 src/bin/pg_resetwal/entries.h     |  60 +++++++--------
 src/bin/pg_resetwal/pg_resetwal.c | 121 ++++++++++++++++++++----------
 2 files changed, 110 insertions(+), 71 deletions(-)

diff --git a/src/bin/pg_resetwal/entries.h b/src/bin/pg_resetwal/entries.h
index 6b7686da83a..25f2c49b3a8 100644
--- a/src/bin/pg_resetwal/entries.h
+++ b/src/bin/pg_resetwal/entries.h
@@ -1,62 +1,62 @@
-CONTROLDATA_LINE("pg_control version number",
+CONTROLDATA_LINE(CD_CONTROL_VERSION, "pg_control version number",
 				 "%u", ControlFile.pg_control_version)
-CONTROLDATA_LINE("Catalog version number",
+CONTROLDATA_LINE(CD_CATALOG_VERSION, "Catalog version number",
 				 "%u", ControlFile.catalog_version_no)
-CONTROLDATA_LINE("Database system identifier",
+CONTROLDATA_LINE(CD_SYSTEM_IDENTIFIER, "Database system identifier",
 				 "%" PRIu64, ControlFile.system_identifier)
-CONTROLDATA_LINE("Latest checkpoint's TimeLineID",
+CONTROLDATA_LINE(CD_CKPT_TIMELINE, "Latest checkpoint's TimeLineID",
 				 "%u", ControlFile.checkPointCopy.ThisTimeLineID)
-CONTROLDATA_LINE("Latest checkpoint's full_page_writes",
+CONTROLDATA_LINE(CD_CKPT_FPW, "Latest checkpoint's full_page_writes",
 				 "%s", (ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off")))
-CONTROLDATA_LINE("Latest checkpoint's NextXID",
+CONTROLDATA_LINE(CD_CKPT_NEXTXID, "Latest checkpoint's NextXID",
 				 "%u:%u", EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid), XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid))
-CONTROLDATA_LINE("Latest checkpoint's NextOID",
+CONTROLDATA_LINE(CD_CKPT_NEXTOID, "Latest checkpoint's NextOID",
 				 "%u", ControlFile.checkPointCopy.nextOid)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiXactId",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXID, "Latest checkpoint's NextMultiXactId",
 				 "%u", ControlFile.checkPointCopy.nextMulti)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiOffset",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXOFF, "Latest checkpoint's NextMultiOffset",
 				 "%" PRIu64, ControlFile.checkPointCopy.nextMultiOffset)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID, "Latest checkpoint's oldestXID",
 				 "%u", ControlFile.checkPointCopy.oldestXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID_DB, "Latest checkpoint's oldestXID's DB",
 				 "%u", ControlFile.checkPointCopy.oldestXidDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestActiveXID",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_ACTIVEXID, "Latest checkpoint's oldestActiveXID",
 				 "%u", ControlFile.checkPointCopy.oldestActiveXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestMultiXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI, "Latest checkpoint's oldestMultiXid",
 				 "%u", ControlFile.checkPointCopy.oldestMulti)
-CONTROLDATA_LINE("Latest checkpoint's oldestMulti's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI_DB, "Latest checkpoint's oldestMulti's DB",
 				 "%u", ControlFile.checkPointCopy.oldestMultiDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_COMMITTS_XID, "Latest checkpoint's oldestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.oldestCommitTsXid)
-CONTROLDATA_LINE("Latest checkpoint's newestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_NEWEST_COMMITTS_XID, "Latest checkpoint's newestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.newestCommitTsXid)
-CONTROLDATA_LINE("Maximum data alignment",
+CONTROLDATA_LINE(CD_MAXALIGN, "Maximum data alignment",
 				 "%u", ControlFile.maxAlign)
-CONTROLDATA_LINE("Database block size",
+CONTROLDATA_LINE(CD_BLCKSZ, "Database block size",
 				 "%u", ControlFile.blcksz)
-CONTROLDATA_LINE("Blocks per segment of large relation",
+CONTROLDATA_LINE(CD_RELSEG_SZ, "Blocks per segment of large relation",
 				 "%u", ControlFile.relseg_size)
-CONTROLDATA_LINE("Pages per SLRU segment",
+CONTROLDATA_LINE(CD_SLRU_PPS, "Pages per SLRU segment",
 				 "%u", ControlFile.slru_pages_per_segment)
-CONTROLDATA_LINE("WAL block size",
+CONTROLDATA_LINE(CD_WAL_BLCKSZ, "WAL block size",
 				 "%u", ControlFile.xlog_blcksz)
-CONTROLDATA_LINE("Bytes per WAL segment",
+CONTROLDATA_LINE(CD_WAL_SEGSIZE, "Bytes per WAL segment",
 				 "%u", ControlFile.xlog_seg_size)
-CONTROLDATA_LINE("Maximum length of identifiers",
+CONTROLDATA_LINE(CD_WAL_NAMEDATALEN, "Maximum length of identifiers",
 				 "%u", ControlFile.nameDataLen)
-CONTROLDATA_LINE("Maximum columns in an index",
+CONTROLDATA_LINE(CD_INDEX_MAX_KEYS, "Maximum columns in an index",
 				 "%u", ControlFile.indexMaxKeys)
-CONTROLDATA_LINE("Maximum size of a TOAST chunk",
+CONTROLDATA_LINE(CD_TOAST_MAXCHUNKSZ, "Maximum size of a TOAST chunk",
 				 "%u", ControlFile.toast_max_chunk_size)
-CONTROLDATA_LINE("Size of a large-object chunk",
+CONTROLDATA_LINE(CD_LO_BLKSZ, "Size of a large-object chunk",
 				 "%u", ControlFile.loblksize)
 
 /* This is no longer configurable, but users may still expect to see it: */
-CONTROLDATA_LINE("Date/time type storage",
+CONTROLDATA_LINE(CD_DATETIME_INT64, "Date/time type storage",
 				 "%s", _("64-bit integers"))
-CONTROLDATA_LINE("Float8 argument passing",
+CONTROLDATA_LINE(CD_FLOAT8_ARGS, "Float8 argument passing",
 				 "%s", ControlFile.float8ByVal ? _("by value") : _("by reference"))
-CONTROLDATA_LINE("Data page checksum version",
+CONTROLDATA_LINE(CD_CHECKSUMS, "Data page checksum version",
 				 "%u", ControlFile.data_checksum_version)
-CONTROLDATA_LINE("Default char data signedness",
+CONTROLDATA_LINE(CD_CHAR_SIGNEDNESS, "Default char data signedness",
 				 "%s", ControlFile.default_char_signedness ? _("signed") : _("unsigned"))
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index fb17b6f80e0..23bf1c62183 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -55,6 +55,7 @@
 #include "common/restricted_token.h"
 #include "common/string.h"
 #include "fe_utils/option_utils.h"
+#include "fe_utils/simple_list.h"
 #include "fe_utils/version.h"
 #include "getopt_long.h"
 #include "mb/pg_wchar.h"
@@ -119,6 +120,14 @@ static int	internal_wcswidth(const char *pwcs, size_t len, int encoding);
 static uint32 strtouint32_strict(const char *restrict s, char **restrict endptr, int base);
 static uint64 strtouint64_strict(const char *restrict s, char **restrict endptr, int base);
 
+/* Define the string enums */
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	symbol,
+enum ControldataStrings {
+#include "entries.h"
+};
+#undef CONTROLDATA_LINE
+
 
 int
 main(int argc, char *argv[])
@@ -768,7 +777,7 @@ PrintControlValues(bool guessed)
 	 * First, determine the maximum length of the description of all entries,
 	 * some or all of which might be translated.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	thislen = internal_wcswidth(_(description),			\
 								strlen(_(description)),	\
 								encoding);				\
@@ -781,7 +790,7 @@ PrintControlValues(bool guessed)
 	 * Print each line: the possibly-translated description, then some padding
 	 * spaces according to its display width, then the value.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	{													\
 		int		thisstrlen;								\
 														\
@@ -807,69 +816,99 @@ static void
 PrintNewControlValues(void)
 {
 	char		fname[MAXFNAMELEN];
+	int			encoding = pg_get_encoding_from_locale(NULL, true);
+	SimpleOidList	toprint = {NULL, NULL};
+	int			maxlen = 0;
+	int			thislen;
 
 	/* This will be always printed in order to keep format same. */
 	printf(_("\n\nValues to be changed:\n\n"));
 
-	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
-				 newXlogSegNo, WalSegSz);
-	printf(_("First log segment after reset:        %s\n"), fname);
-
 	if (mxids_given)
 	{
-		printf(_("NextMultiXactId:                      %u\n"),
-			   ControlFile.checkPointCopy.nextMulti);
-		printf(_("OldestMultiXid:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestMulti);
-		printf(_("OldestMulti's DB:                     %u\n"),
-			   ControlFile.checkPointCopy.oldestMultiDB);
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI_DB);
 	}
 
 	if (next_mxoff_given)
-	{
-		printf(_("NextMultiOffset:                      %" PRIu64 "\n"),
-			   ControlFile.checkPointCopy.nextMultiOffset);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXOFF);
 
 	if (next_oid_given)
-	{
-		printf(_("NextOID:                              %u\n"),
-			   ControlFile.checkPointCopy.nextOid);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTOID);
 
 	if (next_xid_given)
-	{
-		printf(_("NextXID:                              %u\n"),
-			   XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTXID);
 
 	if (oldest_xid_given)
 	{
-		printf(_("OldestXID:                            %u\n"),
-			   ControlFile.checkPointCopy.oldestXid);
-		printf(_("OldestXID's DB:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestXidDB);
-	}
-
-	if (next_xid_epoch_given)
-	{
-		printf(_("NextXID epoch:                        %u\n"),
-			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID_DB);
 	}
 
 	if (commit_ts_xids_given)
 	{
-		printf(_("oldestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.oldestCommitTsXid);
-		printf(_("newestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.newestCommitTsXid);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_COMMITTS_XID);
+		simple_oid_list_append(&toprint, CD_CKPT_NEWEST_COMMITTS_XID);
 	}
 
 	if (wal_segsize_given)
-	{
-		printf(_("Bytes per WAL segment:                %u\n"),
-			   ControlFile.xlog_seg_size);
+		simple_oid_list_append(&toprint, CD_WAL_SEGSIZE);
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{															\
+	thislen = internal_wcswidth(_(description),					\
+								strlen(_(description)),			\
+								encoding);						\
+	if (thislen > maxlen)										\
+		maxlen = thislen;										\
 	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
+
+
+	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
+				 newXlogSegNo, WalSegSz);
+
+	/* We print this one inconditionally */
+	{
+		char *str = "First log segment after reset";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%s\n", _(str), maxlen - thislen + 2, " ", fname);
+	}
+
+	/* We print the XID epoch in a degenerate case */
+	if (next_xid_epoch_given)
+	{
+		char *str = "NextXID epoch";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%u\n", _(str), maxlen - thislen + 2, " ",
+			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+
+	}
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{													\
+		int		thisstrlen;								\
+														\
+		thisstrlen = strlen(_(description));			\
+		thislen = internal_wcswidth(_(description),		\
+									thisstrlen,			\
+									encoding);			\
+		printf("%s:%*s" fmt "\n",						\
+			   _(description),							\
+			   maxlen - thislen + 2,					\
+			   " ",										\
+			   __VA_ARGS__);							\
+	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
 }
 
 
-- 
2.47.3


--m4rixdodkhrlzpzv--





^ permalink  raw  reply  [nested|flat] 180+ messages in thread

* [PATCH 2/2] Apply the same technique to PrintNewControlValues too
@ 2026-01-31 15:01 Álvaro Herrera <[email protected]>
  0 siblings, 0 replies; 180+ messages in thread

From: Álvaro Herrera @ 2026-01-31 15:01 UTC (permalink / raw)

---
 src/bin/pg_resetwal/entries.h     |  60 +++++++--------
 src/bin/pg_resetwal/pg_resetwal.c | 121 ++++++++++++++++++++----------
 2 files changed, 110 insertions(+), 71 deletions(-)

diff --git a/src/bin/pg_resetwal/entries.h b/src/bin/pg_resetwal/entries.h
index 6b7686da83a..25f2c49b3a8 100644
--- a/src/bin/pg_resetwal/entries.h
+++ b/src/bin/pg_resetwal/entries.h
@@ -1,62 +1,62 @@
-CONTROLDATA_LINE("pg_control version number",
+CONTROLDATA_LINE(CD_CONTROL_VERSION, "pg_control version number",
 				 "%u", ControlFile.pg_control_version)
-CONTROLDATA_LINE("Catalog version number",
+CONTROLDATA_LINE(CD_CATALOG_VERSION, "Catalog version number",
 				 "%u", ControlFile.catalog_version_no)
-CONTROLDATA_LINE("Database system identifier",
+CONTROLDATA_LINE(CD_SYSTEM_IDENTIFIER, "Database system identifier",
 				 "%" PRIu64, ControlFile.system_identifier)
-CONTROLDATA_LINE("Latest checkpoint's TimeLineID",
+CONTROLDATA_LINE(CD_CKPT_TIMELINE, "Latest checkpoint's TimeLineID",
 				 "%u", ControlFile.checkPointCopy.ThisTimeLineID)
-CONTROLDATA_LINE("Latest checkpoint's full_page_writes",
+CONTROLDATA_LINE(CD_CKPT_FPW, "Latest checkpoint's full_page_writes",
 				 "%s", (ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off")))
-CONTROLDATA_LINE("Latest checkpoint's NextXID",
+CONTROLDATA_LINE(CD_CKPT_NEXTXID, "Latest checkpoint's NextXID",
 				 "%u:%u", EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid), XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid))
-CONTROLDATA_LINE("Latest checkpoint's NextOID",
+CONTROLDATA_LINE(CD_CKPT_NEXTOID, "Latest checkpoint's NextOID",
 				 "%u", ControlFile.checkPointCopy.nextOid)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiXactId",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXID, "Latest checkpoint's NextMultiXactId",
 				 "%u", ControlFile.checkPointCopy.nextMulti)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiOffset",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXOFF, "Latest checkpoint's NextMultiOffset",
 				 "%" PRIu64, ControlFile.checkPointCopy.nextMultiOffset)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID, "Latest checkpoint's oldestXID",
 				 "%u", ControlFile.checkPointCopy.oldestXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID_DB, "Latest checkpoint's oldestXID's DB",
 				 "%u", ControlFile.checkPointCopy.oldestXidDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestActiveXID",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_ACTIVEXID, "Latest checkpoint's oldestActiveXID",
 				 "%u", ControlFile.checkPointCopy.oldestActiveXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestMultiXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI, "Latest checkpoint's oldestMultiXid",
 				 "%u", ControlFile.checkPointCopy.oldestMulti)
-CONTROLDATA_LINE("Latest checkpoint's oldestMulti's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI_DB, "Latest checkpoint's oldestMulti's DB",
 				 "%u", ControlFile.checkPointCopy.oldestMultiDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_COMMITTS_XID, "Latest checkpoint's oldestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.oldestCommitTsXid)
-CONTROLDATA_LINE("Latest checkpoint's newestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_NEWEST_COMMITTS_XID, "Latest checkpoint's newestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.newestCommitTsXid)
-CONTROLDATA_LINE("Maximum data alignment",
+CONTROLDATA_LINE(CD_MAXALIGN, "Maximum data alignment",
 				 "%u", ControlFile.maxAlign)
-CONTROLDATA_LINE("Database block size",
+CONTROLDATA_LINE(CD_BLCKSZ, "Database block size",
 				 "%u", ControlFile.blcksz)
-CONTROLDATA_LINE("Blocks per segment of large relation",
+CONTROLDATA_LINE(CD_RELSEG_SZ, "Blocks per segment of large relation",
 				 "%u", ControlFile.relseg_size)
-CONTROLDATA_LINE("Pages per SLRU segment",
+CONTROLDATA_LINE(CD_SLRU_PPS, "Pages per SLRU segment",
 				 "%u", ControlFile.slru_pages_per_segment)
-CONTROLDATA_LINE("WAL block size",
+CONTROLDATA_LINE(CD_WAL_BLCKSZ, "WAL block size",
 				 "%u", ControlFile.xlog_blcksz)
-CONTROLDATA_LINE("Bytes per WAL segment",
+CONTROLDATA_LINE(CD_WAL_SEGSIZE, "Bytes per WAL segment",
 				 "%u", ControlFile.xlog_seg_size)
-CONTROLDATA_LINE("Maximum length of identifiers",
+CONTROLDATA_LINE(CD_WAL_NAMEDATALEN, "Maximum length of identifiers",
 				 "%u", ControlFile.nameDataLen)
-CONTROLDATA_LINE("Maximum columns in an index",
+CONTROLDATA_LINE(CD_INDEX_MAX_KEYS, "Maximum columns in an index",
 				 "%u", ControlFile.indexMaxKeys)
-CONTROLDATA_LINE("Maximum size of a TOAST chunk",
+CONTROLDATA_LINE(CD_TOAST_MAXCHUNKSZ, "Maximum size of a TOAST chunk",
 				 "%u", ControlFile.toast_max_chunk_size)
-CONTROLDATA_LINE("Size of a large-object chunk",
+CONTROLDATA_LINE(CD_LO_BLKSZ, "Size of a large-object chunk",
 				 "%u", ControlFile.loblksize)
 
 /* This is no longer configurable, but users may still expect to see it: */
-CONTROLDATA_LINE("Date/time type storage",
+CONTROLDATA_LINE(CD_DATETIME_INT64, "Date/time type storage",
 				 "%s", _("64-bit integers"))
-CONTROLDATA_LINE("Float8 argument passing",
+CONTROLDATA_LINE(CD_FLOAT8_ARGS, "Float8 argument passing",
 				 "%s", ControlFile.float8ByVal ? _("by value") : _("by reference"))
-CONTROLDATA_LINE("Data page checksum version",
+CONTROLDATA_LINE(CD_CHECKSUMS, "Data page checksum version",
 				 "%u", ControlFile.data_checksum_version)
-CONTROLDATA_LINE("Default char data signedness",
+CONTROLDATA_LINE(CD_CHAR_SIGNEDNESS, "Default char data signedness",
 				 "%s", ControlFile.default_char_signedness ? _("signed") : _("unsigned"))
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index fb17b6f80e0..23bf1c62183 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -55,6 +55,7 @@
 #include "common/restricted_token.h"
 #include "common/string.h"
 #include "fe_utils/option_utils.h"
+#include "fe_utils/simple_list.h"
 #include "fe_utils/version.h"
 #include "getopt_long.h"
 #include "mb/pg_wchar.h"
@@ -119,6 +120,14 @@ static int	internal_wcswidth(const char *pwcs, size_t len, int encoding);
 static uint32 strtouint32_strict(const char *restrict s, char **restrict endptr, int base);
 static uint64 strtouint64_strict(const char *restrict s, char **restrict endptr, int base);
 
+/* Define the string enums */
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	symbol,
+enum ControldataStrings {
+#include "entries.h"
+};
+#undef CONTROLDATA_LINE
+
 
 int
 main(int argc, char *argv[])
@@ -768,7 +777,7 @@ PrintControlValues(bool guessed)
 	 * First, determine the maximum length of the description of all entries,
 	 * some or all of which might be translated.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	thislen = internal_wcswidth(_(description),			\
 								strlen(_(description)),	\
 								encoding);				\
@@ -781,7 +790,7 @@ PrintControlValues(bool guessed)
 	 * Print each line: the possibly-translated description, then some padding
 	 * spaces according to its display width, then the value.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	{													\
 		int		thisstrlen;								\
 														\
@@ -807,69 +816,99 @@ static void
 PrintNewControlValues(void)
 {
 	char		fname[MAXFNAMELEN];
+	int			encoding = pg_get_encoding_from_locale(NULL, true);
+	SimpleOidList	toprint = {NULL, NULL};
+	int			maxlen = 0;
+	int			thislen;
 
 	/* This will be always printed in order to keep format same. */
 	printf(_("\n\nValues to be changed:\n\n"));
 
-	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
-				 newXlogSegNo, WalSegSz);
-	printf(_("First log segment after reset:        %s\n"), fname);
-
 	if (mxids_given)
 	{
-		printf(_("NextMultiXactId:                      %u\n"),
-			   ControlFile.checkPointCopy.nextMulti);
-		printf(_("OldestMultiXid:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestMulti);
-		printf(_("OldestMulti's DB:                     %u\n"),
-			   ControlFile.checkPointCopy.oldestMultiDB);
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI_DB);
 	}
 
 	if (next_mxoff_given)
-	{
-		printf(_("NextMultiOffset:                      %" PRIu64 "\n"),
-			   ControlFile.checkPointCopy.nextMultiOffset);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXOFF);
 
 	if (next_oid_given)
-	{
-		printf(_("NextOID:                              %u\n"),
-			   ControlFile.checkPointCopy.nextOid);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTOID);
 
 	if (next_xid_given)
-	{
-		printf(_("NextXID:                              %u\n"),
-			   XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTXID);
 
 	if (oldest_xid_given)
 	{
-		printf(_("OldestXID:                            %u\n"),
-			   ControlFile.checkPointCopy.oldestXid);
-		printf(_("OldestXID's DB:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestXidDB);
-	}
-
-	if (next_xid_epoch_given)
-	{
-		printf(_("NextXID epoch:                        %u\n"),
-			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID_DB);
 	}
 
 	if (commit_ts_xids_given)
 	{
-		printf(_("oldestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.oldestCommitTsXid);
-		printf(_("newestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.newestCommitTsXid);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_COMMITTS_XID);
+		simple_oid_list_append(&toprint, CD_CKPT_NEWEST_COMMITTS_XID);
 	}
 
 	if (wal_segsize_given)
-	{
-		printf(_("Bytes per WAL segment:                %u\n"),
-			   ControlFile.xlog_seg_size);
+		simple_oid_list_append(&toprint, CD_WAL_SEGSIZE);
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{															\
+	thislen = internal_wcswidth(_(description),					\
+								strlen(_(description)),			\
+								encoding);						\
+	if (thislen > maxlen)										\
+		maxlen = thislen;										\
 	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
+
+
+	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
+				 newXlogSegNo, WalSegSz);
+
+	/* We print this one inconditionally */
+	{
+		char *str = "First log segment after reset";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%s\n", _(str), maxlen - thislen + 2, " ", fname);
+	}
+
+	/* We print the XID epoch in a degenerate case */
+	if (next_xid_epoch_given)
+	{
+		char *str = "NextXID epoch";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%u\n", _(str), maxlen - thislen + 2, " ",
+			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+
+	}
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{													\
+		int		thisstrlen;								\
+														\
+		thisstrlen = strlen(_(description));			\
+		thislen = internal_wcswidth(_(description),		\
+									thisstrlen,			\
+									encoding);			\
+		printf("%s:%*s" fmt "\n",						\
+			   _(description),							\
+			   maxlen - thislen + 2,					\
+			   " ",										\
+			   __VA_ARGS__);							\
+	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
 }
 
 
-- 
2.47.3


--m4rixdodkhrlzpzv--





^ permalink  raw  reply  [nested|flat] 180+ messages in thread

* [PATCH 2/2] Apply the same technique to PrintNewControlValues too
@ 2026-01-31 15:01 Álvaro Herrera <[email protected]>
  0 siblings, 0 replies; 180+ messages in thread

From: Álvaro Herrera @ 2026-01-31 15:01 UTC (permalink / raw)

---
 src/bin/pg_resetwal/entries.h     |  60 +++++++--------
 src/bin/pg_resetwal/pg_resetwal.c | 121 ++++++++++++++++++++----------
 2 files changed, 110 insertions(+), 71 deletions(-)

diff --git a/src/bin/pg_resetwal/entries.h b/src/bin/pg_resetwal/entries.h
index 6b7686da83a..25f2c49b3a8 100644
--- a/src/bin/pg_resetwal/entries.h
+++ b/src/bin/pg_resetwal/entries.h
@@ -1,62 +1,62 @@
-CONTROLDATA_LINE("pg_control version number",
+CONTROLDATA_LINE(CD_CONTROL_VERSION, "pg_control version number",
 				 "%u", ControlFile.pg_control_version)
-CONTROLDATA_LINE("Catalog version number",
+CONTROLDATA_LINE(CD_CATALOG_VERSION, "Catalog version number",
 				 "%u", ControlFile.catalog_version_no)
-CONTROLDATA_LINE("Database system identifier",
+CONTROLDATA_LINE(CD_SYSTEM_IDENTIFIER, "Database system identifier",
 				 "%" PRIu64, ControlFile.system_identifier)
-CONTROLDATA_LINE("Latest checkpoint's TimeLineID",
+CONTROLDATA_LINE(CD_CKPT_TIMELINE, "Latest checkpoint's TimeLineID",
 				 "%u", ControlFile.checkPointCopy.ThisTimeLineID)
-CONTROLDATA_LINE("Latest checkpoint's full_page_writes",
+CONTROLDATA_LINE(CD_CKPT_FPW, "Latest checkpoint's full_page_writes",
 				 "%s", (ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off")))
-CONTROLDATA_LINE("Latest checkpoint's NextXID",
+CONTROLDATA_LINE(CD_CKPT_NEXTXID, "Latest checkpoint's NextXID",
 				 "%u:%u", EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid), XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid))
-CONTROLDATA_LINE("Latest checkpoint's NextOID",
+CONTROLDATA_LINE(CD_CKPT_NEXTOID, "Latest checkpoint's NextOID",
 				 "%u", ControlFile.checkPointCopy.nextOid)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiXactId",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXID, "Latest checkpoint's NextMultiXactId",
 				 "%u", ControlFile.checkPointCopy.nextMulti)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiOffset",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXOFF, "Latest checkpoint's NextMultiOffset",
 				 "%" PRIu64, ControlFile.checkPointCopy.nextMultiOffset)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID, "Latest checkpoint's oldestXID",
 				 "%u", ControlFile.checkPointCopy.oldestXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID_DB, "Latest checkpoint's oldestXID's DB",
 				 "%u", ControlFile.checkPointCopy.oldestXidDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestActiveXID",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_ACTIVEXID, "Latest checkpoint's oldestActiveXID",
 				 "%u", ControlFile.checkPointCopy.oldestActiveXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestMultiXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI, "Latest checkpoint's oldestMultiXid",
 				 "%u", ControlFile.checkPointCopy.oldestMulti)
-CONTROLDATA_LINE("Latest checkpoint's oldestMulti's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI_DB, "Latest checkpoint's oldestMulti's DB",
 				 "%u", ControlFile.checkPointCopy.oldestMultiDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_COMMITTS_XID, "Latest checkpoint's oldestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.oldestCommitTsXid)
-CONTROLDATA_LINE("Latest checkpoint's newestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_NEWEST_COMMITTS_XID, "Latest checkpoint's newestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.newestCommitTsXid)
-CONTROLDATA_LINE("Maximum data alignment",
+CONTROLDATA_LINE(CD_MAXALIGN, "Maximum data alignment",
 				 "%u", ControlFile.maxAlign)
-CONTROLDATA_LINE("Database block size",
+CONTROLDATA_LINE(CD_BLCKSZ, "Database block size",
 				 "%u", ControlFile.blcksz)
-CONTROLDATA_LINE("Blocks per segment of large relation",
+CONTROLDATA_LINE(CD_RELSEG_SZ, "Blocks per segment of large relation",
 				 "%u", ControlFile.relseg_size)
-CONTROLDATA_LINE("Pages per SLRU segment",
+CONTROLDATA_LINE(CD_SLRU_PPS, "Pages per SLRU segment",
 				 "%u", ControlFile.slru_pages_per_segment)
-CONTROLDATA_LINE("WAL block size",
+CONTROLDATA_LINE(CD_WAL_BLCKSZ, "WAL block size",
 				 "%u", ControlFile.xlog_blcksz)
-CONTROLDATA_LINE("Bytes per WAL segment",
+CONTROLDATA_LINE(CD_WAL_SEGSIZE, "Bytes per WAL segment",
 				 "%u", ControlFile.xlog_seg_size)
-CONTROLDATA_LINE("Maximum length of identifiers",
+CONTROLDATA_LINE(CD_WAL_NAMEDATALEN, "Maximum length of identifiers",
 				 "%u", ControlFile.nameDataLen)
-CONTROLDATA_LINE("Maximum columns in an index",
+CONTROLDATA_LINE(CD_INDEX_MAX_KEYS, "Maximum columns in an index",
 				 "%u", ControlFile.indexMaxKeys)
-CONTROLDATA_LINE("Maximum size of a TOAST chunk",
+CONTROLDATA_LINE(CD_TOAST_MAXCHUNKSZ, "Maximum size of a TOAST chunk",
 				 "%u", ControlFile.toast_max_chunk_size)
-CONTROLDATA_LINE("Size of a large-object chunk",
+CONTROLDATA_LINE(CD_LO_BLKSZ, "Size of a large-object chunk",
 				 "%u", ControlFile.loblksize)
 
 /* This is no longer configurable, but users may still expect to see it: */
-CONTROLDATA_LINE("Date/time type storage",
+CONTROLDATA_LINE(CD_DATETIME_INT64, "Date/time type storage",
 				 "%s", _("64-bit integers"))
-CONTROLDATA_LINE("Float8 argument passing",
+CONTROLDATA_LINE(CD_FLOAT8_ARGS, "Float8 argument passing",
 				 "%s", ControlFile.float8ByVal ? _("by value") : _("by reference"))
-CONTROLDATA_LINE("Data page checksum version",
+CONTROLDATA_LINE(CD_CHECKSUMS, "Data page checksum version",
 				 "%u", ControlFile.data_checksum_version)
-CONTROLDATA_LINE("Default char data signedness",
+CONTROLDATA_LINE(CD_CHAR_SIGNEDNESS, "Default char data signedness",
 				 "%s", ControlFile.default_char_signedness ? _("signed") : _("unsigned"))
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index fb17b6f80e0..23bf1c62183 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -55,6 +55,7 @@
 #include "common/restricted_token.h"
 #include "common/string.h"
 #include "fe_utils/option_utils.h"
+#include "fe_utils/simple_list.h"
 #include "fe_utils/version.h"
 #include "getopt_long.h"
 #include "mb/pg_wchar.h"
@@ -119,6 +120,14 @@ static int	internal_wcswidth(const char *pwcs, size_t len, int encoding);
 static uint32 strtouint32_strict(const char *restrict s, char **restrict endptr, int base);
 static uint64 strtouint64_strict(const char *restrict s, char **restrict endptr, int base);
 
+/* Define the string enums */
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	symbol,
+enum ControldataStrings {
+#include "entries.h"
+};
+#undef CONTROLDATA_LINE
+
 
 int
 main(int argc, char *argv[])
@@ -768,7 +777,7 @@ PrintControlValues(bool guessed)
 	 * First, determine the maximum length of the description of all entries,
 	 * some or all of which might be translated.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	thislen = internal_wcswidth(_(description),			\
 								strlen(_(description)),	\
 								encoding);				\
@@ -781,7 +790,7 @@ PrintControlValues(bool guessed)
 	 * Print each line: the possibly-translated description, then some padding
 	 * spaces according to its display width, then the value.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	{													\
 		int		thisstrlen;								\
 														\
@@ -807,69 +816,99 @@ static void
 PrintNewControlValues(void)
 {
 	char		fname[MAXFNAMELEN];
+	int			encoding = pg_get_encoding_from_locale(NULL, true);
+	SimpleOidList	toprint = {NULL, NULL};
+	int			maxlen = 0;
+	int			thislen;
 
 	/* This will be always printed in order to keep format same. */
 	printf(_("\n\nValues to be changed:\n\n"));
 
-	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
-				 newXlogSegNo, WalSegSz);
-	printf(_("First log segment after reset:        %s\n"), fname);
-
 	if (mxids_given)
 	{
-		printf(_("NextMultiXactId:                      %u\n"),
-			   ControlFile.checkPointCopy.nextMulti);
-		printf(_("OldestMultiXid:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestMulti);
-		printf(_("OldestMulti's DB:                     %u\n"),
-			   ControlFile.checkPointCopy.oldestMultiDB);
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI_DB);
 	}
 
 	if (next_mxoff_given)
-	{
-		printf(_("NextMultiOffset:                      %" PRIu64 "\n"),
-			   ControlFile.checkPointCopy.nextMultiOffset);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXOFF);
 
 	if (next_oid_given)
-	{
-		printf(_("NextOID:                              %u\n"),
-			   ControlFile.checkPointCopy.nextOid);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTOID);
 
 	if (next_xid_given)
-	{
-		printf(_("NextXID:                              %u\n"),
-			   XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTXID);
 
 	if (oldest_xid_given)
 	{
-		printf(_("OldestXID:                            %u\n"),
-			   ControlFile.checkPointCopy.oldestXid);
-		printf(_("OldestXID's DB:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestXidDB);
-	}
-
-	if (next_xid_epoch_given)
-	{
-		printf(_("NextXID epoch:                        %u\n"),
-			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID_DB);
 	}
 
 	if (commit_ts_xids_given)
 	{
-		printf(_("oldestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.oldestCommitTsXid);
-		printf(_("newestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.newestCommitTsXid);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_COMMITTS_XID);
+		simple_oid_list_append(&toprint, CD_CKPT_NEWEST_COMMITTS_XID);
 	}
 
 	if (wal_segsize_given)
-	{
-		printf(_("Bytes per WAL segment:                %u\n"),
-			   ControlFile.xlog_seg_size);
+		simple_oid_list_append(&toprint, CD_WAL_SEGSIZE);
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{															\
+	thislen = internal_wcswidth(_(description),					\
+								strlen(_(description)),			\
+								encoding);						\
+	if (thislen > maxlen)										\
+		maxlen = thislen;										\
 	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
+
+
+	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
+				 newXlogSegNo, WalSegSz);
+
+	/* We print this one inconditionally */
+	{
+		char *str = "First log segment after reset";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%s\n", _(str), maxlen - thislen + 2, " ", fname);
+	}
+
+	/* We print the XID epoch in a degenerate case */
+	if (next_xid_epoch_given)
+	{
+		char *str = "NextXID epoch";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%u\n", _(str), maxlen - thislen + 2, " ",
+			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+
+	}
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{													\
+		int		thisstrlen;								\
+														\
+		thisstrlen = strlen(_(description));			\
+		thislen = internal_wcswidth(_(description),		\
+									thisstrlen,			\
+									encoding);			\
+		printf("%s:%*s" fmt "\n",						\
+			   _(description),							\
+			   maxlen - thislen + 2,					\
+			   " ",										\
+			   __VA_ARGS__);							\
+	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
 }
 
 
-- 
2.47.3


--m4rixdodkhrlzpzv--





^ permalink  raw  reply  [nested|flat] 180+ messages in thread

* [PATCH 2/2] Apply the same technique to PrintNewControlValues too
@ 2026-01-31 15:01 Álvaro Herrera <[email protected]>
  0 siblings, 0 replies; 180+ messages in thread

From: Álvaro Herrera @ 2026-01-31 15:01 UTC (permalink / raw)

---
 src/bin/pg_resetwal/entries.h     |  60 +++++++--------
 src/bin/pg_resetwal/pg_resetwal.c | 121 ++++++++++++++++++++----------
 2 files changed, 110 insertions(+), 71 deletions(-)

diff --git a/src/bin/pg_resetwal/entries.h b/src/bin/pg_resetwal/entries.h
index 6b7686da83a..25f2c49b3a8 100644
--- a/src/bin/pg_resetwal/entries.h
+++ b/src/bin/pg_resetwal/entries.h
@@ -1,62 +1,62 @@
-CONTROLDATA_LINE("pg_control version number",
+CONTROLDATA_LINE(CD_CONTROL_VERSION, "pg_control version number",
 				 "%u", ControlFile.pg_control_version)
-CONTROLDATA_LINE("Catalog version number",
+CONTROLDATA_LINE(CD_CATALOG_VERSION, "Catalog version number",
 				 "%u", ControlFile.catalog_version_no)
-CONTROLDATA_LINE("Database system identifier",
+CONTROLDATA_LINE(CD_SYSTEM_IDENTIFIER, "Database system identifier",
 				 "%" PRIu64, ControlFile.system_identifier)
-CONTROLDATA_LINE("Latest checkpoint's TimeLineID",
+CONTROLDATA_LINE(CD_CKPT_TIMELINE, "Latest checkpoint's TimeLineID",
 				 "%u", ControlFile.checkPointCopy.ThisTimeLineID)
-CONTROLDATA_LINE("Latest checkpoint's full_page_writes",
+CONTROLDATA_LINE(CD_CKPT_FPW, "Latest checkpoint's full_page_writes",
 				 "%s", (ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off")))
-CONTROLDATA_LINE("Latest checkpoint's NextXID",
+CONTROLDATA_LINE(CD_CKPT_NEXTXID, "Latest checkpoint's NextXID",
 				 "%u:%u", EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid), XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid))
-CONTROLDATA_LINE("Latest checkpoint's NextOID",
+CONTROLDATA_LINE(CD_CKPT_NEXTOID, "Latest checkpoint's NextOID",
 				 "%u", ControlFile.checkPointCopy.nextOid)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiXactId",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXID, "Latest checkpoint's NextMultiXactId",
 				 "%u", ControlFile.checkPointCopy.nextMulti)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiOffset",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXOFF, "Latest checkpoint's NextMultiOffset",
 				 "%" PRIu64, ControlFile.checkPointCopy.nextMultiOffset)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID, "Latest checkpoint's oldestXID",
 				 "%u", ControlFile.checkPointCopy.oldestXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID_DB, "Latest checkpoint's oldestXID's DB",
 				 "%u", ControlFile.checkPointCopy.oldestXidDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestActiveXID",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_ACTIVEXID, "Latest checkpoint's oldestActiveXID",
 				 "%u", ControlFile.checkPointCopy.oldestActiveXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestMultiXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI, "Latest checkpoint's oldestMultiXid",
 				 "%u", ControlFile.checkPointCopy.oldestMulti)
-CONTROLDATA_LINE("Latest checkpoint's oldestMulti's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI_DB, "Latest checkpoint's oldestMulti's DB",
 				 "%u", ControlFile.checkPointCopy.oldestMultiDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_COMMITTS_XID, "Latest checkpoint's oldestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.oldestCommitTsXid)
-CONTROLDATA_LINE("Latest checkpoint's newestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_NEWEST_COMMITTS_XID, "Latest checkpoint's newestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.newestCommitTsXid)
-CONTROLDATA_LINE("Maximum data alignment",
+CONTROLDATA_LINE(CD_MAXALIGN, "Maximum data alignment",
 				 "%u", ControlFile.maxAlign)
-CONTROLDATA_LINE("Database block size",
+CONTROLDATA_LINE(CD_BLCKSZ, "Database block size",
 				 "%u", ControlFile.blcksz)
-CONTROLDATA_LINE("Blocks per segment of large relation",
+CONTROLDATA_LINE(CD_RELSEG_SZ, "Blocks per segment of large relation",
 				 "%u", ControlFile.relseg_size)
-CONTROLDATA_LINE("Pages per SLRU segment",
+CONTROLDATA_LINE(CD_SLRU_PPS, "Pages per SLRU segment",
 				 "%u", ControlFile.slru_pages_per_segment)
-CONTROLDATA_LINE("WAL block size",
+CONTROLDATA_LINE(CD_WAL_BLCKSZ, "WAL block size",
 				 "%u", ControlFile.xlog_blcksz)
-CONTROLDATA_LINE("Bytes per WAL segment",
+CONTROLDATA_LINE(CD_WAL_SEGSIZE, "Bytes per WAL segment",
 				 "%u", ControlFile.xlog_seg_size)
-CONTROLDATA_LINE("Maximum length of identifiers",
+CONTROLDATA_LINE(CD_WAL_NAMEDATALEN, "Maximum length of identifiers",
 				 "%u", ControlFile.nameDataLen)
-CONTROLDATA_LINE("Maximum columns in an index",
+CONTROLDATA_LINE(CD_INDEX_MAX_KEYS, "Maximum columns in an index",
 				 "%u", ControlFile.indexMaxKeys)
-CONTROLDATA_LINE("Maximum size of a TOAST chunk",
+CONTROLDATA_LINE(CD_TOAST_MAXCHUNKSZ, "Maximum size of a TOAST chunk",
 				 "%u", ControlFile.toast_max_chunk_size)
-CONTROLDATA_LINE("Size of a large-object chunk",
+CONTROLDATA_LINE(CD_LO_BLKSZ, "Size of a large-object chunk",
 				 "%u", ControlFile.loblksize)
 
 /* This is no longer configurable, but users may still expect to see it: */
-CONTROLDATA_LINE("Date/time type storage",
+CONTROLDATA_LINE(CD_DATETIME_INT64, "Date/time type storage",
 				 "%s", _("64-bit integers"))
-CONTROLDATA_LINE("Float8 argument passing",
+CONTROLDATA_LINE(CD_FLOAT8_ARGS, "Float8 argument passing",
 				 "%s", ControlFile.float8ByVal ? _("by value") : _("by reference"))
-CONTROLDATA_LINE("Data page checksum version",
+CONTROLDATA_LINE(CD_CHECKSUMS, "Data page checksum version",
 				 "%u", ControlFile.data_checksum_version)
-CONTROLDATA_LINE("Default char data signedness",
+CONTROLDATA_LINE(CD_CHAR_SIGNEDNESS, "Default char data signedness",
 				 "%s", ControlFile.default_char_signedness ? _("signed") : _("unsigned"))
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index fb17b6f80e0..23bf1c62183 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -55,6 +55,7 @@
 #include "common/restricted_token.h"
 #include "common/string.h"
 #include "fe_utils/option_utils.h"
+#include "fe_utils/simple_list.h"
 #include "fe_utils/version.h"
 #include "getopt_long.h"
 #include "mb/pg_wchar.h"
@@ -119,6 +120,14 @@ static int	internal_wcswidth(const char *pwcs, size_t len, int encoding);
 static uint32 strtouint32_strict(const char *restrict s, char **restrict endptr, int base);
 static uint64 strtouint64_strict(const char *restrict s, char **restrict endptr, int base);
 
+/* Define the string enums */
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	symbol,
+enum ControldataStrings {
+#include "entries.h"
+};
+#undef CONTROLDATA_LINE
+
 
 int
 main(int argc, char *argv[])
@@ -768,7 +777,7 @@ PrintControlValues(bool guessed)
 	 * First, determine the maximum length of the description of all entries,
 	 * some or all of which might be translated.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	thislen = internal_wcswidth(_(description),			\
 								strlen(_(description)),	\
 								encoding);				\
@@ -781,7 +790,7 @@ PrintControlValues(bool guessed)
 	 * Print each line: the possibly-translated description, then some padding
 	 * spaces according to its display width, then the value.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	{													\
 		int		thisstrlen;								\
 														\
@@ -807,69 +816,99 @@ static void
 PrintNewControlValues(void)
 {
 	char		fname[MAXFNAMELEN];
+	int			encoding = pg_get_encoding_from_locale(NULL, true);
+	SimpleOidList	toprint = {NULL, NULL};
+	int			maxlen = 0;
+	int			thislen;
 
 	/* This will be always printed in order to keep format same. */
 	printf(_("\n\nValues to be changed:\n\n"));
 
-	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
-				 newXlogSegNo, WalSegSz);
-	printf(_("First log segment after reset:        %s\n"), fname);
-
 	if (mxids_given)
 	{
-		printf(_("NextMultiXactId:                      %u\n"),
-			   ControlFile.checkPointCopy.nextMulti);
-		printf(_("OldestMultiXid:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestMulti);
-		printf(_("OldestMulti's DB:                     %u\n"),
-			   ControlFile.checkPointCopy.oldestMultiDB);
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI_DB);
 	}
 
 	if (next_mxoff_given)
-	{
-		printf(_("NextMultiOffset:                      %" PRIu64 "\n"),
-			   ControlFile.checkPointCopy.nextMultiOffset);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXOFF);
 
 	if (next_oid_given)
-	{
-		printf(_("NextOID:                              %u\n"),
-			   ControlFile.checkPointCopy.nextOid);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTOID);
 
 	if (next_xid_given)
-	{
-		printf(_("NextXID:                              %u\n"),
-			   XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTXID);
 
 	if (oldest_xid_given)
 	{
-		printf(_("OldestXID:                            %u\n"),
-			   ControlFile.checkPointCopy.oldestXid);
-		printf(_("OldestXID's DB:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestXidDB);
-	}
-
-	if (next_xid_epoch_given)
-	{
-		printf(_("NextXID epoch:                        %u\n"),
-			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID_DB);
 	}
 
 	if (commit_ts_xids_given)
 	{
-		printf(_("oldestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.oldestCommitTsXid);
-		printf(_("newestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.newestCommitTsXid);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_COMMITTS_XID);
+		simple_oid_list_append(&toprint, CD_CKPT_NEWEST_COMMITTS_XID);
 	}
 
 	if (wal_segsize_given)
-	{
-		printf(_("Bytes per WAL segment:                %u\n"),
-			   ControlFile.xlog_seg_size);
+		simple_oid_list_append(&toprint, CD_WAL_SEGSIZE);
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{															\
+	thislen = internal_wcswidth(_(description),					\
+								strlen(_(description)),			\
+								encoding);						\
+	if (thislen > maxlen)										\
+		maxlen = thislen;										\
 	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
+
+
+	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
+				 newXlogSegNo, WalSegSz);
+
+	/* We print this one inconditionally */
+	{
+		char *str = "First log segment after reset";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%s\n", _(str), maxlen - thislen + 2, " ", fname);
+	}
+
+	/* We print the XID epoch in a degenerate case */
+	if (next_xid_epoch_given)
+	{
+		char *str = "NextXID epoch";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%u\n", _(str), maxlen - thislen + 2, " ",
+			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+
+	}
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{													\
+		int		thisstrlen;								\
+														\
+		thisstrlen = strlen(_(description));			\
+		thislen = internal_wcswidth(_(description),		\
+									thisstrlen,			\
+									encoding);			\
+		printf("%s:%*s" fmt "\n",						\
+			   _(description),							\
+			   maxlen - thislen + 2,					\
+			   " ",										\
+			   __VA_ARGS__);							\
+	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
 }
 
 
-- 
2.47.3


--m4rixdodkhrlzpzv--





^ permalink  raw  reply  [nested|flat] 180+ messages in thread

* [PATCH 2/2] Apply the same technique to PrintNewControlValues too
@ 2026-01-31 15:01 Álvaro Herrera <[email protected]>
  0 siblings, 0 replies; 180+ messages in thread

From: Álvaro Herrera @ 2026-01-31 15:01 UTC (permalink / raw)

---
 src/bin/pg_resetwal/entries.h     |  60 +++++++--------
 src/bin/pg_resetwal/pg_resetwal.c | 121 ++++++++++++++++++++----------
 2 files changed, 110 insertions(+), 71 deletions(-)

diff --git a/src/bin/pg_resetwal/entries.h b/src/bin/pg_resetwal/entries.h
index 6b7686da83a..25f2c49b3a8 100644
--- a/src/bin/pg_resetwal/entries.h
+++ b/src/bin/pg_resetwal/entries.h
@@ -1,62 +1,62 @@
-CONTROLDATA_LINE("pg_control version number",
+CONTROLDATA_LINE(CD_CONTROL_VERSION, "pg_control version number",
 				 "%u", ControlFile.pg_control_version)
-CONTROLDATA_LINE("Catalog version number",
+CONTROLDATA_LINE(CD_CATALOG_VERSION, "Catalog version number",
 				 "%u", ControlFile.catalog_version_no)
-CONTROLDATA_LINE("Database system identifier",
+CONTROLDATA_LINE(CD_SYSTEM_IDENTIFIER, "Database system identifier",
 				 "%" PRIu64, ControlFile.system_identifier)
-CONTROLDATA_LINE("Latest checkpoint's TimeLineID",
+CONTROLDATA_LINE(CD_CKPT_TIMELINE, "Latest checkpoint's TimeLineID",
 				 "%u", ControlFile.checkPointCopy.ThisTimeLineID)
-CONTROLDATA_LINE("Latest checkpoint's full_page_writes",
+CONTROLDATA_LINE(CD_CKPT_FPW, "Latest checkpoint's full_page_writes",
 				 "%s", (ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off")))
-CONTROLDATA_LINE("Latest checkpoint's NextXID",
+CONTROLDATA_LINE(CD_CKPT_NEXTXID, "Latest checkpoint's NextXID",
 				 "%u:%u", EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid), XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid))
-CONTROLDATA_LINE("Latest checkpoint's NextOID",
+CONTROLDATA_LINE(CD_CKPT_NEXTOID, "Latest checkpoint's NextOID",
 				 "%u", ControlFile.checkPointCopy.nextOid)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiXactId",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXID, "Latest checkpoint's NextMultiXactId",
 				 "%u", ControlFile.checkPointCopy.nextMulti)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiOffset",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXOFF, "Latest checkpoint's NextMultiOffset",
 				 "%" PRIu64, ControlFile.checkPointCopy.nextMultiOffset)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID, "Latest checkpoint's oldestXID",
 				 "%u", ControlFile.checkPointCopy.oldestXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID_DB, "Latest checkpoint's oldestXID's DB",
 				 "%u", ControlFile.checkPointCopy.oldestXidDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestActiveXID",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_ACTIVEXID, "Latest checkpoint's oldestActiveXID",
 				 "%u", ControlFile.checkPointCopy.oldestActiveXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestMultiXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI, "Latest checkpoint's oldestMultiXid",
 				 "%u", ControlFile.checkPointCopy.oldestMulti)
-CONTROLDATA_LINE("Latest checkpoint's oldestMulti's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI_DB, "Latest checkpoint's oldestMulti's DB",
 				 "%u", ControlFile.checkPointCopy.oldestMultiDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_COMMITTS_XID, "Latest checkpoint's oldestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.oldestCommitTsXid)
-CONTROLDATA_LINE("Latest checkpoint's newestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_NEWEST_COMMITTS_XID, "Latest checkpoint's newestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.newestCommitTsXid)
-CONTROLDATA_LINE("Maximum data alignment",
+CONTROLDATA_LINE(CD_MAXALIGN, "Maximum data alignment",
 				 "%u", ControlFile.maxAlign)
-CONTROLDATA_LINE("Database block size",
+CONTROLDATA_LINE(CD_BLCKSZ, "Database block size",
 				 "%u", ControlFile.blcksz)
-CONTROLDATA_LINE("Blocks per segment of large relation",
+CONTROLDATA_LINE(CD_RELSEG_SZ, "Blocks per segment of large relation",
 				 "%u", ControlFile.relseg_size)
-CONTROLDATA_LINE("Pages per SLRU segment",
+CONTROLDATA_LINE(CD_SLRU_PPS, "Pages per SLRU segment",
 				 "%u", ControlFile.slru_pages_per_segment)
-CONTROLDATA_LINE("WAL block size",
+CONTROLDATA_LINE(CD_WAL_BLCKSZ, "WAL block size",
 				 "%u", ControlFile.xlog_blcksz)
-CONTROLDATA_LINE("Bytes per WAL segment",
+CONTROLDATA_LINE(CD_WAL_SEGSIZE, "Bytes per WAL segment",
 				 "%u", ControlFile.xlog_seg_size)
-CONTROLDATA_LINE("Maximum length of identifiers",
+CONTROLDATA_LINE(CD_WAL_NAMEDATALEN, "Maximum length of identifiers",
 				 "%u", ControlFile.nameDataLen)
-CONTROLDATA_LINE("Maximum columns in an index",
+CONTROLDATA_LINE(CD_INDEX_MAX_KEYS, "Maximum columns in an index",
 				 "%u", ControlFile.indexMaxKeys)
-CONTROLDATA_LINE("Maximum size of a TOAST chunk",
+CONTROLDATA_LINE(CD_TOAST_MAXCHUNKSZ, "Maximum size of a TOAST chunk",
 				 "%u", ControlFile.toast_max_chunk_size)
-CONTROLDATA_LINE("Size of a large-object chunk",
+CONTROLDATA_LINE(CD_LO_BLKSZ, "Size of a large-object chunk",
 				 "%u", ControlFile.loblksize)
 
 /* This is no longer configurable, but users may still expect to see it: */
-CONTROLDATA_LINE("Date/time type storage",
+CONTROLDATA_LINE(CD_DATETIME_INT64, "Date/time type storage",
 				 "%s", _("64-bit integers"))
-CONTROLDATA_LINE("Float8 argument passing",
+CONTROLDATA_LINE(CD_FLOAT8_ARGS, "Float8 argument passing",
 				 "%s", ControlFile.float8ByVal ? _("by value") : _("by reference"))
-CONTROLDATA_LINE("Data page checksum version",
+CONTROLDATA_LINE(CD_CHECKSUMS, "Data page checksum version",
 				 "%u", ControlFile.data_checksum_version)
-CONTROLDATA_LINE("Default char data signedness",
+CONTROLDATA_LINE(CD_CHAR_SIGNEDNESS, "Default char data signedness",
 				 "%s", ControlFile.default_char_signedness ? _("signed") : _("unsigned"))
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index fb17b6f80e0..23bf1c62183 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -55,6 +55,7 @@
 #include "common/restricted_token.h"
 #include "common/string.h"
 #include "fe_utils/option_utils.h"
+#include "fe_utils/simple_list.h"
 #include "fe_utils/version.h"
 #include "getopt_long.h"
 #include "mb/pg_wchar.h"
@@ -119,6 +120,14 @@ static int	internal_wcswidth(const char *pwcs, size_t len, int encoding);
 static uint32 strtouint32_strict(const char *restrict s, char **restrict endptr, int base);
 static uint64 strtouint64_strict(const char *restrict s, char **restrict endptr, int base);
 
+/* Define the string enums */
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	symbol,
+enum ControldataStrings {
+#include "entries.h"
+};
+#undef CONTROLDATA_LINE
+
 
 int
 main(int argc, char *argv[])
@@ -768,7 +777,7 @@ PrintControlValues(bool guessed)
 	 * First, determine the maximum length of the description of all entries,
 	 * some or all of which might be translated.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	thislen = internal_wcswidth(_(description),			\
 								strlen(_(description)),	\
 								encoding);				\
@@ -781,7 +790,7 @@ PrintControlValues(bool guessed)
 	 * Print each line: the possibly-translated description, then some padding
 	 * spaces according to its display width, then the value.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	{													\
 		int		thisstrlen;								\
 														\
@@ -807,69 +816,99 @@ static void
 PrintNewControlValues(void)
 {
 	char		fname[MAXFNAMELEN];
+	int			encoding = pg_get_encoding_from_locale(NULL, true);
+	SimpleOidList	toprint = {NULL, NULL};
+	int			maxlen = 0;
+	int			thislen;
 
 	/* This will be always printed in order to keep format same. */
 	printf(_("\n\nValues to be changed:\n\n"));
 
-	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
-				 newXlogSegNo, WalSegSz);
-	printf(_("First log segment after reset:        %s\n"), fname);
-
 	if (mxids_given)
 	{
-		printf(_("NextMultiXactId:                      %u\n"),
-			   ControlFile.checkPointCopy.nextMulti);
-		printf(_("OldestMultiXid:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestMulti);
-		printf(_("OldestMulti's DB:                     %u\n"),
-			   ControlFile.checkPointCopy.oldestMultiDB);
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI_DB);
 	}
 
 	if (next_mxoff_given)
-	{
-		printf(_("NextMultiOffset:                      %" PRIu64 "\n"),
-			   ControlFile.checkPointCopy.nextMultiOffset);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXOFF);
 
 	if (next_oid_given)
-	{
-		printf(_("NextOID:                              %u\n"),
-			   ControlFile.checkPointCopy.nextOid);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTOID);
 
 	if (next_xid_given)
-	{
-		printf(_("NextXID:                              %u\n"),
-			   XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTXID);
 
 	if (oldest_xid_given)
 	{
-		printf(_("OldestXID:                            %u\n"),
-			   ControlFile.checkPointCopy.oldestXid);
-		printf(_("OldestXID's DB:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestXidDB);
-	}
-
-	if (next_xid_epoch_given)
-	{
-		printf(_("NextXID epoch:                        %u\n"),
-			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID_DB);
 	}
 
 	if (commit_ts_xids_given)
 	{
-		printf(_("oldestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.oldestCommitTsXid);
-		printf(_("newestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.newestCommitTsXid);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_COMMITTS_XID);
+		simple_oid_list_append(&toprint, CD_CKPT_NEWEST_COMMITTS_XID);
 	}
 
 	if (wal_segsize_given)
-	{
-		printf(_("Bytes per WAL segment:                %u\n"),
-			   ControlFile.xlog_seg_size);
+		simple_oid_list_append(&toprint, CD_WAL_SEGSIZE);
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{															\
+	thislen = internal_wcswidth(_(description),					\
+								strlen(_(description)),			\
+								encoding);						\
+	if (thislen > maxlen)										\
+		maxlen = thislen;										\
 	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
+
+
+	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
+				 newXlogSegNo, WalSegSz);
+
+	/* We print this one inconditionally */
+	{
+		char *str = "First log segment after reset";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%s\n", _(str), maxlen - thislen + 2, " ", fname);
+	}
+
+	/* We print the XID epoch in a degenerate case */
+	if (next_xid_epoch_given)
+	{
+		char *str = "NextXID epoch";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%u\n", _(str), maxlen - thislen + 2, " ",
+			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+
+	}
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{													\
+		int		thisstrlen;								\
+														\
+		thisstrlen = strlen(_(description));			\
+		thislen = internal_wcswidth(_(description),		\
+									thisstrlen,			\
+									encoding);			\
+		printf("%s:%*s" fmt "\n",						\
+			   _(description),							\
+			   maxlen - thislen + 2,					\
+			   " ",										\
+			   __VA_ARGS__);							\
+	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
 }
 
 
-- 
2.47.3


--m4rixdodkhrlzpzv--





^ permalink  raw  reply  [nested|flat] 180+ messages in thread

* [PATCH 2/2] Apply the same technique to PrintNewControlValues too
@ 2026-01-31 15:01 Álvaro Herrera <[email protected]>
  0 siblings, 0 replies; 180+ messages in thread

From: Álvaro Herrera @ 2026-01-31 15:01 UTC (permalink / raw)

---
 src/bin/pg_resetwal/entries.h     |  60 +++++++--------
 src/bin/pg_resetwal/pg_resetwal.c | 121 ++++++++++++++++++++----------
 2 files changed, 110 insertions(+), 71 deletions(-)

diff --git a/src/bin/pg_resetwal/entries.h b/src/bin/pg_resetwal/entries.h
index 6b7686da83a..25f2c49b3a8 100644
--- a/src/bin/pg_resetwal/entries.h
+++ b/src/bin/pg_resetwal/entries.h
@@ -1,62 +1,62 @@
-CONTROLDATA_LINE("pg_control version number",
+CONTROLDATA_LINE(CD_CONTROL_VERSION, "pg_control version number",
 				 "%u", ControlFile.pg_control_version)
-CONTROLDATA_LINE("Catalog version number",
+CONTROLDATA_LINE(CD_CATALOG_VERSION, "Catalog version number",
 				 "%u", ControlFile.catalog_version_no)
-CONTROLDATA_LINE("Database system identifier",
+CONTROLDATA_LINE(CD_SYSTEM_IDENTIFIER, "Database system identifier",
 				 "%" PRIu64, ControlFile.system_identifier)
-CONTROLDATA_LINE("Latest checkpoint's TimeLineID",
+CONTROLDATA_LINE(CD_CKPT_TIMELINE, "Latest checkpoint's TimeLineID",
 				 "%u", ControlFile.checkPointCopy.ThisTimeLineID)
-CONTROLDATA_LINE("Latest checkpoint's full_page_writes",
+CONTROLDATA_LINE(CD_CKPT_FPW, "Latest checkpoint's full_page_writes",
 				 "%s", (ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off")))
-CONTROLDATA_LINE("Latest checkpoint's NextXID",
+CONTROLDATA_LINE(CD_CKPT_NEXTXID, "Latest checkpoint's NextXID",
 				 "%u:%u", EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid), XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid))
-CONTROLDATA_LINE("Latest checkpoint's NextOID",
+CONTROLDATA_LINE(CD_CKPT_NEXTOID, "Latest checkpoint's NextOID",
 				 "%u", ControlFile.checkPointCopy.nextOid)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiXactId",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXID, "Latest checkpoint's NextMultiXactId",
 				 "%u", ControlFile.checkPointCopy.nextMulti)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiOffset",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXOFF, "Latest checkpoint's NextMultiOffset",
 				 "%" PRIu64, ControlFile.checkPointCopy.nextMultiOffset)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID, "Latest checkpoint's oldestXID",
 				 "%u", ControlFile.checkPointCopy.oldestXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID_DB, "Latest checkpoint's oldestXID's DB",
 				 "%u", ControlFile.checkPointCopy.oldestXidDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestActiveXID",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_ACTIVEXID, "Latest checkpoint's oldestActiveXID",
 				 "%u", ControlFile.checkPointCopy.oldestActiveXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestMultiXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI, "Latest checkpoint's oldestMultiXid",
 				 "%u", ControlFile.checkPointCopy.oldestMulti)
-CONTROLDATA_LINE("Latest checkpoint's oldestMulti's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI_DB, "Latest checkpoint's oldestMulti's DB",
 				 "%u", ControlFile.checkPointCopy.oldestMultiDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_COMMITTS_XID, "Latest checkpoint's oldestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.oldestCommitTsXid)
-CONTROLDATA_LINE("Latest checkpoint's newestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_NEWEST_COMMITTS_XID, "Latest checkpoint's newestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.newestCommitTsXid)
-CONTROLDATA_LINE("Maximum data alignment",
+CONTROLDATA_LINE(CD_MAXALIGN, "Maximum data alignment",
 				 "%u", ControlFile.maxAlign)
-CONTROLDATA_LINE("Database block size",
+CONTROLDATA_LINE(CD_BLCKSZ, "Database block size",
 				 "%u", ControlFile.blcksz)
-CONTROLDATA_LINE("Blocks per segment of large relation",
+CONTROLDATA_LINE(CD_RELSEG_SZ, "Blocks per segment of large relation",
 				 "%u", ControlFile.relseg_size)
-CONTROLDATA_LINE("Pages per SLRU segment",
+CONTROLDATA_LINE(CD_SLRU_PPS, "Pages per SLRU segment",
 				 "%u", ControlFile.slru_pages_per_segment)
-CONTROLDATA_LINE("WAL block size",
+CONTROLDATA_LINE(CD_WAL_BLCKSZ, "WAL block size",
 				 "%u", ControlFile.xlog_blcksz)
-CONTROLDATA_LINE("Bytes per WAL segment",
+CONTROLDATA_LINE(CD_WAL_SEGSIZE, "Bytes per WAL segment",
 				 "%u", ControlFile.xlog_seg_size)
-CONTROLDATA_LINE("Maximum length of identifiers",
+CONTROLDATA_LINE(CD_WAL_NAMEDATALEN, "Maximum length of identifiers",
 				 "%u", ControlFile.nameDataLen)
-CONTROLDATA_LINE("Maximum columns in an index",
+CONTROLDATA_LINE(CD_INDEX_MAX_KEYS, "Maximum columns in an index",
 				 "%u", ControlFile.indexMaxKeys)
-CONTROLDATA_LINE("Maximum size of a TOAST chunk",
+CONTROLDATA_LINE(CD_TOAST_MAXCHUNKSZ, "Maximum size of a TOAST chunk",
 				 "%u", ControlFile.toast_max_chunk_size)
-CONTROLDATA_LINE("Size of a large-object chunk",
+CONTROLDATA_LINE(CD_LO_BLKSZ, "Size of a large-object chunk",
 				 "%u", ControlFile.loblksize)
 
 /* This is no longer configurable, but users may still expect to see it: */
-CONTROLDATA_LINE("Date/time type storage",
+CONTROLDATA_LINE(CD_DATETIME_INT64, "Date/time type storage",
 				 "%s", _("64-bit integers"))
-CONTROLDATA_LINE("Float8 argument passing",
+CONTROLDATA_LINE(CD_FLOAT8_ARGS, "Float8 argument passing",
 				 "%s", ControlFile.float8ByVal ? _("by value") : _("by reference"))
-CONTROLDATA_LINE("Data page checksum version",
+CONTROLDATA_LINE(CD_CHECKSUMS, "Data page checksum version",
 				 "%u", ControlFile.data_checksum_version)
-CONTROLDATA_LINE("Default char data signedness",
+CONTROLDATA_LINE(CD_CHAR_SIGNEDNESS, "Default char data signedness",
 				 "%s", ControlFile.default_char_signedness ? _("signed") : _("unsigned"))
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index fb17b6f80e0..23bf1c62183 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -55,6 +55,7 @@
 #include "common/restricted_token.h"
 #include "common/string.h"
 #include "fe_utils/option_utils.h"
+#include "fe_utils/simple_list.h"
 #include "fe_utils/version.h"
 #include "getopt_long.h"
 #include "mb/pg_wchar.h"
@@ -119,6 +120,14 @@ static int	internal_wcswidth(const char *pwcs, size_t len, int encoding);
 static uint32 strtouint32_strict(const char *restrict s, char **restrict endptr, int base);
 static uint64 strtouint64_strict(const char *restrict s, char **restrict endptr, int base);
 
+/* Define the string enums */
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	symbol,
+enum ControldataStrings {
+#include "entries.h"
+};
+#undef CONTROLDATA_LINE
+
 
 int
 main(int argc, char *argv[])
@@ -768,7 +777,7 @@ PrintControlValues(bool guessed)
 	 * First, determine the maximum length of the description of all entries,
 	 * some or all of which might be translated.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	thislen = internal_wcswidth(_(description),			\
 								strlen(_(description)),	\
 								encoding);				\
@@ -781,7 +790,7 @@ PrintControlValues(bool guessed)
 	 * Print each line: the possibly-translated description, then some padding
 	 * spaces according to its display width, then the value.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	{													\
 		int		thisstrlen;								\
 														\
@@ -807,69 +816,99 @@ static void
 PrintNewControlValues(void)
 {
 	char		fname[MAXFNAMELEN];
+	int			encoding = pg_get_encoding_from_locale(NULL, true);
+	SimpleOidList	toprint = {NULL, NULL};
+	int			maxlen = 0;
+	int			thislen;
 
 	/* This will be always printed in order to keep format same. */
 	printf(_("\n\nValues to be changed:\n\n"));
 
-	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
-				 newXlogSegNo, WalSegSz);
-	printf(_("First log segment after reset:        %s\n"), fname);
-
 	if (mxids_given)
 	{
-		printf(_("NextMultiXactId:                      %u\n"),
-			   ControlFile.checkPointCopy.nextMulti);
-		printf(_("OldestMultiXid:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestMulti);
-		printf(_("OldestMulti's DB:                     %u\n"),
-			   ControlFile.checkPointCopy.oldestMultiDB);
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI_DB);
 	}
 
 	if (next_mxoff_given)
-	{
-		printf(_("NextMultiOffset:                      %" PRIu64 "\n"),
-			   ControlFile.checkPointCopy.nextMultiOffset);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXOFF);
 
 	if (next_oid_given)
-	{
-		printf(_("NextOID:                              %u\n"),
-			   ControlFile.checkPointCopy.nextOid);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTOID);
 
 	if (next_xid_given)
-	{
-		printf(_("NextXID:                              %u\n"),
-			   XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTXID);
 
 	if (oldest_xid_given)
 	{
-		printf(_("OldestXID:                            %u\n"),
-			   ControlFile.checkPointCopy.oldestXid);
-		printf(_("OldestXID's DB:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestXidDB);
-	}
-
-	if (next_xid_epoch_given)
-	{
-		printf(_("NextXID epoch:                        %u\n"),
-			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID_DB);
 	}
 
 	if (commit_ts_xids_given)
 	{
-		printf(_("oldestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.oldestCommitTsXid);
-		printf(_("newestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.newestCommitTsXid);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_COMMITTS_XID);
+		simple_oid_list_append(&toprint, CD_CKPT_NEWEST_COMMITTS_XID);
 	}
 
 	if (wal_segsize_given)
-	{
-		printf(_("Bytes per WAL segment:                %u\n"),
-			   ControlFile.xlog_seg_size);
+		simple_oid_list_append(&toprint, CD_WAL_SEGSIZE);
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{															\
+	thislen = internal_wcswidth(_(description),					\
+								strlen(_(description)),			\
+								encoding);						\
+	if (thislen > maxlen)										\
+		maxlen = thislen;										\
 	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
+
+
+	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
+				 newXlogSegNo, WalSegSz);
+
+	/* We print this one inconditionally */
+	{
+		char *str = "First log segment after reset";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%s\n", _(str), maxlen - thislen + 2, " ", fname);
+	}
+
+	/* We print the XID epoch in a degenerate case */
+	if (next_xid_epoch_given)
+	{
+		char *str = "NextXID epoch";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%u\n", _(str), maxlen - thislen + 2, " ",
+			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+
+	}
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{													\
+		int		thisstrlen;								\
+														\
+		thisstrlen = strlen(_(description));			\
+		thislen = internal_wcswidth(_(description),		\
+									thisstrlen,			\
+									encoding);			\
+		printf("%s:%*s" fmt "\n",						\
+			   _(description),							\
+			   maxlen - thislen + 2,					\
+			   " ",										\
+			   __VA_ARGS__);							\
+	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
 }
 
 
-- 
2.47.3


--m4rixdodkhrlzpzv--





^ permalink  raw  reply  [nested|flat] 180+ messages in thread

* [PATCH 2/2] Apply the same technique to PrintNewControlValues too
@ 2026-01-31 15:01 Álvaro Herrera <[email protected]>
  0 siblings, 0 replies; 180+ messages in thread

From: Álvaro Herrera @ 2026-01-31 15:01 UTC (permalink / raw)

---
 src/bin/pg_resetwal/entries.h     |  60 +++++++--------
 src/bin/pg_resetwal/pg_resetwal.c | 121 ++++++++++++++++++++----------
 2 files changed, 110 insertions(+), 71 deletions(-)

diff --git a/src/bin/pg_resetwal/entries.h b/src/bin/pg_resetwal/entries.h
index 6b7686da83a..25f2c49b3a8 100644
--- a/src/bin/pg_resetwal/entries.h
+++ b/src/bin/pg_resetwal/entries.h
@@ -1,62 +1,62 @@
-CONTROLDATA_LINE("pg_control version number",
+CONTROLDATA_LINE(CD_CONTROL_VERSION, "pg_control version number",
 				 "%u", ControlFile.pg_control_version)
-CONTROLDATA_LINE("Catalog version number",
+CONTROLDATA_LINE(CD_CATALOG_VERSION, "Catalog version number",
 				 "%u", ControlFile.catalog_version_no)
-CONTROLDATA_LINE("Database system identifier",
+CONTROLDATA_LINE(CD_SYSTEM_IDENTIFIER, "Database system identifier",
 				 "%" PRIu64, ControlFile.system_identifier)
-CONTROLDATA_LINE("Latest checkpoint's TimeLineID",
+CONTROLDATA_LINE(CD_CKPT_TIMELINE, "Latest checkpoint's TimeLineID",
 				 "%u", ControlFile.checkPointCopy.ThisTimeLineID)
-CONTROLDATA_LINE("Latest checkpoint's full_page_writes",
+CONTROLDATA_LINE(CD_CKPT_FPW, "Latest checkpoint's full_page_writes",
 				 "%s", (ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off")))
-CONTROLDATA_LINE("Latest checkpoint's NextXID",
+CONTROLDATA_LINE(CD_CKPT_NEXTXID, "Latest checkpoint's NextXID",
 				 "%u:%u", EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid), XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid))
-CONTROLDATA_LINE("Latest checkpoint's NextOID",
+CONTROLDATA_LINE(CD_CKPT_NEXTOID, "Latest checkpoint's NextOID",
 				 "%u", ControlFile.checkPointCopy.nextOid)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiXactId",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXID, "Latest checkpoint's NextMultiXactId",
 				 "%u", ControlFile.checkPointCopy.nextMulti)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiOffset",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXOFF, "Latest checkpoint's NextMultiOffset",
 				 "%" PRIu64, ControlFile.checkPointCopy.nextMultiOffset)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID, "Latest checkpoint's oldestXID",
 				 "%u", ControlFile.checkPointCopy.oldestXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID_DB, "Latest checkpoint's oldestXID's DB",
 				 "%u", ControlFile.checkPointCopy.oldestXidDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestActiveXID",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_ACTIVEXID, "Latest checkpoint's oldestActiveXID",
 				 "%u", ControlFile.checkPointCopy.oldestActiveXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestMultiXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI, "Latest checkpoint's oldestMultiXid",
 				 "%u", ControlFile.checkPointCopy.oldestMulti)
-CONTROLDATA_LINE("Latest checkpoint's oldestMulti's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI_DB, "Latest checkpoint's oldestMulti's DB",
 				 "%u", ControlFile.checkPointCopy.oldestMultiDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_COMMITTS_XID, "Latest checkpoint's oldestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.oldestCommitTsXid)
-CONTROLDATA_LINE("Latest checkpoint's newestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_NEWEST_COMMITTS_XID, "Latest checkpoint's newestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.newestCommitTsXid)
-CONTROLDATA_LINE("Maximum data alignment",
+CONTROLDATA_LINE(CD_MAXALIGN, "Maximum data alignment",
 				 "%u", ControlFile.maxAlign)
-CONTROLDATA_LINE("Database block size",
+CONTROLDATA_LINE(CD_BLCKSZ, "Database block size",
 				 "%u", ControlFile.blcksz)
-CONTROLDATA_LINE("Blocks per segment of large relation",
+CONTROLDATA_LINE(CD_RELSEG_SZ, "Blocks per segment of large relation",
 				 "%u", ControlFile.relseg_size)
-CONTROLDATA_LINE("Pages per SLRU segment",
+CONTROLDATA_LINE(CD_SLRU_PPS, "Pages per SLRU segment",
 				 "%u", ControlFile.slru_pages_per_segment)
-CONTROLDATA_LINE("WAL block size",
+CONTROLDATA_LINE(CD_WAL_BLCKSZ, "WAL block size",
 				 "%u", ControlFile.xlog_blcksz)
-CONTROLDATA_LINE("Bytes per WAL segment",
+CONTROLDATA_LINE(CD_WAL_SEGSIZE, "Bytes per WAL segment",
 				 "%u", ControlFile.xlog_seg_size)
-CONTROLDATA_LINE("Maximum length of identifiers",
+CONTROLDATA_LINE(CD_WAL_NAMEDATALEN, "Maximum length of identifiers",
 				 "%u", ControlFile.nameDataLen)
-CONTROLDATA_LINE("Maximum columns in an index",
+CONTROLDATA_LINE(CD_INDEX_MAX_KEYS, "Maximum columns in an index",
 				 "%u", ControlFile.indexMaxKeys)
-CONTROLDATA_LINE("Maximum size of a TOAST chunk",
+CONTROLDATA_LINE(CD_TOAST_MAXCHUNKSZ, "Maximum size of a TOAST chunk",
 				 "%u", ControlFile.toast_max_chunk_size)
-CONTROLDATA_LINE("Size of a large-object chunk",
+CONTROLDATA_LINE(CD_LO_BLKSZ, "Size of a large-object chunk",
 				 "%u", ControlFile.loblksize)
 
 /* This is no longer configurable, but users may still expect to see it: */
-CONTROLDATA_LINE("Date/time type storage",
+CONTROLDATA_LINE(CD_DATETIME_INT64, "Date/time type storage",
 				 "%s", _("64-bit integers"))
-CONTROLDATA_LINE("Float8 argument passing",
+CONTROLDATA_LINE(CD_FLOAT8_ARGS, "Float8 argument passing",
 				 "%s", ControlFile.float8ByVal ? _("by value") : _("by reference"))
-CONTROLDATA_LINE("Data page checksum version",
+CONTROLDATA_LINE(CD_CHECKSUMS, "Data page checksum version",
 				 "%u", ControlFile.data_checksum_version)
-CONTROLDATA_LINE("Default char data signedness",
+CONTROLDATA_LINE(CD_CHAR_SIGNEDNESS, "Default char data signedness",
 				 "%s", ControlFile.default_char_signedness ? _("signed") : _("unsigned"))
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index fb17b6f80e0..23bf1c62183 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -55,6 +55,7 @@
 #include "common/restricted_token.h"
 #include "common/string.h"
 #include "fe_utils/option_utils.h"
+#include "fe_utils/simple_list.h"
 #include "fe_utils/version.h"
 #include "getopt_long.h"
 #include "mb/pg_wchar.h"
@@ -119,6 +120,14 @@ static int	internal_wcswidth(const char *pwcs, size_t len, int encoding);
 static uint32 strtouint32_strict(const char *restrict s, char **restrict endptr, int base);
 static uint64 strtouint64_strict(const char *restrict s, char **restrict endptr, int base);
 
+/* Define the string enums */
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	symbol,
+enum ControldataStrings {
+#include "entries.h"
+};
+#undef CONTROLDATA_LINE
+
 
 int
 main(int argc, char *argv[])
@@ -768,7 +777,7 @@ PrintControlValues(bool guessed)
 	 * First, determine the maximum length of the description of all entries,
 	 * some or all of which might be translated.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	thislen = internal_wcswidth(_(description),			\
 								strlen(_(description)),	\
 								encoding);				\
@@ -781,7 +790,7 @@ PrintControlValues(bool guessed)
 	 * Print each line: the possibly-translated description, then some padding
 	 * spaces according to its display width, then the value.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	{													\
 		int		thisstrlen;								\
 														\
@@ -807,69 +816,99 @@ static void
 PrintNewControlValues(void)
 {
 	char		fname[MAXFNAMELEN];
+	int			encoding = pg_get_encoding_from_locale(NULL, true);
+	SimpleOidList	toprint = {NULL, NULL};
+	int			maxlen = 0;
+	int			thislen;
 
 	/* This will be always printed in order to keep format same. */
 	printf(_("\n\nValues to be changed:\n\n"));
 
-	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
-				 newXlogSegNo, WalSegSz);
-	printf(_("First log segment after reset:        %s\n"), fname);
-
 	if (mxids_given)
 	{
-		printf(_("NextMultiXactId:                      %u\n"),
-			   ControlFile.checkPointCopy.nextMulti);
-		printf(_("OldestMultiXid:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestMulti);
-		printf(_("OldestMulti's DB:                     %u\n"),
-			   ControlFile.checkPointCopy.oldestMultiDB);
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI_DB);
 	}
 
 	if (next_mxoff_given)
-	{
-		printf(_("NextMultiOffset:                      %" PRIu64 "\n"),
-			   ControlFile.checkPointCopy.nextMultiOffset);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXOFF);
 
 	if (next_oid_given)
-	{
-		printf(_("NextOID:                              %u\n"),
-			   ControlFile.checkPointCopy.nextOid);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTOID);
 
 	if (next_xid_given)
-	{
-		printf(_("NextXID:                              %u\n"),
-			   XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTXID);
 
 	if (oldest_xid_given)
 	{
-		printf(_("OldestXID:                            %u\n"),
-			   ControlFile.checkPointCopy.oldestXid);
-		printf(_("OldestXID's DB:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestXidDB);
-	}
-
-	if (next_xid_epoch_given)
-	{
-		printf(_("NextXID epoch:                        %u\n"),
-			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID_DB);
 	}
 
 	if (commit_ts_xids_given)
 	{
-		printf(_("oldestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.oldestCommitTsXid);
-		printf(_("newestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.newestCommitTsXid);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_COMMITTS_XID);
+		simple_oid_list_append(&toprint, CD_CKPT_NEWEST_COMMITTS_XID);
 	}
 
 	if (wal_segsize_given)
-	{
-		printf(_("Bytes per WAL segment:                %u\n"),
-			   ControlFile.xlog_seg_size);
+		simple_oid_list_append(&toprint, CD_WAL_SEGSIZE);
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{															\
+	thislen = internal_wcswidth(_(description),					\
+								strlen(_(description)),			\
+								encoding);						\
+	if (thislen > maxlen)										\
+		maxlen = thislen;										\
 	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
+
+
+	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
+				 newXlogSegNo, WalSegSz);
+
+	/* We print this one inconditionally */
+	{
+		char *str = "First log segment after reset";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%s\n", _(str), maxlen - thislen + 2, " ", fname);
+	}
+
+	/* We print the XID epoch in a degenerate case */
+	if (next_xid_epoch_given)
+	{
+		char *str = "NextXID epoch";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%u\n", _(str), maxlen - thislen + 2, " ",
+			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+
+	}
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{													\
+		int		thisstrlen;								\
+														\
+		thisstrlen = strlen(_(description));			\
+		thislen = internal_wcswidth(_(description),		\
+									thisstrlen,			\
+									encoding);			\
+		printf("%s:%*s" fmt "\n",						\
+			   _(description),							\
+			   maxlen - thislen + 2,					\
+			   " ",										\
+			   __VA_ARGS__);							\
+	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
 }
 
 
-- 
2.47.3


--m4rixdodkhrlzpzv--





^ permalink  raw  reply  [nested|flat] 180+ messages in thread

* [PATCH 2/2] Apply the same technique to PrintNewControlValues too
@ 2026-01-31 15:01 Álvaro Herrera <[email protected]>
  0 siblings, 0 replies; 180+ messages in thread

From: Álvaro Herrera @ 2026-01-31 15:01 UTC (permalink / raw)

---
 src/bin/pg_resetwal/entries.h     |  60 +++++++--------
 src/bin/pg_resetwal/pg_resetwal.c | 121 ++++++++++++++++++++----------
 2 files changed, 110 insertions(+), 71 deletions(-)

diff --git a/src/bin/pg_resetwal/entries.h b/src/bin/pg_resetwal/entries.h
index 6b7686da83a..25f2c49b3a8 100644
--- a/src/bin/pg_resetwal/entries.h
+++ b/src/bin/pg_resetwal/entries.h
@@ -1,62 +1,62 @@
-CONTROLDATA_LINE("pg_control version number",
+CONTROLDATA_LINE(CD_CONTROL_VERSION, "pg_control version number",
 				 "%u", ControlFile.pg_control_version)
-CONTROLDATA_LINE("Catalog version number",
+CONTROLDATA_LINE(CD_CATALOG_VERSION, "Catalog version number",
 				 "%u", ControlFile.catalog_version_no)
-CONTROLDATA_LINE("Database system identifier",
+CONTROLDATA_LINE(CD_SYSTEM_IDENTIFIER, "Database system identifier",
 				 "%" PRIu64, ControlFile.system_identifier)
-CONTROLDATA_LINE("Latest checkpoint's TimeLineID",
+CONTROLDATA_LINE(CD_CKPT_TIMELINE, "Latest checkpoint's TimeLineID",
 				 "%u", ControlFile.checkPointCopy.ThisTimeLineID)
-CONTROLDATA_LINE("Latest checkpoint's full_page_writes",
+CONTROLDATA_LINE(CD_CKPT_FPW, "Latest checkpoint's full_page_writes",
 				 "%s", (ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off")))
-CONTROLDATA_LINE("Latest checkpoint's NextXID",
+CONTROLDATA_LINE(CD_CKPT_NEXTXID, "Latest checkpoint's NextXID",
 				 "%u:%u", EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid), XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid))
-CONTROLDATA_LINE("Latest checkpoint's NextOID",
+CONTROLDATA_LINE(CD_CKPT_NEXTOID, "Latest checkpoint's NextOID",
 				 "%u", ControlFile.checkPointCopy.nextOid)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiXactId",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXID, "Latest checkpoint's NextMultiXactId",
 				 "%u", ControlFile.checkPointCopy.nextMulti)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiOffset",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXOFF, "Latest checkpoint's NextMultiOffset",
 				 "%" PRIu64, ControlFile.checkPointCopy.nextMultiOffset)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID, "Latest checkpoint's oldestXID",
 				 "%u", ControlFile.checkPointCopy.oldestXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID_DB, "Latest checkpoint's oldestXID's DB",
 				 "%u", ControlFile.checkPointCopy.oldestXidDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestActiveXID",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_ACTIVEXID, "Latest checkpoint's oldestActiveXID",
 				 "%u", ControlFile.checkPointCopy.oldestActiveXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestMultiXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI, "Latest checkpoint's oldestMultiXid",
 				 "%u", ControlFile.checkPointCopy.oldestMulti)
-CONTROLDATA_LINE("Latest checkpoint's oldestMulti's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI_DB, "Latest checkpoint's oldestMulti's DB",
 				 "%u", ControlFile.checkPointCopy.oldestMultiDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_COMMITTS_XID, "Latest checkpoint's oldestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.oldestCommitTsXid)
-CONTROLDATA_LINE("Latest checkpoint's newestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_NEWEST_COMMITTS_XID, "Latest checkpoint's newestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.newestCommitTsXid)
-CONTROLDATA_LINE("Maximum data alignment",
+CONTROLDATA_LINE(CD_MAXALIGN, "Maximum data alignment",
 				 "%u", ControlFile.maxAlign)
-CONTROLDATA_LINE("Database block size",
+CONTROLDATA_LINE(CD_BLCKSZ, "Database block size",
 				 "%u", ControlFile.blcksz)
-CONTROLDATA_LINE("Blocks per segment of large relation",
+CONTROLDATA_LINE(CD_RELSEG_SZ, "Blocks per segment of large relation",
 				 "%u", ControlFile.relseg_size)
-CONTROLDATA_LINE("Pages per SLRU segment",
+CONTROLDATA_LINE(CD_SLRU_PPS, "Pages per SLRU segment",
 				 "%u", ControlFile.slru_pages_per_segment)
-CONTROLDATA_LINE("WAL block size",
+CONTROLDATA_LINE(CD_WAL_BLCKSZ, "WAL block size",
 				 "%u", ControlFile.xlog_blcksz)
-CONTROLDATA_LINE("Bytes per WAL segment",
+CONTROLDATA_LINE(CD_WAL_SEGSIZE, "Bytes per WAL segment",
 				 "%u", ControlFile.xlog_seg_size)
-CONTROLDATA_LINE("Maximum length of identifiers",
+CONTROLDATA_LINE(CD_WAL_NAMEDATALEN, "Maximum length of identifiers",
 				 "%u", ControlFile.nameDataLen)
-CONTROLDATA_LINE("Maximum columns in an index",
+CONTROLDATA_LINE(CD_INDEX_MAX_KEYS, "Maximum columns in an index",
 				 "%u", ControlFile.indexMaxKeys)
-CONTROLDATA_LINE("Maximum size of a TOAST chunk",
+CONTROLDATA_LINE(CD_TOAST_MAXCHUNKSZ, "Maximum size of a TOAST chunk",
 				 "%u", ControlFile.toast_max_chunk_size)
-CONTROLDATA_LINE("Size of a large-object chunk",
+CONTROLDATA_LINE(CD_LO_BLKSZ, "Size of a large-object chunk",
 				 "%u", ControlFile.loblksize)
 
 /* This is no longer configurable, but users may still expect to see it: */
-CONTROLDATA_LINE("Date/time type storage",
+CONTROLDATA_LINE(CD_DATETIME_INT64, "Date/time type storage",
 				 "%s", _("64-bit integers"))
-CONTROLDATA_LINE("Float8 argument passing",
+CONTROLDATA_LINE(CD_FLOAT8_ARGS, "Float8 argument passing",
 				 "%s", ControlFile.float8ByVal ? _("by value") : _("by reference"))
-CONTROLDATA_LINE("Data page checksum version",
+CONTROLDATA_LINE(CD_CHECKSUMS, "Data page checksum version",
 				 "%u", ControlFile.data_checksum_version)
-CONTROLDATA_LINE("Default char data signedness",
+CONTROLDATA_LINE(CD_CHAR_SIGNEDNESS, "Default char data signedness",
 				 "%s", ControlFile.default_char_signedness ? _("signed") : _("unsigned"))
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index fb17b6f80e0..23bf1c62183 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -55,6 +55,7 @@
 #include "common/restricted_token.h"
 #include "common/string.h"
 #include "fe_utils/option_utils.h"
+#include "fe_utils/simple_list.h"
 #include "fe_utils/version.h"
 #include "getopt_long.h"
 #include "mb/pg_wchar.h"
@@ -119,6 +120,14 @@ static int	internal_wcswidth(const char *pwcs, size_t len, int encoding);
 static uint32 strtouint32_strict(const char *restrict s, char **restrict endptr, int base);
 static uint64 strtouint64_strict(const char *restrict s, char **restrict endptr, int base);
 
+/* Define the string enums */
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	symbol,
+enum ControldataStrings {
+#include "entries.h"
+};
+#undef CONTROLDATA_LINE
+
 
 int
 main(int argc, char *argv[])
@@ -768,7 +777,7 @@ PrintControlValues(bool guessed)
 	 * First, determine the maximum length of the description of all entries,
 	 * some or all of which might be translated.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	thislen = internal_wcswidth(_(description),			\
 								strlen(_(description)),	\
 								encoding);				\
@@ -781,7 +790,7 @@ PrintControlValues(bool guessed)
 	 * Print each line: the possibly-translated description, then some padding
 	 * spaces according to its display width, then the value.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	{													\
 		int		thisstrlen;								\
 														\
@@ -807,69 +816,99 @@ static void
 PrintNewControlValues(void)
 {
 	char		fname[MAXFNAMELEN];
+	int			encoding = pg_get_encoding_from_locale(NULL, true);
+	SimpleOidList	toprint = {NULL, NULL};
+	int			maxlen = 0;
+	int			thislen;
 
 	/* This will be always printed in order to keep format same. */
 	printf(_("\n\nValues to be changed:\n\n"));
 
-	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
-				 newXlogSegNo, WalSegSz);
-	printf(_("First log segment after reset:        %s\n"), fname);
-
 	if (mxids_given)
 	{
-		printf(_("NextMultiXactId:                      %u\n"),
-			   ControlFile.checkPointCopy.nextMulti);
-		printf(_("OldestMultiXid:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestMulti);
-		printf(_("OldestMulti's DB:                     %u\n"),
-			   ControlFile.checkPointCopy.oldestMultiDB);
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI_DB);
 	}
 
 	if (next_mxoff_given)
-	{
-		printf(_("NextMultiOffset:                      %" PRIu64 "\n"),
-			   ControlFile.checkPointCopy.nextMultiOffset);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXOFF);
 
 	if (next_oid_given)
-	{
-		printf(_("NextOID:                              %u\n"),
-			   ControlFile.checkPointCopy.nextOid);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTOID);
 
 	if (next_xid_given)
-	{
-		printf(_("NextXID:                              %u\n"),
-			   XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTXID);
 
 	if (oldest_xid_given)
 	{
-		printf(_("OldestXID:                            %u\n"),
-			   ControlFile.checkPointCopy.oldestXid);
-		printf(_("OldestXID's DB:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestXidDB);
-	}
-
-	if (next_xid_epoch_given)
-	{
-		printf(_("NextXID epoch:                        %u\n"),
-			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID_DB);
 	}
 
 	if (commit_ts_xids_given)
 	{
-		printf(_("oldestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.oldestCommitTsXid);
-		printf(_("newestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.newestCommitTsXid);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_COMMITTS_XID);
+		simple_oid_list_append(&toprint, CD_CKPT_NEWEST_COMMITTS_XID);
 	}
 
 	if (wal_segsize_given)
-	{
-		printf(_("Bytes per WAL segment:                %u\n"),
-			   ControlFile.xlog_seg_size);
+		simple_oid_list_append(&toprint, CD_WAL_SEGSIZE);
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{															\
+	thislen = internal_wcswidth(_(description),					\
+								strlen(_(description)),			\
+								encoding);						\
+	if (thislen > maxlen)										\
+		maxlen = thislen;										\
 	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
+
+
+	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
+				 newXlogSegNo, WalSegSz);
+
+	/* We print this one inconditionally */
+	{
+		char *str = "First log segment after reset";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%s\n", _(str), maxlen - thislen + 2, " ", fname);
+	}
+
+	/* We print the XID epoch in a degenerate case */
+	if (next_xid_epoch_given)
+	{
+		char *str = "NextXID epoch";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%u\n", _(str), maxlen - thislen + 2, " ",
+			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+
+	}
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{													\
+		int		thisstrlen;								\
+														\
+		thisstrlen = strlen(_(description));			\
+		thislen = internal_wcswidth(_(description),		\
+									thisstrlen,			\
+									encoding);			\
+		printf("%s:%*s" fmt "\n",						\
+			   _(description),							\
+			   maxlen - thislen + 2,					\
+			   " ",										\
+			   __VA_ARGS__);							\
+	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
 }
 
 
-- 
2.47.3


--m4rixdodkhrlzpzv--





^ permalink  raw  reply  [nested|flat] 180+ messages in thread

* [PATCH 2/2] Apply the same technique to PrintNewControlValues too
@ 2026-01-31 15:01 Álvaro Herrera <[email protected]>
  0 siblings, 0 replies; 180+ messages in thread

From: Álvaro Herrera @ 2026-01-31 15:01 UTC (permalink / raw)

---
 src/bin/pg_resetwal/entries.h     |  60 +++++++--------
 src/bin/pg_resetwal/pg_resetwal.c | 121 ++++++++++++++++++++----------
 2 files changed, 110 insertions(+), 71 deletions(-)

diff --git a/src/bin/pg_resetwal/entries.h b/src/bin/pg_resetwal/entries.h
index 6b7686da83a..25f2c49b3a8 100644
--- a/src/bin/pg_resetwal/entries.h
+++ b/src/bin/pg_resetwal/entries.h
@@ -1,62 +1,62 @@
-CONTROLDATA_LINE("pg_control version number",
+CONTROLDATA_LINE(CD_CONTROL_VERSION, "pg_control version number",
 				 "%u", ControlFile.pg_control_version)
-CONTROLDATA_LINE("Catalog version number",
+CONTROLDATA_LINE(CD_CATALOG_VERSION, "Catalog version number",
 				 "%u", ControlFile.catalog_version_no)
-CONTROLDATA_LINE("Database system identifier",
+CONTROLDATA_LINE(CD_SYSTEM_IDENTIFIER, "Database system identifier",
 				 "%" PRIu64, ControlFile.system_identifier)
-CONTROLDATA_LINE("Latest checkpoint's TimeLineID",
+CONTROLDATA_LINE(CD_CKPT_TIMELINE, "Latest checkpoint's TimeLineID",
 				 "%u", ControlFile.checkPointCopy.ThisTimeLineID)
-CONTROLDATA_LINE("Latest checkpoint's full_page_writes",
+CONTROLDATA_LINE(CD_CKPT_FPW, "Latest checkpoint's full_page_writes",
 				 "%s", (ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off")))
-CONTROLDATA_LINE("Latest checkpoint's NextXID",
+CONTROLDATA_LINE(CD_CKPT_NEXTXID, "Latest checkpoint's NextXID",
 				 "%u:%u", EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid), XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid))
-CONTROLDATA_LINE("Latest checkpoint's NextOID",
+CONTROLDATA_LINE(CD_CKPT_NEXTOID, "Latest checkpoint's NextOID",
 				 "%u", ControlFile.checkPointCopy.nextOid)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiXactId",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXID, "Latest checkpoint's NextMultiXactId",
 				 "%u", ControlFile.checkPointCopy.nextMulti)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiOffset",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXOFF, "Latest checkpoint's NextMultiOffset",
 				 "%" PRIu64, ControlFile.checkPointCopy.nextMultiOffset)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID, "Latest checkpoint's oldestXID",
 				 "%u", ControlFile.checkPointCopy.oldestXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID_DB, "Latest checkpoint's oldestXID's DB",
 				 "%u", ControlFile.checkPointCopy.oldestXidDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestActiveXID",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_ACTIVEXID, "Latest checkpoint's oldestActiveXID",
 				 "%u", ControlFile.checkPointCopy.oldestActiveXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestMultiXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI, "Latest checkpoint's oldestMultiXid",
 				 "%u", ControlFile.checkPointCopy.oldestMulti)
-CONTROLDATA_LINE("Latest checkpoint's oldestMulti's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI_DB, "Latest checkpoint's oldestMulti's DB",
 				 "%u", ControlFile.checkPointCopy.oldestMultiDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_COMMITTS_XID, "Latest checkpoint's oldestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.oldestCommitTsXid)
-CONTROLDATA_LINE("Latest checkpoint's newestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_NEWEST_COMMITTS_XID, "Latest checkpoint's newestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.newestCommitTsXid)
-CONTROLDATA_LINE("Maximum data alignment",
+CONTROLDATA_LINE(CD_MAXALIGN, "Maximum data alignment",
 				 "%u", ControlFile.maxAlign)
-CONTROLDATA_LINE("Database block size",
+CONTROLDATA_LINE(CD_BLCKSZ, "Database block size",
 				 "%u", ControlFile.blcksz)
-CONTROLDATA_LINE("Blocks per segment of large relation",
+CONTROLDATA_LINE(CD_RELSEG_SZ, "Blocks per segment of large relation",
 				 "%u", ControlFile.relseg_size)
-CONTROLDATA_LINE("Pages per SLRU segment",
+CONTROLDATA_LINE(CD_SLRU_PPS, "Pages per SLRU segment",
 				 "%u", ControlFile.slru_pages_per_segment)
-CONTROLDATA_LINE("WAL block size",
+CONTROLDATA_LINE(CD_WAL_BLCKSZ, "WAL block size",
 				 "%u", ControlFile.xlog_blcksz)
-CONTROLDATA_LINE("Bytes per WAL segment",
+CONTROLDATA_LINE(CD_WAL_SEGSIZE, "Bytes per WAL segment",
 				 "%u", ControlFile.xlog_seg_size)
-CONTROLDATA_LINE("Maximum length of identifiers",
+CONTROLDATA_LINE(CD_WAL_NAMEDATALEN, "Maximum length of identifiers",
 				 "%u", ControlFile.nameDataLen)
-CONTROLDATA_LINE("Maximum columns in an index",
+CONTROLDATA_LINE(CD_INDEX_MAX_KEYS, "Maximum columns in an index",
 				 "%u", ControlFile.indexMaxKeys)
-CONTROLDATA_LINE("Maximum size of a TOAST chunk",
+CONTROLDATA_LINE(CD_TOAST_MAXCHUNKSZ, "Maximum size of a TOAST chunk",
 				 "%u", ControlFile.toast_max_chunk_size)
-CONTROLDATA_LINE("Size of a large-object chunk",
+CONTROLDATA_LINE(CD_LO_BLKSZ, "Size of a large-object chunk",
 				 "%u", ControlFile.loblksize)
 
 /* This is no longer configurable, but users may still expect to see it: */
-CONTROLDATA_LINE("Date/time type storage",
+CONTROLDATA_LINE(CD_DATETIME_INT64, "Date/time type storage",
 				 "%s", _("64-bit integers"))
-CONTROLDATA_LINE("Float8 argument passing",
+CONTROLDATA_LINE(CD_FLOAT8_ARGS, "Float8 argument passing",
 				 "%s", ControlFile.float8ByVal ? _("by value") : _("by reference"))
-CONTROLDATA_LINE("Data page checksum version",
+CONTROLDATA_LINE(CD_CHECKSUMS, "Data page checksum version",
 				 "%u", ControlFile.data_checksum_version)
-CONTROLDATA_LINE("Default char data signedness",
+CONTROLDATA_LINE(CD_CHAR_SIGNEDNESS, "Default char data signedness",
 				 "%s", ControlFile.default_char_signedness ? _("signed") : _("unsigned"))
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index fb17b6f80e0..23bf1c62183 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -55,6 +55,7 @@
 #include "common/restricted_token.h"
 #include "common/string.h"
 #include "fe_utils/option_utils.h"
+#include "fe_utils/simple_list.h"
 #include "fe_utils/version.h"
 #include "getopt_long.h"
 #include "mb/pg_wchar.h"
@@ -119,6 +120,14 @@ static int	internal_wcswidth(const char *pwcs, size_t len, int encoding);
 static uint32 strtouint32_strict(const char *restrict s, char **restrict endptr, int base);
 static uint64 strtouint64_strict(const char *restrict s, char **restrict endptr, int base);
 
+/* Define the string enums */
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	symbol,
+enum ControldataStrings {
+#include "entries.h"
+};
+#undef CONTROLDATA_LINE
+
 
 int
 main(int argc, char *argv[])
@@ -768,7 +777,7 @@ PrintControlValues(bool guessed)
 	 * First, determine the maximum length of the description of all entries,
 	 * some or all of which might be translated.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	thislen = internal_wcswidth(_(description),			\
 								strlen(_(description)),	\
 								encoding);				\
@@ -781,7 +790,7 @@ PrintControlValues(bool guessed)
 	 * Print each line: the possibly-translated description, then some padding
 	 * spaces according to its display width, then the value.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	{													\
 		int		thisstrlen;								\
 														\
@@ -807,69 +816,99 @@ static void
 PrintNewControlValues(void)
 {
 	char		fname[MAXFNAMELEN];
+	int			encoding = pg_get_encoding_from_locale(NULL, true);
+	SimpleOidList	toprint = {NULL, NULL};
+	int			maxlen = 0;
+	int			thislen;
 
 	/* This will be always printed in order to keep format same. */
 	printf(_("\n\nValues to be changed:\n\n"));
 
-	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
-				 newXlogSegNo, WalSegSz);
-	printf(_("First log segment after reset:        %s\n"), fname);
-
 	if (mxids_given)
 	{
-		printf(_("NextMultiXactId:                      %u\n"),
-			   ControlFile.checkPointCopy.nextMulti);
-		printf(_("OldestMultiXid:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestMulti);
-		printf(_("OldestMulti's DB:                     %u\n"),
-			   ControlFile.checkPointCopy.oldestMultiDB);
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI_DB);
 	}
 
 	if (next_mxoff_given)
-	{
-		printf(_("NextMultiOffset:                      %" PRIu64 "\n"),
-			   ControlFile.checkPointCopy.nextMultiOffset);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXOFF);
 
 	if (next_oid_given)
-	{
-		printf(_("NextOID:                              %u\n"),
-			   ControlFile.checkPointCopy.nextOid);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTOID);
 
 	if (next_xid_given)
-	{
-		printf(_("NextXID:                              %u\n"),
-			   XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTXID);
 
 	if (oldest_xid_given)
 	{
-		printf(_("OldestXID:                            %u\n"),
-			   ControlFile.checkPointCopy.oldestXid);
-		printf(_("OldestXID's DB:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestXidDB);
-	}
-
-	if (next_xid_epoch_given)
-	{
-		printf(_("NextXID epoch:                        %u\n"),
-			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID_DB);
 	}
 
 	if (commit_ts_xids_given)
 	{
-		printf(_("oldestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.oldestCommitTsXid);
-		printf(_("newestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.newestCommitTsXid);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_COMMITTS_XID);
+		simple_oid_list_append(&toprint, CD_CKPT_NEWEST_COMMITTS_XID);
 	}
 
 	if (wal_segsize_given)
-	{
-		printf(_("Bytes per WAL segment:                %u\n"),
-			   ControlFile.xlog_seg_size);
+		simple_oid_list_append(&toprint, CD_WAL_SEGSIZE);
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{															\
+	thislen = internal_wcswidth(_(description),					\
+								strlen(_(description)),			\
+								encoding);						\
+	if (thislen > maxlen)										\
+		maxlen = thislen;										\
 	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
+
+
+	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
+				 newXlogSegNo, WalSegSz);
+
+	/* We print this one inconditionally */
+	{
+		char *str = "First log segment after reset";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%s\n", _(str), maxlen - thislen + 2, " ", fname);
+	}
+
+	/* We print the XID epoch in a degenerate case */
+	if (next_xid_epoch_given)
+	{
+		char *str = "NextXID epoch";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%u\n", _(str), maxlen - thislen + 2, " ",
+			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+
+	}
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{													\
+		int		thisstrlen;								\
+														\
+		thisstrlen = strlen(_(description));			\
+		thislen = internal_wcswidth(_(description),		\
+									thisstrlen,			\
+									encoding);			\
+		printf("%s:%*s" fmt "\n",						\
+			   _(description),							\
+			   maxlen - thislen + 2,					\
+			   " ",										\
+			   __VA_ARGS__);							\
+	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
 }
 
 
-- 
2.47.3


--m4rixdodkhrlzpzv--





^ permalink  raw  reply  [nested|flat] 180+ messages in thread

* [PATCH 2/2] Apply the same technique to PrintNewControlValues too
@ 2026-01-31 15:01 Álvaro Herrera <[email protected]>
  0 siblings, 0 replies; 180+ messages in thread

From: Álvaro Herrera @ 2026-01-31 15:01 UTC (permalink / raw)

---
 src/bin/pg_resetwal/entries.h     |  60 +++++++--------
 src/bin/pg_resetwal/pg_resetwal.c | 121 ++++++++++++++++++++----------
 2 files changed, 110 insertions(+), 71 deletions(-)

diff --git a/src/bin/pg_resetwal/entries.h b/src/bin/pg_resetwal/entries.h
index 6b7686da83a..25f2c49b3a8 100644
--- a/src/bin/pg_resetwal/entries.h
+++ b/src/bin/pg_resetwal/entries.h
@@ -1,62 +1,62 @@
-CONTROLDATA_LINE("pg_control version number",
+CONTROLDATA_LINE(CD_CONTROL_VERSION, "pg_control version number",
 				 "%u", ControlFile.pg_control_version)
-CONTROLDATA_LINE("Catalog version number",
+CONTROLDATA_LINE(CD_CATALOG_VERSION, "Catalog version number",
 				 "%u", ControlFile.catalog_version_no)
-CONTROLDATA_LINE("Database system identifier",
+CONTROLDATA_LINE(CD_SYSTEM_IDENTIFIER, "Database system identifier",
 				 "%" PRIu64, ControlFile.system_identifier)
-CONTROLDATA_LINE("Latest checkpoint's TimeLineID",
+CONTROLDATA_LINE(CD_CKPT_TIMELINE, "Latest checkpoint's TimeLineID",
 				 "%u", ControlFile.checkPointCopy.ThisTimeLineID)
-CONTROLDATA_LINE("Latest checkpoint's full_page_writes",
+CONTROLDATA_LINE(CD_CKPT_FPW, "Latest checkpoint's full_page_writes",
 				 "%s", (ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off")))
-CONTROLDATA_LINE("Latest checkpoint's NextXID",
+CONTROLDATA_LINE(CD_CKPT_NEXTXID, "Latest checkpoint's NextXID",
 				 "%u:%u", EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid), XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid))
-CONTROLDATA_LINE("Latest checkpoint's NextOID",
+CONTROLDATA_LINE(CD_CKPT_NEXTOID, "Latest checkpoint's NextOID",
 				 "%u", ControlFile.checkPointCopy.nextOid)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiXactId",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXID, "Latest checkpoint's NextMultiXactId",
 				 "%u", ControlFile.checkPointCopy.nextMulti)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiOffset",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXOFF, "Latest checkpoint's NextMultiOffset",
 				 "%" PRIu64, ControlFile.checkPointCopy.nextMultiOffset)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID, "Latest checkpoint's oldestXID",
 				 "%u", ControlFile.checkPointCopy.oldestXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID_DB, "Latest checkpoint's oldestXID's DB",
 				 "%u", ControlFile.checkPointCopy.oldestXidDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestActiveXID",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_ACTIVEXID, "Latest checkpoint's oldestActiveXID",
 				 "%u", ControlFile.checkPointCopy.oldestActiveXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestMultiXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI, "Latest checkpoint's oldestMultiXid",
 				 "%u", ControlFile.checkPointCopy.oldestMulti)
-CONTROLDATA_LINE("Latest checkpoint's oldestMulti's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI_DB, "Latest checkpoint's oldestMulti's DB",
 				 "%u", ControlFile.checkPointCopy.oldestMultiDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_COMMITTS_XID, "Latest checkpoint's oldestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.oldestCommitTsXid)
-CONTROLDATA_LINE("Latest checkpoint's newestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_NEWEST_COMMITTS_XID, "Latest checkpoint's newestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.newestCommitTsXid)
-CONTROLDATA_LINE("Maximum data alignment",
+CONTROLDATA_LINE(CD_MAXALIGN, "Maximum data alignment",
 				 "%u", ControlFile.maxAlign)
-CONTROLDATA_LINE("Database block size",
+CONTROLDATA_LINE(CD_BLCKSZ, "Database block size",
 				 "%u", ControlFile.blcksz)
-CONTROLDATA_LINE("Blocks per segment of large relation",
+CONTROLDATA_LINE(CD_RELSEG_SZ, "Blocks per segment of large relation",
 				 "%u", ControlFile.relseg_size)
-CONTROLDATA_LINE("Pages per SLRU segment",
+CONTROLDATA_LINE(CD_SLRU_PPS, "Pages per SLRU segment",
 				 "%u", ControlFile.slru_pages_per_segment)
-CONTROLDATA_LINE("WAL block size",
+CONTROLDATA_LINE(CD_WAL_BLCKSZ, "WAL block size",
 				 "%u", ControlFile.xlog_blcksz)
-CONTROLDATA_LINE("Bytes per WAL segment",
+CONTROLDATA_LINE(CD_WAL_SEGSIZE, "Bytes per WAL segment",
 				 "%u", ControlFile.xlog_seg_size)
-CONTROLDATA_LINE("Maximum length of identifiers",
+CONTROLDATA_LINE(CD_WAL_NAMEDATALEN, "Maximum length of identifiers",
 				 "%u", ControlFile.nameDataLen)
-CONTROLDATA_LINE("Maximum columns in an index",
+CONTROLDATA_LINE(CD_INDEX_MAX_KEYS, "Maximum columns in an index",
 				 "%u", ControlFile.indexMaxKeys)
-CONTROLDATA_LINE("Maximum size of a TOAST chunk",
+CONTROLDATA_LINE(CD_TOAST_MAXCHUNKSZ, "Maximum size of a TOAST chunk",
 				 "%u", ControlFile.toast_max_chunk_size)
-CONTROLDATA_LINE("Size of a large-object chunk",
+CONTROLDATA_LINE(CD_LO_BLKSZ, "Size of a large-object chunk",
 				 "%u", ControlFile.loblksize)
 
 /* This is no longer configurable, but users may still expect to see it: */
-CONTROLDATA_LINE("Date/time type storage",
+CONTROLDATA_LINE(CD_DATETIME_INT64, "Date/time type storage",
 				 "%s", _("64-bit integers"))
-CONTROLDATA_LINE("Float8 argument passing",
+CONTROLDATA_LINE(CD_FLOAT8_ARGS, "Float8 argument passing",
 				 "%s", ControlFile.float8ByVal ? _("by value") : _("by reference"))
-CONTROLDATA_LINE("Data page checksum version",
+CONTROLDATA_LINE(CD_CHECKSUMS, "Data page checksum version",
 				 "%u", ControlFile.data_checksum_version)
-CONTROLDATA_LINE("Default char data signedness",
+CONTROLDATA_LINE(CD_CHAR_SIGNEDNESS, "Default char data signedness",
 				 "%s", ControlFile.default_char_signedness ? _("signed") : _("unsigned"))
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index fb17b6f80e0..23bf1c62183 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -55,6 +55,7 @@
 #include "common/restricted_token.h"
 #include "common/string.h"
 #include "fe_utils/option_utils.h"
+#include "fe_utils/simple_list.h"
 #include "fe_utils/version.h"
 #include "getopt_long.h"
 #include "mb/pg_wchar.h"
@@ -119,6 +120,14 @@ static int	internal_wcswidth(const char *pwcs, size_t len, int encoding);
 static uint32 strtouint32_strict(const char *restrict s, char **restrict endptr, int base);
 static uint64 strtouint64_strict(const char *restrict s, char **restrict endptr, int base);
 
+/* Define the string enums */
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	symbol,
+enum ControldataStrings {
+#include "entries.h"
+};
+#undef CONTROLDATA_LINE
+
 
 int
 main(int argc, char *argv[])
@@ -768,7 +777,7 @@ PrintControlValues(bool guessed)
 	 * First, determine the maximum length of the description of all entries,
 	 * some or all of which might be translated.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	thislen = internal_wcswidth(_(description),			\
 								strlen(_(description)),	\
 								encoding);				\
@@ -781,7 +790,7 @@ PrintControlValues(bool guessed)
 	 * Print each line: the possibly-translated description, then some padding
 	 * spaces according to its display width, then the value.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	{													\
 		int		thisstrlen;								\
 														\
@@ -807,69 +816,99 @@ static void
 PrintNewControlValues(void)
 {
 	char		fname[MAXFNAMELEN];
+	int			encoding = pg_get_encoding_from_locale(NULL, true);
+	SimpleOidList	toprint = {NULL, NULL};
+	int			maxlen = 0;
+	int			thislen;
 
 	/* This will be always printed in order to keep format same. */
 	printf(_("\n\nValues to be changed:\n\n"));
 
-	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
-				 newXlogSegNo, WalSegSz);
-	printf(_("First log segment after reset:        %s\n"), fname);
-
 	if (mxids_given)
 	{
-		printf(_("NextMultiXactId:                      %u\n"),
-			   ControlFile.checkPointCopy.nextMulti);
-		printf(_("OldestMultiXid:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestMulti);
-		printf(_("OldestMulti's DB:                     %u\n"),
-			   ControlFile.checkPointCopy.oldestMultiDB);
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI_DB);
 	}
 
 	if (next_mxoff_given)
-	{
-		printf(_("NextMultiOffset:                      %" PRIu64 "\n"),
-			   ControlFile.checkPointCopy.nextMultiOffset);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXOFF);
 
 	if (next_oid_given)
-	{
-		printf(_("NextOID:                              %u\n"),
-			   ControlFile.checkPointCopy.nextOid);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTOID);
 
 	if (next_xid_given)
-	{
-		printf(_("NextXID:                              %u\n"),
-			   XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTXID);
 
 	if (oldest_xid_given)
 	{
-		printf(_("OldestXID:                            %u\n"),
-			   ControlFile.checkPointCopy.oldestXid);
-		printf(_("OldestXID's DB:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestXidDB);
-	}
-
-	if (next_xid_epoch_given)
-	{
-		printf(_("NextXID epoch:                        %u\n"),
-			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID_DB);
 	}
 
 	if (commit_ts_xids_given)
 	{
-		printf(_("oldestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.oldestCommitTsXid);
-		printf(_("newestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.newestCommitTsXid);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_COMMITTS_XID);
+		simple_oid_list_append(&toprint, CD_CKPT_NEWEST_COMMITTS_XID);
 	}
 
 	if (wal_segsize_given)
-	{
-		printf(_("Bytes per WAL segment:                %u\n"),
-			   ControlFile.xlog_seg_size);
+		simple_oid_list_append(&toprint, CD_WAL_SEGSIZE);
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{															\
+	thislen = internal_wcswidth(_(description),					\
+								strlen(_(description)),			\
+								encoding);						\
+	if (thislen > maxlen)										\
+		maxlen = thislen;										\
 	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
+
+
+	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
+				 newXlogSegNo, WalSegSz);
+
+	/* We print this one inconditionally */
+	{
+		char *str = "First log segment after reset";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%s\n", _(str), maxlen - thislen + 2, " ", fname);
+	}
+
+	/* We print the XID epoch in a degenerate case */
+	if (next_xid_epoch_given)
+	{
+		char *str = "NextXID epoch";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%u\n", _(str), maxlen - thislen + 2, " ",
+			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+
+	}
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{													\
+		int		thisstrlen;								\
+														\
+		thisstrlen = strlen(_(description));			\
+		thislen = internal_wcswidth(_(description),		\
+									thisstrlen,			\
+									encoding);			\
+		printf("%s:%*s" fmt "\n",						\
+			   _(description),							\
+			   maxlen - thislen + 2,					\
+			   " ",										\
+			   __VA_ARGS__);							\
+	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
 }
 
 
-- 
2.47.3


--m4rixdodkhrlzpzv--





^ permalink  raw  reply  [nested|flat] 180+ messages in thread

* [PATCH 2/2] Apply the same technique to PrintNewControlValues too
@ 2026-01-31 15:01 Álvaro Herrera <[email protected]>
  0 siblings, 0 replies; 180+ messages in thread

From: Álvaro Herrera @ 2026-01-31 15:01 UTC (permalink / raw)

---
 src/bin/pg_resetwal/entries.h     |  60 +++++++--------
 src/bin/pg_resetwal/pg_resetwal.c | 121 ++++++++++++++++++++----------
 2 files changed, 110 insertions(+), 71 deletions(-)

diff --git a/src/bin/pg_resetwal/entries.h b/src/bin/pg_resetwal/entries.h
index 6b7686da83a..25f2c49b3a8 100644
--- a/src/bin/pg_resetwal/entries.h
+++ b/src/bin/pg_resetwal/entries.h
@@ -1,62 +1,62 @@
-CONTROLDATA_LINE("pg_control version number",
+CONTROLDATA_LINE(CD_CONTROL_VERSION, "pg_control version number",
 				 "%u", ControlFile.pg_control_version)
-CONTROLDATA_LINE("Catalog version number",
+CONTROLDATA_LINE(CD_CATALOG_VERSION, "Catalog version number",
 				 "%u", ControlFile.catalog_version_no)
-CONTROLDATA_LINE("Database system identifier",
+CONTROLDATA_LINE(CD_SYSTEM_IDENTIFIER, "Database system identifier",
 				 "%" PRIu64, ControlFile.system_identifier)
-CONTROLDATA_LINE("Latest checkpoint's TimeLineID",
+CONTROLDATA_LINE(CD_CKPT_TIMELINE, "Latest checkpoint's TimeLineID",
 				 "%u", ControlFile.checkPointCopy.ThisTimeLineID)
-CONTROLDATA_LINE("Latest checkpoint's full_page_writes",
+CONTROLDATA_LINE(CD_CKPT_FPW, "Latest checkpoint's full_page_writes",
 				 "%s", (ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off")))
-CONTROLDATA_LINE("Latest checkpoint's NextXID",
+CONTROLDATA_LINE(CD_CKPT_NEXTXID, "Latest checkpoint's NextXID",
 				 "%u:%u", EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid), XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid))
-CONTROLDATA_LINE("Latest checkpoint's NextOID",
+CONTROLDATA_LINE(CD_CKPT_NEXTOID, "Latest checkpoint's NextOID",
 				 "%u", ControlFile.checkPointCopy.nextOid)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiXactId",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXID, "Latest checkpoint's NextMultiXactId",
 				 "%u", ControlFile.checkPointCopy.nextMulti)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiOffset",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXOFF, "Latest checkpoint's NextMultiOffset",
 				 "%" PRIu64, ControlFile.checkPointCopy.nextMultiOffset)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID, "Latest checkpoint's oldestXID",
 				 "%u", ControlFile.checkPointCopy.oldestXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID_DB, "Latest checkpoint's oldestXID's DB",
 				 "%u", ControlFile.checkPointCopy.oldestXidDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestActiveXID",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_ACTIVEXID, "Latest checkpoint's oldestActiveXID",
 				 "%u", ControlFile.checkPointCopy.oldestActiveXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestMultiXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI, "Latest checkpoint's oldestMultiXid",
 				 "%u", ControlFile.checkPointCopy.oldestMulti)
-CONTROLDATA_LINE("Latest checkpoint's oldestMulti's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI_DB, "Latest checkpoint's oldestMulti's DB",
 				 "%u", ControlFile.checkPointCopy.oldestMultiDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_COMMITTS_XID, "Latest checkpoint's oldestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.oldestCommitTsXid)
-CONTROLDATA_LINE("Latest checkpoint's newestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_NEWEST_COMMITTS_XID, "Latest checkpoint's newestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.newestCommitTsXid)
-CONTROLDATA_LINE("Maximum data alignment",
+CONTROLDATA_LINE(CD_MAXALIGN, "Maximum data alignment",
 				 "%u", ControlFile.maxAlign)
-CONTROLDATA_LINE("Database block size",
+CONTROLDATA_LINE(CD_BLCKSZ, "Database block size",
 				 "%u", ControlFile.blcksz)
-CONTROLDATA_LINE("Blocks per segment of large relation",
+CONTROLDATA_LINE(CD_RELSEG_SZ, "Blocks per segment of large relation",
 				 "%u", ControlFile.relseg_size)
-CONTROLDATA_LINE("Pages per SLRU segment",
+CONTROLDATA_LINE(CD_SLRU_PPS, "Pages per SLRU segment",
 				 "%u", ControlFile.slru_pages_per_segment)
-CONTROLDATA_LINE("WAL block size",
+CONTROLDATA_LINE(CD_WAL_BLCKSZ, "WAL block size",
 				 "%u", ControlFile.xlog_blcksz)
-CONTROLDATA_LINE("Bytes per WAL segment",
+CONTROLDATA_LINE(CD_WAL_SEGSIZE, "Bytes per WAL segment",
 				 "%u", ControlFile.xlog_seg_size)
-CONTROLDATA_LINE("Maximum length of identifiers",
+CONTROLDATA_LINE(CD_WAL_NAMEDATALEN, "Maximum length of identifiers",
 				 "%u", ControlFile.nameDataLen)
-CONTROLDATA_LINE("Maximum columns in an index",
+CONTROLDATA_LINE(CD_INDEX_MAX_KEYS, "Maximum columns in an index",
 				 "%u", ControlFile.indexMaxKeys)
-CONTROLDATA_LINE("Maximum size of a TOAST chunk",
+CONTROLDATA_LINE(CD_TOAST_MAXCHUNKSZ, "Maximum size of a TOAST chunk",
 				 "%u", ControlFile.toast_max_chunk_size)
-CONTROLDATA_LINE("Size of a large-object chunk",
+CONTROLDATA_LINE(CD_LO_BLKSZ, "Size of a large-object chunk",
 				 "%u", ControlFile.loblksize)
 
 /* This is no longer configurable, but users may still expect to see it: */
-CONTROLDATA_LINE("Date/time type storage",
+CONTROLDATA_LINE(CD_DATETIME_INT64, "Date/time type storage",
 				 "%s", _("64-bit integers"))
-CONTROLDATA_LINE("Float8 argument passing",
+CONTROLDATA_LINE(CD_FLOAT8_ARGS, "Float8 argument passing",
 				 "%s", ControlFile.float8ByVal ? _("by value") : _("by reference"))
-CONTROLDATA_LINE("Data page checksum version",
+CONTROLDATA_LINE(CD_CHECKSUMS, "Data page checksum version",
 				 "%u", ControlFile.data_checksum_version)
-CONTROLDATA_LINE("Default char data signedness",
+CONTROLDATA_LINE(CD_CHAR_SIGNEDNESS, "Default char data signedness",
 				 "%s", ControlFile.default_char_signedness ? _("signed") : _("unsigned"))
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index fb17b6f80e0..23bf1c62183 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -55,6 +55,7 @@
 #include "common/restricted_token.h"
 #include "common/string.h"
 #include "fe_utils/option_utils.h"
+#include "fe_utils/simple_list.h"
 #include "fe_utils/version.h"
 #include "getopt_long.h"
 #include "mb/pg_wchar.h"
@@ -119,6 +120,14 @@ static int	internal_wcswidth(const char *pwcs, size_t len, int encoding);
 static uint32 strtouint32_strict(const char *restrict s, char **restrict endptr, int base);
 static uint64 strtouint64_strict(const char *restrict s, char **restrict endptr, int base);
 
+/* Define the string enums */
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	symbol,
+enum ControldataStrings {
+#include "entries.h"
+};
+#undef CONTROLDATA_LINE
+
 
 int
 main(int argc, char *argv[])
@@ -768,7 +777,7 @@ PrintControlValues(bool guessed)
 	 * First, determine the maximum length of the description of all entries,
 	 * some or all of which might be translated.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	thislen = internal_wcswidth(_(description),			\
 								strlen(_(description)),	\
 								encoding);				\
@@ -781,7 +790,7 @@ PrintControlValues(bool guessed)
 	 * Print each line: the possibly-translated description, then some padding
 	 * spaces according to its display width, then the value.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	{													\
 		int		thisstrlen;								\
 														\
@@ -807,69 +816,99 @@ static void
 PrintNewControlValues(void)
 {
 	char		fname[MAXFNAMELEN];
+	int			encoding = pg_get_encoding_from_locale(NULL, true);
+	SimpleOidList	toprint = {NULL, NULL};
+	int			maxlen = 0;
+	int			thislen;
 
 	/* This will be always printed in order to keep format same. */
 	printf(_("\n\nValues to be changed:\n\n"));
 
-	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
-				 newXlogSegNo, WalSegSz);
-	printf(_("First log segment after reset:        %s\n"), fname);
-
 	if (mxids_given)
 	{
-		printf(_("NextMultiXactId:                      %u\n"),
-			   ControlFile.checkPointCopy.nextMulti);
-		printf(_("OldestMultiXid:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestMulti);
-		printf(_("OldestMulti's DB:                     %u\n"),
-			   ControlFile.checkPointCopy.oldestMultiDB);
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI_DB);
 	}
 
 	if (next_mxoff_given)
-	{
-		printf(_("NextMultiOffset:                      %" PRIu64 "\n"),
-			   ControlFile.checkPointCopy.nextMultiOffset);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXOFF);
 
 	if (next_oid_given)
-	{
-		printf(_("NextOID:                              %u\n"),
-			   ControlFile.checkPointCopy.nextOid);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTOID);
 
 	if (next_xid_given)
-	{
-		printf(_("NextXID:                              %u\n"),
-			   XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTXID);
 
 	if (oldest_xid_given)
 	{
-		printf(_("OldestXID:                            %u\n"),
-			   ControlFile.checkPointCopy.oldestXid);
-		printf(_("OldestXID's DB:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestXidDB);
-	}
-
-	if (next_xid_epoch_given)
-	{
-		printf(_("NextXID epoch:                        %u\n"),
-			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID_DB);
 	}
 
 	if (commit_ts_xids_given)
 	{
-		printf(_("oldestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.oldestCommitTsXid);
-		printf(_("newestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.newestCommitTsXid);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_COMMITTS_XID);
+		simple_oid_list_append(&toprint, CD_CKPT_NEWEST_COMMITTS_XID);
 	}
 
 	if (wal_segsize_given)
-	{
-		printf(_("Bytes per WAL segment:                %u\n"),
-			   ControlFile.xlog_seg_size);
+		simple_oid_list_append(&toprint, CD_WAL_SEGSIZE);
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{															\
+	thislen = internal_wcswidth(_(description),					\
+								strlen(_(description)),			\
+								encoding);						\
+	if (thislen > maxlen)										\
+		maxlen = thislen;										\
 	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
+
+
+	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
+				 newXlogSegNo, WalSegSz);
+
+	/* We print this one inconditionally */
+	{
+		char *str = "First log segment after reset";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%s\n", _(str), maxlen - thislen + 2, " ", fname);
+	}
+
+	/* We print the XID epoch in a degenerate case */
+	if (next_xid_epoch_given)
+	{
+		char *str = "NextXID epoch";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%u\n", _(str), maxlen - thislen + 2, " ",
+			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+
+	}
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{													\
+		int		thisstrlen;								\
+														\
+		thisstrlen = strlen(_(description));			\
+		thislen = internal_wcswidth(_(description),		\
+									thisstrlen,			\
+									encoding);			\
+		printf("%s:%*s" fmt "\n",						\
+			   _(description),							\
+			   maxlen - thislen + 2,					\
+			   " ",										\
+			   __VA_ARGS__);							\
+	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
 }
 
 
-- 
2.47.3


--m4rixdodkhrlzpzv--





^ permalink  raw  reply  [nested|flat] 180+ messages in thread

* [PATCH 2/2] Apply the same technique to PrintNewControlValues too
@ 2026-01-31 15:01 Álvaro Herrera <[email protected]>
  0 siblings, 0 replies; 180+ messages in thread

From: Álvaro Herrera @ 2026-01-31 15:01 UTC (permalink / raw)

---
 src/bin/pg_resetwal/entries.h     |  60 +++++++--------
 src/bin/pg_resetwal/pg_resetwal.c | 121 ++++++++++++++++++++----------
 2 files changed, 110 insertions(+), 71 deletions(-)

diff --git a/src/bin/pg_resetwal/entries.h b/src/bin/pg_resetwal/entries.h
index 6b7686da83a..25f2c49b3a8 100644
--- a/src/bin/pg_resetwal/entries.h
+++ b/src/bin/pg_resetwal/entries.h
@@ -1,62 +1,62 @@
-CONTROLDATA_LINE("pg_control version number",
+CONTROLDATA_LINE(CD_CONTROL_VERSION, "pg_control version number",
 				 "%u", ControlFile.pg_control_version)
-CONTROLDATA_LINE("Catalog version number",
+CONTROLDATA_LINE(CD_CATALOG_VERSION, "Catalog version number",
 				 "%u", ControlFile.catalog_version_no)
-CONTROLDATA_LINE("Database system identifier",
+CONTROLDATA_LINE(CD_SYSTEM_IDENTIFIER, "Database system identifier",
 				 "%" PRIu64, ControlFile.system_identifier)
-CONTROLDATA_LINE("Latest checkpoint's TimeLineID",
+CONTROLDATA_LINE(CD_CKPT_TIMELINE, "Latest checkpoint's TimeLineID",
 				 "%u", ControlFile.checkPointCopy.ThisTimeLineID)
-CONTROLDATA_LINE("Latest checkpoint's full_page_writes",
+CONTROLDATA_LINE(CD_CKPT_FPW, "Latest checkpoint's full_page_writes",
 				 "%s", (ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off")))
-CONTROLDATA_LINE("Latest checkpoint's NextXID",
+CONTROLDATA_LINE(CD_CKPT_NEXTXID, "Latest checkpoint's NextXID",
 				 "%u:%u", EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid), XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid))
-CONTROLDATA_LINE("Latest checkpoint's NextOID",
+CONTROLDATA_LINE(CD_CKPT_NEXTOID, "Latest checkpoint's NextOID",
 				 "%u", ControlFile.checkPointCopy.nextOid)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiXactId",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXID, "Latest checkpoint's NextMultiXactId",
 				 "%u", ControlFile.checkPointCopy.nextMulti)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiOffset",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXOFF, "Latest checkpoint's NextMultiOffset",
 				 "%" PRIu64, ControlFile.checkPointCopy.nextMultiOffset)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID, "Latest checkpoint's oldestXID",
 				 "%u", ControlFile.checkPointCopy.oldestXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID_DB, "Latest checkpoint's oldestXID's DB",
 				 "%u", ControlFile.checkPointCopy.oldestXidDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestActiveXID",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_ACTIVEXID, "Latest checkpoint's oldestActiveXID",
 				 "%u", ControlFile.checkPointCopy.oldestActiveXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestMultiXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI, "Latest checkpoint's oldestMultiXid",
 				 "%u", ControlFile.checkPointCopy.oldestMulti)
-CONTROLDATA_LINE("Latest checkpoint's oldestMulti's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI_DB, "Latest checkpoint's oldestMulti's DB",
 				 "%u", ControlFile.checkPointCopy.oldestMultiDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_COMMITTS_XID, "Latest checkpoint's oldestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.oldestCommitTsXid)
-CONTROLDATA_LINE("Latest checkpoint's newestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_NEWEST_COMMITTS_XID, "Latest checkpoint's newestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.newestCommitTsXid)
-CONTROLDATA_LINE("Maximum data alignment",
+CONTROLDATA_LINE(CD_MAXALIGN, "Maximum data alignment",
 				 "%u", ControlFile.maxAlign)
-CONTROLDATA_LINE("Database block size",
+CONTROLDATA_LINE(CD_BLCKSZ, "Database block size",
 				 "%u", ControlFile.blcksz)
-CONTROLDATA_LINE("Blocks per segment of large relation",
+CONTROLDATA_LINE(CD_RELSEG_SZ, "Blocks per segment of large relation",
 				 "%u", ControlFile.relseg_size)
-CONTROLDATA_LINE("Pages per SLRU segment",
+CONTROLDATA_LINE(CD_SLRU_PPS, "Pages per SLRU segment",
 				 "%u", ControlFile.slru_pages_per_segment)
-CONTROLDATA_LINE("WAL block size",
+CONTROLDATA_LINE(CD_WAL_BLCKSZ, "WAL block size",
 				 "%u", ControlFile.xlog_blcksz)
-CONTROLDATA_LINE("Bytes per WAL segment",
+CONTROLDATA_LINE(CD_WAL_SEGSIZE, "Bytes per WAL segment",
 				 "%u", ControlFile.xlog_seg_size)
-CONTROLDATA_LINE("Maximum length of identifiers",
+CONTROLDATA_LINE(CD_WAL_NAMEDATALEN, "Maximum length of identifiers",
 				 "%u", ControlFile.nameDataLen)
-CONTROLDATA_LINE("Maximum columns in an index",
+CONTROLDATA_LINE(CD_INDEX_MAX_KEYS, "Maximum columns in an index",
 				 "%u", ControlFile.indexMaxKeys)
-CONTROLDATA_LINE("Maximum size of a TOAST chunk",
+CONTROLDATA_LINE(CD_TOAST_MAXCHUNKSZ, "Maximum size of a TOAST chunk",
 				 "%u", ControlFile.toast_max_chunk_size)
-CONTROLDATA_LINE("Size of a large-object chunk",
+CONTROLDATA_LINE(CD_LO_BLKSZ, "Size of a large-object chunk",
 				 "%u", ControlFile.loblksize)
 
 /* This is no longer configurable, but users may still expect to see it: */
-CONTROLDATA_LINE("Date/time type storage",
+CONTROLDATA_LINE(CD_DATETIME_INT64, "Date/time type storage",
 				 "%s", _("64-bit integers"))
-CONTROLDATA_LINE("Float8 argument passing",
+CONTROLDATA_LINE(CD_FLOAT8_ARGS, "Float8 argument passing",
 				 "%s", ControlFile.float8ByVal ? _("by value") : _("by reference"))
-CONTROLDATA_LINE("Data page checksum version",
+CONTROLDATA_LINE(CD_CHECKSUMS, "Data page checksum version",
 				 "%u", ControlFile.data_checksum_version)
-CONTROLDATA_LINE("Default char data signedness",
+CONTROLDATA_LINE(CD_CHAR_SIGNEDNESS, "Default char data signedness",
 				 "%s", ControlFile.default_char_signedness ? _("signed") : _("unsigned"))
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index fb17b6f80e0..23bf1c62183 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -55,6 +55,7 @@
 #include "common/restricted_token.h"
 #include "common/string.h"
 #include "fe_utils/option_utils.h"
+#include "fe_utils/simple_list.h"
 #include "fe_utils/version.h"
 #include "getopt_long.h"
 #include "mb/pg_wchar.h"
@@ -119,6 +120,14 @@ static int	internal_wcswidth(const char *pwcs, size_t len, int encoding);
 static uint32 strtouint32_strict(const char *restrict s, char **restrict endptr, int base);
 static uint64 strtouint64_strict(const char *restrict s, char **restrict endptr, int base);
 
+/* Define the string enums */
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	symbol,
+enum ControldataStrings {
+#include "entries.h"
+};
+#undef CONTROLDATA_LINE
+
 
 int
 main(int argc, char *argv[])
@@ -768,7 +777,7 @@ PrintControlValues(bool guessed)
 	 * First, determine the maximum length of the description of all entries,
 	 * some or all of which might be translated.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	thislen = internal_wcswidth(_(description),			\
 								strlen(_(description)),	\
 								encoding);				\
@@ -781,7 +790,7 @@ PrintControlValues(bool guessed)
 	 * Print each line: the possibly-translated description, then some padding
 	 * spaces according to its display width, then the value.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	{													\
 		int		thisstrlen;								\
 														\
@@ -807,69 +816,99 @@ static void
 PrintNewControlValues(void)
 {
 	char		fname[MAXFNAMELEN];
+	int			encoding = pg_get_encoding_from_locale(NULL, true);
+	SimpleOidList	toprint = {NULL, NULL};
+	int			maxlen = 0;
+	int			thislen;
 
 	/* This will be always printed in order to keep format same. */
 	printf(_("\n\nValues to be changed:\n\n"));
 
-	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
-				 newXlogSegNo, WalSegSz);
-	printf(_("First log segment after reset:        %s\n"), fname);
-
 	if (mxids_given)
 	{
-		printf(_("NextMultiXactId:                      %u\n"),
-			   ControlFile.checkPointCopy.nextMulti);
-		printf(_("OldestMultiXid:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestMulti);
-		printf(_("OldestMulti's DB:                     %u\n"),
-			   ControlFile.checkPointCopy.oldestMultiDB);
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI_DB);
 	}
 
 	if (next_mxoff_given)
-	{
-		printf(_("NextMultiOffset:                      %" PRIu64 "\n"),
-			   ControlFile.checkPointCopy.nextMultiOffset);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXOFF);
 
 	if (next_oid_given)
-	{
-		printf(_("NextOID:                              %u\n"),
-			   ControlFile.checkPointCopy.nextOid);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTOID);
 
 	if (next_xid_given)
-	{
-		printf(_("NextXID:                              %u\n"),
-			   XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTXID);
 
 	if (oldest_xid_given)
 	{
-		printf(_("OldestXID:                            %u\n"),
-			   ControlFile.checkPointCopy.oldestXid);
-		printf(_("OldestXID's DB:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestXidDB);
-	}
-
-	if (next_xid_epoch_given)
-	{
-		printf(_("NextXID epoch:                        %u\n"),
-			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID_DB);
 	}
 
 	if (commit_ts_xids_given)
 	{
-		printf(_("oldestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.oldestCommitTsXid);
-		printf(_("newestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.newestCommitTsXid);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_COMMITTS_XID);
+		simple_oid_list_append(&toprint, CD_CKPT_NEWEST_COMMITTS_XID);
 	}
 
 	if (wal_segsize_given)
-	{
-		printf(_("Bytes per WAL segment:                %u\n"),
-			   ControlFile.xlog_seg_size);
+		simple_oid_list_append(&toprint, CD_WAL_SEGSIZE);
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{															\
+	thislen = internal_wcswidth(_(description),					\
+								strlen(_(description)),			\
+								encoding);						\
+	if (thislen > maxlen)										\
+		maxlen = thislen;										\
 	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
+
+
+	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
+				 newXlogSegNo, WalSegSz);
+
+	/* We print this one inconditionally */
+	{
+		char *str = "First log segment after reset";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%s\n", _(str), maxlen - thislen + 2, " ", fname);
+	}
+
+	/* We print the XID epoch in a degenerate case */
+	if (next_xid_epoch_given)
+	{
+		char *str = "NextXID epoch";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%u\n", _(str), maxlen - thislen + 2, " ",
+			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+
+	}
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{													\
+		int		thisstrlen;								\
+														\
+		thisstrlen = strlen(_(description));			\
+		thislen = internal_wcswidth(_(description),		\
+									thisstrlen,			\
+									encoding);			\
+		printf("%s:%*s" fmt "\n",						\
+			   _(description),							\
+			   maxlen - thislen + 2,					\
+			   " ",										\
+			   __VA_ARGS__);							\
+	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
 }
 
 
-- 
2.47.3


--m4rixdodkhrlzpzv--





^ permalink  raw  reply  [nested|flat] 180+ messages in thread

* [PATCH 2/2] Apply the same technique to PrintNewControlValues too
@ 2026-01-31 15:01 Álvaro Herrera <[email protected]>
  0 siblings, 0 replies; 180+ messages in thread

From: Álvaro Herrera @ 2026-01-31 15:01 UTC (permalink / raw)

---
 src/bin/pg_resetwal/entries.h     |  60 +++++++--------
 src/bin/pg_resetwal/pg_resetwal.c | 121 ++++++++++++++++++++----------
 2 files changed, 110 insertions(+), 71 deletions(-)

diff --git a/src/bin/pg_resetwal/entries.h b/src/bin/pg_resetwal/entries.h
index 6b7686da83a..25f2c49b3a8 100644
--- a/src/bin/pg_resetwal/entries.h
+++ b/src/bin/pg_resetwal/entries.h
@@ -1,62 +1,62 @@
-CONTROLDATA_LINE("pg_control version number",
+CONTROLDATA_LINE(CD_CONTROL_VERSION, "pg_control version number",
 				 "%u", ControlFile.pg_control_version)
-CONTROLDATA_LINE("Catalog version number",
+CONTROLDATA_LINE(CD_CATALOG_VERSION, "Catalog version number",
 				 "%u", ControlFile.catalog_version_no)
-CONTROLDATA_LINE("Database system identifier",
+CONTROLDATA_LINE(CD_SYSTEM_IDENTIFIER, "Database system identifier",
 				 "%" PRIu64, ControlFile.system_identifier)
-CONTROLDATA_LINE("Latest checkpoint's TimeLineID",
+CONTROLDATA_LINE(CD_CKPT_TIMELINE, "Latest checkpoint's TimeLineID",
 				 "%u", ControlFile.checkPointCopy.ThisTimeLineID)
-CONTROLDATA_LINE("Latest checkpoint's full_page_writes",
+CONTROLDATA_LINE(CD_CKPT_FPW, "Latest checkpoint's full_page_writes",
 				 "%s", (ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off")))
-CONTROLDATA_LINE("Latest checkpoint's NextXID",
+CONTROLDATA_LINE(CD_CKPT_NEXTXID, "Latest checkpoint's NextXID",
 				 "%u:%u", EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid), XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid))
-CONTROLDATA_LINE("Latest checkpoint's NextOID",
+CONTROLDATA_LINE(CD_CKPT_NEXTOID, "Latest checkpoint's NextOID",
 				 "%u", ControlFile.checkPointCopy.nextOid)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiXactId",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXID, "Latest checkpoint's NextMultiXactId",
 				 "%u", ControlFile.checkPointCopy.nextMulti)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiOffset",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXOFF, "Latest checkpoint's NextMultiOffset",
 				 "%" PRIu64, ControlFile.checkPointCopy.nextMultiOffset)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID, "Latest checkpoint's oldestXID",
 				 "%u", ControlFile.checkPointCopy.oldestXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID_DB, "Latest checkpoint's oldestXID's DB",
 				 "%u", ControlFile.checkPointCopy.oldestXidDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestActiveXID",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_ACTIVEXID, "Latest checkpoint's oldestActiveXID",
 				 "%u", ControlFile.checkPointCopy.oldestActiveXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestMultiXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI, "Latest checkpoint's oldestMultiXid",
 				 "%u", ControlFile.checkPointCopy.oldestMulti)
-CONTROLDATA_LINE("Latest checkpoint's oldestMulti's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI_DB, "Latest checkpoint's oldestMulti's DB",
 				 "%u", ControlFile.checkPointCopy.oldestMultiDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_COMMITTS_XID, "Latest checkpoint's oldestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.oldestCommitTsXid)
-CONTROLDATA_LINE("Latest checkpoint's newestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_NEWEST_COMMITTS_XID, "Latest checkpoint's newestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.newestCommitTsXid)
-CONTROLDATA_LINE("Maximum data alignment",
+CONTROLDATA_LINE(CD_MAXALIGN, "Maximum data alignment",
 				 "%u", ControlFile.maxAlign)
-CONTROLDATA_LINE("Database block size",
+CONTROLDATA_LINE(CD_BLCKSZ, "Database block size",
 				 "%u", ControlFile.blcksz)
-CONTROLDATA_LINE("Blocks per segment of large relation",
+CONTROLDATA_LINE(CD_RELSEG_SZ, "Blocks per segment of large relation",
 				 "%u", ControlFile.relseg_size)
-CONTROLDATA_LINE("Pages per SLRU segment",
+CONTROLDATA_LINE(CD_SLRU_PPS, "Pages per SLRU segment",
 				 "%u", ControlFile.slru_pages_per_segment)
-CONTROLDATA_LINE("WAL block size",
+CONTROLDATA_LINE(CD_WAL_BLCKSZ, "WAL block size",
 				 "%u", ControlFile.xlog_blcksz)
-CONTROLDATA_LINE("Bytes per WAL segment",
+CONTROLDATA_LINE(CD_WAL_SEGSIZE, "Bytes per WAL segment",
 				 "%u", ControlFile.xlog_seg_size)
-CONTROLDATA_LINE("Maximum length of identifiers",
+CONTROLDATA_LINE(CD_WAL_NAMEDATALEN, "Maximum length of identifiers",
 				 "%u", ControlFile.nameDataLen)
-CONTROLDATA_LINE("Maximum columns in an index",
+CONTROLDATA_LINE(CD_INDEX_MAX_KEYS, "Maximum columns in an index",
 				 "%u", ControlFile.indexMaxKeys)
-CONTROLDATA_LINE("Maximum size of a TOAST chunk",
+CONTROLDATA_LINE(CD_TOAST_MAXCHUNKSZ, "Maximum size of a TOAST chunk",
 				 "%u", ControlFile.toast_max_chunk_size)
-CONTROLDATA_LINE("Size of a large-object chunk",
+CONTROLDATA_LINE(CD_LO_BLKSZ, "Size of a large-object chunk",
 				 "%u", ControlFile.loblksize)
 
 /* This is no longer configurable, but users may still expect to see it: */
-CONTROLDATA_LINE("Date/time type storage",
+CONTROLDATA_LINE(CD_DATETIME_INT64, "Date/time type storage",
 				 "%s", _("64-bit integers"))
-CONTROLDATA_LINE("Float8 argument passing",
+CONTROLDATA_LINE(CD_FLOAT8_ARGS, "Float8 argument passing",
 				 "%s", ControlFile.float8ByVal ? _("by value") : _("by reference"))
-CONTROLDATA_LINE("Data page checksum version",
+CONTROLDATA_LINE(CD_CHECKSUMS, "Data page checksum version",
 				 "%u", ControlFile.data_checksum_version)
-CONTROLDATA_LINE("Default char data signedness",
+CONTROLDATA_LINE(CD_CHAR_SIGNEDNESS, "Default char data signedness",
 				 "%s", ControlFile.default_char_signedness ? _("signed") : _("unsigned"))
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index fb17b6f80e0..23bf1c62183 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -55,6 +55,7 @@
 #include "common/restricted_token.h"
 #include "common/string.h"
 #include "fe_utils/option_utils.h"
+#include "fe_utils/simple_list.h"
 #include "fe_utils/version.h"
 #include "getopt_long.h"
 #include "mb/pg_wchar.h"
@@ -119,6 +120,14 @@ static int	internal_wcswidth(const char *pwcs, size_t len, int encoding);
 static uint32 strtouint32_strict(const char *restrict s, char **restrict endptr, int base);
 static uint64 strtouint64_strict(const char *restrict s, char **restrict endptr, int base);
 
+/* Define the string enums */
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	symbol,
+enum ControldataStrings {
+#include "entries.h"
+};
+#undef CONTROLDATA_LINE
+
 
 int
 main(int argc, char *argv[])
@@ -768,7 +777,7 @@ PrintControlValues(bool guessed)
 	 * First, determine the maximum length of the description of all entries,
 	 * some or all of which might be translated.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	thislen = internal_wcswidth(_(description),			\
 								strlen(_(description)),	\
 								encoding);				\
@@ -781,7 +790,7 @@ PrintControlValues(bool guessed)
 	 * Print each line: the possibly-translated description, then some padding
 	 * spaces according to its display width, then the value.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	{													\
 		int		thisstrlen;								\
 														\
@@ -807,69 +816,99 @@ static void
 PrintNewControlValues(void)
 {
 	char		fname[MAXFNAMELEN];
+	int			encoding = pg_get_encoding_from_locale(NULL, true);
+	SimpleOidList	toprint = {NULL, NULL};
+	int			maxlen = 0;
+	int			thislen;
 
 	/* This will be always printed in order to keep format same. */
 	printf(_("\n\nValues to be changed:\n\n"));
 
-	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
-				 newXlogSegNo, WalSegSz);
-	printf(_("First log segment after reset:        %s\n"), fname);
-
 	if (mxids_given)
 	{
-		printf(_("NextMultiXactId:                      %u\n"),
-			   ControlFile.checkPointCopy.nextMulti);
-		printf(_("OldestMultiXid:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestMulti);
-		printf(_("OldestMulti's DB:                     %u\n"),
-			   ControlFile.checkPointCopy.oldestMultiDB);
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI_DB);
 	}
 
 	if (next_mxoff_given)
-	{
-		printf(_("NextMultiOffset:                      %" PRIu64 "\n"),
-			   ControlFile.checkPointCopy.nextMultiOffset);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXOFF);
 
 	if (next_oid_given)
-	{
-		printf(_("NextOID:                              %u\n"),
-			   ControlFile.checkPointCopy.nextOid);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTOID);
 
 	if (next_xid_given)
-	{
-		printf(_("NextXID:                              %u\n"),
-			   XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTXID);
 
 	if (oldest_xid_given)
 	{
-		printf(_("OldestXID:                            %u\n"),
-			   ControlFile.checkPointCopy.oldestXid);
-		printf(_("OldestXID's DB:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestXidDB);
-	}
-
-	if (next_xid_epoch_given)
-	{
-		printf(_("NextXID epoch:                        %u\n"),
-			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID_DB);
 	}
 
 	if (commit_ts_xids_given)
 	{
-		printf(_("oldestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.oldestCommitTsXid);
-		printf(_("newestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.newestCommitTsXid);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_COMMITTS_XID);
+		simple_oid_list_append(&toprint, CD_CKPT_NEWEST_COMMITTS_XID);
 	}
 
 	if (wal_segsize_given)
-	{
-		printf(_("Bytes per WAL segment:                %u\n"),
-			   ControlFile.xlog_seg_size);
+		simple_oid_list_append(&toprint, CD_WAL_SEGSIZE);
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{															\
+	thislen = internal_wcswidth(_(description),					\
+								strlen(_(description)),			\
+								encoding);						\
+	if (thislen > maxlen)										\
+		maxlen = thislen;										\
 	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
+
+
+	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
+				 newXlogSegNo, WalSegSz);
+
+	/* We print this one inconditionally */
+	{
+		char *str = "First log segment after reset";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%s\n", _(str), maxlen - thislen + 2, " ", fname);
+	}
+
+	/* We print the XID epoch in a degenerate case */
+	if (next_xid_epoch_given)
+	{
+		char *str = "NextXID epoch";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%u\n", _(str), maxlen - thislen + 2, " ",
+			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+
+	}
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{													\
+		int		thisstrlen;								\
+														\
+		thisstrlen = strlen(_(description));			\
+		thislen = internal_wcswidth(_(description),		\
+									thisstrlen,			\
+									encoding);			\
+		printf("%s:%*s" fmt "\n",						\
+			   _(description),							\
+			   maxlen - thislen + 2,					\
+			   " ",										\
+			   __VA_ARGS__);							\
+	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
 }
 
 
-- 
2.47.3


--m4rixdodkhrlzpzv--





^ permalink  raw  reply  [nested|flat] 180+ messages in thread

* [PATCH 2/2] Apply the same technique to PrintNewControlValues too
@ 2026-01-31 15:01 Álvaro Herrera <[email protected]>
  0 siblings, 0 replies; 180+ messages in thread

From: Álvaro Herrera @ 2026-01-31 15:01 UTC (permalink / raw)

---
 src/bin/pg_resetwal/entries.h     |  60 +++++++--------
 src/bin/pg_resetwal/pg_resetwal.c | 121 ++++++++++++++++++++----------
 2 files changed, 110 insertions(+), 71 deletions(-)

diff --git a/src/bin/pg_resetwal/entries.h b/src/bin/pg_resetwal/entries.h
index 6b7686da83a..25f2c49b3a8 100644
--- a/src/bin/pg_resetwal/entries.h
+++ b/src/bin/pg_resetwal/entries.h
@@ -1,62 +1,62 @@
-CONTROLDATA_LINE("pg_control version number",
+CONTROLDATA_LINE(CD_CONTROL_VERSION, "pg_control version number",
 				 "%u", ControlFile.pg_control_version)
-CONTROLDATA_LINE("Catalog version number",
+CONTROLDATA_LINE(CD_CATALOG_VERSION, "Catalog version number",
 				 "%u", ControlFile.catalog_version_no)
-CONTROLDATA_LINE("Database system identifier",
+CONTROLDATA_LINE(CD_SYSTEM_IDENTIFIER, "Database system identifier",
 				 "%" PRIu64, ControlFile.system_identifier)
-CONTROLDATA_LINE("Latest checkpoint's TimeLineID",
+CONTROLDATA_LINE(CD_CKPT_TIMELINE, "Latest checkpoint's TimeLineID",
 				 "%u", ControlFile.checkPointCopy.ThisTimeLineID)
-CONTROLDATA_LINE("Latest checkpoint's full_page_writes",
+CONTROLDATA_LINE(CD_CKPT_FPW, "Latest checkpoint's full_page_writes",
 				 "%s", (ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off")))
-CONTROLDATA_LINE("Latest checkpoint's NextXID",
+CONTROLDATA_LINE(CD_CKPT_NEXTXID, "Latest checkpoint's NextXID",
 				 "%u:%u", EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid), XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid))
-CONTROLDATA_LINE("Latest checkpoint's NextOID",
+CONTROLDATA_LINE(CD_CKPT_NEXTOID, "Latest checkpoint's NextOID",
 				 "%u", ControlFile.checkPointCopy.nextOid)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiXactId",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXID, "Latest checkpoint's NextMultiXactId",
 				 "%u", ControlFile.checkPointCopy.nextMulti)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiOffset",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXOFF, "Latest checkpoint's NextMultiOffset",
 				 "%" PRIu64, ControlFile.checkPointCopy.nextMultiOffset)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID, "Latest checkpoint's oldestXID",
 				 "%u", ControlFile.checkPointCopy.oldestXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID_DB, "Latest checkpoint's oldestXID's DB",
 				 "%u", ControlFile.checkPointCopy.oldestXidDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestActiveXID",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_ACTIVEXID, "Latest checkpoint's oldestActiveXID",
 				 "%u", ControlFile.checkPointCopy.oldestActiveXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestMultiXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI, "Latest checkpoint's oldestMultiXid",
 				 "%u", ControlFile.checkPointCopy.oldestMulti)
-CONTROLDATA_LINE("Latest checkpoint's oldestMulti's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI_DB, "Latest checkpoint's oldestMulti's DB",
 				 "%u", ControlFile.checkPointCopy.oldestMultiDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_COMMITTS_XID, "Latest checkpoint's oldestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.oldestCommitTsXid)
-CONTROLDATA_LINE("Latest checkpoint's newestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_NEWEST_COMMITTS_XID, "Latest checkpoint's newestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.newestCommitTsXid)
-CONTROLDATA_LINE("Maximum data alignment",
+CONTROLDATA_LINE(CD_MAXALIGN, "Maximum data alignment",
 				 "%u", ControlFile.maxAlign)
-CONTROLDATA_LINE("Database block size",
+CONTROLDATA_LINE(CD_BLCKSZ, "Database block size",
 				 "%u", ControlFile.blcksz)
-CONTROLDATA_LINE("Blocks per segment of large relation",
+CONTROLDATA_LINE(CD_RELSEG_SZ, "Blocks per segment of large relation",
 				 "%u", ControlFile.relseg_size)
-CONTROLDATA_LINE("Pages per SLRU segment",
+CONTROLDATA_LINE(CD_SLRU_PPS, "Pages per SLRU segment",
 				 "%u", ControlFile.slru_pages_per_segment)
-CONTROLDATA_LINE("WAL block size",
+CONTROLDATA_LINE(CD_WAL_BLCKSZ, "WAL block size",
 				 "%u", ControlFile.xlog_blcksz)
-CONTROLDATA_LINE("Bytes per WAL segment",
+CONTROLDATA_LINE(CD_WAL_SEGSIZE, "Bytes per WAL segment",
 				 "%u", ControlFile.xlog_seg_size)
-CONTROLDATA_LINE("Maximum length of identifiers",
+CONTROLDATA_LINE(CD_WAL_NAMEDATALEN, "Maximum length of identifiers",
 				 "%u", ControlFile.nameDataLen)
-CONTROLDATA_LINE("Maximum columns in an index",
+CONTROLDATA_LINE(CD_INDEX_MAX_KEYS, "Maximum columns in an index",
 				 "%u", ControlFile.indexMaxKeys)
-CONTROLDATA_LINE("Maximum size of a TOAST chunk",
+CONTROLDATA_LINE(CD_TOAST_MAXCHUNKSZ, "Maximum size of a TOAST chunk",
 				 "%u", ControlFile.toast_max_chunk_size)
-CONTROLDATA_LINE("Size of a large-object chunk",
+CONTROLDATA_LINE(CD_LO_BLKSZ, "Size of a large-object chunk",
 				 "%u", ControlFile.loblksize)
 
 /* This is no longer configurable, but users may still expect to see it: */
-CONTROLDATA_LINE("Date/time type storage",
+CONTROLDATA_LINE(CD_DATETIME_INT64, "Date/time type storage",
 				 "%s", _("64-bit integers"))
-CONTROLDATA_LINE("Float8 argument passing",
+CONTROLDATA_LINE(CD_FLOAT8_ARGS, "Float8 argument passing",
 				 "%s", ControlFile.float8ByVal ? _("by value") : _("by reference"))
-CONTROLDATA_LINE("Data page checksum version",
+CONTROLDATA_LINE(CD_CHECKSUMS, "Data page checksum version",
 				 "%u", ControlFile.data_checksum_version)
-CONTROLDATA_LINE("Default char data signedness",
+CONTROLDATA_LINE(CD_CHAR_SIGNEDNESS, "Default char data signedness",
 				 "%s", ControlFile.default_char_signedness ? _("signed") : _("unsigned"))
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index fb17b6f80e0..23bf1c62183 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -55,6 +55,7 @@
 #include "common/restricted_token.h"
 #include "common/string.h"
 #include "fe_utils/option_utils.h"
+#include "fe_utils/simple_list.h"
 #include "fe_utils/version.h"
 #include "getopt_long.h"
 #include "mb/pg_wchar.h"
@@ -119,6 +120,14 @@ static int	internal_wcswidth(const char *pwcs, size_t len, int encoding);
 static uint32 strtouint32_strict(const char *restrict s, char **restrict endptr, int base);
 static uint64 strtouint64_strict(const char *restrict s, char **restrict endptr, int base);
 
+/* Define the string enums */
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	symbol,
+enum ControldataStrings {
+#include "entries.h"
+};
+#undef CONTROLDATA_LINE
+
 
 int
 main(int argc, char *argv[])
@@ -768,7 +777,7 @@ PrintControlValues(bool guessed)
 	 * First, determine the maximum length of the description of all entries,
 	 * some or all of which might be translated.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	thislen = internal_wcswidth(_(description),			\
 								strlen(_(description)),	\
 								encoding);				\
@@ -781,7 +790,7 @@ PrintControlValues(bool guessed)
 	 * Print each line: the possibly-translated description, then some padding
 	 * spaces according to its display width, then the value.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	{													\
 		int		thisstrlen;								\
 														\
@@ -807,69 +816,99 @@ static void
 PrintNewControlValues(void)
 {
 	char		fname[MAXFNAMELEN];
+	int			encoding = pg_get_encoding_from_locale(NULL, true);
+	SimpleOidList	toprint = {NULL, NULL};
+	int			maxlen = 0;
+	int			thislen;
 
 	/* This will be always printed in order to keep format same. */
 	printf(_("\n\nValues to be changed:\n\n"));
 
-	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
-				 newXlogSegNo, WalSegSz);
-	printf(_("First log segment after reset:        %s\n"), fname);
-
 	if (mxids_given)
 	{
-		printf(_("NextMultiXactId:                      %u\n"),
-			   ControlFile.checkPointCopy.nextMulti);
-		printf(_("OldestMultiXid:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestMulti);
-		printf(_("OldestMulti's DB:                     %u\n"),
-			   ControlFile.checkPointCopy.oldestMultiDB);
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI_DB);
 	}
 
 	if (next_mxoff_given)
-	{
-		printf(_("NextMultiOffset:                      %" PRIu64 "\n"),
-			   ControlFile.checkPointCopy.nextMultiOffset);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXOFF);
 
 	if (next_oid_given)
-	{
-		printf(_("NextOID:                              %u\n"),
-			   ControlFile.checkPointCopy.nextOid);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTOID);
 
 	if (next_xid_given)
-	{
-		printf(_("NextXID:                              %u\n"),
-			   XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTXID);
 
 	if (oldest_xid_given)
 	{
-		printf(_("OldestXID:                            %u\n"),
-			   ControlFile.checkPointCopy.oldestXid);
-		printf(_("OldestXID's DB:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestXidDB);
-	}
-
-	if (next_xid_epoch_given)
-	{
-		printf(_("NextXID epoch:                        %u\n"),
-			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID_DB);
 	}
 
 	if (commit_ts_xids_given)
 	{
-		printf(_("oldestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.oldestCommitTsXid);
-		printf(_("newestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.newestCommitTsXid);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_COMMITTS_XID);
+		simple_oid_list_append(&toprint, CD_CKPT_NEWEST_COMMITTS_XID);
 	}
 
 	if (wal_segsize_given)
-	{
-		printf(_("Bytes per WAL segment:                %u\n"),
-			   ControlFile.xlog_seg_size);
+		simple_oid_list_append(&toprint, CD_WAL_SEGSIZE);
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{															\
+	thislen = internal_wcswidth(_(description),					\
+								strlen(_(description)),			\
+								encoding);						\
+	if (thislen > maxlen)										\
+		maxlen = thislen;										\
 	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
+
+
+	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
+				 newXlogSegNo, WalSegSz);
+
+	/* We print this one inconditionally */
+	{
+		char *str = "First log segment after reset";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%s\n", _(str), maxlen - thislen + 2, " ", fname);
+	}
+
+	/* We print the XID epoch in a degenerate case */
+	if (next_xid_epoch_given)
+	{
+		char *str = "NextXID epoch";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%u\n", _(str), maxlen - thislen + 2, " ",
+			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+
+	}
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{													\
+		int		thisstrlen;								\
+														\
+		thisstrlen = strlen(_(description));			\
+		thislen = internal_wcswidth(_(description),		\
+									thisstrlen,			\
+									encoding);			\
+		printf("%s:%*s" fmt "\n",						\
+			   _(description),							\
+			   maxlen - thislen + 2,					\
+			   " ",										\
+			   __VA_ARGS__);							\
+	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
 }
 
 
-- 
2.47.3


--m4rixdodkhrlzpzv--





^ permalink  raw  reply  [nested|flat] 180+ messages in thread

* [PATCH 2/2] Apply the same technique to PrintNewControlValues too
@ 2026-01-31 15:01 Álvaro Herrera <[email protected]>
  0 siblings, 0 replies; 180+ messages in thread

From: Álvaro Herrera @ 2026-01-31 15:01 UTC (permalink / raw)

---
 src/bin/pg_resetwal/entries.h     |  60 +++++++--------
 src/bin/pg_resetwal/pg_resetwal.c | 121 ++++++++++++++++++++----------
 2 files changed, 110 insertions(+), 71 deletions(-)

diff --git a/src/bin/pg_resetwal/entries.h b/src/bin/pg_resetwal/entries.h
index 6b7686da83a..25f2c49b3a8 100644
--- a/src/bin/pg_resetwal/entries.h
+++ b/src/bin/pg_resetwal/entries.h
@@ -1,62 +1,62 @@
-CONTROLDATA_LINE("pg_control version number",
+CONTROLDATA_LINE(CD_CONTROL_VERSION, "pg_control version number",
 				 "%u", ControlFile.pg_control_version)
-CONTROLDATA_LINE("Catalog version number",
+CONTROLDATA_LINE(CD_CATALOG_VERSION, "Catalog version number",
 				 "%u", ControlFile.catalog_version_no)
-CONTROLDATA_LINE("Database system identifier",
+CONTROLDATA_LINE(CD_SYSTEM_IDENTIFIER, "Database system identifier",
 				 "%" PRIu64, ControlFile.system_identifier)
-CONTROLDATA_LINE("Latest checkpoint's TimeLineID",
+CONTROLDATA_LINE(CD_CKPT_TIMELINE, "Latest checkpoint's TimeLineID",
 				 "%u", ControlFile.checkPointCopy.ThisTimeLineID)
-CONTROLDATA_LINE("Latest checkpoint's full_page_writes",
+CONTROLDATA_LINE(CD_CKPT_FPW, "Latest checkpoint's full_page_writes",
 				 "%s", (ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off")))
-CONTROLDATA_LINE("Latest checkpoint's NextXID",
+CONTROLDATA_LINE(CD_CKPT_NEXTXID, "Latest checkpoint's NextXID",
 				 "%u:%u", EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid), XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid))
-CONTROLDATA_LINE("Latest checkpoint's NextOID",
+CONTROLDATA_LINE(CD_CKPT_NEXTOID, "Latest checkpoint's NextOID",
 				 "%u", ControlFile.checkPointCopy.nextOid)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiXactId",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXID, "Latest checkpoint's NextMultiXactId",
 				 "%u", ControlFile.checkPointCopy.nextMulti)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiOffset",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXOFF, "Latest checkpoint's NextMultiOffset",
 				 "%" PRIu64, ControlFile.checkPointCopy.nextMultiOffset)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID, "Latest checkpoint's oldestXID",
 				 "%u", ControlFile.checkPointCopy.oldestXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID_DB, "Latest checkpoint's oldestXID's DB",
 				 "%u", ControlFile.checkPointCopy.oldestXidDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestActiveXID",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_ACTIVEXID, "Latest checkpoint's oldestActiveXID",
 				 "%u", ControlFile.checkPointCopy.oldestActiveXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestMultiXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI, "Latest checkpoint's oldestMultiXid",
 				 "%u", ControlFile.checkPointCopy.oldestMulti)
-CONTROLDATA_LINE("Latest checkpoint's oldestMulti's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI_DB, "Latest checkpoint's oldestMulti's DB",
 				 "%u", ControlFile.checkPointCopy.oldestMultiDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_COMMITTS_XID, "Latest checkpoint's oldestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.oldestCommitTsXid)
-CONTROLDATA_LINE("Latest checkpoint's newestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_NEWEST_COMMITTS_XID, "Latest checkpoint's newestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.newestCommitTsXid)
-CONTROLDATA_LINE("Maximum data alignment",
+CONTROLDATA_LINE(CD_MAXALIGN, "Maximum data alignment",
 				 "%u", ControlFile.maxAlign)
-CONTROLDATA_LINE("Database block size",
+CONTROLDATA_LINE(CD_BLCKSZ, "Database block size",
 				 "%u", ControlFile.blcksz)
-CONTROLDATA_LINE("Blocks per segment of large relation",
+CONTROLDATA_LINE(CD_RELSEG_SZ, "Blocks per segment of large relation",
 				 "%u", ControlFile.relseg_size)
-CONTROLDATA_LINE("Pages per SLRU segment",
+CONTROLDATA_LINE(CD_SLRU_PPS, "Pages per SLRU segment",
 				 "%u", ControlFile.slru_pages_per_segment)
-CONTROLDATA_LINE("WAL block size",
+CONTROLDATA_LINE(CD_WAL_BLCKSZ, "WAL block size",
 				 "%u", ControlFile.xlog_blcksz)
-CONTROLDATA_LINE("Bytes per WAL segment",
+CONTROLDATA_LINE(CD_WAL_SEGSIZE, "Bytes per WAL segment",
 				 "%u", ControlFile.xlog_seg_size)
-CONTROLDATA_LINE("Maximum length of identifiers",
+CONTROLDATA_LINE(CD_WAL_NAMEDATALEN, "Maximum length of identifiers",
 				 "%u", ControlFile.nameDataLen)
-CONTROLDATA_LINE("Maximum columns in an index",
+CONTROLDATA_LINE(CD_INDEX_MAX_KEYS, "Maximum columns in an index",
 				 "%u", ControlFile.indexMaxKeys)
-CONTROLDATA_LINE("Maximum size of a TOAST chunk",
+CONTROLDATA_LINE(CD_TOAST_MAXCHUNKSZ, "Maximum size of a TOAST chunk",
 				 "%u", ControlFile.toast_max_chunk_size)
-CONTROLDATA_LINE("Size of a large-object chunk",
+CONTROLDATA_LINE(CD_LO_BLKSZ, "Size of a large-object chunk",
 				 "%u", ControlFile.loblksize)
 
 /* This is no longer configurable, but users may still expect to see it: */
-CONTROLDATA_LINE("Date/time type storage",
+CONTROLDATA_LINE(CD_DATETIME_INT64, "Date/time type storage",
 				 "%s", _("64-bit integers"))
-CONTROLDATA_LINE("Float8 argument passing",
+CONTROLDATA_LINE(CD_FLOAT8_ARGS, "Float8 argument passing",
 				 "%s", ControlFile.float8ByVal ? _("by value") : _("by reference"))
-CONTROLDATA_LINE("Data page checksum version",
+CONTROLDATA_LINE(CD_CHECKSUMS, "Data page checksum version",
 				 "%u", ControlFile.data_checksum_version)
-CONTROLDATA_LINE("Default char data signedness",
+CONTROLDATA_LINE(CD_CHAR_SIGNEDNESS, "Default char data signedness",
 				 "%s", ControlFile.default_char_signedness ? _("signed") : _("unsigned"))
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index fb17b6f80e0..23bf1c62183 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -55,6 +55,7 @@
 #include "common/restricted_token.h"
 #include "common/string.h"
 #include "fe_utils/option_utils.h"
+#include "fe_utils/simple_list.h"
 #include "fe_utils/version.h"
 #include "getopt_long.h"
 #include "mb/pg_wchar.h"
@@ -119,6 +120,14 @@ static int	internal_wcswidth(const char *pwcs, size_t len, int encoding);
 static uint32 strtouint32_strict(const char *restrict s, char **restrict endptr, int base);
 static uint64 strtouint64_strict(const char *restrict s, char **restrict endptr, int base);
 
+/* Define the string enums */
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	symbol,
+enum ControldataStrings {
+#include "entries.h"
+};
+#undef CONTROLDATA_LINE
+
 
 int
 main(int argc, char *argv[])
@@ -768,7 +777,7 @@ PrintControlValues(bool guessed)
 	 * First, determine the maximum length of the description of all entries,
 	 * some or all of which might be translated.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	thislen = internal_wcswidth(_(description),			\
 								strlen(_(description)),	\
 								encoding);				\
@@ -781,7 +790,7 @@ PrintControlValues(bool guessed)
 	 * Print each line: the possibly-translated description, then some padding
 	 * spaces according to its display width, then the value.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	{													\
 		int		thisstrlen;								\
 														\
@@ -807,69 +816,99 @@ static void
 PrintNewControlValues(void)
 {
 	char		fname[MAXFNAMELEN];
+	int			encoding = pg_get_encoding_from_locale(NULL, true);
+	SimpleOidList	toprint = {NULL, NULL};
+	int			maxlen = 0;
+	int			thislen;
 
 	/* This will be always printed in order to keep format same. */
 	printf(_("\n\nValues to be changed:\n\n"));
 
-	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
-				 newXlogSegNo, WalSegSz);
-	printf(_("First log segment after reset:        %s\n"), fname);
-
 	if (mxids_given)
 	{
-		printf(_("NextMultiXactId:                      %u\n"),
-			   ControlFile.checkPointCopy.nextMulti);
-		printf(_("OldestMultiXid:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestMulti);
-		printf(_("OldestMulti's DB:                     %u\n"),
-			   ControlFile.checkPointCopy.oldestMultiDB);
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI_DB);
 	}
 
 	if (next_mxoff_given)
-	{
-		printf(_("NextMultiOffset:                      %" PRIu64 "\n"),
-			   ControlFile.checkPointCopy.nextMultiOffset);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXOFF);
 
 	if (next_oid_given)
-	{
-		printf(_("NextOID:                              %u\n"),
-			   ControlFile.checkPointCopy.nextOid);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTOID);
 
 	if (next_xid_given)
-	{
-		printf(_("NextXID:                              %u\n"),
-			   XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTXID);
 
 	if (oldest_xid_given)
 	{
-		printf(_("OldestXID:                            %u\n"),
-			   ControlFile.checkPointCopy.oldestXid);
-		printf(_("OldestXID's DB:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestXidDB);
-	}
-
-	if (next_xid_epoch_given)
-	{
-		printf(_("NextXID epoch:                        %u\n"),
-			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID_DB);
 	}
 
 	if (commit_ts_xids_given)
 	{
-		printf(_("oldestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.oldestCommitTsXid);
-		printf(_("newestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.newestCommitTsXid);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_COMMITTS_XID);
+		simple_oid_list_append(&toprint, CD_CKPT_NEWEST_COMMITTS_XID);
 	}
 
 	if (wal_segsize_given)
-	{
-		printf(_("Bytes per WAL segment:                %u\n"),
-			   ControlFile.xlog_seg_size);
+		simple_oid_list_append(&toprint, CD_WAL_SEGSIZE);
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{															\
+	thislen = internal_wcswidth(_(description),					\
+								strlen(_(description)),			\
+								encoding);						\
+	if (thislen > maxlen)										\
+		maxlen = thislen;										\
 	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
+
+
+	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
+				 newXlogSegNo, WalSegSz);
+
+	/* We print this one inconditionally */
+	{
+		char *str = "First log segment after reset";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%s\n", _(str), maxlen - thislen + 2, " ", fname);
+	}
+
+	/* We print the XID epoch in a degenerate case */
+	if (next_xid_epoch_given)
+	{
+		char *str = "NextXID epoch";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%u\n", _(str), maxlen - thislen + 2, " ",
+			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+
+	}
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{													\
+		int		thisstrlen;								\
+														\
+		thisstrlen = strlen(_(description));			\
+		thislen = internal_wcswidth(_(description),		\
+									thisstrlen,			\
+									encoding);			\
+		printf("%s:%*s" fmt "\n",						\
+			   _(description),							\
+			   maxlen - thislen + 2,					\
+			   " ",										\
+			   __VA_ARGS__);							\
+	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
 }
 
 
-- 
2.47.3


--m4rixdodkhrlzpzv--





^ permalink  raw  reply  [nested|flat] 180+ messages in thread

* [PATCH 2/2] Apply the same technique to PrintNewControlValues too
@ 2026-01-31 15:01 Álvaro Herrera <[email protected]>
  0 siblings, 0 replies; 180+ messages in thread

From: Álvaro Herrera @ 2026-01-31 15:01 UTC (permalink / raw)

---
 src/bin/pg_resetwal/entries.h     |  60 +++++++--------
 src/bin/pg_resetwal/pg_resetwal.c | 121 ++++++++++++++++++++----------
 2 files changed, 110 insertions(+), 71 deletions(-)

diff --git a/src/bin/pg_resetwal/entries.h b/src/bin/pg_resetwal/entries.h
index 6b7686da83a..25f2c49b3a8 100644
--- a/src/bin/pg_resetwal/entries.h
+++ b/src/bin/pg_resetwal/entries.h
@@ -1,62 +1,62 @@
-CONTROLDATA_LINE("pg_control version number",
+CONTROLDATA_LINE(CD_CONTROL_VERSION, "pg_control version number",
 				 "%u", ControlFile.pg_control_version)
-CONTROLDATA_LINE("Catalog version number",
+CONTROLDATA_LINE(CD_CATALOG_VERSION, "Catalog version number",
 				 "%u", ControlFile.catalog_version_no)
-CONTROLDATA_LINE("Database system identifier",
+CONTROLDATA_LINE(CD_SYSTEM_IDENTIFIER, "Database system identifier",
 				 "%" PRIu64, ControlFile.system_identifier)
-CONTROLDATA_LINE("Latest checkpoint's TimeLineID",
+CONTROLDATA_LINE(CD_CKPT_TIMELINE, "Latest checkpoint's TimeLineID",
 				 "%u", ControlFile.checkPointCopy.ThisTimeLineID)
-CONTROLDATA_LINE("Latest checkpoint's full_page_writes",
+CONTROLDATA_LINE(CD_CKPT_FPW, "Latest checkpoint's full_page_writes",
 				 "%s", (ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off")))
-CONTROLDATA_LINE("Latest checkpoint's NextXID",
+CONTROLDATA_LINE(CD_CKPT_NEXTXID, "Latest checkpoint's NextXID",
 				 "%u:%u", EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid), XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid))
-CONTROLDATA_LINE("Latest checkpoint's NextOID",
+CONTROLDATA_LINE(CD_CKPT_NEXTOID, "Latest checkpoint's NextOID",
 				 "%u", ControlFile.checkPointCopy.nextOid)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiXactId",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXID, "Latest checkpoint's NextMultiXactId",
 				 "%u", ControlFile.checkPointCopy.nextMulti)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiOffset",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXOFF, "Latest checkpoint's NextMultiOffset",
 				 "%" PRIu64, ControlFile.checkPointCopy.nextMultiOffset)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID, "Latest checkpoint's oldestXID",
 				 "%u", ControlFile.checkPointCopy.oldestXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID_DB, "Latest checkpoint's oldestXID's DB",
 				 "%u", ControlFile.checkPointCopy.oldestXidDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestActiveXID",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_ACTIVEXID, "Latest checkpoint's oldestActiveXID",
 				 "%u", ControlFile.checkPointCopy.oldestActiveXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestMultiXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI, "Latest checkpoint's oldestMultiXid",
 				 "%u", ControlFile.checkPointCopy.oldestMulti)
-CONTROLDATA_LINE("Latest checkpoint's oldestMulti's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI_DB, "Latest checkpoint's oldestMulti's DB",
 				 "%u", ControlFile.checkPointCopy.oldestMultiDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_COMMITTS_XID, "Latest checkpoint's oldestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.oldestCommitTsXid)
-CONTROLDATA_LINE("Latest checkpoint's newestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_NEWEST_COMMITTS_XID, "Latest checkpoint's newestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.newestCommitTsXid)
-CONTROLDATA_LINE("Maximum data alignment",
+CONTROLDATA_LINE(CD_MAXALIGN, "Maximum data alignment",
 				 "%u", ControlFile.maxAlign)
-CONTROLDATA_LINE("Database block size",
+CONTROLDATA_LINE(CD_BLCKSZ, "Database block size",
 				 "%u", ControlFile.blcksz)
-CONTROLDATA_LINE("Blocks per segment of large relation",
+CONTROLDATA_LINE(CD_RELSEG_SZ, "Blocks per segment of large relation",
 				 "%u", ControlFile.relseg_size)
-CONTROLDATA_LINE("Pages per SLRU segment",
+CONTROLDATA_LINE(CD_SLRU_PPS, "Pages per SLRU segment",
 				 "%u", ControlFile.slru_pages_per_segment)
-CONTROLDATA_LINE("WAL block size",
+CONTROLDATA_LINE(CD_WAL_BLCKSZ, "WAL block size",
 				 "%u", ControlFile.xlog_blcksz)
-CONTROLDATA_LINE("Bytes per WAL segment",
+CONTROLDATA_LINE(CD_WAL_SEGSIZE, "Bytes per WAL segment",
 				 "%u", ControlFile.xlog_seg_size)
-CONTROLDATA_LINE("Maximum length of identifiers",
+CONTROLDATA_LINE(CD_WAL_NAMEDATALEN, "Maximum length of identifiers",
 				 "%u", ControlFile.nameDataLen)
-CONTROLDATA_LINE("Maximum columns in an index",
+CONTROLDATA_LINE(CD_INDEX_MAX_KEYS, "Maximum columns in an index",
 				 "%u", ControlFile.indexMaxKeys)
-CONTROLDATA_LINE("Maximum size of a TOAST chunk",
+CONTROLDATA_LINE(CD_TOAST_MAXCHUNKSZ, "Maximum size of a TOAST chunk",
 				 "%u", ControlFile.toast_max_chunk_size)
-CONTROLDATA_LINE("Size of a large-object chunk",
+CONTROLDATA_LINE(CD_LO_BLKSZ, "Size of a large-object chunk",
 				 "%u", ControlFile.loblksize)
 
 /* This is no longer configurable, but users may still expect to see it: */
-CONTROLDATA_LINE("Date/time type storage",
+CONTROLDATA_LINE(CD_DATETIME_INT64, "Date/time type storage",
 				 "%s", _("64-bit integers"))
-CONTROLDATA_LINE("Float8 argument passing",
+CONTROLDATA_LINE(CD_FLOAT8_ARGS, "Float8 argument passing",
 				 "%s", ControlFile.float8ByVal ? _("by value") : _("by reference"))
-CONTROLDATA_LINE("Data page checksum version",
+CONTROLDATA_LINE(CD_CHECKSUMS, "Data page checksum version",
 				 "%u", ControlFile.data_checksum_version)
-CONTROLDATA_LINE("Default char data signedness",
+CONTROLDATA_LINE(CD_CHAR_SIGNEDNESS, "Default char data signedness",
 				 "%s", ControlFile.default_char_signedness ? _("signed") : _("unsigned"))
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index fb17b6f80e0..23bf1c62183 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -55,6 +55,7 @@
 #include "common/restricted_token.h"
 #include "common/string.h"
 #include "fe_utils/option_utils.h"
+#include "fe_utils/simple_list.h"
 #include "fe_utils/version.h"
 #include "getopt_long.h"
 #include "mb/pg_wchar.h"
@@ -119,6 +120,14 @@ static int	internal_wcswidth(const char *pwcs, size_t len, int encoding);
 static uint32 strtouint32_strict(const char *restrict s, char **restrict endptr, int base);
 static uint64 strtouint64_strict(const char *restrict s, char **restrict endptr, int base);
 
+/* Define the string enums */
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	symbol,
+enum ControldataStrings {
+#include "entries.h"
+};
+#undef CONTROLDATA_LINE
+
 
 int
 main(int argc, char *argv[])
@@ -768,7 +777,7 @@ PrintControlValues(bool guessed)
 	 * First, determine the maximum length of the description of all entries,
 	 * some or all of which might be translated.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	thislen = internal_wcswidth(_(description),			\
 								strlen(_(description)),	\
 								encoding);				\
@@ -781,7 +790,7 @@ PrintControlValues(bool guessed)
 	 * Print each line: the possibly-translated description, then some padding
 	 * spaces according to its display width, then the value.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	{													\
 		int		thisstrlen;								\
 														\
@@ -807,69 +816,99 @@ static void
 PrintNewControlValues(void)
 {
 	char		fname[MAXFNAMELEN];
+	int			encoding = pg_get_encoding_from_locale(NULL, true);
+	SimpleOidList	toprint = {NULL, NULL};
+	int			maxlen = 0;
+	int			thislen;
 
 	/* This will be always printed in order to keep format same. */
 	printf(_("\n\nValues to be changed:\n\n"));
 
-	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
-				 newXlogSegNo, WalSegSz);
-	printf(_("First log segment after reset:        %s\n"), fname);
-
 	if (mxids_given)
 	{
-		printf(_("NextMultiXactId:                      %u\n"),
-			   ControlFile.checkPointCopy.nextMulti);
-		printf(_("OldestMultiXid:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestMulti);
-		printf(_("OldestMulti's DB:                     %u\n"),
-			   ControlFile.checkPointCopy.oldestMultiDB);
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI_DB);
 	}
 
 	if (next_mxoff_given)
-	{
-		printf(_("NextMultiOffset:                      %" PRIu64 "\n"),
-			   ControlFile.checkPointCopy.nextMultiOffset);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXOFF);
 
 	if (next_oid_given)
-	{
-		printf(_("NextOID:                              %u\n"),
-			   ControlFile.checkPointCopy.nextOid);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTOID);
 
 	if (next_xid_given)
-	{
-		printf(_("NextXID:                              %u\n"),
-			   XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTXID);
 
 	if (oldest_xid_given)
 	{
-		printf(_("OldestXID:                            %u\n"),
-			   ControlFile.checkPointCopy.oldestXid);
-		printf(_("OldestXID's DB:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestXidDB);
-	}
-
-	if (next_xid_epoch_given)
-	{
-		printf(_("NextXID epoch:                        %u\n"),
-			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID_DB);
 	}
 
 	if (commit_ts_xids_given)
 	{
-		printf(_("oldestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.oldestCommitTsXid);
-		printf(_("newestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.newestCommitTsXid);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_COMMITTS_XID);
+		simple_oid_list_append(&toprint, CD_CKPT_NEWEST_COMMITTS_XID);
 	}
 
 	if (wal_segsize_given)
-	{
-		printf(_("Bytes per WAL segment:                %u\n"),
-			   ControlFile.xlog_seg_size);
+		simple_oid_list_append(&toprint, CD_WAL_SEGSIZE);
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{															\
+	thislen = internal_wcswidth(_(description),					\
+								strlen(_(description)),			\
+								encoding);						\
+	if (thislen > maxlen)										\
+		maxlen = thislen;										\
 	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
+
+
+	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
+				 newXlogSegNo, WalSegSz);
+
+	/* We print this one inconditionally */
+	{
+		char *str = "First log segment after reset";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%s\n", _(str), maxlen - thislen + 2, " ", fname);
+	}
+
+	/* We print the XID epoch in a degenerate case */
+	if (next_xid_epoch_given)
+	{
+		char *str = "NextXID epoch";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%u\n", _(str), maxlen - thislen + 2, " ",
+			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+
+	}
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{													\
+		int		thisstrlen;								\
+														\
+		thisstrlen = strlen(_(description));			\
+		thislen = internal_wcswidth(_(description),		\
+									thisstrlen,			\
+									encoding);			\
+		printf("%s:%*s" fmt "\n",						\
+			   _(description),							\
+			   maxlen - thislen + 2,					\
+			   " ",										\
+			   __VA_ARGS__);							\
+	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
 }
 
 
-- 
2.47.3


--m4rixdodkhrlzpzv--





^ permalink  raw  reply  [nested|flat] 180+ messages in thread

* [PATCH 2/2] Apply the same technique to PrintNewControlValues too
@ 2026-01-31 15:01 Álvaro Herrera <[email protected]>
  0 siblings, 0 replies; 180+ messages in thread

From: Álvaro Herrera @ 2026-01-31 15:01 UTC (permalink / raw)

---
 src/bin/pg_resetwal/entries.h     |  60 +++++++--------
 src/bin/pg_resetwal/pg_resetwal.c | 121 ++++++++++++++++++++----------
 2 files changed, 110 insertions(+), 71 deletions(-)

diff --git a/src/bin/pg_resetwal/entries.h b/src/bin/pg_resetwal/entries.h
index 6b7686da83a..25f2c49b3a8 100644
--- a/src/bin/pg_resetwal/entries.h
+++ b/src/bin/pg_resetwal/entries.h
@@ -1,62 +1,62 @@
-CONTROLDATA_LINE("pg_control version number",
+CONTROLDATA_LINE(CD_CONTROL_VERSION, "pg_control version number",
 				 "%u", ControlFile.pg_control_version)
-CONTROLDATA_LINE("Catalog version number",
+CONTROLDATA_LINE(CD_CATALOG_VERSION, "Catalog version number",
 				 "%u", ControlFile.catalog_version_no)
-CONTROLDATA_LINE("Database system identifier",
+CONTROLDATA_LINE(CD_SYSTEM_IDENTIFIER, "Database system identifier",
 				 "%" PRIu64, ControlFile.system_identifier)
-CONTROLDATA_LINE("Latest checkpoint's TimeLineID",
+CONTROLDATA_LINE(CD_CKPT_TIMELINE, "Latest checkpoint's TimeLineID",
 				 "%u", ControlFile.checkPointCopy.ThisTimeLineID)
-CONTROLDATA_LINE("Latest checkpoint's full_page_writes",
+CONTROLDATA_LINE(CD_CKPT_FPW, "Latest checkpoint's full_page_writes",
 				 "%s", (ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off")))
-CONTROLDATA_LINE("Latest checkpoint's NextXID",
+CONTROLDATA_LINE(CD_CKPT_NEXTXID, "Latest checkpoint's NextXID",
 				 "%u:%u", EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid), XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid))
-CONTROLDATA_LINE("Latest checkpoint's NextOID",
+CONTROLDATA_LINE(CD_CKPT_NEXTOID, "Latest checkpoint's NextOID",
 				 "%u", ControlFile.checkPointCopy.nextOid)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiXactId",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXID, "Latest checkpoint's NextMultiXactId",
 				 "%u", ControlFile.checkPointCopy.nextMulti)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiOffset",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXOFF, "Latest checkpoint's NextMultiOffset",
 				 "%" PRIu64, ControlFile.checkPointCopy.nextMultiOffset)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID, "Latest checkpoint's oldestXID",
 				 "%u", ControlFile.checkPointCopy.oldestXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID_DB, "Latest checkpoint's oldestXID's DB",
 				 "%u", ControlFile.checkPointCopy.oldestXidDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestActiveXID",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_ACTIVEXID, "Latest checkpoint's oldestActiveXID",
 				 "%u", ControlFile.checkPointCopy.oldestActiveXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestMultiXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI, "Latest checkpoint's oldestMultiXid",
 				 "%u", ControlFile.checkPointCopy.oldestMulti)
-CONTROLDATA_LINE("Latest checkpoint's oldestMulti's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI_DB, "Latest checkpoint's oldestMulti's DB",
 				 "%u", ControlFile.checkPointCopy.oldestMultiDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_COMMITTS_XID, "Latest checkpoint's oldestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.oldestCommitTsXid)
-CONTROLDATA_LINE("Latest checkpoint's newestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_NEWEST_COMMITTS_XID, "Latest checkpoint's newestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.newestCommitTsXid)
-CONTROLDATA_LINE("Maximum data alignment",
+CONTROLDATA_LINE(CD_MAXALIGN, "Maximum data alignment",
 				 "%u", ControlFile.maxAlign)
-CONTROLDATA_LINE("Database block size",
+CONTROLDATA_LINE(CD_BLCKSZ, "Database block size",
 				 "%u", ControlFile.blcksz)
-CONTROLDATA_LINE("Blocks per segment of large relation",
+CONTROLDATA_LINE(CD_RELSEG_SZ, "Blocks per segment of large relation",
 				 "%u", ControlFile.relseg_size)
-CONTROLDATA_LINE("Pages per SLRU segment",
+CONTROLDATA_LINE(CD_SLRU_PPS, "Pages per SLRU segment",
 				 "%u", ControlFile.slru_pages_per_segment)
-CONTROLDATA_LINE("WAL block size",
+CONTROLDATA_LINE(CD_WAL_BLCKSZ, "WAL block size",
 				 "%u", ControlFile.xlog_blcksz)
-CONTROLDATA_LINE("Bytes per WAL segment",
+CONTROLDATA_LINE(CD_WAL_SEGSIZE, "Bytes per WAL segment",
 				 "%u", ControlFile.xlog_seg_size)
-CONTROLDATA_LINE("Maximum length of identifiers",
+CONTROLDATA_LINE(CD_WAL_NAMEDATALEN, "Maximum length of identifiers",
 				 "%u", ControlFile.nameDataLen)
-CONTROLDATA_LINE("Maximum columns in an index",
+CONTROLDATA_LINE(CD_INDEX_MAX_KEYS, "Maximum columns in an index",
 				 "%u", ControlFile.indexMaxKeys)
-CONTROLDATA_LINE("Maximum size of a TOAST chunk",
+CONTROLDATA_LINE(CD_TOAST_MAXCHUNKSZ, "Maximum size of a TOAST chunk",
 				 "%u", ControlFile.toast_max_chunk_size)
-CONTROLDATA_LINE("Size of a large-object chunk",
+CONTROLDATA_LINE(CD_LO_BLKSZ, "Size of a large-object chunk",
 				 "%u", ControlFile.loblksize)
 
 /* This is no longer configurable, but users may still expect to see it: */
-CONTROLDATA_LINE("Date/time type storage",
+CONTROLDATA_LINE(CD_DATETIME_INT64, "Date/time type storage",
 				 "%s", _("64-bit integers"))
-CONTROLDATA_LINE("Float8 argument passing",
+CONTROLDATA_LINE(CD_FLOAT8_ARGS, "Float8 argument passing",
 				 "%s", ControlFile.float8ByVal ? _("by value") : _("by reference"))
-CONTROLDATA_LINE("Data page checksum version",
+CONTROLDATA_LINE(CD_CHECKSUMS, "Data page checksum version",
 				 "%u", ControlFile.data_checksum_version)
-CONTROLDATA_LINE("Default char data signedness",
+CONTROLDATA_LINE(CD_CHAR_SIGNEDNESS, "Default char data signedness",
 				 "%s", ControlFile.default_char_signedness ? _("signed") : _("unsigned"))
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index fb17b6f80e0..23bf1c62183 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -55,6 +55,7 @@
 #include "common/restricted_token.h"
 #include "common/string.h"
 #include "fe_utils/option_utils.h"
+#include "fe_utils/simple_list.h"
 #include "fe_utils/version.h"
 #include "getopt_long.h"
 #include "mb/pg_wchar.h"
@@ -119,6 +120,14 @@ static int	internal_wcswidth(const char *pwcs, size_t len, int encoding);
 static uint32 strtouint32_strict(const char *restrict s, char **restrict endptr, int base);
 static uint64 strtouint64_strict(const char *restrict s, char **restrict endptr, int base);
 
+/* Define the string enums */
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	symbol,
+enum ControldataStrings {
+#include "entries.h"
+};
+#undef CONTROLDATA_LINE
+
 
 int
 main(int argc, char *argv[])
@@ -768,7 +777,7 @@ PrintControlValues(bool guessed)
 	 * First, determine the maximum length of the description of all entries,
 	 * some or all of which might be translated.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	thislen = internal_wcswidth(_(description),			\
 								strlen(_(description)),	\
 								encoding);				\
@@ -781,7 +790,7 @@ PrintControlValues(bool guessed)
 	 * Print each line: the possibly-translated description, then some padding
 	 * spaces according to its display width, then the value.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	{													\
 		int		thisstrlen;								\
 														\
@@ -807,69 +816,99 @@ static void
 PrintNewControlValues(void)
 {
 	char		fname[MAXFNAMELEN];
+	int			encoding = pg_get_encoding_from_locale(NULL, true);
+	SimpleOidList	toprint = {NULL, NULL};
+	int			maxlen = 0;
+	int			thislen;
 
 	/* This will be always printed in order to keep format same. */
 	printf(_("\n\nValues to be changed:\n\n"));
 
-	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
-				 newXlogSegNo, WalSegSz);
-	printf(_("First log segment after reset:        %s\n"), fname);
-
 	if (mxids_given)
 	{
-		printf(_("NextMultiXactId:                      %u\n"),
-			   ControlFile.checkPointCopy.nextMulti);
-		printf(_("OldestMultiXid:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestMulti);
-		printf(_("OldestMulti's DB:                     %u\n"),
-			   ControlFile.checkPointCopy.oldestMultiDB);
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI_DB);
 	}
 
 	if (next_mxoff_given)
-	{
-		printf(_("NextMultiOffset:                      %" PRIu64 "\n"),
-			   ControlFile.checkPointCopy.nextMultiOffset);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXOFF);
 
 	if (next_oid_given)
-	{
-		printf(_("NextOID:                              %u\n"),
-			   ControlFile.checkPointCopy.nextOid);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTOID);
 
 	if (next_xid_given)
-	{
-		printf(_("NextXID:                              %u\n"),
-			   XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTXID);
 
 	if (oldest_xid_given)
 	{
-		printf(_("OldestXID:                            %u\n"),
-			   ControlFile.checkPointCopy.oldestXid);
-		printf(_("OldestXID's DB:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestXidDB);
-	}
-
-	if (next_xid_epoch_given)
-	{
-		printf(_("NextXID epoch:                        %u\n"),
-			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID_DB);
 	}
 
 	if (commit_ts_xids_given)
 	{
-		printf(_("oldestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.oldestCommitTsXid);
-		printf(_("newestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.newestCommitTsXid);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_COMMITTS_XID);
+		simple_oid_list_append(&toprint, CD_CKPT_NEWEST_COMMITTS_XID);
 	}
 
 	if (wal_segsize_given)
-	{
-		printf(_("Bytes per WAL segment:                %u\n"),
-			   ControlFile.xlog_seg_size);
+		simple_oid_list_append(&toprint, CD_WAL_SEGSIZE);
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{															\
+	thislen = internal_wcswidth(_(description),					\
+								strlen(_(description)),			\
+								encoding);						\
+	if (thislen > maxlen)										\
+		maxlen = thislen;										\
 	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
+
+
+	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
+				 newXlogSegNo, WalSegSz);
+
+	/* We print this one inconditionally */
+	{
+		char *str = "First log segment after reset";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%s\n", _(str), maxlen - thislen + 2, " ", fname);
+	}
+
+	/* We print the XID epoch in a degenerate case */
+	if (next_xid_epoch_given)
+	{
+		char *str = "NextXID epoch";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%u\n", _(str), maxlen - thislen + 2, " ",
+			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+
+	}
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{													\
+		int		thisstrlen;								\
+														\
+		thisstrlen = strlen(_(description));			\
+		thislen = internal_wcswidth(_(description),		\
+									thisstrlen,			\
+									encoding);			\
+		printf("%s:%*s" fmt "\n",						\
+			   _(description),							\
+			   maxlen - thislen + 2,					\
+			   " ",										\
+			   __VA_ARGS__);							\
+	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
 }
 
 
-- 
2.47.3


--m4rixdodkhrlzpzv--





^ permalink  raw  reply  [nested|flat] 180+ messages in thread

* [PATCH 2/2] Apply the same technique to PrintNewControlValues too
@ 2026-01-31 15:01 Álvaro Herrera <[email protected]>
  0 siblings, 0 replies; 180+ messages in thread

From: Álvaro Herrera @ 2026-01-31 15:01 UTC (permalink / raw)

---
 src/bin/pg_resetwal/entries.h     |  60 +++++++--------
 src/bin/pg_resetwal/pg_resetwal.c | 121 ++++++++++++++++++++----------
 2 files changed, 110 insertions(+), 71 deletions(-)

diff --git a/src/bin/pg_resetwal/entries.h b/src/bin/pg_resetwal/entries.h
index 6b7686da83a..25f2c49b3a8 100644
--- a/src/bin/pg_resetwal/entries.h
+++ b/src/bin/pg_resetwal/entries.h
@@ -1,62 +1,62 @@
-CONTROLDATA_LINE("pg_control version number",
+CONTROLDATA_LINE(CD_CONTROL_VERSION, "pg_control version number",
 				 "%u", ControlFile.pg_control_version)
-CONTROLDATA_LINE("Catalog version number",
+CONTROLDATA_LINE(CD_CATALOG_VERSION, "Catalog version number",
 				 "%u", ControlFile.catalog_version_no)
-CONTROLDATA_LINE("Database system identifier",
+CONTROLDATA_LINE(CD_SYSTEM_IDENTIFIER, "Database system identifier",
 				 "%" PRIu64, ControlFile.system_identifier)
-CONTROLDATA_LINE("Latest checkpoint's TimeLineID",
+CONTROLDATA_LINE(CD_CKPT_TIMELINE, "Latest checkpoint's TimeLineID",
 				 "%u", ControlFile.checkPointCopy.ThisTimeLineID)
-CONTROLDATA_LINE("Latest checkpoint's full_page_writes",
+CONTROLDATA_LINE(CD_CKPT_FPW, "Latest checkpoint's full_page_writes",
 				 "%s", (ControlFile.checkPointCopy.fullPageWrites ? _("on") : _("off")))
-CONTROLDATA_LINE("Latest checkpoint's NextXID",
+CONTROLDATA_LINE(CD_CKPT_NEXTXID, "Latest checkpoint's NextXID",
 				 "%u:%u", EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid), XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid))
-CONTROLDATA_LINE("Latest checkpoint's NextOID",
+CONTROLDATA_LINE(CD_CKPT_NEXTOID, "Latest checkpoint's NextOID",
 				 "%u", ControlFile.checkPointCopy.nextOid)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiXactId",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXID, "Latest checkpoint's NextMultiXactId",
 				 "%u", ControlFile.checkPointCopy.nextMulti)
-CONTROLDATA_LINE("Latest checkpoint's NextMultiOffset",
+CONTROLDATA_LINE(CD_CKPT_NEXTMXOFF, "Latest checkpoint's NextMultiOffset",
 				 "%" PRIu64, ControlFile.checkPointCopy.nextMultiOffset)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID, "Latest checkpoint's oldestXID",
 				 "%u", ControlFile.checkPointCopy.oldestXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestXID's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDESTXID_DB, "Latest checkpoint's oldestXID's DB",
 				 "%u", ControlFile.checkPointCopy.oldestXidDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestActiveXID",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_ACTIVEXID, "Latest checkpoint's oldestActiveXID",
 				 "%u", ControlFile.checkPointCopy.oldestActiveXid)
-CONTROLDATA_LINE("Latest checkpoint's oldestMultiXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI, "Latest checkpoint's oldestMultiXid",
 				 "%u", ControlFile.checkPointCopy.oldestMulti)
-CONTROLDATA_LINE("Latest checkpoint's oldestMulti's DB",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_MULTI_DB, "Latest checkpoint's oldestMulti's DB",
 				 "%u", ControlFile.checkPointCopy.oldestMultiDB)
-CONTROLDATA_LINE("Latest checkpoint's oldestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_OLDEST_COMMITTS_XID, "Latest checkpoint's oldestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.oldestCommitTsXid)
-CONTROLDATA_LINE("Latest checkpoint's newestCommitTsXid",
+CONTROLDATA_LINE(CD_CKPT_NEWEST_COMMITTS_XID, "Latest checkpoint's newestCommitTsXid",
 				 "%u", ControlFile.checkPointCopy.newestCommitTsXid)
-CONTROLDATA_LINE("Maximum data alignment",
+CONTROLDATA_LINE(CD_MAXALIGN, "Maximum data alignment",
 				 "%u", ControlFile.maxAlign)
-CONTROLDATA_LINE("Database block size",
+CONTROLDATA_LINE(CD_BLCKSZ, "Database block size",
 				 "%u", ControlFile.blcksz)
-CONTROLDATA_LINE("Blocks per segment of large relation",
+CONTROLDATA_LINE(CD_RELSEG_SZ, "Blocks per segment of large relation",
 				 "%u", ControlFile.relseg_size)
-CONTROLDATA_LINE("Pages per SLRU segment",
+CONTROLDATA_LINE(CD_SLRU_PPS, "Pages per SLRU segment",
 				 "%u", ControlFile.slru_pages_per_segment)
-CONTROLDATA_LINE("WAL block size",
+CONTROLDATA_LINE(CD_WAL_BLCKSZ, "WAL block size",
 				 "%u", ControlFile.xlog_blcksz)
-CONTROLDATA_LINE("Bytes per WAL segment",
+CONTROLDATA_LINE(CD_WAL_SEGSIZE, "Bytes per WAL segment",
 				 "%u", ControlFile.xlog_seg_size)
-CONTROLDATA_LINE("Maximum length of identifiers",
+CONTROLDATA_LINE(CD_WAL_NAMEDATALEN, "Maximum length of identifiers",
 				 "%u", ControlFile.nameDataLen)
-CONTROLDATA_LINE("Maximum columns in an index",
+CONTROLDATA_LINE(CD_INDEX_MAX_KEYS, "Maximum columns in an index",
 				 "%u", ControlFile.indexMaxKeys)
-CONTROLDATA_LINE("Maximum size of a TOAST chunk",
+CONTROLDATA_LINE(CD_TOAST_MAXCHUNKSZ, "Maximum size of a TOAST chunk",
 				 "%u", ControlFile.toast_max_chunk_size)
-CONTROLDATA_LINE("Size of a large-object chunk",
+CONTROLDATA_LINE(CD_LO_BLKSZ, "Size of a large-object chunk",
 				 "%u", ControlFile.loblksize)
 
 /* This is no longer configurable, but users may still expect to see it: */
-CONTROLDATA_LINE("Date/time type storage",
+CONTROLDATA_LINE(CD_DATETIME_INT64, "Date/time type storage",
 				 "%s", _("64-bit integers"))
-CONTROLDATA_LINE("Float8 argument passing",
+CONTROLDATA_LINE(CD_FLOAT8_ARGS, "Float8 argument passing",
 				 "%s", ControlFile.float8ByVal ? _("by value") : _("by reference"))
-CONTROLDATA_LINE("Data page checksum version",
+CONTROLDATA_LINE(CD_CHECKSUMS, "Data page checksum version",
 				 "%u", ControlFile.data_checksum_version)
-CONTROLDATA_LINE("Default char data signedness",
+CONTROLDATA_LINE(CD_CHAR_SIGNEDNESS, "Default char data signedness",
 				 "%s", ControlFile.default_char_signedness ? _("signed") : _("unsigned"))
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index fb17b6f80e0..23bf1c62183 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -55,6 +55,7 @@
 #include "common/restricted_token.h"
 #include "common/string.h"
 #include "fe_utils/option_utils.h"
+#include "fe_utils/simple_list.h"
 #include "fe_utils/version.h"
 #include "getopt_long.h"
 #include "mb/pg_wchar.h"
@@ -119,6 +120,14 @@ static int	internal_wcswidth(const char *pwcs, size_t len, int encoding);
 static uint32 strtouint32_strict(const char *restrict s, char **restrict endptr, int base);
 static uint64 strtouint64_strict(const char *restrict s, char **restrict endptr, int base);
 
+/* Define the string enums */
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	symbol,
+enum ControldataStrings {
+#include "entries.h"
+};
+#undef CONTROLDATA_LINE
+
 
 int
 main(int argc, char *argv[])
@@ -768,7 +777,7 @@ PrintControlValues(bool guessed)
 	 * First, determine the maximum length of the description of all entries,
 	 * some or all of which might be translated.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	thislen = internal_wcswidth(_(description),			\
 								strlen(_(description)),	\
 								encoding);				\
@@ -781,7 +790,7 @@ PrintControlValues(bool guessed)
 	 * Print each line: the possibly-translated description, then some padding
 	 * spaces according to its display width, then the value.
 	 */
-#define CONTROLDATA_LINE(description, fmt, ...)			\
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
 	{													\
 		int		thisstrlen;								\
 														\
@@ -807,69 +816,99 @@ static void
 PrintNewControlValues(void)
 {
 	char		fname[MAXFNAMELEN];
+	int			encoding = pg_get_encoding_from_locale(NULL, true);
+	SimpleOidList	toprint = {NULL, NULL};
+	int			maxlen = 0;
+	int			thislen;
 
 	/* This will be always printed in order to keep format same. */
 	printf(_("\n\nValues to be changed:\n\n"));
 
-	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
-				 newXlogSegNo, WalSegSz);
-	printf(_("First log segment after reset:        %s\n"), fname);
-
 	if (mxids_given)
 	{
-		printf(_("NextMultiXactId:                      %u\n"),
-			   ControlFile.checkPointCopy.nextMulti);
-		printf(_("OldestMultiXid:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestMulti);
-		printf(_("OldestMulti's DB:                     %u\n"),
-			   ControlFile.checkPointCopy.oldestMultiDB);
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_MULTI_DB);
 	}
 
 	if (next_mxoff_given)
-	{
-		printf(_("NextMultiOffset:                      %" PRIu64 "\n"),
-			   ControlFile.checkPointCopy.nextMultiOffset);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTMXOFF);
 
 	if (next_oid_given)
-	{
-		printf(_("NextOID:                              %u\n"),
-			   ControlFile.checkPointCopy.nextOid);
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTOID);
 
 	if (next_xid_given)
-	{
-		printf(_("NextXID:                              %u\n"),
-			   XidFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
-	}
+		simple_oid_list_append(&toprint, CD_CKPT_NEXTXID);
 
 	if (oldest_xid_given)
 	{
-		printf(_("OldestXID:                            %u\n"),
-			   ControlFile.checkPointCopy.oldestXid);
-		printf(_("OldestXID's DB:                       %u\n"),
-			   ControlFile.checkPointCopy.oldestXidDB);
-	}
-
-	if (next_xid_epoch_given)
-	{
-		printf(_("NextXID epoch:                        %u\n"),
-			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDESTXID_DB);
 	}
 
 	if (commit_ts_xids_given)
 	{
-		printf(_("oldestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.oldestCommitTsXid);
-		printf(_("newestCommitTsXid:                    %u\n"),
-			   ControlFile.checkPointCopy.newestCommitTsXid);
+		simple_oid_list_append(&toprint, CD_CKPT_OLDEST_COMMITTS_XID);
+		simple_oid_list_append(&toprint, CD_CKPT_NEWEST_COMMITTS_XID);
 	}
 
 	if (wal_segsize_given)
-	{
-		printf(_("Bytes per WAL segment:                %u\n"),
-			   ControlFile.xlog_seg_size);
+		simple_oid_list_append(&toprint, CD_WAL_SEGSIZE);
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{															\
+	thislen = internal_wcswidth(_(description),					\
+								strlen(_(description)),			\
+								encoding);						\
+	if (thislen > maxlen)										\
+		maxlen = thislen;										\
 	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
+
+
+	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
+				 newXlogSegNo, WalSegSz);
+
+	/* We print this one inconditionally */
+	{
+		char *str = "First log segment after reset";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%s\n", _(str), maxlen - thislen + 2, " ", fname);
+	}
+
+	/* We print the XID epoch in a degenerate case */
+	if (next_xid_epoch_given)
+	{
+		char *str = "NextXID epoch";
+		thislen = internal_wcswidth(_(str), strlen(_(str)), encoding);
+		if (thislen > maxlen)
+			maxlen = thislen;
+		printf("%s:%*s%u\n", _(str), maxlen - thislen + 2, " ",
+			   EpochFromFullTransactionId(ControlFile.checkPointCopy.nextXid));
+
+	}
+
+#define CONTROLDATA_LINE(symbol, description, fmt, ...)			\
+	if (simple_oid_list_member(&toprint, symbol))				\
+	{													\
+		int		thisstrlen;								\
+														\
+		thisstrlen = strlen(_(description));			\
+		thislen = internal_wcswidth(_(description),		\
+									thisstrlen,			\
+									encoding);			\
+		printf("%s:%*s" fmt "\n",						\
+			   _(description),							\
+			   maxlen - thislen + 2,					\
+			   " ",										\
+			   __VA_ARGS__);							\
+	}
+#include "entries.h"
+#undef CONTROLDATA_LINE
 }
 
 
-- 
2.47.3


--m4rixdodkhrlzpzv--





^ permalink  raw  reply  [nested|flat] 180+ messages in thread