amcheck: Improve confusing message

petere · petere · commit 953050236ab2 · 2025-07-01T12:24:17.000+02:00
The way it was worded, the %u placeholder could be read as the table OID. Rearrange slightly to avoid the possible confusion. Reported-by: jian he <jian.universality@gmail.com> Reviewed-by: Bertrand Drouvot <bertranddrouvot.pg@gmail.com> Discussion: https://www.postgresql.org/message-id/flat/CACJufxFx-25XQV%2Br23oku7ZnL958P30hyb9cFeYPv6wv7yzCCw%40mail.gmail.com
diff --git a/contrib/amcheck/verify_heapam.c b/contrib/amcheck/verify_heapam.c
@@ -1942,7 +1942,7 @@ check_tuple(HeapCheckContext *ctx, bool *xmin_commit_status_ok,
 	if (RelationGetDescr(ctx->rel)->natts < ctx->natts)
 	{
 		report_corruption(ctx,
-						  psprintf("number of attributes %u exceeds maximum expected for table %u",
+						  psprintf("number of attributes %u exceeds maximum %u expected for table",
 								   ctx->natts,
 								   RelationGetDescr(ctx->rel)->natts));
 		return;
diff --git a/src/bin/pg_amcheck/t/004_verify_heapam.pl b/src/bin/pg_amcheck/t/004_verify_heapam.pl
@@ -529,7 +529,7 @@ sub header
 		$tup->{t_infomask2} |= HEAP_NATTS_MASK;
 
 		push @expected,
-		  qr/${$header}number of attributes 2047 exceeds maximum expected for table 3/;
+		  qr/${$header}number of attributes 2047 exceeds maximum 3 expected for table/;
 	}
 	elsif ($offnum == 10)
 	{
@@ -552,7 +552,7 @@ sub header
 		$tup->{t_hoff} = 32;
 
 		push @expected,
-		  qr/${$header}number of attributes 67 exceeds maximum expected for table 3/;
+		  qr/${$header}number of attributes 67 exceeds maximum 3 expected for table/;
 	}
 	elsif ($offnum == 12)
 	{

Original file line number	Diff line number	Diff line change
`@@ -1942,7 +1942,7 @@ check_tuple(HeapCheckContext ctx, bool xmin_commit_status_ok,`
`1942`	`1942`	`if (RelationGetDescr(ctx->rel)->natts < ctx->natts)`
`1943`	`1943`	`{`
`1944`	`1944`	`report_corruption(ctx,`
`1945`		`- psprintf("number of attributes %u exceeds maximum expected for table %u",`
	`1945`	`+ psprintf("number of attributes %u exceeds maximum %u expected for table",`
`1946`	`1946`	`ctx->natts,`
`1947`	`1947`	`RelationGetDescr(ctx->rel)->natts));`
`1948`	`1948`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -529,7 +529,7 @@ sub header`
`529`	`529`	`$tup->{t_infomask2} \|= HEAP_NATTS_MASK;`
`530`	`530`
`531`	`531`	`push @expected,`
`532`		`- qr/${$header}number of attributes 2047 exceeds maximum expected for table 3/;`
	`532`	`+ qr/${$header}number of attributes 2047 exceeds maximum 3 expected for table/;`
`533`	`533`	`}`
`534`	`534`	`elsif ($offnum == 10)`
`535`	`535`	`{`
`@@ -552,7 +552,7 @@ sub header`
`552`	`552`	`$tup->{t_hoff} = 32;`
`553`	`553`
`554`	`554`	`push @expected,`
`555`		`- qr/${$header}number of attributes 67 exceeds maximum expected for table 3/;`
	`555`	`+ qr/${$header}number of attributes 67 exceeds maximum 3 expected for table/;`
`556`	`556`	`}`
`557`	`557`	`elsif ($offnum == 12)`
`558`	`558`	`{`