From 05b38c7e63d1c8bca8c07ab4c8b194eed3c50ec7 Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Thu, 25 Apr 2019 10:50:14 -0400 Subject: Fix partitioned index attachment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When an existing index in a partition is attached to a new index on its parent, we forgot to set the "relispartition" flag correctly, which meant that it was not possible to find the index in various operations, such as adding a foreign key constraint that references that partitioned table. One of four places that was assigning the parent index was forgetting to do that, so fix by shifting responsibility of updating the flag to the routine that changes the parent. Author: Amit Langote, Álvaro Herrera Reported-by: Hubert "depesz" Lubaczewski Discussion: https://postgr.es/m/CA+HiwqHMsRtRYRWYTWavKJ8x14AFsv7bmAV46mYwnfD3vy8goQ@mail.gmail.com --- src/backend/commands/tablecmds.c | 37 ------------------------------------- 1 file changed, 37 deletions(-) (limited to 'src/backend/commands/tablecmds.c') diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index 66122afb077..b2f8189fa16 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -525,8 +525,6 @@ static ObjectAddress ATExecAttachPartitionIdx(List **wqueue, Relation rel, static void validatePartitionedIndex(Relation partedIdx, Relation partedTbl); static void refuseDupeIndexAttach(Relation parentIdx, Relation partIdx, Relation partitionTbl); -static void update_relispartition(Relation classRel, Oid relationId, - bool newval); static List *GetParentedForeignKeyRefs(Relation partition); static void ATDetachCheckNoForeignKeyRefs(Relation partition); @@ -15714,7 +15712,6 @@ AttachPartitionEnsureIndexes(Relation rel, Relation attachrel) if (OidIsValid(constraintOid)) ConstraintSetParentConstraint(cldConstrOid, constraintOid, RelationGetRelid(attachrel)); - update_relispartition(NULL, cldIdxId, true); found = true; CommandCounterIncrement(); @@ -15970,7 +15967,6 @@ ATExecDetachPartition(Relation rel, RangeVar *name) idx = index_open(idxid, AccessExclusiveLock); IndexSetParentIndex(idx, InvalidOid); - update_relispartition(classRel, idxid, false); /* If there's a constraint associated with the index, detach it too */ constrOid = get_relation_idx_constraint_oid(RelationGetRelid(partRel), @@ -16268,7 +16264,6 @@ ATExecAttachPartitionIdx(List **wqueue, Relation parentIdx, RangeVar *name) if (OidIsValid(constraintOid)) ConstraintSetParentConstraint(cldConstrId, constraintOid, RelationGetRelid(partTbl)); - update_relispartition(NULL, partIdxId, true); pfree(attmap); @@ -16401,38 +16396,6 @@ validatePartitionedIndex(Relation partedIdx, Relation partedTbl) } } -/* - * Update the relispartition flag of the given relation to the given value. - * - * classRel is the pg_class relation, already open and suitably locked. - * It can be passed as NULL, in which case it's opened and closed locally. - */ -static void -update_relispartition(Relation classRel, Oid relationId, bool newval) -{ - HeapTuple tup; - HeapTuple newtup; - Form_pg_class classForm; - bool opened = false; - - if (classRel == NULL) - { - classRel = table_open(RelationRelationId, RowExclusiveLock); - opened = true; - } - - tup = SearchSysCache1(RELOID, ObjectIdGetDatum(relationId)); - newtup = heap_copytuple(tup); - classForm = (Form_pg_class) GETSTRUCT(newtup); - classForm->relispartition = newval; - CatalogTupleUpdate(classRel, &tup->t_self, newtup); - heap_freetuple(newtup); - ReleaseSysCache(tup); - - if (opened) - table_close(classRel, RowExclusiveLock); -} - /* * Return an OID list of constraints that reference the given relation * that are marked as having a parent constraints. -- cgit v1.2.3