Commit01b88b4

committed

MERGE minor errata

1 parent3af7b2b commit01b88b4Copy full SHA for 01b88b4

File tree

-6

lines changed

-6

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,8 @@ consists of a super-row that contains all the columns needed by any of the`
`42`	`42`	`individual actions, plus CTID and TABLEOID junk columns. The CTID column is`
`43`	`43`	`required to know if a matching target row was found or not and the TABLEOID`
`44`	`44`	`column is needed to find the underlying target partition, in case when the`
`45`		`-target table is apartition table. When a matching target tuple is found, the`
`46`		`-CTID column identifies the matching target tuple and we attempt to activate`
	`45`	`+target table is apartitioned table. When a matching target tuple is found,`
	`46`	`+theCTID column identifies the matching tuple and we attempt to activate`
`47`	`47`	`WHEN MATCHED actions. If a matching tuple is not found, then CTID column is`
`48`	`48`	`NULL and we attempt to activate WHEN NOT MATCHED actions. Once we know which`
`49`	`49`	`action is activated we form the final result row and apply only those changes.`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ ExecMerge(ModifyTableState mtstate, EState estate, TupleTableSlot *slot,`
`51`	`51`	`Datumdatum;`
`52`	`52`	`boolisNull;`
`53`	`53`
`54`		`-Assert(resultRelInfo->ri_RelationDesc->rd_rel->relkind\|\|`
	`54`	`+Assert(resultRelInfo->ri_RelationDesc->rd_rel->relkind==RELKIND_RELATION\|\|`
`55`	`55`	`resultRelInfo->ri_RelationDesc->rd_rel->relkind==RELKIND_PARTITIONED_TABLE);`
`56`	`56`
`57`	`57`	`/*`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -314,9 +314,7 @@ ExecFindPartition(ResultRelInfo resultRelInfo, PartitionDispatch pd,`
`314`	`314`	`* Given OID of the partition leaf, return the index of the leaf in the`
`315`	`315`	`* partition hierarchy.`
`316`	`316`	`*`
`317`		`- * NB: This is an O(N) operation. Unfortunately, there are many other problem`
`318`		`- * areas with more than a handful partitions, so we don't try to optimise this`
`319`		`- * code right now.`
	`317`	`+ * XXX This is an O(N) operation and further optimization would be beneficial`
`320`	`318`	`*/`
`321`	`319`	`int`
`322`	`320`	`ExecFindPartitionByOid(PartitionTupleRouting*proute,Oidpartoid)`

Comments

(0)