Skip to content

Commit e4faa90

Browse files
kovdb75kovdb75
committed
Changed some regression tests + results
1) 'DROP SCHEMA ... CASCADE' replaced to 'DROP SCHEMA ...'; 2) pathman_column_type.sql: from results removed row 'partition status cache'; 3) pathman_mergejoin.sql: added GUC's for fixate strategy of queries
1 parent 26610df commit e4faa90

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;

0 commit comments

Comments
 (0)