[WIP] add 'allow_incomplete' option to function refresh_pathman_relation_info()

funbringer · funbringer · commit 14e05f22b2e8 · 2016-10-21T19:44:36.000+03:00
diff --git a/src/init.c b/src/init.c
@@ -752,7 +752,9 @@ read_pathman_config(void)
 		}
 
 		/* Create or update PartRelationInfo for this partitioned table */
-		refresh_pathman_relation_info(relid, parttype, text_to_cstring(attname));
+		refresh_pathman_relation_info(relid, parttype,
+									  text_to_cstring(attname),
+									  true); /* allow lazy prel loading */
 	}
 
 	/* Clean resources */
diff --git a/src/pl_funcs.c b/src/pl_funcs.c
@@ -623,7 +623,9 @@ add_to_pathman_config(PG_FUNCTION_ARGS)
 		/* Some flags might change during refresh attempt */
 		save_pathman_init_state(&init_state);
 
-		refresh_pathman_relation_info(relid, parttype, text_to_cstring(attname));
+		refresh_pathman_relation_info(relid, parttype,
+									  text_to_cstring(attname),
+									  false); /* initialize immediately */
 	}
 	PG_CATCH();
 	{
diff --git a/src/relation_info.c b/src/relation_info.c
@@ -67,7 +67,8 @@ static Oid get_parent_of_partition_internal(Oid partition,
 const PartRelationInfo *
 refresh_pathman_relation_info(Oid relid,
 							  PartType partitioning_type,
-							  const char *part_column_name)
+							  const char *part_column_name,
+							  bool allow_incomplete)
 {
 	const LOCKMODE			lockmode = AccessShareLock;
 	const TypeCacheEntry   *typcache;
@@ -103,14 +104,14 @@ refresh_pathman_relation_info(Oid relid,
 	}
 
 	/* First we assume that this entry is invalid */
-	prel->valid = false;
+	prel->valid		= false;
 
 	/* Make both arrays point to NULL */
-	prel->children = NULL;
-	prel->ranges = NULL;
+	prel->children	= NULL;
+	prel->ranges	= NULL;
 
 	/* Set partitioning type */
-	prel->parttype = partitioning_type;
+	prel->parttype	= partitioning_type;
 
 	/* Initialize PartRelationInfo using syscache & typcache */
 	prel->attnum	= get_attnum(relid, part_column_name);
@@ -245,9 +246,8 @@ get_pathman_relation_info(Oid relid)
 
 			/* Refresh partitioned table cache entry (might turn NULL) */
 			/* TODO: possible refactoring, pass found 'prel' instead of searching */
-			prel = refresh_pathman_relation_info(relid,
-												 part_type,
-												 attname);
+			prel = refresh_pathman_relation_info(relid, part_type,
+												 attname, false);
 		}
 		/* Else clear remaining cache entry */
 		else remove_pathman_relation_info(relid);
@@ -611,10 +611,10 @@ try_perform_parent_refresh(Oid parent)
 		parttype = DatumGetPartType(values[Anum_pathman_config_parttype - 1]);
 		attname = DatumGetTextP(values[Anum_pathman_config_attname - 1]);
 
-		/* If anything went wrong, return false (actually, it might throw ERROR) */
-		if (!PrelIsValid(refresh_pathman_relation_info(parent, parttype,
-													   text_to_cstring(attname))))
-			return false;
+		/* If anything went wrong, return false (actually, it might emit ERROR) */
+		refresh_pathman_relation_info(parent, parttype,
+									  text_to_cstring(attname),
+									  true); /* allow lazy */
 	}
 	/* Not a partitioned relation */
 	else return false;
diff --git a/src/relation_info.h b/src/relation_info.h
@@ -120,7 +120,8 @@ PrelLastChild(const PartRelationInfo *prel)
 
 const PartRelationInfo *refresh_pathman_relation_info(Oid relid,
 													  PartType partitioning_type,
-													  const char *part_column_name);
+													  const char *part_column_name,
+													  bool allow_incomplete);
 void invalidate_pathman_relation_info(Oid relid, bool *found);
 void remove_pathman_relation_info(Oid relid);
 const PartRelationInfo *get_pathman_relation_info(Oid relid);

Original file line number	Diff line number	Diff line change
`@@ -752,7 +752,9 @@ read_pathman_config(void)`
`752`	`752`	`}`
`753`	`753`
`754`	`754`	`/* Create or update PartRelationInfo for this partitioned table */`
`755`		`- refresh_pathman_relation_info(relid, parttype, text_to_cstring(attname));`
	`755`	`+ refresh_pathman_relation_info(relid, parttype,`
	`756`	`+ text_to_cstring(attname),`
	`757`	`+ true); /* allow lazy prel loading */`
`756`	`758`	`}`
`757`	`759`
`758`	`760`	`/* Clean resources */`
Original file line number	Diff line number	Diff line change
`@@ -623,7 +623,9 @@ add_to_pathman_config(PG_FUNCTION_ARGS)`
`623`	`623`	`/* Some flags might change during refresh attempt */`
`624`	`624`	`save_pathman_init_state(&init_state);`
`625`	`625`
`626`		`- refresh_pathman_relation_info(relid, parttype, text_to_cstring(attname));`
	`626`	`+ refresh_pathman_relation_info(relid, parttype,`
	`627`	`+ text_to_cstring(attname),`
	`628`	`+ false); /* initialize immediately */`
`627`	`629`	`}`
`628`	`630`	`PG_CATCH();`
`629`	`631`	`{`