fix errors found by clang-analyzer, add special rule for CTEs (PostgreSQL 9.5)

Author: funbringer

expected/pathman_upd_del.out

@@ -118,6 +118,21 @@ EXPLAIN (COSTS OFF) DELETE FROM test.tmp t USING test.range_rel r WHERE r.dt = '
 (8 rows)
 
 DELETE FROM test.tmp t USING test.range_rel r WHERE r.dt = '2010-01-02' AND r.id = t.id;
+EXPLAIN (COSTS OFF) WITH q AS (SELECT * FROM test.range_rel r WHERE r.dt = '2010-01-02') DELETE FROM test.tmp USING q;
+                                       QUERY PLAN                                       
+----------------------------------------------------------------------------------------
+ Delete on tmp
+   CTE q
+     ->  Append
+           ->  Seq Scan on range_rel_1 r
+                 Filter: (dt = 'Sat Jan 02 00:00:00 2010'::timestamp without time zone)
+   ->  Nested Loop
+         ->  CTE Scan on q
+         ->  Materialize
+               ->  Seq Scan on tmp
+(9 rows)
+
+WITH q AS (SELECT * FROM test.range_rel r WHERE r.dt = '2010-01-02') DELETE FROM test.tmp USING q;
 DROP SCHEMA test CASCADE;
 NOTICE:  drop cascades to 15 other objects
 DROP EXTENSION pg_pathman CASCADE;

expected/pathman_upd_del_1.out

@@ -120,6 +120,21 @@ EXPLAIN (COSTS OFF) DELETE FROM test.tmp t USING test.range_rel r WHERE r.dt = '
 (10 rows)
 
 DELETE FROM test.tmp t USING test.range_rel r WHERE r.dt = '2010-01-02' AND r.id = t.id;
+EXPLAIN (COSTS OFF) WITH q AS (SELECT * FROM test.range_rel r WHERE r.dt = '2010-01-02') DELETE FROM test.tmp USING q;
+                                       QUERY PLAN                                       
+----------------------------------------------------------------------------------------
+ Delete on tmp
+   CTE q
+     ->  Append
+           ->  Seq Scan on range_rel_1 r
+                 Filter: (dt = 'Sat Jan 02 00:00:00 2010'::timestamp without time zone)
+   ->  Nested Loop
+         ->  CTE Scan on q
+         ->  Materialize
+               ->  Seq Scan on tmp
+(9 rows)
+
+WITH q AS (SELECT * FROM test.range_rel r WHERE r.dt = '2010-01-02') DELETE FROM test.tmp USING q;
 DROP SCHEMA test CASCADE;
 NOTICE:  drop cascades to 15 other objects
 DROP EXTENSION pg_pathman CASCADE;

sql/pathman_upd_del.sql

@@ -5,6 +5,8 @@ CREATE SCHEMA pathman;
 CREATE EXTENSION pg_pathman SCHEMA pathman;
 CREATE SCHEMA test;
 
+
+
 SET enable_indexscan = ON;
 SET enable_seqscan = OFF;
 
@@ -46,6 +48,11 @@ DELETE FROM test.range_rel r USING test.tmp t WHERE r.dt = '2010-01-02' AND r.id
 EXPLAIN (COSTS OFF) DELETE FROM test.tmp t USING test.range_rel r WHERE r.dt = '2010-01-02' AND r.id = t.id;
 DELETE FROM test.tmp t USING test.range_rel r WHERE r.dt = '2010-01-02' AND r.id = t.id;
 
+EXPLAIN (COSTS OFF) WITH q AS (SELECT * FROM test.range_rel r WHERE r.dt = '2010-01-02') DELETE FROM test.tmp USING q;
+WITH q AS (SELECT * FROM test.range_rel r WHERE r.dt = '2010-01-02') DELETE FROM test.tmp USING q;
+
+
+
 DROP SCHEMA test CASCADE;
 DROP EXTENSION pg_pathman CASCADE;
 DROP SCHEMA pathman CASCADE;

src/hooks.c

@@ -95,8 +95,12 @@ pathman_join_pathlist_hook(PlannerInfo *root,
 	if (!IsPathmanReady() || !pg_pathman_enable_runtimeappend)
 		return;
 
+	/* We should only consider base relations */
+	if (innerrel->reloptkind != RELOPT_BASEREL)
+		return;
+
 	/* We shouldn't process tables with active children */
-	if (inner_rte && inner_rte->inh)
+	if (inner_rte->inh)
 		return;
 
 	/* We can't handle full or right outer joins */

src/planner_tree_modification.c

@@ -52,6 +52,7 @@ typedef struct
 
 	/* params for handle_modification_query() */
 	ParamListInfo	query_params;
+	SubLink		   *parent_sublink;
 } transform_query_cxt;
 
 
@@ -183,6 +184,20 @@ pathman_transform_query_walker(Node *node, void *context)
 	if (node == NULL)
 		return false;
 
+	else if (IsA(node, SubLink))
+	{
+		transform_query_cxt	   *current_context = context,
+								next_context;
+
+		/* Initialize next context for bottom subqueries */
+		next_context = *current_context;
+		next_context.parent_sublink = (SubLink *) node;
+
+		return expression_tree_walker(node,
+									  pathman_transform_query_walker,
+									  (void *) &next_context);
+	}
+
 	else if (IsA(node, Query))
 	{
 		Query				   *query = (Query *) node;
@@ -238,11 +253,17 @@ disable_standard_inheritance(Query *parse, transform_query_cxt *context)
 	Index		current_rti; /* current range table entry index */
 
 #ifdef LEGACY_ROWMARKS_95
-	/* Don't process non-topmost non-select queries */
-	if (parse->commandType != CMD_SELECT ||
-		TRANSFORM_CONTEXT_HAS_PARENT(context, UPDATE) ||
-		TRANSFORM_CONTEXT_HAS_PARENT(context, DELETE))
-		return;	
+	/* Don't process non-SELECT queries */
+	if (parse->commandType != CMD_SELECT)
+		return;
+
+	/* Don't process queries under UPDATE or DELETE (except for CTEs) */
+	if ((TRANSFORM_CONTEXT_HAS_PARENT(context, UPDATE) ||
+		 TRANSFORM_CONTEXT_HAS_PARENT(context, DELETE)) &&
+			(context->parent_sublink &&
+			 context->parent_sublink->subselect == (Node *) parse &&
+			 context->parent_sublink->subLinkType != CTE_SUBLINK))
+		return;
 #endif
 
 	/* Walk through RangeTblEntries list */