database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-22 23:02:54 +03:00
Code

Get rid of pg_class usage in SJE regression tests

Browse Source 
Usage of pg_class led to instability, see the buildfarm failure.
https://buildfarm.postgresql.org/cgi-bin/show_log.pl?nm=prion&dt=2024-02-15%2021%3A58%3A04

Reported-by: Andrei Lepikhov
Discussion: https://postgr.es/m/250c4cec-e459-4311-8fd6-da2558b3fb0a@postgrespro.ru
This commit is contained in:
Alexander Korotkov 2024-02-19 14:11:50 +02:00
parent 21a71648d3
commit e1b7fde418
2 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/test/regress/expected/aggregates.out
View File

@ -2873,7 +2873,6 @@ SELECT y,x,array_agg(distinct w) FROM btg WHERE y < 0 GROUP BY x,y;
(6 rows) (6 rows)
RESET enable_incremental_sort; RESET enable_incremental_sort;
DROP TABLE btg;
-- Check we don't pick aggregate path key instead of grouping path key -- Check we don't pick aggregate path key instead of grouping path key
CREATE TABLE group_agg_pk AS SELECT CREATE TABLE group_agg_pk AS SELECT
i % 10 AS x, i % 10 AS x,
@ -2925,32 +2924,31 @@ DROP TABLE agg_sort_order CASCADE;
SET enable_hashjoin = off; SET enable_hashjoin = off;
SET enable_nestloop = off; SET enable_nestloop = off;
explain (COSTS OFF) explain (COSTS OFF)
SELECT c1.relname,c1.relpages SELECT b1.x,b1.w FROM btg b1 JOIN btg b2 ON (b1.z=b2.z AND b1.w=b2.w)
FROM pg_class c1 JOIN pg_class c2 ON (c1.relname=c2.relname AND c1.relpages=c2.relpages) GROUP BY b1.x,b1.z,b1.w ORDER BY b1.z, b1.w, b1.x*b1.x;
GROUP BY c1.reltuples,c1.relpages,c1.relname QUERY PLAN
ORDER BY c1.relpages, c1.relname, c1.relpages*c1.relpages; -------------------------------------------------------------------
QUERY PLAN
---------------------------------------------------------------------------------------------
Incremental Sort Incremental Sort
Sort Key: c1.relpages, c1.relname, ((c1.relpages * c1.relpages)) Sort Key: b1.z, b1.w, ((b1.x * b1.x))
Presorted Key: c1.relpages, c1.relname Presorted Key: b1.z, b1.w
-> Group -> Group
Group Key: c1.relpages, c1.relname, c1.reltuples Group Key: b1.z, b1.w, b1.x
-> Incremental Sort -> Incremental Sort
Sort Key: c1.relpages, c1.relname, c1.reltuples Sort Key: b1.z, b1.w, b1.x
Presorted Key: c1.relpages, c1.relname Presorted Key: b1.z, b1.w
-> Merge Join -> Merge Join
Merge Cond: ((c1.relpages = c2.relpages) AND (c1.relname = c2.relname)) Merge Cond: ((b1.z = b2.z) AND (b1.w = b2.w))
-> Sort -> Sort
Sort Key: c1.relpages, c1.relname Sort Key: b1.z, b1.w
-> Seq Scan on pg_class c1 -> Seq Scan on btg b1
-> Sort -> Sort
Sort Key: c2.relpages, c2.relname Sort Key: b2.z, b2.w
-> Seq Scan on pg_class c2 -> Seq Scan on btg b2
(16 rows) (16 rows)
RESET enable_hashjoin; RESET enable_hashjoin;
RESET enable_nestloop; RESET enable_nestloop;
DROP TABLE btg;
RESET enable_hashagg; RESET enable_hashagg;
RESET max_parallel_workers; RESET max_parallel_workers;
RESET max_parallel_workers_per_gather; RESET max_parallel_workers_per_gather;

9
src/test/regress/sql/aggregates.sql
View File

@ -1229,8 +1229,6 @@ EXPLAIN (VERBOSE, COSTS OFF)
SELECT y,x,array_agg(distinct w) FROM btg WHERE y < 0 GROUP BY x,y; SELECT y,x,array_agg(distinct w) FROM btg WHERE y < 0 GROUP BY x,y;
RESET enable_incremental_sort; RESET enable_incremental_sort;
DROP TABLE btg;
-- Check we don't pick aggregate path key instead of grouping path key -- Check we don't pick aggregate path key instead of grouping path key
CREATE TABLE group_agg_pk AS SELECT CREATE TABLE group_agg_pk AS SELECT
i % 10 AS x, i % 10 AS x,
@ -1264,13 +1262,12 @@ DROP TABLE agg_sort_order CASCADE;
SET enable_hashjoin = off; SET enable_hashjoin = off;
SET enable_nestloop = off; SET enable_nestloop = off;
explain (COSTS OFF) explain (COSTS OFF)
SELECT c1.relname,c1.relpages SELECT b1.x,b1.w FROM btg b1 JOIN btg b2 ON (b1.z=b2.z AND b1.w=b2.w)
FROM pg_class c1 JOIN pg_class c2 ON (c1.relname=c2.relname AND c1.relpages=c2.relpages) GROUP BY b1.x,b1.z,b1.w ORDER BY b1.z, b1.w, b1.x*b1.x;
GROUP BY c1.reltuples,c1.relpages,c1.relname
ORDER BY c1.relpages, c1.relname, c1.relpages*c1.relpages;
RESET enable_hashjoin; RESET enable_hashjoin;
RESET enable_nestloop; RESET enable_nestloop;
DROP TABLE btg;
RESET enable_hashagg; RESET enable_hashagg;
RESET max_parallel_workers; RESET max_parallel_workers;
RESET max_parallel_workers_per_gather; RESET max_parallel_workers_per_gather;