Feedback-ID: i0fe9450f:Fastmail
Date: Fri, 21 Feb 2025 18:55:22 +0900
From: Michael Paquier <michael@paquier.xyz>
To: Andrew Dunstan <andrew@dunslane.net>
Cc: Jim Jones <jim.jones@uni-muenster.de>,
	PostgreSQL Hackers <pgsql-hackers@lists.postgresql.org>,
	Pavel Stehule <pavel.stehule@gmail.com>
Subject: Re: Missing [NO] INDENT flag in XMLSerialize backward parsing
Message-ID: <Z7hNimpV405ClyWx@paquier.xyz>
References: <bebd457e-5b43-46b3-8fc6-f6a6509483ba@uni-muenster.de>
 <Z7gdpZ46I4TNfqSH@paquier.xyz>
 <88b183f1-ebf9-4f51-9144-3704380ccae7@dunslane.net>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="OP3n7wvWOEr36oE3"
Content-Disposition: inline
In-Reply-To: <88b183f1-ebf9-4f51-9144-3704380ccae7@dunslane.net>
Archived-At: <https://www.postgresql.org/message-id/Z7hNimpV405ClyWx%40paquier.xyz>
Precedence: bulk


--OP3n7wvWOEr36oE3
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Fri, Feb 21, 2025 at 04:36:07AM -0500, Andrew Dunstan wrote:
> The fix has broken cross version upgrade test. Maybe we need to filter out
> NO INDENT in releases prior to 16 in AdjustUpgrade.pm?

Yes, I was just looking at that.  The regex I am finishing with in
AdjustUpgrade.pm is something like that, which is enough to discard
the NO INDENT clause in an XMLSERIALIZE:
--- src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
+++ src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
@@ -628,6 +628,12 @@ sub adjust_new_dumpfile
 						\s+FUNCTION\s2\s\(text,\stext\)\spublic\.part_hashtext_length\(text,=
bigint\);} {}mxg;
 	}
=20
+	# pre-v16 dumps do not know about XMLSERIALIZE(NO INDENT).
+	if ($old_version < 16)
+	{
+		$dump =3D~ s/XMLSERIALIZE\((.*)? NO INDENT\)/XMLSERIALIZE\($1\)/mg;
+	}

This needs to be applied in adjust_new_dumpfile() so as the comparison
with the old dump will be stable, is that right?
--
Michael

--OP3n7wvWOEr36oE3
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEEG72nH6vTowiyblFKnvQgOdbyQH0FAme4TYoACgkQnvQgOdby
QH12IQ/+Kw65R08eNb1Yhv3hqkJXwuQD/+1MdJdL1Vdl0Mx7Ag1GZt39Fgbttq1x
uFgmiBulQgLayDyjJOYSuQ/Do6rzEQfcglZK/2k8bRoTFtYrbxE3J0L50+FUSE9A
mfo7Bh9sbFLhh1GOLWCgGyGHxkVuTaajmIEENEa6otTU+4n3h6/E8oH+Ie/GJsD7
JfZLfykuOlMDgeta9/aBlpmUreS9wRI4UahHc6AIazemLMDsEoDfNflfAlIsU28O
7OWNczU+AkAtH6dt0s54awjO3SuvMlkujXuxtsZBe6HzpceqhDm3JPmuY4mxrBa7
9ruA5D04SH1zdU4EZ/b6obVxiAj5a2NWL/1c63E13oM3Ci/AyCIb+AlMbXavtsiw
YH9y6G5nW/nY+kDUKqxPv3yatz3lWBygPVDk+Jr+R7KD8NGgs5zWVt2vFfqNLyur
k67+PACkApJdzAWJo6e6WwRWjJVpZMV1K3Rw2t3w5myJOLChO6UVe9x+kBtYifqy
oAyjur7zhTuyE7G9+g70wn2rM6NE/lZ2rzRspL5CcdQG13m7n01VzBsLFM34FEZ+
JickGzw9nSLY7I1A3VESYYVKc+y+6Cx7aBOFucDsOvmi0YPI8Jzrv0RXLc/etIMX
av17tN11zY2l4NKYDY/k7rzYTwt+rAoettlf2mq47IjkZx+N/Gw=
=gRGX
-----END PGP SIGNATURE-----

--OP3n7wvWOEr36oE3--