Commitd22d98c

committed

Assert that partition inherits from only one parent in MergeAttributes()

A partition inherits only from one partitioned table and thus inheritsa column definition only once. Assert the same in MergeAttributes()and simplify a condition accordingly.Similar definition exists about line 3068 in the same function.Author: Ashutosh Bapat <ashutosh.bapat.oss@gmail.com>Discussion:https://www.postgresql.org/message-id/flat/CAExHW5uOykuTC+C6R1yDSp=o8Q83jr8xJdZxgPkxfZ1Ue5RRGg@mail.gmail.com

1 parent58b20e6 commitd22d98cCopy full SHA for d22d98c

File tree

-5

lines changed

-5

lines changed

Lines changed: 8 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -2721,6 +2721,12 @@ MergeAttributes(List columns, const List supers, char relpersistence,`
`2721`	`2721`	`int32deftypmod;`
`2722`	`2722`	`OiddefCollId;`
`2723`	`2723`
	`2724`	`+/*`
	`2725`	`+ * Partitions have only one parent and have no column`
	`2726`	`+ * definitions of their own, so conflict should never occur.`
	`2727`	`+ */`
	`2728`	`+Assert(!is_partition);`
	`2729`	`+`
`2724`	`2730`	`/*`
`2725`	`2731`	`* Yes, try to merge the two column definitions.`
`2726`	`2732`	`*/`
`@@ -2792,12 +2798,9 @@ MergeAttributes(List columns, const List supers, char relpersistence,`
`2792`	`2798`
`2793`	`2799`	`/*`
`2794`	`2800`	`* In regular inheritance, columns in the parent's primary key`
`2795`		`- * get an extra not-null constraint. Partitioning doesn't`
`2796`		`- * need this, because the PK itself is going to be cloned to`
`2797`		`- * the partition.`
	`2801`	`+ * get an extra not-null constraint.`
`2798`	`2802`	`*/`
`2799`		`-if (!is_partition &&`
`2800`		`-bms_is_member(parent_attno - FirstLowInvalidHeapAttributeNumber,`
	`2803`	`+if (bms_is_member(parent_attno - FirstLowInvalidHeapAttributeNumber,`
`2801`	`2804`	`pkattrs))`
`2802`	`2805`	`{`
`2803`	`2806`	`CookedConstraint *nn;`

Comments

(0)