resolve fixme regarding flushing all caches

funbringer · funbringer · commit 087abe75abd9 · 2018-07-13T15:09:55.000+03:00
diff --git a/src/hooks.c b/src/hooks.c
@@ -834,9 +834,9 @@ pathman_relcache_hook(Datum arg, Oid relid)
 	/* Invalidation event for whole cache */
 	if (relid == InvalidOid)
 	{
-		invalidate_pathman_status_info_cache();
-
-		/* FIXME: reset other caches as well */
+		invalidate_bounds_cache();
+		invalidate_parents_cache();
+		invalidate_status_cache();
 	}
 
 	/* Invalidation event for PATHMAN_CONFIG table (probably DROP) */
@@ -855,7 +855,7 @@ pathman_relcache_hook(Datum arg, Oid relid)
 		forget_parent_of_partition(relid);
 
 		/* Invalidate PartStatusInfo entry if needed */
-		invalidate_pathman_status_info(relid);
+		forget_status_of_relation(relid);
 	}
 }
 
diff --git a/src/include/relation_info.h b/src/include/relation_info.h
@@ -184,6 +184,16 @@ typedef struct PartBoundInfo
 	uint32			part_idx;
 } PartBoundInfo;
 
+static inline void
+FreePartBoundInfo(PartBoundInfo *pbin)
+{
+	if (pbin->parttype == PT_RANGE)
+	{
+		FreeBound(&pbin->range_min, pbin->byval);
+		FreeBound(&pbin->range_max, pbin->byval);
+	}
+}
+
 /*
  * PartRelationInfo
  *		Per-relation partitioning information.
@@ -341,8 +351,8 @@ PartTypeToCString(PartType parttype)
 
 
 /* Status chache */
-void invalidate_pathman_status_info(Oid relid);
-void invalidate_pathman_status_info_cache(void);
+void forget_status_of_relation(Oid relid);
+void invalidate_status_cache(void);
 
 /* Dispatch cache */
 bool has_pathman_relation_info(Oid relid);
@@ -359,11 +369,13 @@ void shout_if_prel_is_invalid(const Oid parent_oid,
 /* Bounds cache */
 void forget_bounds_of_partition(Oid partition);
 PartBoundInfo *get_bounds_of_partition(Oid partition, const PartRelationInfo *prel);
+void invalidate_bounds_cache(void);
 
 /* Parents cache */
 void cache_parent_of_partition(Oid partition, Oid parent);
 void forget_parent_of_partition(Oid partition);
 Oid get_parent_of_partition(Oid partition);
+void invalidate_parents_cache(void);
 
 /* Partitioning expression routines */
 Node *parse_partitioning_expression(const Oid relid,
diff --git a/src/relation_info.c b/src/relation_info.c
@@ -187,7 +187,7 @@ init_relation_info_static_data(void)
 
 /* Invalidate PartStatusInfo for 'relid' */
 void
-invalidate_pathman_status_info(Oid relid)
+forget_status_of_relation(Oid relid)
 {
 	PartStatusInfo *psin;
 	PartParentInfo *ppar;
@@ -225,7 +225,7 @@ invalidate_pathman_status_info(Oid relid)
 
 /* Invalidate all PartStatusInfo entries */
 void
-invalidate_pathman_status_info_cache(void)
+invalidate_status_cache(void)
 {
 	invalidate_psin_entries_using_relid(InvalidOid);
 }
@@ -241,14 +241,14 @@ invalidate_psin_entries_using_relid(Oid relid)
 
 	while ((psin = (PartStatusInfo *) hash_seq_search(&status)) != NULL)
 	{
-		if (relid == InvalidOid ||
+		if (!OidIsValid(relid) ||
 			psin->relid == relid ||
 			(psin->prel && PrelHasPartition(psin->prel, relid)))
 		{
 			/* Perform invalidation */
 			invalidate_psin_entry(psin);
 
-			/* Exit if found */
+			/* Exit if exact match */
 			if (OidIsValid(relid))
 			{
 				hash_seq_term(&status);
@@ -952,15 +952,10 @@ forget_bounds_of_partition(Oid partition)
 										   NULL) :
 				NULL; /* don't even bother */
 
-	/* Free this entry */
 	if (pbin)
 	{
-		/* Call pfree() if it's RANGE bounds */
-		if (pbin->parttype == PT_RANGE)
-		{
-			FreeBound(&pbin->range_min, pbin->byval);
-			FreeBound(&pbin->range_max, pbin->byval);
-		}
+		/* Free this entry */
+		FreePartBoundInfo(pbin);
 
 		/* Finally remove this entry from cache */
 		pathman_cache_search_relid(bounds_cache,
@@ -1027,6 +1022,26 @@ get_bounds_of_partition(Oid partition, const PartRelationInfo *prel)
 	return pbin;
 }
 
+void
+invalidate_bounds_cache(void)
+{
+	HASH_SEQ_STATUS		status;
+	PartBoundInfo	   *pbin;
+
+	Assert(offsetof(PartBoundInfo, child_relid) == 0);
+
+	hash_seq_init(&status, bounds_cache);
+
+	while ((pbin = hash_seq_search(&status)) != NULL)
+	{
+		FreePartBoundInfo(pbin);
+
+		pathman_cache_search_relid(bounds_cache,
+								   pbin->child_relid,
+								   HASH_REMOVE, NULL);
+	}
+}
+
 /*
  * Get constraint expression tree of a partition.
  *
@@ -1258,6 +1273,26 @@ get_parent_of_partition(Oid partition)
 	}
 }
 
+void
+invalidate_parents_cache(void)
+{
+	HASH_SEQ_STATUS		status;
+	PartParentInfo	   *ppar;
+
+	Assert(offsetof(PartParentInfo, child_relid) == 0);
+
+	hash_seq_init(&status, parents_cache);
+
+	while ((ppar = hash_seq_search(&status)) != NULL)
+	{
+		/* This is a plain structure, no need to pfree() */
+
+		pathman_cache_search_relid(parents_cache,
+								   ppar->child_relid,
+								   HASH_REMOVE, NULL);
+	}
+}
+
 
 /*
  * Partitioning expression routines.

Original file line number	Diff line number	Diff line change
`@@ -834,9 +834,9 @@ pathman_relcache_hook(Datum arg, Oid relid)`
`834`	`834`	`/* Invalidation event for whole cache */`
`835`	`835`	`if (relid == InvalidOid)`
`836`	`836`	`{`
`837`		`- invalidate_pathman_status_info_cache();`
`838`		`-`
`839`		`- /* FIXME: reset other caches as well */`
	`837`	`+ invalidate_bounds_cache();`
	`838`	`+ invalidate_parents_cache();`
	`839`	`+ invalidate_status_cache();`
`840`	`840`	`}`
`841`	`841`
`842`	`842`	`/* Invalidation event for PATHMAN_CONFIG table (probably DROP) */`
`@@ -855,7 +855,7 @@ pathman_relcache_hook(Datum arg, Oid relid)`
`855`	`855`	`forget_parent_of_partition(relid);`
`856`	`856`
`857`	`857`	`/* Invalidate PartStatusInfo entry if needed */`
`858`		`- invalidate_pathman_status_info(relid);`
	`858`	`+ forget_status_of_relation(relid);`
`859`	`859`	`}`
`860`	`860`	`}`
`861`	`861`