diff options
| -rw-r--r-- | src/backend/catalog/heap.c | 7 | ||||
| -rw-r--r-- | src/backend/commands/tablecmds.c | 13 | ||||
| -rw-r--r-- | src/include/catalog/heap.h | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c index c09c9f28a73..e5d6aecc3f8 100644 --- a/src/backend/catalog/heap.c +++ b/src/backend/catalog/heap.c @@ -3230,9 +3230,12 @@ RemovePartitionKeyByRelId(Oid relid) * StorePartitionBound * Update pg_class tuple of rel to store the partition bound and set * relispartition to true + * + * Also, invalidate the parent's relcache, so that the next rebuild will load + * the new partition's info into its partition descriptor. */ void -StorePartitionBound(Relation rel, Node *bound) +StorePartitionBound(Relation rel, Relation parent, Node *bound) { Relation classRel; HeapTuple tuple, @@ -3273,4 +3276,6 @@ StorePartitionBound(Relation rel, Node *bound) CatalogUpdateIndexes(classRel, newtuple); heap_freetuple(newtuple); heap_close(classRel, RowExclusiveLock); + + CacheInvalidateRelcache(parent); } diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index 7a574dc50da..1c219b03dd9 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -777,10 +777,11 @@ DefineRelation(CreateStmt *stmt, char relkind, Oid ownerId, * it does not return on error. */ check_new_partition_bound(relname, parent, bound); - heap_close(parent, NoLock); /* Update the pg_class entry. */ - StorePartitionBound(rel, bound); + StorePartitionBound(rel, parent, bound); + + heap_close(parent, NoLock); /* * The code that follows may also update the pg_class tuple to update @@ -13141,7 +13142,7 @@ ATExecAttachPartition(List **wqueue, Relation rel, PartitionCmd *cmd) cmd->bound); /* Update the pg_class entry. */ - StorePartitionBound(attachRel, cmd->bound); + StorePartitionBound(attachRel, rel, cmd->bound); /* * Generate partition constraint from the partition bound specification. @@ -13352,12 +13353,6 @@ ATExecAttachPartition(List **wqueue, Relation rel, PartitionCmd *cmd) } } - /* - * Invalidate the parent's relcache so that the new partition is now - * included its partition descriptor. - */ - CacheInvalidateRelcache(rel); - ObjectAddressSet(address, RelationRelationId, RelationGetRelid(attachRel)); /* keep our lock until commit */ diff --git a/src/include/catalog/heap.h b/src/include/catalog/heap.h index 77dc1983e83..0e4262f611c 100644 --- a/src/include/catalog/heap.h +++ b/src/include/catalog/heap.h @@ -143,6 +143,6 @@ extern void StorePartitionKey(Relation rel, Oid *partopclass, Oid *partcollation); extern void RemovePartitionKeyByRelId(Oid relid); -extern void StorePartitionBound(Relation rel, Node *bound); +extern void StorePartitionBound(Relation rel, Relation parent, Node *bound); #endif /* HEAP_H */ |