Merge latest changes from master

funbringer · funbringer · commit 691c6e1529be · 2016-06-17T03:51:29.000+03:00
diff --git a/expected/pg_pathman.out b/expected/pg_pathman.out
@@ -114,6 +114,8 @@ SELECT COUNT(*) FROM ONLY test.num_range_rel;
      0
 (1 row)
 
+SELECT * FROM ONLY test.range_rel UNION SELECT * FROM test.range_rel;
+ERROR:  It is prohibited to query partitioned tables both with and without ONLY modifier
 SET pg_pathman.enable_runtimeappend = OFF;
 SET pg_pathman.enable_runtimemergeappend = OFF;
 VACUUM;
diff --git a/sql/pg_pathman.sql b/sql/pg_pathman.sql
@@ -46,6 +46,8 @@ INSERT INTO test.num_range_rel
 SELECT COUNT(*) FROM test.num_range_rel;
 SELECT COUNT(*) FROM ONLY test.num_range_rel;
 
+SELECT * FROM ONLY test.range_rel UNION SELECT * FROM test.range_rel;
+
 SET pg_pathman.enable_runtimeappend = OFF;
 SET pg_pathman.enable_runtimemergeappend = OFF;
 
diff --git a/src/hooks.c b/src/hooks.c
@@ -165,7 +165,8 @@ pathman_rel_pathlist_hook(PlannerInfo *root, RelOptInfo *rel, Index rti, RangeTb
 		return;
 
 	/* This works only for SELECT queries (at least for now) */
-	if (root->parse->commandType != CMD_SELECT || !inheritance_disabled)
+	if (root->parse->commandType != CMD_SELECT ||
+		!list_member_oid(inheritance_enabled_relids, rte->relid))
 		return;
 
 	/* Lookup partitioning information for parent relation */
@@ -372,7 +373,6 @@ pathman_planner_hook(Query *parse, int cursorOptions, ParamListInfo boundParams)
 
 	if (pg_pathman_enable)
 	{
-		inheritance_disabled = false;
 		switch(parse->commandType)
 		{
 			case CMD_SELECT:
@@ -421,6 +421,9 @@ pathman_planner_hook(Query *parse, int cursorOptions, ParamListInfo boundParams)
 			postprocess_lock_rows(result->rtable, (Plan *) lfirst(lc));
 	}
 
+	list_free(inheritance_disabled_relids);
+	inheritance_disabled_relids = NIL;
+
 	return result;
 }
 
@@ -436,6 +439,9 @@ pathman_post_parse_analysis_hook(ParseState *pstate, Query *query)
 
 	if (post_parse_analyze_hook_next)
 		post_parse_analyze_hook_next(pstate, query);
+
+	inheritance_disabled_relids = NIL;
+	inheritance_enabled_relids = NIL;
 }
 
 void
diff --git a/src/pathman.h b/src/pathman.h
@@ -133,14 +133,25 @@ typedef struct PathmanState
 	DsmArray		databases;
 } PathmanState;
 
+
 typedef enum
 {
 	SEARCH_RANGEREL_OUT_OF_RANGE = 0,
 	SEARCH_RANGEREL_GAP,
 	SEARCH_RANGEREL_FOUND
 } search_rangerel_result;
 
-extern bool				inheritance_disabled;
+
+/*
+ * The list of partitioned relation relids that must be handled by pg_pathman
+ */
+extern List			   *inheritance_enabled_relids;
+/*
+ * This list is used to ensure that partitioned relation isn't used both
+ * with and without ONLY modifiers
+ */
+extern List			   *inheritance_disabled_relids;
+
 extern bool 			pg_pathman_enable;
 extern PathmanState    *pmstate;
 
diff --git a/src/pg_pathman.c b/src/pg_pathman.c
@@ -47,7 +47,8 @@
 PG_MODULE_MAGIC;
 
 
-bool			inheritance_disabled;
+List		   *inheritance_disabled_relids = NIL;
+List		   *inheritance_enabled_relids = NIL;
 bool			pg_pathman_enable;
 PathmanState   *pmstate;
 
