Skip to content

Commit a9a64e2

Browse files
kovdb75kovdb75
authored
Merge pull request #239 from postgrespro/PGPRO-4546
Changed some regression tests + results
2 parents 26610df + e4faa90 commit a9a64e2

File tree

107 files changed

+649
-274
lines changed

Some content is hidden

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

107 files changed

+649
-274
lines changed

‎expected/pathman_array_qual.out

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2402,6 +2402,7 @@ EXECUTE q(100);
24022402
(1 row)
24032403

24042404
DEALLOCATE q;
2405-
DROP SCHEMA array_qual CASCADE;
2406-
NOTICE: drop cascades to 12 other objects
2405+
DROP TABLE array_qual.test CASCADE;
2406+
NOTICE: drop cascades to 11 other objects
2407+
DROP SCHEMA array_qual;
24072408
DROP EXTENSION pg_pathman;

‎expected/pathman_array_qual_1.out

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2392,6 +2392,7 @@ EXECUTE q(100);
23922392
(1 row)
23932393

23942394
DEALLOCATE q;
2395-
DROP SCHEMA array_qual CASCADE;
2396-
NOTICE: drop cascades to 12 other objects
2395+
DROP TABLE array_qual.test CASCADE;
2396+
NOTICE: drop cascades to 11 other objects
2397+
DROP SCHEMA array_qual;
23972398
DROP EXTENSION pg_pathman;

‎expected/pathman_basic.out

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1830,7 +1830,22 @@ SELECT * FROM test.mixinh_child1;
18301830

18311831
SELECT * FROM test.mixinh_parent;
18321832
ERROR: could not expand partitioned table "mixinh_child1"
1833-
DROP SCHEMA test CASCADE;
1834-
NOTICE: drop cascades to 32 other objects
1833+
DROP TABLE test.hash_rel CASCADE;
1834+
NOTICE: drop cascades to 3 other objects
1835+
DROP TABLE test.index_on_childs CASCADE;
1836+
NOTICE: drop cascades to 6 other objects
1837+
DROP TABLE test.mixinh_child1 CASCADE;
1838+
NOTICE: drop cascades to 2 other objects
1839+
DROP TABLE test.mixinh_parent CASCADE;
1840+
DROP TABLE test.num_range_rel CASCADE;
1841+
NOTICE: drop cascades to 5 other objects
1842+
DROP TABLE test.hash_rel_wrong CASCADE;
1843+
DROP TABLE test.range_rel CASCADE;
1844+
DROP TABLE test.range_rel_archive CASCADE;
1845+
DROP TABLE test.special_case_1_ind_o_s CASCADE;
1846+
NOTICE: drop cascades to 5 other objects
1847+
DROP TABLE test.range_rel_test1 CASCADE;
1848+
DROP TABLE test.range_rel_test2 CASCADE;
1849+
DROP SCHEMA test;
18351850
DROP EXTENSION pg_pathman CASCADE;
1836-
DROP SCHEMA pathman CASCADE;
1851+
DROP SCHEMA pathman;

‎expected/pathman_basic_1.out

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1813,7 +1813,22 @@ SELECT * FROM test.mixinh_child1;
18131813

18141814
SELECT * FROM test.mixinh_parent;
18151815
ERROR: could not expand partitioned table "mixinh_child1"
1816-
DROP SCHEMA test CASCADE;
1817-
NOTICE: drop cascades to 32 other objects
1816+
DROP TABLE test.hash_rel CASCADE;
1817+
NOTICE: drop cascades to 3 other objects
1818+
DROP TABLE test.index_on_childs CASCADE;
1819+
NOTICE: drop cascades to 6 other objects
1820+
DROP TABLE test.mixinh_child1 CASCADE;
1821+
NOTICE: drop cascades to 2 other objects
1822+
DROP TABLE test.mixinh_parent CASCADE;
1823+
DROP TABLE test.num_range_rel CASCADE;
1824+
NOTICE: drop cascades to 5 other objects
1825+
DROP TABLE test.hash_rel_wrong CASCADE;
1826+
DROP TABLE test.range_rel CASCADE;
1827+
DROP TABLE test.range_rel_archive CASCADE;
1828+
DROP TABLE test.special_case_1_ind_o_s CASCADE;
1829+
NOTICE: drop cascades to 5 other objects
1830+
DROP TABLE test.range_rel_test1 CASCADE;
1831+
DROP TABLE test.range_rel_test2 CASCADE;
1832+
DROP SCHEMA test;
18181833
DROP EXTENSION pg_pathman CASCADE;
1819-
DROP SCHEMA pathman CASCADE;
1834+
DROP SCHEMA pathman;

‎expected/pathman_basic_2.out

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1813,7 +1813,22 @@ SELECT * FROM test.mixinh_child1;
18131813

