Commiteec4e1d

authored

Merge pull request#248 from postgrespro/PGPRO-6538

Changed lock order for MERGE of range partitions + change for issue#247

2 parentse57e04d +66543e7 commiteec4e1dCopy full SHA for eec4e1d

File tree

-4

lines changed

-4

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -683,9 +683,6 @@ merge_range_partitions(PG_FUNCTION_ARGS)`
`683`	`683`	`/* Extract partition Oids from array */`
`684`	`684`	`parts[i]=DatumGetObjectId(datums[i]);`
`685`	`685`
`686`		`-/* Prevent modification of partitions */`
`687`		`-LockRelationOid(parts[i],AccessExclusiveLock);`
`688`		`-`
`689`	`686`	`/* Check if all partitions are from the same parent */`
`690`	`687`	`cur_parent=get_parent_of_partition(parts[i]);`
`691`	`688`
`@@ -708,6 +705,10 @@ merge_range_partitions(PG_FUNCTION_ARGS)`
`708`	`705`	`/* Prevent changes in partitioning scheme */`
`709`	`706`	`LockRelationOid(parent,ShareUpdateExclusiveLock);`
`710`	`707`
	`708`	`+/* Prevent modification of partitions */`
	`709`	`+for (i=0;i<nparts;i++)`
	`710`	`+LockRelationOid(parts[i],AccessExclusiveLock);`
	`711`	`+`
`711`	`712`	`/* Emit an error if it is not partitioned by RANGE */`
`712`	`713`	`prel=get_pathman_relation_info(parent);`
`713`	`714`	`shout_if_prel_is_invalid(parent,prel,PT_RANGE);`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,11 @@ is_pathman_related_copy(Node *parsetree)`
`114`	`114`	`(copy_stmt->is_from ?`
`115`	`115`	`PATHMAN_COPY_WRITE_LOCK :`
`116`	`116`	`PATHMAN_COPY_READ_LOCK),`
`117`		`-false);`
	`117`	`+true);`
	`118`	`+`
	`119`	`+/* Skip relation if it does not exist (for Citus compatibility) */`
	`120`	`+if (!OidIsValid(parent_relid))`
	`121`	`+return false;`
`118`	`122`
`119`	`123`	`/* Check that relation is partitioned */`
`120`	`124`	`if (has_pathman_relation_info(parent_relid))`

Comments

(0)