Improve support of UPDATE and DELETE.

Alexander Korotkov · Alexander Korotkov · commit 51f148b6c649 · 2016-03-14T15:35:31.000+03:00
diff --git a/contrib/pg_pathman/expected/pg_pathman.out b/contrib/pg_pathman/expected/pg_pathman.out
@@ -818,6 +818,9 @@ EXPLAIN (COSTS OFF) SELECT * FROM range_rel WHERE dt > '2010-12-15';
    ->  Seq Scan on range_rel_14
 (4 rows)
 
+/* Temporary table for JOINs */
+CREATE TABLE tmp (id INTEGER NOT NULL, value INTEGER NOT NULL);
+INSERT INTO tmp VALUES (1, 1), (2, 2);
 /* Test UPDATE and DELETE */
 EXPLAIN (COSTS OFF) UPDATE range_rel SET value = 111 WHERE dt = '2010-06-15';
                                    QUERY PLAN                                   
@@ -848,6 +851,32 @@ SELECT * FROM range_rel WHERE dt = '2010-06-15';
 ----+----+-------
 (0 rows)
 
+EXPLAIN (COSTS OFF) UPDATE range_rel r SET value = t.value FROM tmp t WHERE r.dt = '2010-01-01' AND r.id = t.id;
+                                         QUERY PLAN                                         
+--------------------------------------------------------------------------------------------
+ Update on range_rel_1 r
+   ->  Hash Join
+         Hash Cond: (t.id = r.id)
+         ->  Seq Scan on tmp t
+         ->  Hash
+               ->  Index Scan using range_rel_1_pkey on range_rel_1 r
+                     Filter: (dt = 'Fri Jan 01 00:00:00 2010'::timestamp without time zone)
+(7 rows)
+
+UPDATE range_rel r SET value = t.value FROM tmp t WHERE r.dt = '2010-01-01' AND r.id = t.id;
+EXPLAIN (COSTS OFF) DELETE FROM range_rel r USING tmp t WHERE r.dt = '2010-01-02' AND r.id = t.id;
+                                         QUERY PLAN                                         
+--------------------------------------------------------------------------------------------
+ Delete on range_rel_1 r
+   ->  Hash Join
+         Hash Cond: (t.id = r.id)
+         ->  Seq Scan on tmp t
+         ->  Hash
+               ->  Index Scan using range_rel_1_pkey on range_rel_1 r
+                     Filter: (dt = 'Sat Jan 02 00:00:00 2010'::timestamp without time zone)
+(7 rows)
+
+DELETE FROM range_rel r USING tmp t WHERE r.dt = '2010-01-02' AND r.id = t.id;
 /* Create range partitions from whole range */
 SELECT drop_range_partitions('range_rel');
 NOTICE:  0 rows copied from range_rel_15
@@ -863,7 +892,7 @@ NOTICE:  29 rows copied from range_rel_6
 NOTICE:  31 rows copied from range_rel_5
 NOTICE:  30 rows copied from range_rel_4
 NOTICE:  31 rows copied from range_rel_3
-NOTICE:  45 rows copied from range_rel_1
+NOTICE:  44 rows copied from range_rel_1
  drop_range_partitions 
 -----------------------
                     14
diff --git a/contrib/pg_pathman/pg_pathman.c b/contrib/pg_pathman/pg_pathman.c
@@ -21,6 +21,7 @@
 #include "optimizer/planner.h"
 #include "optimizer/restrictinfo.h"
 #include "optimizer/cost.h"
+#include "parser/parsetree.h"
 #include "utils/hsearch.h"
 #include "utils/tqual.h"
 #include "utils/rel.h"
@@ -276,10 +277,11 @@ handle_modification_query(Query *parse)
 	WrapperNode *wrap;
 	bool found;
 
-	if (list_length(parse->rtable) != 1)
-		return;
+	Assert(parse->commandType == CMD_UPDATE ||
+		   parse->commandType == CMD_DELETE);
+	Assert(parse->resultRelation > 0);
 
-	rte = (RangeTblEntry *) linitial(parse->rtable);
+	rte = rt_fetch(parse->resultRelation, parse->rtable);
 	prel = get_pathman_relation_info(rte->relid, &found);
 
 	if (!found)
diff --git a/contrib/pg_pathman/sql/pg_pathman.sql b/contrib/pg_pathman/sql/pg_pathman.sql
@@ -202,13 +202,21 @@ SELECT prepend_range_partition('range_rel');
 EXPLAIN (COSTS OFF) SELECT * FROM range_rel WHERE dt < '2010-03-01';
 EXPLAIN (COSTS OFF) SELECT * FROM range_rel WHERE dt > '2010-12-15';
 
+/* Temporary table for JOINs */
+CREATE TABLE tmp (id INTEGER NOT NULL, value INTEGER NOT NULL);
+INSERT INTO tmp VALUES (1, 1), (2, 2);
+
 /* Test UPDATE and DELETE */
 EXPLAIN (COSTS OFF) UPDATE range_rel SET value = 111 WHERE dt = '2010-06-15';
 UPDATE range_rel SET value = 111 WHERE dt = '2010-06-15';
 SELECT * FROM range_rel WHERE dt = '2010-06-15';
 EXPLAIN (COSTS OFF) DELETE FROM range_rel WHERE dt = '2010-06-15';
 DELETE FROM range_rel WHERE dt = '2010-06-15';
 SELECT * FROM range_rel WHERE dt = '2010-06-15';
+EXPLAIN (COSTS OFF) UPDATE range_rel r SET value = t.value FROM tmp t WHERE r.dt = '2010-01-01' AND r.id = t.id;
+UPDATE range_rel r SET value = t.value FROM tmp t WHERE r.dt = '2010-01-01' AND r.id = t.id;
+EXPLAIN (COSTS OFF) DELETE FROM range_rel r USING tmp t WHERE r.dt = '2010-01-02' AND r.id = t.id;
+DELETE FROM range_rel r USING tmp t WHERE r.dt = '2010-01-02' AND r.id = t.id;
 
 /* Create range partitions from whole range */
 SELECT drop_range_partitions('range_rel');