18141814
SELECT * FROM test.mixinh_parent;
18151815
ERROR: could not expand partitioned table "mixinh_child1"
1816-
DROP SCHEMA test CASCADE;
1817-
NOTICE: drop cascades to 32 other objects
1816+
DROP TABLE test.hash_rel CASCADE;
1817+
NOTICE: drop cascades to 3 other objects
1818+
DROP TABLE test.index_on_childs CASCADE;
1819+
NOTICE: drop cascades to 6 other objects
1820+
DROP TABLE test.mixinh_child1 CASCADE;
1821+
NOTICE: drop cascades to 2 other objects
1822+
DROP TABLE test.mixinh_parent CASCADE;
1823+
DROP TABLE test.num_range_rel CASCADE;
1824+
NOTICE: drop cascades to 5 other objects
1825+
DROP TABLE test.hash_rel_wrong CASCADE;
1826+
DROP TABLE test.range_rel CASCADE;
1827+
DROP TABLE test.range_rel_archive CASCADE;
1828+
DROP TABLE test.special_case_1_ind_o_s CASCADE;
1829+
NOTICE: drop cascades to 5 other objects
1830+
DROP TABLE test.range_rel_test1 CASCADE;
1831+
DROP TABLE test.range_rel_test2 CASCADE;
1832+
DROP SCHEMA test;
18181833
DROP EXTENSION pg_pathman CASCADE;
1819-
DROP SCHEMA pathman CASCADE;
1834+
DROP SCHEMA pathman;

‎expected/pathman_bgw.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,5 +242,5 @@ SELECT count(*) FROM test_bgw.conc_part;
242242

243243
DROP TABLE test_bgw.conc_part CASCADE;
244244
NOTICE: drop cascades to 5 other objects
245-
DROP SCHEMA test_bgw CASCADE;
245+
DROP SCHEMA test_bgw;
246246
DROP EXTENSION pg_pathman;

