Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb01512e

Browse files
author
Daniil Anisimov
committed
[PGPRO-16127] Move settings from PGOPTIONS env to regression tests
1 parent826abe5 commitb01512e

File tree

48 files changed

+258
-10
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+258
-10
lines changed

‎Makefile‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,6 @@ REGRESS =aqo_disabled \
3535
eclasses_mchar\
3636
aqo_query_stat
3737

38-
# Set default values of some gucs to be stable on custom settings during
39-
# a kind of installcheck
40-
PGOPTIONS = --aqo.force_collect_stat=off --max_parallel_maintenance_workers=1\
41-
--aqo.join_threshold=0 --max_parallel_workers_per_gather=1
42-
exportPGOPTIONS
43-
4438
fdw_srcdir =$(top_srcdir)/contrib/postgres_fdw
4539
stat_srcdir =$(top_srcdir)/contrib/pg_stat_statements
4640
PG_CPPFLAGS += -I$(libpq_srcdir) -I$(fdw_srcdir) -I$(stat_srcdir)

‎expected/aqo_CVE-2020-14350.out‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ END
2727
$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
2828
RESET ROLE;
2929
CREATE EXTENSION aqo;
30+
-- For the tests stability
31+
SET max_parallel_maintenance_workers = 1;
32+
SET max_parallel_workers_per_gather = 1;
33+
SET aqo.force_collect_stat = OFF;
3034
SET aqo.join_threshold = 0;
3135
-- Test result (must be 'off')
3236
SET ROLE regress_hacker;

‎expected/aqo_controlled.out‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ SELECT true AS success FROM aqo_reset();
55
t
66
(1 row)
77

8+
-- For the tests stability
9+
SET max_parallel_maintenance_workers = 1;
10+
SET max_parallel_workers_per_gather = 1;
11+
SET aqo.force_collect_stat = OFF;
12+
SET aqo.join_threshold = 0;
813
CREATE TABLE aqo_test0(a int, b int, c int, d int);
914
WITH RECURSIVE t(a, b, c, d)
1015
AS (

‎expected/aqo_disabled.out‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ SELECT true AS success FROM aqo_reset();
77
t
88
(1 row)
99

10+
-- For the tests stability
11+
SET max_parallel_maintenance_workers = 1;
12+
SET max_parallel_workers_per_gather = 1;
13+
SET aqo.force_collect_stat = OFF;
14+
SET aqo.join_threshold = 0;
1015
CREATE TABLE aqo_test0(a int, b int, c int, d int);
1116
WITH RECURSIVE t(a, b, c, d)
1217
AS (

‎expected/aqo_fdw.out‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ SELECT true AS success FROM aqo_reset();
1111
t
1212
(1 row)
1313

14+
-- For the tests stability
15+
SET max_parallel_maintenance_workers = 1;
16+
SET max_parallel_workers_per_gather = 1;
17+
SET aqo.force_collect_stat = OFF;
18+
SET aqo.join_threshold = 0;
1419
SET aqo.mode = 'learn';
1520
SET aqo.show_details = 'true'; -- show AQO info for each node and entire query.
1621
SET aqo.show_hash = 'false'; -- a hash value is system-depended. Ignore it.

‎expected/aqo_forced.out‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ SELECT true AS success FROM aqo_reset();
66
t
77
(1 row)
88

9+
-- For the tests stability
10+
SET max_parallel_maintenance_workers = 1;
11+
SET max_parallel_workers_per_gather = 1;
12+
SET aqo.force_collect_stat = OFF;
13+
SET aqo.join_threshold = 0;
914
CREATE TABLE aqo_test0(a int, b int, c int, d int);
1015
WITH RECURSIVE t(a, b, c, d)
1116
AS (

‎expected/aqo_intelligent.out‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ SELECT true AS success FROM aqo_reset();
55
t
66
(1 row)
77

8+
-- For the tests stability
9+
SET max_parallel_maintenance_workers = 1;
10+
SET max_parallel_workers_per_gather = 1;
11+
SET aqo.force_collect_stat = OFF;
12+
SET aqo.join_threshold = 0;
813
CREATE TABLE aqo_test0(a int, b int, c int, d int);
914
WITH RECURSIVE t(a, b, c, d)
1015
AS (

‎expected/aqo_learn.out‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ SELECT true AS success FROM aqo_reset();
55
t
66
(1 row)
77

8+
-- For the tests stability
9+
SET max_parallel_maintenance_workers = 1;
10+
SET max_parallel_workers_per_gather = 1;
11+
SET aqo.force_collect_stat = OFF;
12+
SET aqo.join_threshold = 0;
813
-- The function just copied from stats_ext.sql
914
create function check_estimated_rows(text) returns table (estimated int, actual int)
1015
language plpgsql as

‎expected/aqo_query_stat.out‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ SELECT true AS success FROM aqo_reset();
77
t
88
(1 row)
99

10+
-- For the tests stability
11+
SET max_parallel_maintenance_workers = 1;
12+
SET max_parallel_workers_per_gather = 1;
13+
SET aqo.force_collect_stat = OFF;
14+
SET aqo.join_threshold = 0;
1015
DROP TABLE IF EXISTS A;
1116
NOTICE: table "a" does not exist, skipping
1217
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;
6469
8
6570
(1 row)
6671

67-
-- Ignore unstable time-related columns
72+
-- Ignore unstable time-related columns
6873
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;
6974
error_aqo | error_no_aqo | executions_with_aqo | executions_without_aqo
7075
--------------------+--------------+---------------------+------------------------

‎expected/clean_aqo_data.out‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ SELECT true AS success FROM aqo_reset();
55
t
66
(1 row)
77

8+
-- For the tests stability
9+
SET max_parallel_maintenance_workers = 1;
10+
SET max_parallel_workers_per_gather = 1;
11+
SET aqo.force_collect_stat = OFF;
12+
SET aqo.join_threshold = 0;
813
SET aqo.mode = 'learn';
914
DROP TABLE IF EXISTS a;
1015
NOTICE: table "a" does not exist, skipping

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp