Don't prematurely cram a value into a short int.

tglsfdc · tglsfdc · commit c545e9524dcf · 2021-03-31T16:45:24.000-04:00
Since a4d75c8, some buildfarm members have been warning that Assert(attnum <= MaxAttrNumber); is useless if attnum is an AttrNumber. I'm not certain how plausible it is that the value coming out of the bitmap could actually exceed MaxAttrNumber, but we seem to have thought that that was possible back in 7300a69. Revert the intermediate variable to int so that we have the same overflow protection as before.
diff --git a/src/backend/statistics/extended_stats.c b/src/backend/statistics/extended_stats.c
@@ -978,7 +978,7 @@ build_attnums_array(Bitmapset *attrs, int nexprs, int *numattrs)
 	j = -1;
 	while ((j = bms_next_member(attrs, j)) >= 0)
 	{
-		AttrNumber	attnum = (j - nexprs);
+		int			attnum = (j - nexprs);
 
 		/*
 		 * Make sure the bitmap contains only user-defined attributes. As

Original file line number	Diff line number	Diff line change
`@@ -978,7 +978,7 @@ build_attnums_array(Bitmapset attrs, int nexprs, int numattrs)`
`978`	`978`	`j = -1;`
`979`	`979`	`while ((j = bms_next_member(attrs, j)) >= 0)`
`980`	`980`	`{`
`981`		`- AttrNumber attnum = (j - nexprs);`
	`981`	`+ int attnum = (j - nexprs);`
`982`	`982`
`983`	`983`	`/*`
`984`	`984`	`* Make sure the bitmap contains only user-defined attributes. As`