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

Commit0ef9ac2

Browse files
committed
Fix broken collate.icu.utf8 test in v12 branch.
collate.icu.utf8.sql is not run by default before v13, and commits9c47574/46d9be5ef evidently didn't bother to test it, withthe completely predictable result that it was broken.We didn't have enable_incremental_sort in v12, plus EXPLAIN makesdifferent table alias choices than later branches.Per buildfarm member copperhead.
1 parent7b9ec11 commit0ef9ac2

File tree

2 files changed

+31
-35
lines changed

2 files changed

+31
-35
lines changed

‎src/test/regress/expected/collate.icu.utf8.out

Lines changed: 31 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1950,7 +1950,6 @@ SELECT (SELECT count(*) FROM test33_0) <> (SELECT count(*) FROM test33_1);
19501950
-- partition key's collation doesn't match that of the GROUP BY column it is
19511951
-- matched with.
19521952
SET max_parallel_workers_per_gather TO 0;
1953-
SET enable_incremental_sort TO off;
19541953
CREATE TABLE pagg_tab3 (a text, c text collate case_insensitive) PARTITION BY LIST(c collate "C");
19551954
CREATE TABLE pagg_tab3_p1 PARTITION OF pagg_tab3 FOR VALUES IN ('a', 'b');
19561955
CREATE TABLE pagg_tab3_p2 PARTITION OF pagg_tab3 FOR VALUES IN ('B', 'A');
@@ -1959,15 +1958,15 @@ ANALYZE pagg_tab3;
19591958
SET enable_partitionwise_aggregate TO false;
19601959
EXPLAIN (COSTS OFF)
19611960
SELECT upper(c collate case_insensitive), count(c) FROM pagg_tab3 GROUP BY c collate case_insensitive ORDER BY 1;
1962-
QUERY PLAN
1963-
-----------------------------------------------------------
1961+
QUERY PLAN
1962+
--------------------------------------------------------------
19641963
Sort
1965-
Sort Key: (upper(pagg_tab3.c)) COLLATE case_insensitive
1964+
Sort Key: (upper(pagg_tab3_p2.c)) COLLATE case_insensitive
19661965
-> HashAggregate
1967-
Group Key:pagg_tab3.c
1966+
Group Key:pagg_tab3_p2.c
19681967
-> Append
1969-
-> Seq Scan on pagg_tab3_p2 pagg_tab3_1
1970-
-> Seq Scan on pagg_tab3_p1 pagg_tab3_2
1968+
-> Seq Scan on pagg_tab3_p2
1969+
-> Seq Scan on pagg_tab3_p1
19711970
(7 rows)
19721971

19731972
SELECT upper(c collate case_insensitive), count(c) FROM pagg_tab3 GROUP BY c collate case_insensitive ORDER BY 1;
@@ -1984,16 +1983,16 @@ SELECT upper(c collate case_insensitive), count(c) FROM pagg_tab3 GROUP BY c col
19841983
QUERY PLAN
19851984
--------------------------------------------------------------
19861985
Sort
1987-
Sort Key: (upper(pagg_tab3.c)) COLLATE case_insensitive
1986+
Sort Key: (upper(pagg_tab3_p2.c)) COLLATE case_insensitive
19881987
-> Finalize HashAggregate
1989-
Group Key:pagg_tab3.c
1988+
Group Key:pagg_tab3_p2.c
19901989
-> Append
19911990
-> Partial HashAggregate
1992-
Group Key:pagg_tab3.c
1993-
-> Seq Scan on pagg_tab3_p2 pagg_tab3
1991+
Group Key:pagg_tab3_p2.c
1992+
-> Seq Scan on pagg_tab3_p2
19941993
-> Partial HashAggregate
1995-
Group Key:pagg_tab3_1.c
1996-
-> Seq Scan on pagg_tab3_p1 pagg_tab3_1
1994+
Group Key:pagg_tab3_p1.c
1995+
-> Seq Scan on pagg_tab3_p1
19971996
(11 rows)
19981997

19991998
SELECT upper(c collate case_insensitive), count(c) FROM pagg_tab3 GROUP BY c collate case_insensitive ORDER BY 1;
@@ -2007,17 +2006,17 @@ SELECT upper(c collate case_insensitive), count(c) FROM pagg_tab3 GROUP BY c col
20072006
-- collation to be the same as that of the partition key.
20082007
EXPLAIN (COSTS OFF)
20092008
SELECT c collate "C", count(c) FROM pagg_tab3 GROUP BY c collate "C" ORDER BY 1;
2010-
QUERY PLAN
2011-
--------------------------------------------------------
2009+
QUERY PLAN
2010+
--------------------------------------------------
20122011
Sort
2013-
Sort Key: ((pagg_tab3.c)::text) COLLATE "C"
2012+
Sort Key: ((pagg_tab3_p2.c)::text) COLLATE "C"
20142013
-> Append
20152014
-> HashAggregate
2016-
Group Key: (pagg_tab3.c)::text
2017-
-> Seq Scan on pagg_tab3_p2 pagg_tab3
2015+
Group Key: (pagg_tab3_p2.c)::text
2016+
-> Seq Scan on pagg_tab3_p2
20182017
-> HashAggregate
2019-
Group Key: (pagg_tab3_1.c)::text
2020-
-> Seq Scan on pagg_tab3_p1 pagg_tab3_1
2018+
Group Key: (pagg_tab3_p1.c)::text
2019+
-> Seq Scan on pagg_tab3_p1
20212020
(9 rows)
20222021

