[PGPRO-16127] Move settings from PGOPTIONS env to regression tests

Daniil Anisimov · Daniil Anisimov · commit b01512e3874c · 2025-11-27T14:56:45.000+07:00
diff --git a/Makefile b/Makefile
@@ -35,12 +35,6 @@ REGRESS =	aqo_disabled \
 			eclasses_mchar \
 			aqo_query_stat
 
-# Set default values of some gucs to be stable on custom settings during
-# a kind of installcheck
-PGOPTIONS = --aqo.force_collect_stat=off --max_parallel_maintenance_workers=1 \
-	--aqo.join_threshold=0 --max_parallel_workers_per_gather=1
-export PGOPTIONS
-
 fdw_srcdir = $(top_srcdir)/contrib/postgres_fdw
 stat_srcdir = $(top_srcdir)/contrib/pg_stat_statements
 PG_CPPFLAGS += -I$(libpq_srcdir) -I$(fdw_srcdir) -I$(stat_srcdir)
diff --git a/expected/aqo_CVE-2020-14350.out b/expected/aqo_CVE-2020-14350.out
@@ -27,6 +27,10 @@ END
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 RESET ROLE;
 CREATE EXTENSION aqo;
+-- For the tests stability
+SET max_parallel_maintenance_workers = 1;
+SET max_parallel_workers_per_gather = 1;
+SET aqo.force_collect_stat = OFF;
 SET aqo.join_threshold = 0;
 -- Test result (must be 'off')
 SET ROLE regress_hacker;
diff --git a/expected/aqo_controlled.out b/expected/aqo_controlled.out
@@ -5,6 +5,11 @@ SELECT true AS success FROM aqo_reset();
  t
 (1 row)
 
