(cloudberry) 04/22: Don't use Perl pack('Q') in 039_end_of_wal.pl.

[dj...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tuhaihe pushed a commit to branch REL_2_STABLE
in repository https://gitbox.apache.org/repos/asf/cloudberry.git

commit 9c4e12b930a40e00813e35d9b2fb6210224f641c
Author: Thomas Munro <tm...@postgresql.org>
AuthorDate: Sat Sep 23 14:13:06 2023 +1200

    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
---
 src/test/recovery/t/039_end_of_wal.pl | 24 ++++++++++++++++++------
 1 file 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 00a669c77d9..1eb65c07654 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;
 
@@ -131,13 +138,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
@@ -155,10 +165,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


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cloudberry.apache.org
For additional commands, e-mail: commits-help@cloudberry.apache.org