Skip to content

Commit 68ac9cf

Browse files
michaelpqmichaelpq
committed
Fix dependency handling at swap phase of REINDEX CONCURRENTLY
When swapping the dependencies of the old and new indexes, the code has been correctly switching all links in pg_depend from the old to the new index for both referencing and referenced entries. However it forgot the fact that the new index may itself have existing entries in pg_depend, like references to the parent table attributes. This resulted in duplicated entries in pg_depend after running REINDEX CONCURRENTLY. Fix this problem by removing any existing entries in pg_depend on the new index before switching the dependencies of the old index to the new one. More regression tests are added to check the consistency of entries in pg_depend for indexes, including partition indexes. Author: Michael Paquier Discussion: https://postgr.es/m/20191025064318.GF8671@paquier.xyz Backpatch-through: 12
1 parent 51970fa commit 68ac9cf

File tree

3 files changed

+185
-1
lines changed

3 files changed

+185
-1
lines changed

‎src/backend/catalog/index.c‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1668,8 +1668,12 @@ index_concurrently_swap(Oid newIndexId, Oid oldIndexId, const char *oldName)
16681668
}
16691669

16701670
/*
1671-
* Move all dependencies of and on the old index to the new one
1671+
* Move all dependencies of and on the old index to the new one. First
1672+
* remove any dependencies that the new index may have to provide an
1673+
* initial clean state for the dependency switch, and then move all the
1674+
* dependencies from the old index to the new one.
16721675
*/
1676+
deleteDependencyRecordsFor(RelationRelationId, newIndexId, false);
16731677
changeDependenciesOf(RelationRelationId, oldIndexId, newIndexId);
16741678
changeDependenciesOn(RelationRelationId, oldIndexId, newIndexId);
16751679

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

Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1973,9 +1973,61 @@ ERROR: conflicting key value violates exclusion constraint "concur_reindex_tab3
19731973
DETAIL: Key (c2)=([2,5)) conflicts with existing key (c2)=([1,3)).
19741974
-- Check materialized views
19751975
CREATE MATERIALIZED VIEW concur_reindex_matview AS SELECT * FROM concur_reindex_tab;
1976+
-- Dependency lookup before and after the follow-up REINDEX commands.
1977+
-- These should remain consistent.
1978+
SELECT pg_describe_object(classid, objid, objsubid) as obj,
1979+
pg_describe_object(refclassid,refobjid,refobjsubid) as objref,
1980+
deptype
1981+
FROM pg_depend
1982+
WHERE classid = 'pg_class'::regclass AND
1983+
objid in ('concur_reindex_tab'::regclass,
1984+
'concur_reindex_ind1'::regclass,
1985+
'concur_reindex_ind2'::regclass,
1986+
'concur_reindex_ind3'::regclass,
1987+
'concur_reindex_ind4'::regclass,
1988+
'concur_reindex_matview'::regclass)
1989+
ORDER BY 1, 2;
1990+
obj | objref | deptype
1991+
------------------------------------------+------------------------------------------------------------+---------
1992+
index concur_reindex_ind1 | constraint concur_reindex_ind1 on table concur_reindex_tab | i
1993+
index concur_reindex_ind2 | column c2 of table concur_reindex_tab | a
1994+
index concur_reindex_ind3 | column c1 of table concur_reindex_tab | a
1995+
index concur_reindex_ind3 | table concur_reindex_tab | a
1996+
index concur_reindex_ind4 | column c1 of table concur_reindex_tab | a
1997+
index concur_reindex_ind4 | column c1 of table concur_reindex_tab | a
1998+
index concur_reindex_ind4 | column c2 of table concur_reindex_tab | a
1999+
materialized view concur_reindex_matview | schema public | n
2000+
table concur_reindex_tab | schema public | n
2001+
(9 rows)
2002+
19762003
REINDEX INDEX CONCURRENTLY concur_reindex_ind1;
19772004
REINDEX TABLE CONCURRENTLY concur_reindex_tab;
19782005
REINDEX TABLE CONCURRENTLY concur_reindex_matview;
2006+
SELECT pg_describe_object(classid, objid, objsubid) as obj,
2007+
pg_describe_object(refclassid,refobjid,refobjsubid) as objref,
2008+
deptype
2009+
FROM pg_depend
2010+
WHERE classid = 'pg_class'::regclass AND
2011+
objid in ('concur_reindex_tab'::regclass,
2012+
'concur_reindex_ind1'::regclass,
2013+
'concur_reindex_ind2'::regclass,
2014+
'concur_reindex_ind3'::regclass,
2015+
'concur_reindex_ind4'::regclass,
2016+
'concur_reindex_matview'::regclass)
2017+
ORDER BY 1, 2;
2018+
obj | objref | deptype
2019+
------------------------------------------+------------------------------------------------------------+---------
2020+
index concur_reindex_ind1 | constraint concur_reindex_ind1 on table concur_reindex_tab | i
2021+
index concur_reindex_ind2 | column c2 of table concur_reindex_tab | a
2022+
index concur_reindex_ind3 | column c1 of table concur_reindex_tab | a
2023+
index concur_reindex_ind3 | table concur_reindex_tab | a
2024+
index concur_reindex_ind4 | column c1 of table concur_reindex_tab | a
2025+
index concur_reindex_ind4 | column c1 of table concur_reindex_tab | a
2026+
index concur_reindex_ind4 | column c2 of table concur_reindex_tab | a
2027+
materialized view concur_reindex_matview | schema public | n
2028+
table concur_reindex_tab | schema public | n
2029+
(9 rows)
2030+
19792031
-- Check that comments are preserved
19802032
CREATE TABLE testcomment (i int);
19812033
CREATE INDEX testcomment_idx1 ON testcomment (i);
@@ -2059,6 +2111,43 @@ SELECT relid, parentrelid, level FROM pg_partition_tree('concur_reindex_part_ind
20592111
(5 rows)
20602112

20612113
-- REINDEX should preserve dependencies of partition tree.
2114+
SELECT pg_describe_object(classid, objid, objsubid) as obj,
2115+
pg_describe_object(refclassid,refobjid,refobjsubid) as objref,
2116+
deptype
2117+
FROM pg_depend
2118+
WHERE classid = 'pg_class'::regclass AND
2119+
objid in ('concur_reindex_part'::regclass,
2120+
'concur_reindex_part_0'::regclass,
2121+
'concur_reindex_part_0_1'::regclass,
2122+
'concur_reindex_part_0_2'::regclass,
2123+
'concur_reindex_part_index'::regclass,
2124+
'concur_reindex_part_index_0'::regclass,
2125+
'concur_reindex_part_index_0_1'::regclass,
2126+
'concur_reindex_part_index_0_2'::regclass)
2127+
ORDER BY 1, 2;
2128+
obj | objref | deptype
2129+
------------------------------------------+--------------------------------------------+---------
2130+
column c1 of table concur_reindex_part | table concur_reindex_part | i
2131+
column c2 of table concur_reindex_part_0 | table concur_reindex_part_0 | i
2132+
index concur_reindex_part_index | column c1 of table concur_reindex_part | a
2133+
index concur_reindex_part_index_0 | column c1 of table concur_reindex_part_0 | a
2134+
index concur_reindex_part_index_0 | index concur_reindex_part_index | P
2135+
index concur_reindex_part_index_0 | table concur_reindex_part_0 | S
2136+
index concur_reindex_part_index_0_1 | column c1 of table concur_reindex_part_0_1 | a
2137+
index concur_reindex_part_index_0_1 | index concur_reindex_part_index_0 | P
2138+
index concur_reindex_part_index_0_1 | table concur_reindex_part_0_1 | S
2139+
index concur_reindex_part_index_0_2 | column c1 of table concur_reindex_part_0_2 | a
2140+
index concur_reindex_part_index_0_2 | index concur_reindex_part_index_0 | P
2141+
index concur_reindex_part_index_0_2 | table concur_reindex_part_0_2 | S
2142+
table concur_reindex_part | schema public | n
2143+
table concur_reindex_part_0 | schema public | n
2144+
table concur_reindex_part_0 | table concur_reindex_part | a
2145+
table concur_reindex_part_0_1 | schema public | n
2146+
table concur_reindex_part_0_1 | table concur_reindex_part_0 | a
2147+
table concur_reindex_part_0_2 | schema public | n
2148+
table concur_reindex_part_0_2 | table concur_reindex_part_0 | a
2149+
(19 rows)
2150+
20622151
REINDEX INDEX CONCURRENTLY concur_reindex_part_index_0_1;
20632152
REINDEX INDEX CONCURRENTLY concur_reindex_part_index_0_2;
20642153
SELECT relid, parentrelid, level FROM pg_partition_tree('concur_reindex_part_index')
@@ -2074,6 +2163,43 @@ SELECT relid, parentrelid, level FROM pg_partition_tree('concur_reindex_part_ind
20742163

20752164
REINDEX TABLE CONCURRENTLY concur_reindex_part_0_1;
20762165
REINDEX TABLE CONCURRENTLY concur_reindex_part_0_2;
2166+
SELECT pg_describe_object(classid, objid, objsubid) as obj,
2167+
pg_describe_object(refclassid,refobjid,refobjsubid) as objref,
2168+
deptype
2169+
FROM pg_depend
2170+
WHERE classid = 'pg_class'::regclass AND
2171+
objid in ('concur_reindex_part'::regclass,
2172+
'concur_reindex_part_0'::regclass,
2173+
'concur_reindex_part_0_1'::regclass,
2174+
'concur_reindex_part_0_2'::regclass,
2175+
'concur_reindex_part_index'::regclass,
2176+
'concur_reindex_part_index_0'::regclass,
2177+
'concur_reindex_part_index_0_1'::regclass,
2178+
'concur_reindex_part_index_0_2'::regclass)
2179+
ORDER BY 1, 2;
2180+
obj | objref | deptype
2181+
------------------------------------------+--------------------------------------------+---------
2182+
column c1 of table concur_reindex_part | table concur_reindex_part | i
2183+
column c2 of table concur_reindex_part_0 | table concur_reindex_part_0 | i
2184+
index concur_reindex_part_index | column c1 of table concur_reindex_part | a
2185+
index concur_reindex_part_index_0 | column c1 of table concur_reindex_part_0 | a
2186+
index concur_reindex_part_index_0 | index concur_reindex_part_index | P
2187+
index concur_reindex_part_index_0 | table concur_reindex_part_0 | S
2188+
index concur_reindex_part_index_0_1 | column c1 of table concur_reindex_part_0_1 | a
2189+
index concur_reindex_part_index_0_1 | index concur_reindex_part_index_0 | P
2190+
index concur_reindex_part_index_0_1 | table concur_reindex_part_0_1 | S
2191+
index concur_reindex_part_index_0_2 | column c1 of table concur_reindex_part_0_2 | a
2192+
index concur_reindex_part_index_0_2 | index concur_reindex_part_index_0 | P
2193+
index concur_reindex_part_index_0_2 | table concur_reindex_part_0_2 | S
2194+
table concur_reindex_part | schema public | n
2195+
table concur_reindex_part_0 | schema public | n
2196+
table concur_reindex_part_0 | table concur_reindex_part | a
2197+
table concur_reindex_part_0_1 | schema public | n
2198+
table concur_reindex_part_0_1 | table concur_reindex_part_0 | a
2199+
table concur_reindex_part_0_2 | schema public | n
2200+
table concur_reindex_part_0_2 | table concur_reindex_part_0 | a
2201+
(19 rows)
2202+
20772203
SELECT relid, parentrelid, level FROM pg_partition_tree('concur_reindex_part_index')
20782204
ORDER BY relid, level;
20792205
relid | parentrelid | level

‎src/test/regress/sql/create_index.sql‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -776,9 +776,35 @@ REINDEX TABLE CONCURRENTLY concur_reindex_tab3; -- succeeds with warning
776776
INSERT INTO concur_reindex_tab3 VALUES (4, '[2,4]');
777777
-- Check materialized views
778778
CREATE MATERIALIZED VIEW concur_reindex_matview AS SELECT * FROM concur_reindex_tab;
779+
-- Dependency lookup before and after the follow-up REINDEX commands.
780+
-- These should remain consistent.
781+
SELECT pg_describe_object(classid, objid, objsubid) as obj,
782+
pg_describe_object(refclassid,refobjid,refobjsubid) as objref,
783+
deptype
784+
FROM pg_depend
785+
WHERE classid = 'pg_class'::regclass AND
786+
objid in ('concur_reindex_tab'::regclass,
787+
'concur_reindex_ind1'::regclass,
788+
'concur_reindex_ind2'::regclass,
789+
'concur_reindex_ind3'::regclass,
790+
'concur_reindex_ind4'::regclass,
791+
'concur_reindex_matview'::regclass)
792+
ORDER BY 1, 2;
779793
REINDEX INDEX CONCURRENTLY concur_reindex_ind1;
780794
REINDEX TABLE CONCURRENTLY concur_reindex_tab;
781795
REINDEX TABLE CONCURRENTLY concur_reindex_matview;
796+
SELECT pg_describe_object(classid, objid, objsubid) as obj,
797+
pg_describe_object(refclassid,refobjid,refobjsubid) as objref,
798+
deptype
799+
FROM pg_depend
800+
WHERE classid = 'pg_class'::regclass AND
801+
objid in ('concur_reindex_tab'::regclass,
802+
'concur_reindex_ind1'::regclass,
803+
'concur_reindex_ind2'::regclass,
804+
'concur_reindex_ind3'::regclass,
805+
'concur_reindex_ind4'::regclass,
806+
'concur_reindex_matview'::regclass)
807+
ORDER BY 1, 2;
782808
-- Check that comments are preserved
783809
CREATE TABLE testcomment (i int);
784810
CREATE INDEX testcomment_idx1 ON testcomment (i);
@@ -823,12 +849,40 @@ REINDEX TABLE CONCURRENTLY concur_reindex_part_10;
823849
SELECT relid, parentrelid, level FROM pg_partition_tree('concur_reindex_part_index')
824850
ORDER BY relid, level;
825851
-- REINDEX should preserve dependencies of partition tree.
852+
SELECT pg_describe_object(classid, objid, objsubid) as obj,
853+
pg_describe_object(refclassid,refobjid,refobjsubid) as objref,
854+
deptype
855+
FROM pg_depend
856+
WHERE classid = 'pg_class'::regclass AND
857+
objid in ('concur_reindex_part'::regclass,
858+
'concur_reindex_part_0'::regclass,
859+
'concur_reindex_part_0_1'::regclass,
860+
'concur_reindex_part_0_2'::regclass,
861+
'concur_reindex_part_index'::regclass,
862+
'concur_reindex_part_index_0'::regclass,
863+
'concur_reindex_part_index_0_1'::regclass,
864+
'concur_reindex_part_index_0_2'::regclass)
865+
ORDER BY 1, 2;
826866
REINDEX INDEX CONCURRENTLY concur_reindex_part_index_0_1;
827867
REINDEX INDEX CONCURRENTLY concur_reindex_part_index_0_2;
828868
SELECT relid, parentrelid, level FROM pg_partition_tree('concur_reindex_part_index')
829869
ORDER BY relid, level;
830870
REINDEX TABLE CONCURRENTLY concur_reindex_part_0_1;
831871
REINDEX TABLE CONCURRENTLY concur_reindex_part_0_2;
872+
SELECT pg_describe_object(classid, objid, objsubid) as obj,
873+
pg_describe_object(refclassid,refobjid,refobjsubid) as objref,
874+
deptype
875+
FROM pg_depend
876+
WHERE classid = 'pg_class'::regclass AND
877+
objid in ('concur_reindex_part'::regclass,
878+
'concur_reindex_part_0'::regclass,
879+
'concur_reindex_part_0_1'::regclass,
880+
'concur_reindex_part_0_2'::regclass,
881+
'concur_reindex_part_index'::regclass,
882+
'concur_reindex_part_index_0'::regclass,
883+
'concur_reindex_part_index_0_1'::regclass,
884+
'concur_reindex_part_index_0_2'::regclass)
885+
ORDER BY 1, 2;
832886
SELECT relid, parentrelid, level FROM pg_partition_tree('concur_reindex_part_index')
833887
ORDER BY relid, level;
834888
DROP TABLE concur_reindex_part;

0 commit comments

Comments
 (0)