pgbench: Fix overflow in table populating when rows >= 2^31-1

michaelpq · michaelpq · commit 64e77b496af6 · 2023-12-24T11:49:14.000+09:00
Using a scale factor large enough so as the number of rows to insert gets larger than INT32_MAX would cause an infinite loop in initPopulateTable(), preventing pgbench to finish its initialization. Oversight in e35cc3b that has refactored the data generation logic. Author: John Hsu Reviewed-by: Tatsuo Ishii, Japin Li Discussion: https://postgr.es/m/CA+-JvFvHsOafjHcuFPfkyouHNZvbOXhBNhwZxKm3WNgYz9bwzA@mail.gmail.com
diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c
@@ -4908,7 +4908,7 @@ initPopulateTable(PGconn *con, const char *table, int64 base,
 				  initRowMethod init_row)
 {
 	int			n;
-	int			k;
+	int64		k;
 	int			chars = 0;
 	PGresult   *res;
 	PQExpBufferData sql;

Original file line number	Diff line number	Diff line change
`@@ -4908,7 +4908,7 @@ initPopulateTable(PGconn con, const char table, int64 base,`
`4908`	`4908`	`initRowMethod init_row)`
`4909`	`4909`	`{`
`4910`	`4910`	`int n;`
`4911`		`- int k;`
	`4911`	`+ int64 k;`
`4912`	`4912`	`int chars = 0;`
`4913`	`4913`	`PGresult *res;`
`4914`	`4914`	`PQExpBufferData sql;`