improve checks for DELETE FROM part_table USING part_table

funbringer · funbringer · commit 4d29720b50b3 · 2017-09-22T20:16:58.000+03:00
diff --git a/expected/pathman_upd_del.out b/expected/pathman_upd_del.out
@@ -10,7 +10,7 @@ CREATE EXTENSION pg_pathman SCHEMA pathman;
 CREATE SCHEMA test;
 SET enable_indexscan = ON;
 SET enable_seqscan = OFF;
-/* Temporary table for JOINs */
+/* Temporary tables for JOINs */
 CREATE TABLE test.tmp (id INTEGER NOT NULL, value INTEGER NOT NULL);
 INSERT INTO test.tmp VALUES (1, 1), (2, 2);
 CREATE TABLE test.tmp2 (id INTEGER NOT NULL, value INTEGER NOT NULL);
@@ -35,6 +35,7 @@ SELECT pathman.create_range_partitions('test.range_rel', 'dt',
                       12
 (1 row)
 
+VACUUM ANALYZE;
 /*
  * Test UPDATE and DELETE
  */
@@ -111,16 +112,15 @@ ROLLBACK;
 EXPLAIN (COSTS OFF)
 UPDATE test.range_rel r SET value = t.value
 FROM test.tmp t WHERE r.dt = '2010-01-01' AND r.id = t.id;
-                                         QUERY PLAN                                         
---------------------------------------------------------------------------------------------
+                                      QUERY PLAN                                      
+--------------------------------------------------------------------------------------
  Update on range_rel_1 r
-   ->  Hash Join
-         Hash Cond: (t.id = r.id)
+   ->  Nested Loop
+         Join Filter: (r.id = t.id)
+         ->  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)
          ->  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)
+(6 rows)
 
 BEGIN;
 UPDATE test.range_rel r SET value = t.value
@@ -130,17 +130,16 @@ ROLLBACK;
 EXPLAIN (COSTS OFF)
 UPDATE test.tmp t SET value = r.value
 FROM test.range_rel r WHERE r.dt = '2010-01-01' AND r.id = t.id;
-                                            QUERY PLAN                                            
---------------------------------------------------------------------------------------------------
+                                         QUERY PLAN                                         
+--------------------------------------------------------------------------------------------
  Update on tmp t
-   ->  Hash Join
-         Hash Cond: (t.id = r.id)
+   ->  Nested Loop
          ->  Seq Scan on tmp t
-         ->  Hash
-               ->  Append
-                     ->  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)
-(8 rows)
+         ->  Append
+               ->  Index Scan using range_rel_1_pkey on range_rel_1 r
+                     Index Cond: (id = t.id)
+                     Filter: (dt = 'Fri Jan 01 00:00:00 2010'::timestamp without time zone)
+(7 rows)
 
 BEGIN;
 UPDATE test.tmp t SET value = r.value
@@ -150,16 +149,15 @@ ROLLBACK;
 EXPLAIN (COSTS OFF)
 DELETE FROM test.range_rel r USING test.tmp t
 WHERE r.dt = '2010-01-02' AND r.id = t.id;
-                                         QUERY PLAN                                         
---------------------------------------------------------------------------------------------
+                                      QUERY PLAN                                      
+--------------------------------------------------------------------------------------
  Delete on range_rel_1 r
-   ->  Hash Join
-         Hash Cond: (t.id = r.id)
+   ->  Nested Loop
+         Join Filter: (r.id = t.id)
+         ->  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)
          ->  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)
+(6 rows)
 
 BEGIN;
 DELETE FROM test.range_rel r USING test.tmp t
@@ -169,22 +167,118 @@ ROLLBACK;
 EXPLAIN (COSTS OFF)
 DELETE FROM test.tmp t USING test.range_rel r
 WHERE r.dt = '2010-01-02' AND r.id = t.id;
-                                            QUERY PLAN                                            
---------------------------------------------------------------------------------------------------
+                                         QUERY PLAN                                         
+--------------------------------------------------------------------------------------------
  Delete on tmp t
