Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 9da3001

Browse files
committed
pg_upgrade: Fix some minor code issues
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.
1 parent c040874 commit 9da3001

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

src/bin/pg_upgrade/controldata.c

-1
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,6 @@ get_control_data(ClusterInfo *cluster, bool live_check)
497497
pg_fatal("%d: controldata retrieval problem", __LINE__);
498498

499499
p++; /* remove ':' char */
500-
/* used later for contrib check */
501500
cluster->controldata.data_checksum_version = str2uint(p);
502501
got_data_checksum_version = true;
503502
}

src/bin/pg_upgrade/pg_upgrade.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ typedef struct
216216
uint32 large_object;
217217
bool date_is_int;
218218
bool float8_pass_by_value;
219-
bool data_checksum_version;
219+
uint32 data_checksum_version;
220220
} ControlData;
221221

222222
/*

0 commit comments

Comments
 (0)