+-- For the tests stability
+SET max_parallel_maintenance_workers = 1;
+SET max_parallel_workers_per_gather = 1;
+SET aqo.force_collect_stat = OFF;
+SET aqo.join_threshold = 0;
 CREATE TABLE aqo_test0(a int, b int, c int, d int);
 WITH RECURSIVE t(a, b, c, d)
 AS (
diff --git a/expected/aqo_disabled.out b/expected/aqo_disabled.out
@@ -7,6 +7,11 @@ SELECT true AS success FROM aqo_reset();
  t
 (1 row)
 
+-- For the tests stability
+SET max_parallel_maintenance_workers = 1;
+SET max_parallel_workers_per_gather = 1;
+SET aqo.force_collect_stat = OFF;
+SET aqo.join_threshold = 0;
 CREATE TABLE aqo_test0(a int, b int, c int, d int);
 WITH RECURSIVE t(a, b, c, d)
 AS (
diff --git a/expected/aqo_fdw.out b/expected/aqo_fdw.out
@@ -11,6 +11,11 @@ SELECT true AS success FROM aqo_reset();
  t
 (1 row)
 
+-- For the tests stability
+SET max_parallel_maintenance_workers = 1;
+SET max_parallel_workers_per_gather = 1;
+SET aqo.force_collect_stat = OFF;
+SET aqo.join_threshold = 0;
 SET aqo.mode = 'learn';
 SET aqo.show_details = 'true'; -- show AQO info for each node and entire query.
 SET aqo.show_hash = 'false'; -- a hash value is system-depended. Ignore it.
diff --git a/expected/aqo_forced.out b/expected/aqo_forced.out
@@ -6,6 +6,11 @@ SELECT true AS success FROM aqo_reset();
  t
 (1 row)
 
+-- For the tests stability
+SET max_parallel_maintenance_workers = 1;
+SET max_parallel_workers_per_gather = 1;
+SET aqo.force_collect_stat = OFF;
+SET aqo.join_threshold = 0;
 CREATE TABLE aqo_test0(a int, b int, c int, d int);
 WITH RECURSIVE t(a, b, c, d)
 AS (
diff --git a/expected/aqo_intelligent.out b/expected/aqo_intelligent.out
@@ -5,6 +5,11 @@ SELECT true AS success FROM aqo_reset();
  t
 (1 row)
 
+-- For the tests stability
+SET max_parallel_maintenance_workers = 1;
+SET max_parallel_workers_per_gather = 1;
+SET aqo.force_collect_stat = OFF;
+SET aqo.join_threshold = 0;
 CREATE TABLE aqo_test0(a int, b int, c int, d int);
 WITH RECURSIVE t(a, b, c, d)
 AS (
diff --git a/expected/aqo_learn.out b/expected/aqo_learn.out
@@ -5,6 +5,11 @@ SELECT true AS success FROM aqo_reset();
  t
 (1 row)
 
+-- For the tests stability
+SET max_parallel_maintenance_workers = 1;
+SET max_parallel_workers_per_gather = 1;
+SET aqo.force_collect_stat = OFF;
+SET aqo.join_threshold = 0;
 -- The function just copied from stats_ext.sql
 create function check_estimated_rows(text) returns table (estimated int, actual int)
 language plpgsql as
diff --git a/expected/aqo_query_stat.out b/expected/aqo_query_stat.out
@@ -7,6 +7,11 @@ SELECT true AS success FROM aqo_reset();
  t
 (1 row)
 
+-- For the tests stability
+SET max_parallel_maintenance_workers = 1;
+SET max_parallel_workers_per_gather = 1;
+SET aqo.force_collect_stat = OFF;
+SET aqo.join_threshold = 0;
 DROP TABLE IF EXISTS A;
 NOTICE:  table "a" does not exist, skipping
 CREATE TABLE A AS SELECT x FROM generate_series(1, 20) as x;
@@ -64,7 +69,7 @@ SELECT count(*) FROM A JOIN B ON (A.x > B.y) WHERE A.x > 19 AND B.y < 9;
      8
 (1 row)
 
--- Ignore unstable time-related columns 
+-- Ignore unstable time-related columns
 SELECT round_array(cardinality_error_with_aqo) AS error_aqo, round_array(cardinality_error_without_aqo) AS error_no_aqo, executions_with_aqo, executions_without_aqo FROM aqo_query_stat;
      error_aqo      | error_no_aqo | executions_with_aqo | executions_without_aqo 
 --------------------+--------------+---------------------+------------------------
diff --git a/expected/clean_aqo_data.out b/expected/clean_aqo_data.out
@@ -5,6 +5,11 @@ SELECT true AS success FROM aqo_reset();
  t
 (1 row)
 
+-- For the tests stability
+SET max_parallel_maintenance_workers = 1;
+SET max_parallel_workers_per_gather = 1;
+SET aqo.force_collect_stat = OFF;
+SET aqo.join_threshold = 0;
 SET aqo.mode = 'learn';
 DROP TABLE IF EXISTS a;
 NOTICE:  table "a" does not exist, skipping
diff --git a/expected/eclasses.out b/expected/eclasses.out
@@ -1,5 +1,10 @@
 -- Testing for working with equivalence classes
 CREATE EXTENSION IF NOT EXISTS aqo;
+-- For the tests stability
+SET max_parallel_maintenance_workers = 1;
+SET max_parallel_workers_per_gather = 1;
+SET aqo.force_collect_stat = OFF;
+SET aqo.join_threshold = 0;
 SET aqo.show_details = 'on';
 SET aqo.show_hash = 'off';
 SET aqo.mode = 'forced';
diff --git a/expected/eclasses_mchar_1.out b/expected/eclasses_mchar_1.out
@@ -6,6 +6,11 @@ FROM pg_available_extensions WHERE name = 'mchar' \gset
 \quit
 \endif
 CREATE EXTENSION IF NOT EXISTS aqo;
+-- For the tests stability
+SET max_parallel_maintenance_workers = 1;
+SET max_parallel_workers_per_gather = 1;
+SET aqo.force_collect_stat = OFF;
+SET aqo.join_threshold = 0;
 SET aqo.show_details = 'on';
 SET aqo.show_hash = 'off';
 SET aqo.mode = 'forced';
diff --git a/expected/feature_subspace.out b/expected/feature_subspace.out
@@ -6,6 +6,11 @@ SELECT true AS success FROM aqo_reset();
  t
 (1 row)
 
+-- For the tests stability
+SET max_parallel_maintenance_workers = 1;
+SET max_parallel_workers_per_gather = 1;
+SET aqo.force_collect_stat = OFF;
+SET aqo.join_threshold = 0;
 SET aqo.mode = 'learn';
 SET aqo.show_details = 'on';
 CREATE TABLE a AS (SELECT gs AS x FROM generate_series(1,10) AS gs);
diff --git a/expected/forced_stat_collection.out b/expected/forced_stat_collection.out
@@ -6,8 +6,12 @@ SELECT true AS success FROM aqo_reset();
 (1 row)
 
 \set citizens	1000
+-- For the tests stability
+SET max_parallel_maintenance_workers = 1;
+SET max_parallel_workers_per_gather = 1;
+SET aqo.force_collect_stat = OFF;
+SET aqo.join_threshold = 0;
 SET aqo.mode = 'disabled';
-SET aqo.force_collect_stat = 'off';
 CREATE TABLE person (
     id serial PRIMARY KEY,
     age integer,
diff --git a/expected/gucs.out b/expected/gucs.out
@@ -6,6 +6,11 @@ SELECT true AS success FROM aqo_reset();
  t
 (1 row)
 
+-- For the tests stability
+SET max_parallel_maintenance_workers = 1;
+SET max_parallel_workers_per_gather = 1;
+SET aqo.force_collect_stat = OFF;
+SET aqo.join_threshold = 0;
 -- Utility tool. Allow to filter system-dependent strings from an explain output.
 CREATE OR REPLACE FUNCTION expln(query_string text) RETURNS SETOF text AS $$
 BEGIN
diff --git a/expected/look_a_like.out b/expected/look_a_like.out
@@ -6,6 +6,11 @@ SELECT true AS success FROM aqo_reset();
  t
 (1 row)
 
+-- For the tests stability
+SET max_parallel_maintenance_workers = 1;
+SET max_parallel_workers_per_gather = 1;
+SET aqo.force_collect_stat = OFF;
+SET aqo.join_threshold = 0;
 SET aqo.wide_search = 'on';
 SET aqo.mode = 'learn';
 SET aqo.show_details = 'on';
diff --git a/expected/parallel_workers.out b/expected/parallel_workers.out
@@ -7,6 +7,10 @@ SELECT true AS success FROM aqo_reset();
  t
 (1 row)
 
+-- For the tests stability
+SET max_parallel_maintenance_workers = 1;
+SET aqo.force_collect_stat = OFF;
+SET aqo.join_threshold = 0;
 -- Utility tool. Allow to filter system-dependent strings from explain output.
 CREATE OR REPLACE FUNCTION expln(query_string text) RETURNS SETOF text AS $$
 BEGIN
diff --git a/expected/plancache.out b/expected/plancache.out
@@ -6,6 +6,11 @@ SELECT true AS success FROM aqo_reset();
  t
 (1 row)
 
+-- For the tests stability
+SET max_parallel_maintenance_workers = 1;
+SET max_parallel_workers_per_gather = 1;
+SET aqo.force_collect_stat = OFF;
+SET aqo.join_threshold = 0;
 SET aqo.mode = 'intelligent';
 SET aqo.show_details = 'on';
 SET aqo.show_hash = 'off';
diff --git a/expected/relocatable.out b/expected/relocatable.out
@@ -5,6 +5,11 @@ SELECT true AS success FROM aqo_reset();
  t
 (1 row)
 
+-- For the tests stability
+SET max_parallel_maintenance_workers = 1;
+SET max_parallel_workers_per_gather = 1;
+SET aqo.force_collect_stat = OFF;
+SET aqo.join_threshold = 0;
 SET aqo.mode = 'learn'; -- use this mode for unconditional learning
 CREATE TABLE test AS (SELECT id, 'payload' || id FROM generate_series(1,100) id);
 ANALYZE test;
diff --git a/expected/schema.out b/expected/schema.out
@@ -16,6 +16,11 @@ SELECT true AS success FROM aqo_reset();
  t
 (1 row)
 
+-- For the tests stability
+SET max_parallel_maintenance_workers = 1;
+SET max_parallel_workers_per_gather = 1;
+SET aqo.force_collect_stat = OFF;
+SET aqo.join_threshold = 0;
 SET aqo.mode = 'intelligent';
 CREATE TABLE test (id SERIAL, data TEXT);
 INSERT INTO test (data) VALUES ('string');
diff --git a/expected/temp_tables.out b/expected/temp_tables.out
@@ -6,6 +6,11 @@ SELECT true AS success FROM aqo_reset();
  t
 (1 row)
 
+-- For the tests stability
+SET max_parallel_maintenance_workers = 1;
+SET max_parallel_workers_per_gather = 1;
+SET aqo.force_collect_stat = OFF;
+SET aqo.join_threshold = 0;
 SET aqo.wide_search = 'on';
 SET aqo.mode = 'learn';
 CREATE TEMP TABLE tt();
diff --git a/expected/top_queries.out b/expected/top_queries.out
@@ -6,6 +6,11 @@ SELECT true AS success FROM aqo_reset();
  t
 (1 row)
 
+-- For the tests stability
+SET max_parallel_maintenance_workers = 1;
+SET max_parallel_workers_per_gather = 1;
+SET aqo.force_collect_stat = OFF;
+SET aqo.join_threshold = 0;
 SET aqo.mode = 'disabled';
 SET aqo.force_collect_stat = 'on';
 --
diff --git a/expected/unsupported.out b/expected/unsupported.out
@@ -5,6 +5,11 @@ SELECT true AS success FROM aqo_reset();
  t
 (1 row)
 
+-- For the tests stability
+SET max_parallel_maintenance_workers = 1;
+SET max_parallel_workers_per_gather = 1;
+SET aqo.force_collect_stat = OFF;
+SET aqo.join_threshold = 0;
 -- Utility tool. Allow to filter system-dependent strings from an explain output.
 CREATE OR REPLACE FUNCTION expln(query_string text) RETURNS SETOF text AS $$
 BEGIN
diff --git a/expected/unsupported_1.out b/expected/unsupported_1.out
@@ -5,6 +5,11 @@ SELECT true AS success FROM aqo_reset();
  t
 (1 row)
 
+-- For the tests stability
+SET max_parallel_maintenance_workers = 1;
+SET max_parallel_workers_per_gather = 1;
+SET aqo.force_collect_stat = OFF;
+SET aqo.join_threshold = 0;
 -- Utility tool. Allow to filter system-dependent strings from an explain output.
 CREATE OR REPLACE FUNCTION expln(query_string text) RETURNS SETOF text AS $$
 BEGIN
diff --git a/expected/update_functions.out b/expected/update_functions.out
@@ -6,6 +6,11 @@ SELECT true AS success FROM aqo_reset();
  t
 (1 row)
 
+-- For the tests stability
+SET max_parallel_maintenance_workers = 1;
+SET max_parallel_workers_per_gather = 1;
+SET aqo.force_collect_stat = OFF;
+SET aqo.join_threshold = 0;
 CREATE TABLE aqo_test1(a int, b int);
 WITH RECURSIVE t(a, b)
 AS (
diff --git a/sql/aqo_CVE-2020-14350.sql b/sql/aqo_CVE-2020-14350.sql
@@ -27,6 +27,10 @@ $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
 RESET ROLE;
 CREATE EXTENSION aqo;
+-- For the tests stability
+SET max_parallel_maintenance_workers = 1;
+SET max_parallel_workers_per_gather = 1;
+SET aqo.force_collect_stat = OFF;
 SET aqo.join_threshold = 0;
 
 -- Test result (must be 'off')
diff --git a/sql/aqo_controlled.sql b/sql/aqo_controlled.sql
@@ -1,6 +1,12 @@
 CREATE EXTENSION IF NOT EXISTS aqo;
 SELECT true AS success FROM aqo_reset();
 
+-- For the tests stability
+SET max_parallel_maintenance_workers = 1;
+SET max_parallel_workers_per_gather = 1;
+SET aqo.force_collect_stat = OFF;
+SET aqo.join_threshold = 0;
+
 CREATE TABLE aqo_test0(a int, b int, c int, d int);
 WITH RECURSIVE t(a, b, c, d)
 AS (
diff --git a/sql/aqo_disabled.sql b/sql/aqo_disabled.sql
@@ -3,6 +3,12 @@
 CREATE EXTENSION IF NOT EXISTS aqo;
 SELECT true AS success FROM aqo_reset();
 
+-- For the tests stability
+SET max_parallel_maintenance_workers = 1;
+SET max_parallel_workers_per_gather = 1;
+SET aqo.force_collect_stat = OFF;
+SET aqo.join_threshold = 0;
+
 CREATE TABLE aqo_test0(a int, b int, c int, d int);
 WITH RECURSIVE t(a, b, c, d)
 AS (
diff --git a/sql/aqo_fdw.sql b/sql/aqo_fdw.sql
@@ -8,6 +8,12 @@ CREATE EXTENSION IF NOT EXISTS aqo;
 CREATE EXTENSION IF NOT EXISTS postgres_fdw;
 SELECT true AS success FROM aqo_reset();
 
+-- For the tests stability
+SET max_parallel_maintenance_workers = 1;
+SET max_parallel_workers_per_gather = 1;
+SET aqo.force_collect_stat = OFF;
+SET aqo.join_threshold = 0;
+
 SET aqo.mode = 'learn';
 SET aqo.show_details = 'true'; -- show AQO info for each node and entire query.
 SET aqo.show_hash = 'false'; -- a hash value is system-depended. Ignore it.
diff --git a/sql/aqo_forced.sql b/sql/aqo_forced.sql
@@ -2,6 +2,12 @@
 CREATE EXTENSION IF NOT EXISTS aqo;
 SELECT true AS success FROM aqo_reset();
 
+-- For the tests stability
+SET max_parallel_maintenance_workers = 1;
+SET max_parallel_workers_per_gather = 1;
+SET aqo.force_collect_stat = OFF;
+SET aqo.join_threshold = 0;
+
 CREATE TABLE aqo_test0(a int, b int, c int, d int);
 WITH RECURSIVE t(a, b, c, d)
 AS (
diff --git a/sql/aqo_intelligent.sql b/sql/aqo_intelligent.sql
@@ -1,6 +1,12 @@
 CREATE EXTENSION IF NOT EXISTS aqo;
 SELECT true AS success FROM aqo_reset();
 
+-- For the tests stability
+SET max_parallel_maintenance_workers = 1;
+SET max_parallel_workers_per_gather = 1;
+SET aqo.force_collect_stat = OFF;
+SET aqo.join_threshold = 0;
+
 CREATE TABLE aqo_test0(a int, b int, c int, d int);
 WITH RECURSIVE t(a, b, c, d)
 AS (
diff --git a/sql/aqo_learn.sql b/sql/aqo_learn.sql
@@ -1,6 +1,12 @@
 CREATE EXTENSION IF NOT EXISTS aqo;
 SELECT true AS success FROM aqo_reset();
 
+-- For the tests stability
+SET max_parallel_maintenance_workers = 1;
+SET max_parallel_workers_per_gather = 1;
+SET aqo.force_collect_stat = OFF;
+SET aqo.join_threshold = 0;
+
 -- The function just copied from stats_ext.sql
 create function check_estimated_rows(text) returns table (estimated int, actual int)
 language plpgsql as
diff --git a/sql/aqo_query_stat.sql b/sql/aqo_query_stat.sql
diff --git a/sql/clean_aqo_data.sql b/sql/clean_aqo_data.sql
diff --git a/sql/eclasses.sql b/sql/eclasses.sql
diff --git a/sql/eclasses_mchar.sql b/sql/eclasses_mchar.sql
diff --git a/sql/feature_subspace.sql b/sql/feature_subspace.sql
diff --git a/sql/forced_stat_collection.sql b/sql/forced_stat_collection.sql
diff --git a/sql/gucs.sql b/sql/gucs.sql
diff --git a/sql/look_a_like.sql b/sql/look_a_like.sql
diff --git a/sql/parallel_workers.sql b/sql/parallel_workers.sql
diff --git a/sql/plancache.sql b/sql/plancache.sql
diff --git a/sql/relocatable.sql b/sql/relocatable.sql
diff --git a/sql/schema.sql b/sql/schema.sql
diff --git a/sql/temp_tables.sql b/sql/temp_tables.sql
diff --git a/sql/top_queries.sql b/sql/top_queries.sql
diff --git a/sql/unsupported.sql b/sql/unsupported.sql
diff --git a/sql/update_functions.sql b/sql/update_functions.sql
