include parent into Runtime[Merge]Append's plan if asked to, introduce macro PrelParentRelid

funbringer · funbringer · commit c78ee4ed5e06 · 2016-08-30T15:25:14.000+03:00
diff --git a/src/init.c b/src/init.c
@@ -373,7 +373,7 @@ fill_prel_with_partitions(const Oid *partitions,
 				DisablePathman(); /* disable pg_pathman since config is broken */
 				ereport(ERROR,
 						(errmsg("Unknown partitioning type for relation \"%s\"",
-								get_rel_name_or_relid(prel->key)),
+								get_rel_name_or_relid(PrelParentRelid(prel))),
 						 errhint(INIT_ERROR_HINT)));
 			}
 		}
@@ -419,7 +419,7 @@ fill_prel_with_partitions(const Oid *partitions,
 				DisablePathman(); /* disable pg_pathman since config is broken */
 				elog(ERROR, "pg_pathman's cache for relation \"%s\" "
 							"has not been properly initialized",
-					 get_rel_name_or_relid(prel->key));
+					 get_rel_name_or_relid(PrelParentRelid(prel)));
 			}
 		}
 #endif
diff --git a/src/nodes_common.c b/src/nodes_common.c
@@ -248,6 +248,12 @@ get_partition_oids(List *ranges, int *n, const PartRelationInfo *prel)
 	Oid		   *result = (Oid *) palloc(allocated * sizeof(Oid));
 	Oid		   *children = PrelGetChildrenArray(prel);
 
+	/* If required, add parent to result */
+	Assert(INITIAL_ALLOC_NUM >= 1);
+	if (prel->enable_parent)
+		result[used++] = PrelParentRelid(prel);
+
+	/* Deal with selected partitions */
 	foreach (range_cell, ranges)
 	{
 		uint32	i;
@@ -366,6 +372,10 @@ create_append_plan_common(PlannerInfo *root, RelOptInfo *rel,
 		{
 			Plan		   *child_plan = (Plan *) lfirst(lc2);
 			RelOptInfo 	   *child_rel = ((Path *) lfirst(lc1))->parent;
+			Oid				child_relid;
+
+			/* Fetch relid of the 'child_rel' */
+			child_relid = root->simple_rte_array[child_rel->relid]->relid;
 
 			/* Replace rel's  tlist with a matching one */
 			if (!cscan->scan.plan.targetlist)
@@ -380,6 +390,10 @@ create_append_plan_common(PlannerInfo *root, RelOptInfo *rel,
 			if (!cscan->custom_scan_tlist)
 				cscan->custom_scan_tlist = replace_tlist_varnos(child_plan->targetlist,
 																rel);
+
+			/* If this is a plan for parent table, fill it with quals */
+			if (PrelParentRelid(prel) == child_relid)
+				child_plan->qual = get_actual_clauses(clauses);
 		}
 	}
 
diff --git a/src/pg_pathman.c b/src/pg_pathman.c
@@ -900,13 +900,13 @@ create_partitions_internal(Oid relid, Datum value, Oid value_type)
 				elog(ERROR, "Could not connect using SPI");
 
 			/* while (value >= MAX) ... */
-			spawn_partitions(prel->key, value, max_rvalue, prel->atttype,
-							 &interval_type_cmp, interval_binary,
+			spawn_partitions(PrelParentRelid(prel), value, max_rvalue,
+							 prel->atttype, &interval_type_cmp, interval_binary,
 							 interval_type, true, &partid);
 
 			/* while (value < MIN) ... */
-			spawn_partitions(prel->key, value, min_rvalue, prel->atttype,
-							 &interval_type_cmp, interval_binary,
+			spawn_partitions(PrelParentRelid(prel), value, min_rvalue,
+							 prel->atttype, &interval_type_cmp, interval_binary,
 							 interval_type, false, &partid);
 
 			SPI_finish(); /* close SPI connection */
diff --git a/src/relation_info.h b/src/relation_info.h
@@ -96,6 +96,8 @@ typedef enum
  * PartRelationInfo field access macros.
  */
 
+#define PrelParentRelid(prel)		( (prel)->key )
+
 #define PrelGetChildrenArray(prel)	( (prel)->children )
 
 #define PrelGetRangesArray(prel)	( (prel)->ranges )
@@ -111,7 +113,7 @@ PrelLastChild(const PartRelationInfo *prel)
 
 	if (PrelChildrenCount(prel) == 0)
 		elog(ERROR, "pg_pathman's cache entry for relation %u has 0 children",
-			 prel->key);
+			 PrelParentRelid(prel));
 
 	return PrelChildrenCount(prel) - 1; /* last partition */
 }
@@ -161,7 +163,7 @@ FreeChildrenArray(PartRelationInfo *prel)
 			Oid child = (prel)->children[i];
 
 			/* If it's *always been* relid's partition, free cache */
-			if (prel->key == get_parent_of_partition(child, NULL))
+			if (PrelParentRelid(prel) == get_parent_of_partition(child, NULL))
 				forget_parent_of_partition(child, NULL);
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -373,7 +373,7 @@ fill_prel_with_partitions(const Oid *partitions,`
`373`	`373`	`DisablePathman(); /* disable pg_pathman since config is broken */`
`374`	`374`	`ereport(ERROR,`
`375`	`375`	`(errmsg("Unknown partitioning type for relation \"%s\"",`
`376`		`- get_rel_name_or_relid(prel->key)),`
	`376`	`+ get_rel_name_or_relid(PrelParentRelid(prel))),`
`377`	`377`	`errhint(INIT_ERROR_HINT)));`
`378`	`378`	`}`
`379`	`379`	`}`
`@@ -419,7 +419,7 @@ fill_prel_with_partitions(const Oid *partitions,`
`419`	`419`	`DisablePathman(); /* disable pg_pathman since config is broken */`
`420`	`420`	`elog(ERROR, "pg_pathman's cache for relation \"%s\" "`
`421`	`421`	`"has not been properly initialized",`
`422`		`- get_rel_name_or_relid(prel->key));`
	`422`	`+ get_rel_name_or_relid(PrelParentRelid(prel)));`
`423`	`423`	`}`
`424`	`424`	`}`
`425`	`425`	`#endif`