Commitd38e7c9

committed

Fix segfault on DELETE .. USING with joins of partitioned tables

1 parent713c5f9 commitd38e7c9Copy full SHA for d38e7c9

File tree

+36

-2

lines changed

+36

-2

lines changed

Lines changed: 11 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,13 @@ SET enable_seqscan = OFF;`
`13`	`13`	`/* Temporary table for JOINs */`
`14`	`14`	`CREATE TABLE test.tmp (id INTEGER NOT NULL, value INTEGER NOT NULL);`
`15`	`15`	`INSERT INTO test.tmp VALUES (1, 1), (2, 2);`
	`16`	`+CREATE TABLE test.tmp2 (id INTEGER NOT NULL, value INTEGER NOT NULL);`
	`17`	`+SELECT pathman.create_range_partitions('test.tmp2', 'id', 1, 1, 10);`
	`18`	`+ create_range_partitions`
	`19`	`+-------------------------`
	`20`	`+ 10`
	`21`	`+(1 row)`
	`22`	`+`
`16`	`23`	`/* Partition table by RANGE */`
`17`	`24`	`CREATE TABLE test.range_rel (`
`18`	`25`	`idSERIAL PRIMARY KEY,`
`@@ -258,7 +265,10 @@ WITH q AS (DELETE FROM test.tmp t`
`258`	`265`	`RETURNING *)`
`259`	`266`	`DELETE FROM test.tmp USING q;`
`260`	`267`	`ROLLBACK;`
	`268`	`+/* Test special rule for CTE; DELETE + USING with partitioned table */`
	`269`	`+DELETE FROM test.range_rel r USING test.tmp2 t WHERE t.id = r.id;`
	`270`	`+ERROR: pg_pathman doesn't support DELETE queries with joining of partitioned tables`
`261`	`271`	`DROP SCHEMA test CASCADE;`
`262`		`-NOTICE: drop cascades to15 other objects`
	`272`	`+NOTICE: drop cascades to27 other objects`
`263`	`273`	`DROP EXTENSION pg_pathman CASCADE;`
`264`	`274`	`DROP SCHEMA pathman CASCADE;`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,9 @@ SET enable_seqscan = OFF;`
`21`	`21`	`CREATETABLEtest.tmp (idINTEGERNOT NULL, valueINTEGERNOT NULL);`
`22`	`22`	`INSERT INTOtest.tmpVALUES (1,1), (2,2);`
`23`	`23`
	`24`	`+CREATETABLEtest.tmp2 (idINTEGERNOT NULL, valueINTEGERNOT NULL);`
	`25`	`+SELECTpathman.create_range_partitions('test.tmp2','id',1,1,10);`
	`26`	`+`
`24`	`27`
`25`	`28`	`/* Partition table by RANGE*/`
`26`	`29`	`CREATETABLEtest.range_rel (`
`@@ -164,7 +167,8 @@ WITH q AS (DELETE FROM test.tmp t`
`164`	`167`	`DELETEFROMtest.tmp USING q;`
`165`	`168`	`ROLLBACK;`
`166`	`169`
`167`		`-`
	`170`	`+/* Test special rule for CTE; DELETE + USING with partitioned table*/`
	`171`	`+DELETEFROMtest.range_rel r USINGtest.tmp2 tWHEREt.id=r.id;`
`168`	`172`
`169`	`173`	`DROPSCHEMA test CASCADE;`
`170`	`174`	`DROP EXTENSION pg_pathman CASCADE;`

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,23 @@ pathman_join_pathlist_hook(PlannerInfo *root,`
`99`	`99`	`if (innerrel->reloptkind!=RELOPT_BASEREL)`
`100`	`100`	`return;`
`101`	`101`
	`102`	`+/* check if query DELETE FROM .. USING .. */`
	`103`	`+if (root->parse->commandType==CMD_DELETE&&jointype==JOIN_INNER)`
	`104`	`+{`
	`105`	`+intx=-1;`
	`106`	`+intcount=0;`
	`107`	`+`
	`108`	`+while ((x=bms_next_member(joinrel->relids,x)) >=0)`
	`109`	`+if (get_pathman_relation_info(root->simple_rte_array[x]->relid))`
	`110`	`+count+=1;`
	`111`	`+`
	`112`	`+if (count>1)`
	`113`	`+ereport(ERROR,`
	`114`	`+(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),`
	`115`	`+errmsg("pg_pathman doesn't support DELETE queries with "\`
	`116`	`+"joining of partitioned tables")));`
	`117`	`+}`
	`118`	`+`
`102`	`119`	`/* We shouldn't process tables with active children */`
`103`	`120`	`if (inner_rte->inh)`
`104`	`121`	`return;`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1916,6 +1916,9 @@ set_append_rel_pathlist(PlannerInfo root, RelOptInfo rel, Index rti,`
`1916`	`1916`	`childRTE=root->simple_rte_array[childRTindex];`
`1917`	`1917`	`childrel=root->simple_rel_array[childRTindex];`
`1918`	`1918`
	`1919`	`+if (!childrel)`
	`1920`	`+elog(ERROR,"could not make access paths to a relation");`
	`1921`	`+`
`1919`	`1922`	`#ifPG_VERSION_NUM >=90600`
`1920`	`1923`	`/*`
`1921`	`1924`	`* If parallelism is allowable for this query in general and for parent`

Comments

(0)