load PATHMAN_CONFIG lazily

Author: funbringer

src/init.c

@@ -830,9 +830,7 @@ read_pathman_config(void)
 	{
 		Datum		values[Natts_pathman_config];
 		bool		isnull[Natts_pathman_config];
-		Oid			relid;		/* partitioned table */
-		PartType	parttype;	/* partitioning type */
-		text	   *attname;	/* partitioned column name */
+		Oid			relid; /* partitioned table */
 
 		/* Extract Datums from tuple 'htup' */
 		heap_deform_tuple(htup, RelationGetDescr(rel), values, isnull);
@@ -844,8 +842,6 @@ read_pathman_config(void)
 
 		/* Extract values from Datums */
 		relid = DatumGetObjectId(values[Anum_pathman_config_partrel - 1]);
-		parttype = DatumGetPartType(values[Anum_pathman_config_parttype - 1]);
-		attname = DatumGetTextP(values[Anum_pathman_config_attname - 1]);
 
 		/* Check that relation 'relid' exists */
 		if (get_rel_type_id(relid) == InvalidOid)
@@ -857,10 +853,8 @@ read_pathman_config(void)
 					 errhint(INIT_ERROR_HINT)));
 		}
 
-		/* Create or update PartRelationInfo for this partitioned table */
-		refresh_pathman_relation_info(relid, parttype,
-									  text_to_cstring(attname),
-									  true); /* allow lazy prel loading */
+		/* get_pathman_relation_info() will refresh this entry */
+		invalidate_pathman_relation_info(relid, NULL);
 	}
 
 	/* Clean resources */

src/pg_pathman.c

@@ -225,7 +225,7 @@ append_child_relation(PlannerInfo *root, Relation parent_relation,
 				   *child_rowmark;
 	Node		   *childqual;
 	List		   *childquals;
-	ListCell	   *lc,
+	ListCell	   *lc1,
 				   *lc2;
 
 	parent_rel = root->simple_rel_array[parent_rti];
@@ -288,9 +288,9 @@ append_child_relation(PlannerInfo *root, Relation parent_relation,
 	{
 		childquals = NIL;
 
-		forboth(lc, wrappers, lc2, parent_rel->baserestrictinfo)
+		forboth(lc1, wrappers, lc2, parent_rel->baserestrictinfo)
 		{
-			WrapperNode	   *wrap = (WrapperNode *) lfirst(lc);
+			WrapperNode	   *wrap = (WrapperNode *) lfirst(lc1);
 			Node		   *new_clause;
 			bool			always_true;