-   ->  Hash Join
-         Hash Cond: (t.id = r.id)
+   ->  Nested Loop
          ->  Seq Scan on tmp t
-         ->  Hash
-               ->  Append
-                     ->  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)
-(8 rows)
+         ->  Append
+               ->  Index Scan using range_rel_1_pkey on range_rel_1 r
+                     Index Cond: (id = t.id)
+                     Filter: (dt = 'Sat Jan 02 00:00:00 2010'::timestamp without time zone)
+(7 rows)
 
 BEGIN;
 DELETE FROM test.tmp t USING test.range_rel r
 WHERE r.dt = '2010-01-02' AND r.id = t.id;
 ROLLBACK;
+/* DELETE + USING, two partitioned tables */
+EXPLAIN (COSTS OFF)
+DELETE FROM test.range_rel r USING test.tmp2 t
+WHERE t.id = r.id;
+ERROR:  DELETE and UPDATE queries with a join of partitioned tables are not supported
+BEGIN;
+DELETE FROM test.range_rel r USING test.tmp2 t
+WHERE t.id = r.id;
+ERROR:  DELETE and UPDATE queries with a join of partitioned tables are not supported
+ROLLBACK;
+/* DELETE + USING, partitioned table + two partitioned tables in subselect */
+EXPLAIN (COSTS OFF)
+DELETE FROM test.range_rel r
+USING (SELECT *
+	   FROM test.tmp2 a1
+	   JOIN test.tmp2 a2
+	   USING(id)) t
+WHERE t.id = r.id;
+ERROR:  DELETE and UPDATE queries with a join of partitioned tables are not supported
+BEGIN;
+DELETE FROM test.range_rel r
+USING (SELECT *
+	   FROM test.tmp2 a1
+	   JOIN test.tmp2 a2
+	   USING(id)) t
+WHERE t.id = r.id;
+ERROR:  DELETE and UPDATE queries with a join of partitioned tables are not supported
+ROLLBACK;
+/* DELETE + USING, single table + two partitioned tables in subselect */
+EXPLAIN (COSTS OFF)
+DELETE FROM test.tmp r
+USING (SELECT *
+	   FROM test.tmp2 a1
+	   JOIN test.tmp2 a2
+	   USING(id)) t
+WHERE t.id = r.id;
+                      QUERY PLAN                      
+------------------------------------------------------
+ Delete on tmp r
+   ->  Nested Loop
+         Join Filter: (a1.id = a2.id)
+         ->  Append
+               ->  Seq Scan on tmp2_1 a2
+               ->  Seq Scan on tmp2_2 a2_1
+               ->  Seq Scan on tmp2_3 a2_2
+               ->  Seq Scan on tmp2_4 a2_3
+               ->  Seq Scan on tmp2_5 a2_4
+               ->  Seq Scan on tmp2_6 a2_5
+               ->  Seq Scan on tmp2_7 a2_6
+               ->  Seq Scan on tmp2_8 a2_7
+               ->  Seq Scan on tmp2_9 a2_8
+               ->  Seq Scan on tmp2_10 a2_9
+         ->  Materialize
+               ->  Nested Loop
+                     ->  Seq Scan on tmp r
+                     ->  Custom Scan (RuntimeAppend)
+                           Prune by: (r.id = a1.id)
+                           ->  Seq Scan on tmp2_1 a1
+                                 Filter: (r.id = id)
+                           ->  Seq Scan on tmp2_2 a1
+                                 Filter: (r.id = id)
+                           ->  Seq Scan on tmp2_3 a1
+                                 Filter: (r.id = id)
+                           ->  Seq Scan on tmp2_4 a1
+                                 Filter: (r.id = id)
+                           ->  Seq Scan on tmp2_5 a1
+                                 Filter: (r.id = id)
+                           ->  Seq Scan on tmp2_6 a1
+                                 Filter: (r.id = id)
+                           ->  Seq Scan on tmp2_7 a1
+                                 Filter: (r.id = id)
+                           ->  Seq Scan on tmp2_8 a1
+                                 Filter: (r.id = id)
+                           ->  Seq Scan on tmp2_9 a1
+                                 Filter: (r.id = id)
+                           ->  Seq Scan on tmp2_10 a1
+                                 Filter: (r.id = id)
+(39 rows)
+
+BEGIN;
+DELETE FROM test.tmp r
+USING (SELECT *
+	   FROM test.tmp2 a1
+	   JOIN test.tmp2 a2
+	   USING(id)) t
+WHERE t.id = r.id;
+ROLLBACK;
+/* UPDATE + FROM, two partitioned tables */
+EXPLAIN (COSTS OFF)
+UPDATE test.range_rel r SET value = 1 FROM test.tmp2 t
+WHERE t.id = r.id;
+ERROR:  DELETE and UPDATE queries with a join of partitioned tables are not supported
+BEGIN;
+UPDATE test.range_rel r SET value = 1 FROM test.tmp2 t
+WHERE t.id = r.id;
+ERROR:  DELETE and UPDATE queries with a join of partitioned tables are not supported
+ROLLBACK;
 /* Test special rule for CTE; SELECT (PostgreSQL 9.5) */
 EXPLAIN (COSTS OFF)
 WITH q AS (SELECT * FROM test.range_rel r
@@ -198,10 +292,9 @@ DELETE FROM test.tmp USING q;
            ->  Seq Scan on range_rel_1 r
                  Filter: (dt = 'Sat Jan 02 00:00:00 2010'::timestamp without time zone)
    ->  Nested Loop
+         ->  Seq Scan on tmp
          ->  CTE Scan on q
-         ->  Materialize
-               ->  Seq Scan on tmp
-(9 rows)
+(8 rows)
 
 BEGIN;
 WITH q AS (SELECT * FROM test.range_rel r
@@ -222,10 +315,9 @@ DELETE FROM test.tmp USING q;
            ->  Seq Scan on range_rel_1 r
                  Filter: (dt = 'Sat Jan 02 00:00:00 2010'::timestamp without time zone)
    ->  Nested Loop
+         ->  Seq Scan on tmp
          ->  CTE Scan on q
-         ->  Materialize
-               ->  Seq Scan on tmp
-(9 rows)
+(8 rows)
 
 BEGIN;
 WITH q AS (DELETE FROM test.range_rel r
@@ -240,23 +332,21 @@ WITH q AS (DELETE FROM test.tmp t
 		   WHERE r.dt = '2010-01-02' AND r.id = t.id
 		   RETURNING *)
 DELETE FROM test.tmp USING q;
-                                                QUERY PLAN                                                
-----------------------------------------------------------------------------------------------------------
+                                             QUERY PLAN                                             
+----------------------------------------------------------------------------------------------------
  Delete on tmp
    CTE q
      ->  Delete on tmp t
-           ->  Hash Join
-                 Hash Cond: (t.id = r.id)
+           ->  Nested Loop
                  ->  Seq Scan on tmp t
-                 ->  Hash
-                       ->  Append
-                             ->  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)
+                 ->  Append
+                       ->  Index Scan using range_rel_1_pkey on range_rel_1 r
+                             Index Cond: (id = t.id)
+                             Filter: (dt = 'Sat Jan 02 00:00:00 2010'::timestamp without time zone)
    ->  Nested Loop
+         ->  Seq Scan on tmp
          ->  CTE Scan on q
-         ->  Materialize
-               ->  Seq Scan on tmp
-(14 rows)
+(12 rows)
 
 BEGIN;
 WITH q AS (DELETE FROM test.tmp t
@@ -265,9 +355,6 @@ WITH q AS (DELETE FROM test.tmp t
 		   RETURNING *)
 DELETE FROM test.tmp USING q;
 ROLLBACK;
-/* Test special rule for CTE; DELETE + USING with partitioned table */
-DELETE FROM test.range_rel r USING test.tmp2 t WHERE t.id = r.id;
-ERROR:  pg_pathman doesn't support DELETE queries with joining of partitioned tables
 DROP SCHEMA test CASCADE;
 NOTICE:  drop cascades to 27 other objects
 DROP EXTENSION pg_pathman CASCADE;
diff --git a/sql/pathman_upd_del.sql b/sql/pathman_upd_del.sql
@@ -17,7 +17,7 @@ SET enable_indexscan = ON;
 SET enable_seqscan = OFF;
 
 
-/* Temporary table for JOINs */
+/* Temporary tables for JOINs */
 CREATE TABLE test.tmp (id INTEGER NOT NULL, value INTEGER NOT NULL);
 INSERT INTO test.tmp VALUES (1, 1), (2, 2);
 
@@ -39,6 +39,9 @@ SELECT pathman.create_range_partitions('test.range_rel', 'dt',
 									   12);
 
 
+VACUUM ANALYZE;
+
+
 /*
  * Test UPDATE and DELETE
  */
@@ -123,6 +126,66 @@ WHERE r.dt = '2010-01-02' AND r.id = t.id;
 ROLLBACK;
 
 
+/* DELETE + USING, two partitioned tables */
+EXPLAIN (COSTS OFF)
+DELETE FROM test.range_rel r USING test.tmp2 t
+WHERE t.id = r.id;
+
+BEGIN;
+DELETE FROM test.range_rel r USING test.tmp2 t
+WHERE t.id = r.id;
+ROLLBACK;
+
+
+/* DELETE + USING, partitioned table + two partitioned tables in subselect */
+EXPLAIN (COSTS OFF)
+DELETE FROM test.range_rel r
+USING (SELECT *
+	   FROM test.tmp2 a1
+	   JOIN test.tmp2 a2
+	   USING(id)) t
+WHERE t.id = r.id;
+
+BEGIN;
+DELETE FROM test.range_rel r
+USING (SELECT *
+	   FROM test.tmp2 a1
+	   JOIN test.tmp2 a2
+	   USING(id)) t
+WHERE t.id = r.id;
+ROLLBACK;
+
+
+/* DELETE + USING, single table + two partitioned tables in subselect */
+EXPLAIN (COSTS OFF)
+DELETE FROM test.tmp r
+USING (SELECT *
+	   FROM test.tmp2 a1
+	   JOIN test.tmp2 a2
+	   USING(id)) t
+WHERE t.id = r.id;
+
+BEGIN;
+DELETE FROM test.tmp r
+USING (SELECT *
+	   FROM test.tmp2 a1
+	   JOIN test.tmp2 a2
+	   USING(id)) t
+WHERE t.id = r.id;
+ROLLBACK;
+
+
+/* UPDATE + FROM, two partitioned tables */
+EXPLAIN (COSTS OFF)
+UPDATE test.range_rel r SET value = 1 FROM test.tmp2 t
+WHERE t.id = r.id;
+
+BEGIN;
+UPDATE test.range_rel r SET value = 1 FROM test.tmp2 t
+WHERE t.id = r.id;
+ROLLBACK;
+
+
 /* Test special rule for CTE; SELECT (PostgreSQL 9.5) */
 EXPLAIN (COSTS OFF)
 WITH q AS (SELECT * FROM test.range_rel r
@@ -167,8 +230,7 @@ WITH q AS (DELETE FROM test.tmp t
 DELETE FROM test.tmp USING q;
 ROLLBACK;
 
-/* Test special rule for CTE; DELETE + USING with partitioned table */
-DELETE FROM test.range_rel r USING test.tmp2 t WHERE t.id = r.id;
+
 
 DROP SCHEMA test CASCADE;
 DROP EXTENSION pg_pathman CASCADE;
diff --git a/src/hooks.c b/src/hooks.c
