aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThomas Munro <tmunro@postgresql.org>2023-09-23 14:13:06 +1200
committerThomas Munro <tmunro@postgresql.org>2023-09-23 14:13:06 +1200
commit91b0e85aa0ade896129fab540c3e02f62d7fe6fb (patch)
tree05bb8f60afac7f7c947f44db597b3288b345b46b /src
parentbae868caf222ca01c569b61146fc2e398427127a (diff)
downloadpostgresql-91b0e85aa0ade896129fab540c3e02f62d7fe6fb.tar.gz
postgresql-91b0e85aa0ade896129fab540c3e02f62d7fe6fb.zip
Don't use Perl pack('Q') in 039_end_of_wal.pl.
'Q' for 64 bit integers turns out not to work on 32 bit Perl, as revealed by the build farm. Use 'II' instead, and deal with endianness. Back-patch to 12, like bae868ca. Discussion: https://postgr.es/m/ZQ4r1vHcryBsSi_V%40paquier.xyz
Diffstat (limited to 'src')
-rw-r--r--src/test/recovery/t/039_end_of_wal.pl24
1 files changed, 18 insertions, 6 deletions
diff --git a/src/test/recovery/t/039_end_of_wal.pl b/src/test/recovery/t/039_end_of_wal.pl
index a8b0b70bb16..61728bc38bb 100644
--- a/src/test/recovery/t/039_end_of_wal.pl
+++ b/src/test/recovery/t/039_end_of_wal.pl
@@ -13,6 +13,13 @@ use Fcntl qw(SEEK_SET);
use integer; # causes / operator to use integer math
+# Is this a big-endian system ("network" byte order)? We can't use 'Q' in
+# pack() calls because it's not available in some perl builds, so we need to
+# break 64 bit LSN values into two 'I' values. Fortunately we don't need to
+# deal with high values, so we can just write 0 for the high order 32 bits, but
+# we need to know the endianness to do that.
+my $BIG_ENDIAN = pack("L", 0x12345678) eq pack("N", 0x12345678);
+
# Header size of record header.
my $RECORD_HEADER_SIZE = 24;
@@ -125,13 +132,16 @@ sub build_record_header
# This needs to follow the structure XLogRecord:
# I for xl_tot_len
# I for xl_xid
- # Q for xl_prev
+ # II for xl_prev
# C for xl_info
# C for xl_rmid
# BB for two bytes of padding
# I for xl_crc
- return pack("IIQCCBBI",
- $xl_tot_len, $xl_xid, $xl_prev, $xl_info, $xl_rmid, 0, 0, $xl_crc);
+ return pack("IIIICCBBI",
+ $xl_tot_len, $xl_xid,
+ $BIG_ENDIAN ? 0 : $xl_prev,
+ $BIG_ENDIAN ? $xl_prev : 0,
+ $xl_info, $xl_rmid, 0, 0, $xl_crc);
}
# Build a fake WAL page header, based on the data given by the caller
@@ -149,10 +159,12 @@ sub build_page_header
# S for xlp_magic
# S for xlp_info
# I for xlp_tli
- # Q for xlp_pageaddr
+ # II for xlp_pageaddr
# I for xlp_rem_len
- return pack("SSIQI",
- $xlp_magic, $xlp_info, $xlp_tli, $xlp_pageaddr, $xlp_rem_len);
+ return pack("SSIIII",
+ $xlp_magic, $xlp_info, $xlp_tli,
+ $BIG_ENDIAN ? 0 : $xlp_pageaddr,
+ $BIG_ENDIAN ? $xlp_pageaddr : 0, $xlp_rem_len);
}
# Make sure we are far away enough from the end of a page that we could insert