From e80084deb6c9c4e317315f1d88f8ad035f211526 Mon Sep 17 00:00:00 2001 From: Marina Polyakova Date: Fri, 16 Aug 2024 09:12:34 +0300 Subject: [PATCH] Fix GUCs for select_parallel regression test max_parallel_workers_per_gather = 0 breaks new checks in select_parallel regression test, see the commit adc28d01e98bdfaf9720d363447124d22565620a (Allow adjusting session_authorization and role in parallel workers.) in PostgreSQL 12. So use PGOPTIONS as done in other aqo versions. E.g. see the commit f84caae72663396214142fc2a5d18f873e925219 (One more step towards improving the AQO regression tests stability.) in the stable13 branch. --- Makefile | 5 +++++ conf.add | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ab807d6d..d6ea34ff 100644 --- a/Makefile +++ b/Makefile @@ -23,6 +23,11 @@ REGRESS = aqo_disabled \ gucs endif +# Set default values of some gucs to be stable on custom settings during +# a kind of installcheck +PGOPTIONS = --max_parallel_workers_per_gather=0 +export PGOPTIONS + fdw_srcdir = $(top_srcdir)/contrib/postgres_fdw PG_CPPFLAGS += -I$(libpq_srcdir) -I$(fdw_srcdir) EXTRA_REGRESS_OPTS=--temp-config=$(top_srcdir)/$(subdir)/conf.add diff --git a/conf.add b/conf.add index 936ca166..705e3dde 100644 --- a/conf.add +++ b/conf.add @@ -1,3 +1,2 @@ autovacuum = off shared_preload_libraries = 'postgres_fdw, aqo' -max_parallel_workers_per_gather = 0