‎expected/pathman_calamity.out

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -779,8 +779,16 @@ SELECT merge_range_partitions('calamity.merge_test_a_1',
779779
ERROR: cannot merge partitions
780780
DROP TABLE calamity.merge_test_a,calamity.merge_test_b CASCADE;
781781
NOTICE: drop cascades to 6 other objects
782-
DROP SCHEMA calamity CASCADE;
783-
NOTICE: drop cascades to 15 other objects
782+
DROP DOMAIN calamity.test_domain;
783+
DROP TABLE calamity.part_test CASCADE;
784+
NOTICE: drop cascades to table calamity.wrong_partition
785+
DROP TABLE calamity.part_ok CASCADE;
786+
NOTICE: drop cascades to 4 other objects
787+
DROP TABLE calamity.hash_two_times CASCADE;
788+
NOTICE: drop cascades to 2 other objects
789+
DROP TABLE calamity.to_be_disabled CASCADE;
790+
NOTICE: drop cascades to 3 other objects
791+
DROP SCHEMA calamity;
784792
DROP EXTENSION pg_pathman;
785793
/*
786794
* -------------------------------
@@ -987,7 +995,7 @@ SELECT context, entries FROM pathman_cache_stats
987995
partition parents cache | 0
988996
(3 rows)
989997

990-
DROP SCHEMA calamity CASCADE;
998+
DROP SCHEMA calamity;
991999
DROP EXTENSION pg_pathman;
9921000
/*
9931001
* ------------------------------------------
@@ -1060,5 +1068,5 @@ EXPLAIN (COSTS OFF) SELECT * FROM calamity.survivor; /* OK */
10601068

10611069
DROP TABLE calamity.survivor CASCADE;
10621070
NOTICE: drop cascades to 3 other objects
1063-
DROP SCHEMA calamity CASCADE;
1071+
DROP SCHEMA calamity;
10641072
DROP EXTENSION pg_pathman;

‎expected/pathman_calamity_1.out

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -779,8 +779,16 @@ SELECT merge_range_partitions('calamity.merge_test_a_1',
779779
ERROR: cannot merge partitions
780780
DROP TABLE calamity.merge_test_a,calamity.merge_test_b CASCADE;
781781
NOTICE: drop cascades to 6 other objects
782-
DROP SCHEMA calamity CASCADE;
783-
NOTICE: drop cascades to 15 other objects
782+
DROP DOMAIN calamity.test_domain;
783+
DROP TABLE calamity.part_test CASCADE;
784+
NOTICE: drop cascades to table calamity.wrong_partition
785+
DROP TABLE calamity.part_ok CASCADE;
786+
NOTICE: drop cascades to 4 other objects
787+
DROP TABLE calamity.hash_two_times CASCADE;
788+
NOTICE: drop cascades to 2 other objects
789+
DROP TABLE calamity.to_be_disabled CASCADE;
790+
NOTICE: drop cascades to 3 other objects
791+
DROP SCHEMA calamity;
784792
DROP EXTENSION pg_pathman;
785793
/*
786794
* -------------------------------
@@ -987,7 +995,7 @@ SELECT context, entries FROM pathman_cache_stats
987995
partition parents cache | 0
988996
(3 rows)
989997

990-
DROP SCHEMA calamity CASCADE;
998+
DROP SCHEMA calamity;
991999
DROP EXTENSION pg_pathman;
9921000
/*
9931001
* ------------------------------------------
@@ -1060,5 +1068,5 @@ EXPLAIN (COSTS OFF) SELECT * FROM calamity.survivor; /* OK */
10601068

10611069
DROP TABLE calamity.survivor CASCADE;
10621070
NOTICE: drop cascades to 3 other objects
1063-
DROP SCHEMA calamity CASCADE;
1071+
DROP SCHEMA calamity;
10641072
DROP EXTENSION pg_pathman;

‎expected/pathman_calamity_2.out

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -779,8 +779,16 @@ SELECT merge_range_partitions('calamity.merge_test_a_1',
779779
ERROR: cannot merge partitions
780780
DROP TABLE calamity.merge_test_a,calamity.merge_test_b CASCADE;
781781
NOTICE: drop cascades to 6 other objects
782-
DROP SCHEMA calamity CASCADE;
783-
NOTICE: drop cascades to 15 other objects
782+
DROP DOMAIN calamity.test_domain;
783+
DROP TABLE calamity.part_test CASCADE;
784+
NOTICE: drop cascades to table calamity.wrong_partition
785+
DROP TABLE calamity.part_ok CASCADE;
786+
NOTICE: drop cascades to 4 other objects
787+
DROP TABLE calamity.hash_two_times CASCADE;
788+
NOTICE: drop cascades to 2 other objects
789+
DROP TABLE calamity.to_be_disabled CASCADE;
790+
NOTICE: drop cascades to 3 other objects
791+
DROP SCHEMA calamity;
784792
DROP EXTENSION pg_pathman;
785793
/*
786794
* -------------------------------
@@ -987,7 +995,7 @@ SELECT context, entries FROM pathman_cache_stats
987995
partition parents cache | 0
988996
(3 rows)
989997

990-
DROP SCHEMA calamity CASCADE;
998+
DROP SCHEMA calamity;
991999
DROP EXTENSION pg_pathman;
9921000
/*
9931001
* ------------------------------------------
@@ -1060,5 +1068,5 @@ EXPLAIN (COSTS OFF) SELECT * FROM calamity.survivor; /* OK */
10601068

10611069
DROP TABLE calamity.survivor CASCADE;
10621070
NOTICE: drop cascades to 3 other objects
1063-
DROP SCHEMA calamity CASCADE;
1071+
DROP SCHEMA calamity;
10641072
DROP EXTENSION pg_pathman;

‎expected/pathman_calamity_3.out

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -783,8 +783,16 @@ SELECT merge_range_partitions('calamity.merge_test_a_1',
783783
ERROR: cannot merge partitions
784784
DROP TABLE calamity.merge_test_a,calamity.merge_test_b CASCADE;
785785
NOTICE: drop cascades to 6 other objects
786-
DROP SCHEMA calamity CASCADE;
787-
NOTICE: drop cascades to 15 other objects
786+
DROP DOMAIN calamity.test_domain;
787+
DROP TABLE calamity.part_test CASCADE;
788+
NOTICE: drop cascades to table calamity.wrong_partition
789+
DROP TABLE calamity.part_ok CASCADE;
790+
NOTICE: drop cascades to 4 other objects
791+
DROP TABLE calamity.hash_two_times CASCADE;
792+
NOTICE: drop cascades to 2 other objects
793+
DROP TABLE calamity.to_be_disabled CASCADE;
794+
NOTICE: drop cascades to 3 other objects
795+
DROP SCHEMA calamity;
788796
DROP EXTENSION pg_pathman;
789797
/*
790798
* -------------------------------
@@ -991,7 +999,7 @@ SELECT context, entries FROM pathman_cache_stats
991999
partition parents cache | 0
9921000
(3 rows)
9931001

994-
DROP SCHEMA calamity CASCADE;
1002+
DROP SCHEMA calamity;
9951003
DROP EXTENSION pg_pathman;
9961004
/*
9971005
* ------------------------------------------
@@ -1064,5 +1072,5 @@ EXPLAIN (COSTS OFF) SELECT * FROM calamity.survivor; /* OK */
10641072

10651073
DROP TABLE calamity.survivor CASCADE;
10661074
NOTICE: drop cascades to 3 other objects
1067-
DROP SCHEMA calamity CASCADE;
1075+
DROP SCHEMA calamity;
10681076
DROP EXTENSION pg_pathman;

‎expected/pathman_callbacks.out

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -411,6 +411,8 @@ ORDER BY range_min::INT4;
411411

412412
DROP TABLE callbacks.abc CASCADE;
413413
NOTICE: drop cascades to 5 other objects
414-
DROP SCHEMA callbacks CASCADE;
415-
NOTICE: drop cascades to 2 other objects
414+
DROP FUNCTION callbacks.abc_on_part_created_callback(jsonb);
415+
DROP FUNCTION public.dummy_cb(jsonb);
416+
DROP FUNCTION callbacks.rotation_callback(jsonb);
417+
DROP SCHEMA callbacks;
416418
DROP EXTENSION pg_pathman CASCADE;

‎expected/pathman_column_type.out

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ SELECT * FROM test_column_type.test;
2323
-----
2424
(0 rows)
2525

26-
SELECT context, entries FROM pathman_cache_stats ORDER BY context;
26+
SELECT context, entries FROM pathman_cache_stats
27+
WHERE context != 'partition status cache' ORDER BY context;
2728
context | entries
2829
-------------------------+---------
2930
maintenance | 0
3031
partition bounds cache | 10
3132
partition parents cache | 10
32-
partition status cache | 3
33-
(4 rows)
33+
(3 rows)
3434

3535
/*
3636
* Get parsed and analyzed expression.
@@ -84,14 +84,14 @@ SELECT * FROM test_column_type.test;
8484
-----
8585
(0 rows)
8686

87-
SELECT context, entries FROM pathman_cache_stats ORDER BY context;
87+
SELECT context, entries FROM pathman_cache_stats
88+
WHERE context != 'partition status cache' ORDER BY context;
8889
context | entries
8990
-------------------------+---------
9091
maintenance | 0
9192
partition bounds cache | 10
9293
partition parents cache | 10
93-
partition status cache | 3
94-
(4 rows)
94+
(3 rows)
9595

9696
/* check insert dispatching */
9797
INSERT INTO test_column_type.test VALUES (1);
@@ -135,14 +135,14 @@ SELECT * FROM test_column_type.test;
135135
----+-----
136136
(0 rows)
137137

138-
SELECT context, entries FROM pathman_cache_stats ORDER BY context;
138+
SELECT context, entries FROM pathman_cache_stats
139+
WHERE context != 'partition status cache' ORDER BY context;
139140
context | entries
140141
-------------------------+---------
141142
maintenance | 0
142143
partition bounds cache | 5
143144
partition parents cache | 5
144-
partition status cache | 3
145-
(4 rows)
145+
(3 rows)
146146

147147
/* change column's type (should NOT work) */
148148
ALTER TABLE test_column_type.test ALTER id TYPE NUMERIC;
@@ -153,14 +153,14 @@ SELECT * FROM test_column_type.test;
153153
----+-----
154154
(0 rows)
155155

156-
SELECT context, entries FROM pathman_cache_stats ORDER BY context;
156+
SELECT context, entries FROM pathman_cache_stats
157+
WHERE context != 'partition status cache' ORDER BY context;
157158
context | entries
158159
-------------------------+---------
159160
maintenance | 0
160161
partition bounds cache | 5
161162
partition parents cache | 5
162-
partition status cache | 3
163-
(4 rows)
163+
(3 rows)
164164

165165
/* change column's type (should flush caches) */
166166
ALTER TABLE test_column_type.test ALTER val TYPE NUMERIC;
@@ -170,14 +170,14 @@ SELECT * FROM test_column_type.test;
170170
----+-----
171171
(0 rows)
172172

173-
SELECT context, entries FROM pathman_cache_stats ORDER BY context;
173+
SELECT context, entries FROM pathman_cache_stats
174+
WHERE context != 'partition status cache' ORDER BY context;
174175
context | entries
175176
-------------------------+---------
176177
maintenance | 0
177178
partition bounds cache | 5
178179
partition parents cache | 5
179-
partition status cache | 3
180-
(4 rows)
180+
(3 rows)
181181

182182
/* check insert dispatching */
183183
INSERT INTO test_column_type.test VALUES (1);
@@ -199,5 +199,5 @@ NOTICE: 0 rows copied from test_column_type.test_4
199199
(1 row)
200200

201201
DROP TABLE test_column_type.test CASCADE;
202-
DROP SCHEMA test_column_type CASCADE;
202+
DROP SCHEMA test_column_type;
203203
DROP EXTENSION pg_pathman;

0 commit comments

Comments
 (0)