@@ -199,6 +200,7 @@ disable_inheritance(Query *parse)
 	foreach(lc, parse->rtable)
 	{
 		rte = (RangeTblEntry *) lfirst(lc);
+
 		switch(rte->rtekind)
 		{
 			case RTE_RELATION:
@@ -215,9 +217,28 @@ disable_inheritance(Query *parse)
 						 * when user uses ONLY statement from case when we
 						 * make rte->inh false intentionally.
 						 */
-						inheritance_disabled = true;
+						inheritance_enabled_relids = \
+							lappend_oid(inheritance_enabled_relids, rte->relid);
+
+						/*
+						 * Check if relation was already found with ONLY modifier. In
+						 * this case throw an error because we cannot handle
+						 * situations when partitioned table used both with and
+						 * without ONLY modifier in SELECT queries
+						 */
+						if (list_member_oid(inheritance_disabled_relids, rte->relid))
+							goto disable_error;
+
+						goto disable_next;
 					}
 				}
+
+				inheritance_disabled_relids = \
+					lappend_oid(inheritance_disabled_relids, rte->relid);
+
+				/* Check if relation was already found withoud ONLY modifier */
+				if (list_member_oid(inheritance_enabled_relids, rte->relid))
+						goto disable_error;
 				break;
 			case RTE_SUBQUERY:
 				/* Recursively disable inheritance for subqueries */
@@ -226,7 +247,16 @@ disable_inheritance(Query *parse)
 			default:
 				break;
 		}
+
+disable_next:
+		;
 	}
+
+	return;
+
+disable_error:
+	elog(ERROR, "It is prohibited to query partitioned tables both "
+				"with and without ONLY modifier");
 }
 
 void

Original file line number	Diff line number	Diff line change
`@@ -114,6 +114,8 @@ SELECT COUNT(*) FROM ONLY test.num_range_rel;`
`114`	`114`	`0`
`115`	`115`	`(1 row)`
`116`	`116`
	`117`	`+SELECT * FROM ONLY test.range_rel UNION SELECT * FROM test.range_rel;`
	`118`	`+ERROR: It is prohibited to query partitioned tables both with and without ONLY modifier`
`117`	`119`	`SET pg_pathman.enable_runtimeappend = OFF;`
`118`	`120`	`SET pg_pathman.enable_runtimemergeappend = OFF;`
`119`	`121`	`VACUUM;`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,8 @@ pathman_rel_pathlist_hook(PlannerInfo root, RelOptInfo rel, Index rti, RangeTb`
`165`	`165`	`return;`
`166`	`166`
`167`	`167`	`/* This works only for SELECT queries (at least for now) */`
`168`		`- if (root->parse->commandType != CMD_SELECT \|\| !inheritance_disabled)`
	`168`	`+ if (root->parse->commandType != CMD_SELECT \|\|`
	`169`	`+ !list_member_oid(inheritance_enabled_relids, rte->relid))`
`169`	`170`	`return;`
`170`	`171`
`171`	`172`	`/* Lookup partitioning information for parent relation */`
`@@ -372,7 +373,6 @@ pathman_planner_hook(Query *parse, int cursorOptions, ParamListInfo boundParams)`
`372`	`373`
`373`	`374`	`if (pg_pathman_enable)`
`374`	`375`	`{`
`375`		`- inheritance_disabled = false;`
`376`	`376`	`switch(parse->commandType)`
`377`	`377`	`{`
`378`	`378`	`case CMD_SELECT:`
`@@ -421,6 +421,9 @@ pathman_planner_hook(Query *parse, int cursorOptions, ParamListInfo boundParams)`
`421`	`421`	`postprocess_lock_rows(result->rtable, (Plan *) lfirst(lc));`
`422`	`422`	`}`
`423`	`423`
	`424`	`+ list_free(inheritance_disabled_relids);`
	`425`	`+ inheritance_disabled_relids = NIL;`
	`426`	`+`
`424`	`427`	`return result;`
`425`	`428`	`}`
`426`	`429`
`@@ -436,6 +439,9 @@ pathman_post_parse_analysis_hook(ParseState pstate, Query query)`
`436`	`439`
`437`	`440`	`if (post_parse_analyze_hook_next)`
`438`	`441`	`post_parse_analyze_hook_next(pstate, query);`
	`442`	`+`
	`443`	`+ inheritance_disabled_relids = NIL;`
	`444`	`+ inheritance_enabled_relids = NIL;`
`439`	`445`	`}`
`440`	`446`
`441`	`447`	`void`