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

Commite1b7fde

Browse files
committed
Get rid of pg_class usage in SJE regression tests
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%3A04Reported-by: Andrei LepikhovDiscussion:https://postgr.es/m/250c4cec-e459-4311-8fd6-da2558b3fb0a@postgrespro.ru
1 parent21a7164 commite1b7fde

File tree

2 files changed

+18
-23
lines changed

2 files changed

+18
-23
lines changed

‎src/test/regress/expected/aggregates.out

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2873,7 +2873,6 @@ SELECT y,x,array_agg(distinct w) FROM btg WHERE y < 0 GROUP BY x,y;
28732873
(6 rows)
28742874

28752875
RESET enable_incremental_sort;
2876-
DROP TABLE btg;
28772876
-- Check we don't pick aggregate path key instead of grouping path key
28782877
CREATE TABLE group_agg_pk AS SELECT
28792878
i % 10 AS x,
@@ -2925,32 +2924,31 @@ DROP TABLE agg_sort_order CASCADE;
29252924
SET enable_hashjoin = off;
29262925
SET enable_nestloop = off;
29272926
explain (COSTS OFF)
2928-
SELECT c1.relname,c1.relpages
2929-
FROM pg_class c1 JOIN pg_class c2 ON (c1.relname=c2.relname AND c1.relpages=c2.relpages)
2930-
GROUP BY c1.reltuples,c1.relpages,c1.relname
2931-
ORDER BY c1.relpages, c1.relname, c1.relpages*c1.relpages;
2932-
QUERY PLAN
2933-
---------------------------------------------------------------------------------------------
2927+
SELECT b1.x,b1.w FROM btg b1 JOIN btg b2 ON (b1.z=b2.z AND b1.w=b2.w)
2928+
GROUP BY b1.x,b1.z,b1.w ORDER BY b1.z, b1.w, b1.x*b1.x;
2929+
QUERY PLAN
2930+
-------------------------------------------------------------------
29342931
Incremental Sort
2935-
Sort Key:c1.relpages, c1.relname, ((c1.relpages *c1.relpages))
2936-
Presorted Key:c1.relpages, c1.relname
2932+
Sort Key:b1.z, b1.w, ((b1.x *b1.x))
2933+
Presorted Key:b1.z, b1.w
29372934
-> Group
2938-
Group Key:c1.relpages, c1.relname, c1.reltuples
2935+
Group Key:b1.z, b1.w, b1.x
29392936
-> Incremental Sort
2940-
Sort Key:c1.relpages, c1.relname, c1.reltuples
2941-
Presorted Key:c1.relpages, c1.relname
2937+
Sort Key:b1.z, b1.w, b1.x
2938+
Presorted Key:b1.z, b1.w
29422939
-> Merge Join
2943-
Merge Cond: ((c1.relpages =c2.relpages) AND (c1.relname =c2.relname))
2940+
Merge Cond: ((b1.z =b2.z) AND (b1.w =b2.w))
29442941
-> Sort
2945-
Sort Key:c1.relpages, c1.relname
2946-
-> Seq Scan onpg_class c1
2942+
Sort Key:b1.z, b1.w
2943+
-> Seq Scan onbtg b1
29472944
-> Sort
2948-
Sort Key:c2.relpages, c2.relname
2949-
-> Seq Scan onpg_class c2
2945+
Sort Key:b2.z, b2.w
2946+
-> Seq Scan onbtg b2
29502947
(16 rows)
29512948

29522949
RESET enable_hashjoin;
29532950
RESET enable_nestloop;
2951+
DROP TABLE btg;
29542952
RESET enable_hashagg;
29552953
RESET max_parallel_workers;
29562954
RESET max_parallel_workers_per_gather;

‎src/test/regress/sql/aggregates.sql

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1229,8 +1229,6 @@ EXPLAIN (VERBOSE, COSTS OFF)
12291229
SELECT y,x,array_agg(distinct w)FROM btgWHERE y<0GROUP BY x,y;
12301230
RESET enable_incremental_sort;
12311231

1232-
DROPTABLE btg;
1233-
12341232
-- Check we don't pick aggregate path key instead of grouping path key
12351233
CREATETABLEgroup_agg_pkASSELECT
12361234
i %10AS x,
@@ -1264,13 +1262,12 @@ DROP TABLE agg_sort_order CASCADE;
12641262
SET enable_hashjoin= off;
12651263
SET enable_nestloop= off;
12661264
explain (COSTS OFF)
1267-
SELECTc1.relname,c1.relpages
1268-
FROM pg_class c1JOIN pg_class c2ON (c1.relname=c2.relnameANDc1.relpages=c2.relpages)
1269-
GROUP BYc1.reltuples,c1.relpages,c1.relname
1270-
ORDER BYc1.relpages,c1.relname,c1.relpages*c1.relpages;
1265+
SELECTb1.x,b1.wFROM btg b1JOIN btg b2ON (b1.z=b2.zANDb1.w=b2.w)
1266+
GROUP BYb1.x,b1.z,b1.wORDER BYb1.z,b1.w,b1.x*b1.x;
12711267
RESET enable_hashjoin;
12721268
RESET enable_nestloop;
12731269

1270+
DROPTABLE btg;
12741271
RESET enable_hashagg;
12751272
RESET max_parallel_workers;
12761273
RESET max_parallel_workers_per_gather;

0 commit comments

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