fix INSERT INTO ... SELECT ... FROM partitioned_table (+tests)

funbringer · funbringer · commit 1823fbbbc5ee · 2016-11-05T03:46:09.000+03:00
diff --git a/expected/pathman_basic.out b/expected/pathman_basic.out
@@ -262,6 +262,64 @@ EXPLAIN (COSTS OFF) SELECT * FROM test.improved_dummy WHERE id = 101 OR id = 5 A
 
 DROP TABLE test.improved_dummy CASCADE;
 NOTICE:  drop cascades to 11 other objects
+/* Test pathman_rel_pathlist_hook() with INSERT query */
+CREATE TABLE test.insert_into_select(val int NOT NULL);
+INSERT INTO test.insert_into_select SELECT generate_series(1, 100);
+SELECT pathman.create_range_partitions('test.insert_into_select', 'val', 1, 20);
+NOTICE:  sequence "insert_into_select_seq" does not exist, skipping
+ create_range_partitions 
+-------------------------
+                       5
+(1 row)
+
+CREATE TABLE test.insert_into_select_copy (LIKE test.insert_into_select); /* INSERT INTO ... SELECT ... */
+EXPLAIN (COSTS OFF)
+INSERT INTO test.insert_into_select_copy
+SELECT * FROM test.insert_into_select
+WHERE val <= 80;
+                  QUERY PLAN                  
+----------------------------------------------
+ Insert on insert_into_select_copy
+   ->  Append
+         ->  Seq Scan on insert_into_select_1
+         ->  Seq Scan on insert_into_select_2
+         ->  Seq Scan on insert_into_select_3
+         ->  Seq Scan on insert_into_select_4
+               Filter: (val <= 80)
+(7 rows)
+
+SELECT pathman.set_enable_parent('test.insert_into_select', true);
+ set_enable_parent 
+-------------------
+ 
+(1 row)
+
+EXPLAIN (COSTS OFF)
+INSERT INTO test.insert_into_select_copy
+SELECT * FROM test.insert_into_select
+WHERE val <= 80;
+                  QUERY PLAN                  
+----------------------------------------------
+ Insert on insert_into_select_copy
+   ->  Append
+         ->  Seq Scan on insert_into_select
+               Filter: (val <= 80)
+         ->  Seq Scan on insert_into_select_1
+         ->  Seq Scan on insert_into_select_2
+         ->  Seq Scan on insert_into_select_3
+         ->  Seq Scan on insert_into_select_4
+               Filter: (val <= 80)
+(9 rows)
+
+INSERT INTO test.insert_into_select_copy SELECT * FROM test.insert_into_select;
+SELECT count(*) FROM test.insert_into_select_copy;
+ count 
+-------
+   100
+(1 row)
+
+DROP TABLE test.insert_into_select_copy, test.insert_into_select CASCADE;
+NOTICE:  drop cascades to 5 other objects
 /* test special case: ONLY statement with not-ONLY for partitioned table */
 CREATE TABLE test.from_only_test(val INT NOT NULL);
 INSERT INTO test.from_only_test SELECT generate_series(1, 20);
@@ -1909,6 +1967,6 @@ EXPLAIN (COSTS OFF) SELECT * FROM test.index_on_childs WHERE c1 > 100 AND c1 < 2
 (12 rows)
 
 DROP SCHEMA test CASCADE;
-NOTICE:  drop cascades to 47 other objects
+NOTICE:  drop cascades to 48 other objects
 DROP EXTENSION pg_pathman CASCADE;
 DROP SCHEMA pathman CASCADE;
diff --git a/sql/pathman_basic.sql b/sql/pathman_basic.sql
@@ -78,6 +78,29 @@ EXPLAIN (COSTS OFF) SELECT * FROM test.improved_dummy WHERE id = 101 OR id = 5 A
 DROP TABLE test.improved_dummy CASCADE;
 
 
+/* Test pathman_rel_pathlist_hook() with INSERT query */
+CREATE TABLE test.insert_into_select(val int NOT NULL);
+INSERT INTO test.insert_into_select SELECT generate_series(1, 100);
+SELECT pathman.create_range_partitions('test.insert_into_select', 'val', 1, 20);
+CREATE TABLE test.insert_into_select_copy (LIKE test.insert_into_select); /* INSERT INTO ... SELECT ... */
+
+EXPLAIN (COSTS OFF)
+INSERT INTO test.insert_into_select_copy
+SELECT * FROM test.insert_into_select
+WHERE val <= 80;
+
+SELECT pathman.set_enable_parent('test.insert_into_select', true);
+
+EXPLAIN (COSTS OFF)
+INSERT INTO test.insert_into_select_copy
+SELECT * FROM test.insert_into_select
+WHERE val <= 80;
+
+INSERT INTO test.insert_into_select_copy SELECT * FROM test.insert_into_select;
+SELECT count(*) FROM test.insert_into_select_copy;
+DROP TABLE test.insert_into_select_copy, test.insert_into_select CASCADE;
+
+
 /* test special case: ONLY statement with not-ONLY for partitioned table */
 CREATE TABLE test.from_only_test(val INT NOT NULL);
 INSERT INTO test.from_only_test SELECT generate_series(1, 20);
diff --git a/src/hooks.c b/src/hooks.c
@@ -204,10 +204,11 @@ pathman_rel_pathlist_hook(PlannerInfo *root,
 	if (!IsPathmanReady())
 		return;
 
-	/* This works only for SELECTs on simple relations */
-	if (root->parse->commandType != CMD_SELECT ||
-		rte->rtekind != RTE_RELATION ||
-		rte->relkind != RELKIND_RELATION)
+	/* This works only for SELECTs or INSERTs on simple relations */
+	if (rte->rtekind != RTE_RELATION ||
+		rte->relkind != RELKIND_RELATION ||
+			(root->parse->commandType != CMD_SELECT &&
+			 root->parse->commandType != CMD_INSERT)) /* INSERT INTO ... SELECT ... */
 		return;
 
 	/* Skip if this table is not allowed to act as parent (see FROM ONLY) */
