Feedback-ID: i0fe9450f:Fastmail
Date: Mon, 8 Dec 2025 13:53:32 +0900
From: Michael Paquier <michael@paquier.xyz>
To: Tom Lane <tgl@sss.pgh.pa.us>
Cc: Andrew Dunstan <andrew@dunslane.net>,
	pgsql-committers@lists.postgresql.org,
	Sami Imseih <samimseih@gmail.com>
Subject: Re: pgsql: injection_points: Remove portions related to custom
 pgstats
Message-ID: <aTZZzFhQTtUKWGLm@paquier.xyz>
References: <E1vSSCn-003N0Z-2i@gemulon.postgresql.org>
 <2899652.1765167313@sss.pgh.pa.us>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="tYO4PfAh6TeYcx+0"
Content-Disposition: inline
In-Reply-To: <2899652.1765167313@sss.pgh.pa.us>
Archived-At: 
 <https://www.postgresql.org/message-id/aTZZzFhQTtUKWGLm%40paquier.xyz>
Precedence: bulk


--tYO4PfAh6TeYcx+0
Content-Type: multipart/mixed; boundary="K8IPjYXKragKyxcQ"
Content-Disposition: inline


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

On Sun, Dec 07, 2025 at 11:15:13PM -0500, Tom Lane wrote:
> I think that this is really a bug in the Xversion-update test, because
> I don't see why we'd be holding src/test/modules libraries to the
> standard of can-be-upgraded-across-versions.  But maybe there's
> something I'm missing?

Yes, I've noticed that a couple of minutes ago, trying to make heads
and tails out of it.  I thought that the tets modules libraries were
not getting pulled in the cross-version upgrades but here we are.

=46rom what I can see, this specific failure is caused by
src/test/modules/gin/ where the module has forgotten to drop the
extension injection_points, but there is a total of three modules that
could have hit the problem, as of:
- src/test/modules/nbtree/ (could be hit in the future as it uses
injection_points).
- src/test/modules/gin/
- src/test/modules/typcache/

And I was wondering whether I should just plant more items in
AdjustUpgrade.pm, like in the attached.  We need that for gin when
dealing with an old server of at least v17, and for typcache with v18.
The nbtree test is so recent that it does not matter.
TestUpgradeXversion.pm has an ON_ERROR_STOP=3D1 so the version check is=20
required.
--
Michael

--K8IPjYXKragKyxcQ
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
	filename="0001-Adjust-upgrade-outputs.patch"
Content-Transfer-Encoding: quoted-printable

=46rom b46344c697771e5496e5d837b9e8e6e2d6b88b01 Mon Sep 17 00:00:00 2001
=46rom: Michael Paquier <michael@paquier.xyz>
Date: Mon, 8 Dec 2025 13:51:40 +0900
Subject: [PATCH] Adjust upgrade outputs

---
 src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl=
/PostgreSQL/Test/AdjustUpgrade.pm
index 7224c286e1df..78d060c989ab 100644
--- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
+++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
@@ -102,6 +102,19 @@ sub adjust_database_contents
 		}
 	}
=20
+	# Remove databases that are known to cause upgrades to fail because of
+	# updates done in the test module injection_points in v19 that these rely
+	# on.
+	if ($old_version >=3D 18)
+	{
+		_add_st($result, 'postgres', 'drop database regression_typcache');
+	}
+
+	if ($old_version >=3D 17)
+	{
+		_add_st($result, 'postgres', 'drop database regression_gin');
+	}
+
 	# avoid no-path-to-downgrade-extension-version issues
 	if ($dbnames{contrib_regression_test_extensions})
 	{
--=20
2.51.0


--K8IPjYXKragKyxcQ--

--tYO4PfAh6TeYcx+0
Content-Type: application/pgp-signature; name="signature.asc"

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

iQIzBAABCgAdFiEEG72nH6vTowiyblFKnvQgOdbyQH0FAmk2WcwACgkQnvQgOdby
QH3bJQ/+OWU718NQJRgOu3ns6R8sBY0t3XC+77xYruN1erHiSGslz3m32Zjwpo9D
7Io03RWQxxqbW/sxz62lwqe1W1Ub5EaIj0+r9D0VRZlOWr0MuYK3jCOvR8QroVoj
nj3B9dD0MDEUdhvtdlkhn3Xrz9nEMRgwKmlcC+4q1afVhNhwU3sJJDl/H7T81vxC
QnDGwlOz0zYORKQhkblNHG076NcBzGdiVVby3VVZGLCX4gUBUex875ckdfdD5M1f
CjsATS2deDU01HYt1vaiO3/U8MSmmelT5l0hapkTzIpNUYiuamRxYDpmKrJEqDdw
z7UkfV9J8HZSr/e0CiMvBRLbUPD2p98xHOrJZeadCuzdijQZsNSv3iI1oOgG80Ev
UIivm0ysMiYDypObs9lwsGgMOxNHijSP9BYxqegxcMf67fvPEUfC7RBroz2+WiPR
A3aA3HBAV9yuG1laQ9AakzuU3ZiEOl2WrJV68cTNhEfgR0iwSMpPo1Esh2YHtIXh
ioK3PrRsj5BSGzL/bnMtt7i1SyobEMGbwop+NvXUWhIdMTE51kV6bZbARvPNdD3+
INgvdtWh510ncM0NeYy+vvCgMPOFt0o3rtld1mLJG4YicRklxQKG6zTK96DkPu6y
Qv4NkswLV/K59Vmj6rI4iHSuYXSBNIIVK7l1UFVKzZnKQJEKgPA=
=qmzM
-----END PGP SIGNATURE-----

--tYO4PfAh6TeYcx+0--