Commit7cd0fd6

committed

Invalid parent's relcache after CREATE TABLE .. PARTITION OF.

Otherwise, subsequent commands in the same transaction see the wrongpartition descriptor.Amit Langote. Reported by Tomas Vondra and David Fetter. Reviewedby me.Discussion:http://postgr.es/m/22dd313b-d7fd-22b5-0787-654845c8f849%402ndquadrant.comDiscussion:http://postgr.es/m/20161215090916.GB20659%40fetter.org

1 parente13029a commit7cd0fd6Copy full SHA for 7cd0fd6

File tree

+11

-11

lines changed

+11

-11

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3230,9 +3230,12 @@ RemovePartitionKeyByRelId(Oid relid)`
`3230`	`3230`	`* StorePartitionBound`
`3231`	`3231`	`*Update pg_class tuple of rel to store the partition bound and set`
`3232`	`3232`	`*relispartition to true`
	`3233`	`+ *`
	`3234`	`+ * Also, invalidate the parent's relcache, so that the next rebuild will load`
	`3235`	`+ * the new partition's info into its partition descriptor.`
`3233`	`3236`	`*/`
`3234`	`3237`	`void`
`3235`		`-StorePartitionBound(Relationrel,Node*bound)`
	`3238`	`+StorePartitionBound(Relationrel,Relationparent,Node*bound)`
`3236`	`3239`	`{`
`3237`	`3240`	`RelationclassRel;`
`3238`	`3241`	`HeapTupletuple,`
`@@ -3273,4 +3276,6 @@ StorePartitionBound(Relation rel, Node *bound)`
`3273`	`3276`	`CatalogUpdateIndexes(classRel,newtuple);`
`3274`	`3277`	`heap_freetuple(newtuple);`
`3275`	`3278`	`heap_close(classRel,RowExclusiveLock);`
	`3279`	`+`
	`3280`	`+CacheInvalidateRelcache(parent);`
`3276`	`3281`	`}`

Lines changed: 4 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -777,10 +777,11 @@ DefineRelation(CreateStmt *stmt, char relkind, Oid ownerId,`
`777`	`777`	`* it does not return on error.`
`778`	`778`	`*/`
`779`	`779`	`check_new_partition_bound(relname,parent,bound);`
`780`		`-heap_close(parent,NoLock);`
`781`	`780`
`782`	`781`	`/* Update the pg_class entry. */`
`783`		`-StorePartitionBound(rel,bound);`
	`782`	`+StorePartitionBound(rel,parent,bound);`
	`783`	`+`
	`784`	`+heap_close(parent,NoLock);`
`784`	`785`
`785`	`786`	`/*`
`786`	`787`	`* The code that follows may also update the pg_class tuple to update`
`@@ -13141,7 +13142,7 @@ ATExecAttachPartition(List *wqueue, Relation rel, PartitionCmd cmd)`
`13141`	`13142`	`cmd->bound);`
`13142`	`13143`
`13143`	`13144`	`/* Update the pg_class entry. */`
`13144`		`-StorePartitionBound(attachRel,cmd->bound);`
	`13145`	`+StorePartitionBound(attachRel,rel,cmd->bound);`
`13145`	`13146`
`13146`	`13147`	`/*`
`13147`	`13148`	`* Generate partition constraint from the partition bound specification.`
`@@ -13352,12 +13353,6 @@ ATExecAttachPartition(List *wqueue, Relation rel, PartitionCmd cmd)`
`13352`	`13353`	`}`
`13353`	`13354`	`}`
`13354`	`13355`
`13355`		`-/*`
`13356`		`- * Invalidate the parent's relcache so that the new partition is now`
`13357`		`- * included its partition descriptor.`
`13358`		`- */`
`13359`		`-CacheInvalidateRelcache(rel);`
`13360`		`-`
`13361`	`13356`	`ObjectAddressSet(address,RelationRelationId,RelationGetRelid(attachRel));`
`13362`	`13357`
`13363`	`13358`	`/* keep our lock until commit */`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -143,6 +143,6 @@ extern void StorePartitionKey(Relation rel,`
`143`	`143`	`Oid*partopclass,`
`144`	`144`	`Oid*partcollation);`
`145`	`145`	`externvoidRemovePartitionKeyByRelId(Oidrelid);`
`146`		`-externvoidStorePartitionBound(Relationrel,Node*bound);`
	`146`	`+externvoidStorePartitionBound(Relationrel,Relationparent,Node*bound);`
`147`	`147`
`148`	`148`	`#endif/* HEAP_H */`

Comments

(0)