fix 'spawned' in spawn_partitions(), small fixes in pl_funcs.c, get_pathman_relation_info() returns pointer to const PartRelationInfo

Author: funbringer

src/hooks.c

@@ -36,16 +36,16 @@ pathman_join_pathlist_hook(PlannerInfo *root,
 						   JoinType jointype,
 						   JoinPathExtraData *extra)
 {
-	JoinCostWorkspace	workspace;
-	RangeTblEntry	   *inner_rte = root->simple_rte_array[innerrel->relid];
-	PartRelationInfo   *inner_prel;
-	List			   *pathkeys = NIL,
-					   *joinclauses,
-					   *otherclauses;
-	ListCell		   *lc;
-	WalkerContext		context;
-	double				paramsel;
-	bool				innerrel_rinfo_contains_part_attr;
+	JoinCostWorkspace		workspace;
+	RangeTblEntry		   *inner_rte = root->simple_rte_array[innerrel->relid];
+	const PartRelationInfo *inner_prel;
+	List				   *pathkeys = NIL,
+						   *joinclauses,
+						   *otherclauses;
+	ListCell			   *lc;
+	WalkerContext			context;
+	double					paramsel;
+	bool					innerrel_rinfo_contains_part_attr;
 
 	/* Call hooks set by other extensions */
 	if (set_join_pathlist_next)
@@ -159,10 +159,10 @@ pathman_join_pathlist_hook(PlannerInfo *root,
 void
 pathman_rel_pathlist_hook(PlannerInfo *root, RelOptInfo *rel, Index rti, RangeTblEntry *rte)
 {
-	PartRelationInfo   *prel = NULL;
-	RangeTblEntry	  **new_rte_array;
-	RelOptInfo		  **new_rel_array;
-	int					len;
+	const PartRelationInfo *prel;
+	RangeTblEntry		  **new_rte_array;
+	RelOptInfo			  **new_rel_array;
+	int						len;
 
 	/* Invoke original hook if needed */
 	if (set_rel_pathlist_hook_next != NULL)

src/nodes_common.c

@@ -139,7 +139,7 @@ replace_tlist_varnos(List *child_tlist, RelOptInfo *parent)
 
 /* Append partition attribute in case it's not present in target list */
 static List *
-append_part_attr_to_tlist(List *tlist, Index relno, PartRelationInfo *prel)
+append_part_attr_to_tlist(List *tlist, Index relno, const PartRelationInfo *prel)
 {
 	ListCell   *lc;
 	bool		part_attr_found = false;
@@ -346,9 +346,12 @@ create_append_plan_common(PlannerInfo *root, RelOptInfo *rel,
 						  List *clauses, List *custom_plans,
 						  CustomScanMethods *scan_methods)
 {
-	RuntimeAppendPath  *rpath = (RuntimeAppendPath *) best_path;
-	CustomScan		   *cscan;
-	PartRelationInfo   *prel = get_pathman_relation_info(rpath->relid);
+	RuntimeAppendPath	   *rpath = (RuntimeAppendPath *) best_path;
+	const PartRelationInfo *prel;
+	CustomScan			   *cscan;
+
+	prel = get_pathman_relation_info(rpath->relid);
+	Assert(prel);
 
 	cscan = makeNode(CustomScan);
 	cscan->custom_scan_tlist = NIL; /* initial value (empty list) */
@@ -487,27 +490,27 @@ end_append_common(CustomScanState *node)
 void
 rescan_append_common(CustomScanState *node)
 {
-	RuntimeAppendState *scan_state = (RuntimeAppendState *) node;
-	ExprContext		   *econtext = node->ss.ps.ps_ExprContext;
-	PartRelationInfo   *prel;
-	List			   *ranges;
-	ListCell		   *lc;
-	Oid				   *parts;
-	int					nparts;
+	RuntimeAppendState	   *scan_state = (RuntimeAppendState *) node;
+	ExprContext			   *econtext = node->ss.ps.ps_ExprContext;
+	const PartRelationInfo *prel;
+	List				   *ranges;
+	ListCell			   *lc;
+	Oid					   *parts;
+	int						nparts;
 
 	prel = get_pathman_relation_info(scan_state->relid);
 	Assert(prel);
 
+	/* First we select all available partitions... */
 	ranges = list_make1_irange(make_irange(0, PrelChildrenCount(prel) - 1, false));
 
 	InitWalkerContext(&scan_state->wcxt, prel, econtext, false);
-
 	foreach (lc, scan_state->custom_exprs)
 	{
 		WrapperNode	   *wn;
 
+		/* ... then we cut off irrelevant ones using the provided clauses */
 		wn = walk_expr_tree((Expr *) lfirst(lc), &scan_state->wcxt);
-
 		ranges = irange_list_intersect(ranges, wn->rangeset);
 	}
 

src/partition_filter.c

@@ -153,18 +153,18 @@ partition_filter_exec(CustomScanState *node)
 
 	if (!TupIsNull(slot))
 	{
-		PartRelationInfo   *prel;
+		const PartRelationInfo *prel;
 
-		MemoryContext		old_cxt;
+		MemoryContext			old_cxt;
 
-		List			   *ranges;
-		int					nparts;
-		Oid				   *parts;
-		Oid					selected_partid;
+		List				   *ranges;
+		int						nparts;
+		Oid					   *parts;
+		Oid						selected_partid;
 
-		WalkerContext		wcxt;
-		bool				isnull;
-		Datum				value;
+		WalkerContext			wcxt;
+		bool					isnull;
+		Datum					value;
 
 		/* Fetch PartRelationInfo for this partitioned relation */
 		prel = get_pathman_relation_info(state->partitioned_table);
@@ -390,9 +390,9 @@ partition_filter_visitor(Plan *plan, void *context)
 
 	forboth (lc1, modify_table->plans, lc2, modify_table->resultRelations)
 	{
-		Index				rindex = lfirst_int(lc2);
-		Oid					relid = getrelid(rindex, rtable);
-		PartRelationInfo   *prel = get_pathman_relation_info(relid);
+		Index					rindex = lfirst_int(lc2);
+		Oid						relid = getrelid(rindex, rtable);
+		const PartRelationInfo *prel = get_pathman_relation_info(relid);
 
 		/* Check that table is partitioned */
 		if (prel)

src/pg_pathman.c

@@ -175,10 +175,10 @@ _PG_init(void)
 void
 disable_inheritance(Query *parse)
 {
-	ListCell		   *lc;
-	RangeTblEntry	   *rte;
-	PartRelationInfo   *prel;
-	MemoryContext		oldcontext;
+	const PartRelationInfo *prel;
+	RangeTblEntry		   *rte;
+	MemoryContext			oldcontext;
+	ListCell			   *lc;
 
 	/* If query contains CTE (WITH statement) then handle subqueries too */
 	disable_inheritance_cte(parse);
@@ -301,12 +301,12 @@ disable_inheritance_subselect_walker(Node *node, void *context)
 void
 handle_modification_query(Query *parse)
 {
-	PartRelationInfo   *prel;
-	List			   *ranges;
-	RangeTblEntry	   *rte;
-	WrapperNode		   *wrap;
-	Expr			   *expr;
-	WalkerContext		context;
+	const PartRelationInfo *prel;
+	List				   *ranges;
+	RangeTblEntry		   *rte;
+	WrapperNode			   *wrap;
+	Expr				   *expr;
+	WalkerContext			context;
 
 	Assert(parse->commandType == CMD_UPDATE ||
 		   parse->commandType == CMD_DELETE);
@@ -725,7 +725,7 @@ spawn_partitions(Oid partitioned_rel,		/* parent's Oid */
 
 	FmgrInfo 	interval_move_bound; /* function to move upper\lower boundary */
 	bool		interval_move_bound_cached = false; /* is it cached already? */
-	bool		done = false;
+	bool		spawned = false;
 
 	Datum		cur_part_leading = leading_bound;
 
@@ -737,7 +737,7 @@ spawn_partitions(Oid partitioned_rel,		/* parent's Oid */
 					 get_namespace_name(get_pathman_schema()));
 
 	/* Execute comparison function cmp(value, cur_part_leading) */
-	while ((done = do_compare(cmp_proc, value, cur_part_leading, forward)))
+	while (do_compare(cmp_proc, value, cur_part_leading, forward))
 	{
 		char   *nulls = NULL; /* no params are NULL */
 		Oid		types[3] = { REGCLASSOID, leading_bound_type, leading_bound_type };
@@ -786,11 +786,14 @@ spawn_partitions(Oid partitioned_rel,		/* parent's Oid */
 			 DebugPrintDatum(cur_part_leading, leading_bound_type),
 			 MyProcPid);
 #endif
+
+		/* We have spawned at least 1 partition */
+		spawned = true;
 	}
 
 	pfree(query);
 
-	return done;
+	return spawned;
 }
 
 /*