20232022
SELECT c collate "C", count(c) FROM pagg_tab3 GROUP BY c collate "C" ORDER BY 1;
@@ -2043,12 +2042,12 @@ SELECT t1.c, count(t2.c) FROM pagg_tab3 t1 JOIN pagg_tab3 t2 ON t1.c = t2.c GROU
20432042
-> Hash Join
20442043
Hash Cond: (t1.c = t2.c)
20452044
-> Append
2046-
-> Seq Scan on pagg_tab3_p2t1_1
2047-
-> Seq Scan on pagg_tab3_p1t1_2
2045+
-> Seq Scan on pagg_tab3_p2t1
2046+
-> Seq Scan on pagg_tab3_p1t1_1
20482047
-> Hash
20492048
-> Append
2050-
-> Seq Scan on pagg_tab3_p2t2_1
2051-
-> Seq Scan on pagg_tab3_p1t2_2
2049+
-> Seq Scan on pagg_tab3_p2t2
2050+
-> Seq Scan on pagg_tab3_p1t2_1
20522051
(13 rows)
20532052

20542053
SELECT t1.c, count(t2.c) FROM pagg_tab3 t1 JOIN pagg_tab3 t2 ON t1.c = t2.c GROUP BY 1 ORDER BY t1.c COLLATE "C";
@@ -2070,12 +2069,12 @@ SELECT t1.c, count(t2.c) FROM pagg_tab3 t1 JOIN pagg_tab3 t2 ON t1.c = t2.c GROU
20702069
-> Hash Join
20712070
Hash Cond: (t1.c = t2.c)
20722071
-> Append
2073-
-> Seq Scan on pagg_tab3_p2t1_1
2074-
-> Seq Scan on pagg_tab3_p1t1_2
2072+
-> Seq Scan on pagg_tab3_p2t1
2073+
-> Seq Scan on pagg_tab3_p1t1_1
20752074
-> Hash
20762075
-> Append
2077-
-> Seq Scan on pagg_tab3_p2t2_1
2078-
-> Seq Scan on pagg_tab3_p1t2_2
2076+
-> Seq Scan on pagg_tab3_p2t2
2077+
-> Seq Scan on pagg_tab3_p1t2_1
20792078
(13 rows)
20802079

20812080
SELECT t1.c, count(t2.c) FROM pagg_tab3 t1 JOIN pagg_tab3 t2 ON t1.c = t2.c GROUP BY 1 ORDER BY t1.c COLLATE "C";
@@ -2130,12 +2129,12 @@ SELECT t1.c COLLATE "C", count(t2.c) FROM pagg_tab3 t1 JOIN pagg_tab3 t2 ON t1.c
21302129
-> Hash Join
21312130
Hash Cond: ((t1.c)::text = (t2.c)::text)
21322131
-> Append
2133-
-> Seq Scan on pagg_tab3_p2t1_1
2134-
-> Seq Scan on pagg_tab3_p1t1_2
2132+
-> Seq Scan on pagg_tab3_p2t1
2133+
-> Seq Scan on pagg_tab3_p1t1_1
21352134
-> Hash
21362135
-> Append
2137-
-> Seq Scan on pagg_tab3_p2t2_1
2138-
-> Seq Scan on pagg_tab3_p1t2_2
2136+
-> Seq Scan on pagg_tab3_p2t2
2137+
-> Seq Scan on pagg_tab3_p1t2_1
21392138
(13 rows)
21402139

21412140
SELECT t1.c COLLATE "C", count(t2.c) FROM pagg_tab3 t1 JOIN pagg_tab3 t2 ON t1.c = t2.c COLLATE "C" GROUP BY t1.c COLLATE "C" ORDER BY t1.c COLLATE "C";
@@ -2150,7 +2149,6 @@ SELECT t1.c COLLATE "C", count(t2.c) FROM pagg_tab3 t1 JOIN pagg_tab3 t2 ON t1.c
21502149
DROP TABLE pagg_tab3;
21512150
RESET enable_partitionwise_aggregate;
21522151
RESET max_parallel_workers_per_gather;
2153-
RESET enable_incremental_sort;
21542152
-- cleanup
21552153
RESET search_path;
21562154
SET client_min_messages TO warning;

‎src/test/regress/sql/collate.icu.utf8.sql

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -746,7 +746,6 @@ SELECT (SELECT count(*) FROM test33_0) <> (SELECT count(*) FROM test33_1);
746746
-- partition key's collation doesn't match that of the GROUP BY column it is
747747
-- matched with.
748748
SET max_parallel_workers_per_gather TO0;
749-
SET enable_incremental_sort TO off;
750749

751750
CREATETABLEpagg_tab3 (atext, ctext collate case_insensitive) PARTITION BY LIST(c collate"C");
752751
CREATETABLEpagg_tab3_p1 PARTITION OF pagg_tab3 FORVALUESIN ('a','b');
@@ -797,7 +796,6 @@ DROP TABLE pagg_tab3;
797796

798797
RESET enable_partitionwise_aggregate;
799798
RESET max_parallel_workers_per_gather;
800-
RESET enable_incremental_sort;
801799

802800
-- cleanup
803801
RESET search_path;

0 commit comments

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