fix complete cache invalidation event handling

funbringer · funbringer · commit 83dc5afcc96b · 2017-10-25T19:43:49.000+03:00
diff --git a/src/hooks.c b/src/hooks.c
@@ -36,6 +36,11 @@
 #include "utils/lsyscache.h"
 
 
+#ifdef USE_ASSERT_CHECKING
+#define USE_RELCACHE_LOGGING
+#endif
+
+
 /* Borrowed from joinpath.c */
 #define PATH_PARAM_BY_REL(path, rel)  \
 	((path)->param_info && bms_overlap(PATH_REQ_OUTER(path), (rel)->relids))
@@ -808,6 +813,18 @@ pathman_relcache_hook(Datum arg, Oid relid)
 	if (!IsPathmanReady())
 		return;
 
+	/* Special case: flush whole relcache */
+	if (relid == InvalidOid)
+	{
+		delay_invalidation_whole_cache();
+
+#ifdef USE_RELCACHE_LOGGING
+		elog(DEBUG2, "Invalidation message for all relations [%u]", MyProcPid);
+#endif
+
+		return;
+	}
+
 	/* We shouldn't even consider special OIDs */
 	if (relid < FirstNormalObjectId)
 		return;
@@ -827,16 +844,20 @@ pathman_relcache_hook(Datum arg, Oid relid)
 	{
 		delay_invalidation_parent_rel(parent_relid);
 
+#ifdef USE_RELCACHE_LOGGING
 		elog(DEBUG2, "Invalidation message for partition %u [%u]",
 			 relid, MyProcPid);
+#endif
 	}
 	/* We can't say, perform full invalidation procedure */
 	else
 	{
 		delay_invalidation_vague_rel(relid);
 
-		elog(DEBUG2, "Invalidation message for vague relation %u [%u]",
+#ifdef USE_RELCACHE_LOGGING
+		elog(DEBUG2, "Invalidation message for vague rel %u [%u]",
 			 relid, MyProcPid);
+#endif
 	}
 }
 
diff --git a/src/include/init.h b/src/include/init.h
@@ -54,6 +54,7 @@ typedef struct
 
 #define PATHMAN_MCXT_COUNT	4
 extern MemoryContext		TopPathmanContext;
+extern MemoryContext		PathmanInvalJobsContext;
 extern MemoryContext		PathmanRelationCacheContext;
 extern MemoryContext		PathmanParentCacheContext;
 extern MemoryContext		PathmanBoundCacheContext;
diff --git a/src/include/relation_info.h b/src/include/relation_info.h
@@ -275,6 +275,7 @@ const PartRelationInfo *refresh_pathman_relation_info(Oid relid,
 													  Datum *values,
 													  bool allow_incomplete);
 PartRelationInfo *invalidate_pathman_relation_info(Oid relid, bool *found);
+void invalidate_pathman_relation_info_cache(const Oid *parents, int parents_count);
 void remove_pathman_relation_info(Oid relid);
 const PartRelationInfo *get_pathman_relation_info(Oid relid);
 const PartRelationInfo *get_pathman_relation_info_after_lock(Oid relid,
@@ -296,6 +297,7 @@ char *canonicalize_partitioning_expression(const Oid relid,
 
 /* Global invalidation routines */
 void delay_pathman_shutdown(void);
+void delay_invalidation_whole_cache(void);
 void delay_invalidation_parent_rel(Oid parent);
 void delay_invalidation_vague_rel(Oid vague_rel);
 void finish_delayed_invalidation(void);
diff --git a/src/init.c b/src/init.c
@@ -41,6 +41,7 @@
 
 /* Various memory contexts for caches */
 MemoryContext		TopPathmanContext				= NULL;
+MemoryContext		PathmanInvalJobsContext			= NULL;
 MemoryContext		PathmanRelationCacheContext		= NULL;
 MemoryContext		PathmanParentCacheContext		= NULL;
 MemoryContext		PathmanBoundCacheContext		= NULL;
@@ -312,6 +313,7 @@ init_local_cache(void)
 	if (TopPathmanContext)
 	{
 		/* Check that child contexts exist */
+		Assert(MemoryContextIsValid(PathmanInvalJobsContext));
 		Assert(MemoryContextIsValid(PathmanRelationCacheContext));
 		Assert(MemoryContextIsValid(PathmanParentCacheContext));
 		Assert(MemoryContextIsValid(PathmanBoundCacheContext));
@@ -322,6 +324,7 @@ init_local_cache(void)
 	/* Initialize pg_pathman's memory contexts */
 	else
 	{
+		Assert(PathmanInvalJobsContext == NULL);
 		Assert(PathmanRelationCacheContext == NULL);
 		Assert(PathmanParentCacheContext == NULL);
 		Assert(PathmanBoundCacheContext == NULL);
@@ -331,6 +334,11 @@ init_local_cache(void)
 									  CppAsString(TopPathmanContext),
 									  ALLOCSET_DEFAULT_SIZES);
 
+		PathmanInvalJobsContext =
+				AllocSetContextCreate(TopMemoryContext,
+									  CppAsString(PathmanInvalJobsContext),
+									  ALLOCSET_SMALL_SIZES);
+
 		/* For PartRelationInfo */
 		PathmanRelationCacheContext =
 				AllocSetContextCreate(TopPathmanContext,
diff --git a/src/relation_info.c b/src/relation_info.c
