pg_upgrade: Fix some minor code issues

petere · petere · commit d0dde35ee713 · 2022-08-13T00:16:31.000+02:00
96ef3b8 accidentally copied a not applicable comment from the float8_pass_by_value code to the data_checksums code. Remove that. 87d3b35 changed pg_upgrade to checking the checksum version rather than just the Boolean presence of checksums, but didn't change the field type in its ControlData struct from bool. So this would not work correctly if there ever is a checksum version larger than 1.
diff --git a/src/bin/pg_upgrade/controldata.c b/src/bin/pg_upgrade/controldata.c
@@ -493,7 +493,6 @@ get_control_data(ClusterInfo *cluster, bool live_check)
 				pg_fatal("%d: controldata retrieval problem\n", __LINE__);
 
 			p++;				/* remove ':' char */
-			/* used later for contrib check */
 			cluster->controldata.data_checksum_version = str2uint(p);
 			got_data_checksum_version = true;
 		}
diff --git a/src/bin/pg_upgrade/pg_upgrade.h b/src/bin/pg_upgrade/pg_upgrade.h
@@ -227,7 +227,7 @@ typedef struct
 	uint32		large_object;
 	bool		date_is_int;
 	bool		float8_pass_by_value;
-	bool		data_checksum_version;
+	uint32		data_checksum_version;
 } ControlData;
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -493,7 +493,6 @@ get_control_data(ClusterInfo *cluster, bool live_check)`
`493`	`493`	`pg_fatal("%d: controldata retrieval problem\n", __LINE__);`
`494`	`494`
`495`	`495`	`p++; /* remove ':' char */`
`496`		`- /* used later for contrib check */`
`497`	`496`	`cluster->controldata.data_checksum_version = str2uint(p);`
`498`	`497`	`got_data_checksum_version = true;`
`499`	`498`	`}`