From 8664335f18638b6dcff30b0c30ff167175970cff Mon Sep 17 00:00:00 2001
From: Kyotaro Horiguchi <horiguchi.kyotaro@lab.ntt.co.jp>
Date: Fri, 16 Dec 2016 16:44:40 +0900
Subject: [PATCH 2/2] Cleanup negative cache of pg_class when dropping a schema

This feature in turn is triggered by catcache invalidation. This patch
provides a syscache invalidation callback to flush negative cache
entries corresponding to an invalidated object.
---
 src/backend/utils/cache/catcache.c |  42 +++++
 src/backend/utils/cache/inval.c    |   8 +-
 src/backend/utils/cache/syscache.c | 319 ++++++++++++++++++++++++++++---------
 src/include/utils/catcache.h       |   3 +
 4 files changed, 295 insertions(+), 77 deletions(-)

diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c
index 6ff2c5e..1554b22 100644
--- a/src/backend/utils/cache/catcache.c
+++ b/src/backend/utils/cache/catcache.c
@@ -1423,8 +1423,50 @@ GetCatCacheHashValue(CatCache *cache,
 	 */
 	return CatalogCacheComputeHashValue(cache, cache->cc_nkeys, cur_skey);
 }
 
+/*
+ * CollectOIDsForHashValue
+ *
+ * Collect OIDs corresnpond to a hash value. attnum is the column to retrieve
+ * the OIDs.
+ */
+List *
+CollectOIDsForHashValue(CatCache *cache, uint32 hashValue, int attnum)
+{
+	Index		 hashIndex = HASH_INDEX(hashValue, cache->cc_nbuckets);
+	dlist_head	*bucket = &cache->cc_bucket[hashIndex];
+	dlist_iter	 iter;
+	List *ret = NIL;
+
+	/* Nothing to return before initialized */
+	if (cache->cc_tupdesc == NULL)
+		return ret;
+
+	/* Currently only OID key is supported */
+	Assert(attnum <= cache->cc_tupdesc->natts);
+	Assert(attnum < 0 ? attnum == ObjectIdAttributeNumber :
+		   cache->cc_tupdesc->attrs[attnum]->atttypid == OIDOID);
+
+	dlist_foreach(iter, bucket)
+	{
+		CatCTup *ct = dlist_container(CatCTup, cache_elem, iter.cur);
+		bool	isNull;
+		Datum	oid;
+
+		if (ct->dead)
+			continue;			/* ignore dead entries */
+
+		if (ct->hash_value != hashValue)
+			continue;			/* quickly skip entry if wrong hash val */
+
+		oid = heap_getattr(&ct->tuple, attnum, cache->cc_tupdesc, &isNull);
+		if (!isNull)
+			ret = lappend_oid(ret, DatumGetObjectId(oid));
+	}
+
+	return ret;
+}
 
 /*
  *	SearchCatCacheList
  *
diff --git a/src/backend/utils/cache/inval.c b/src/backend/utils/cache/inval.c
index 11f9218..7b78d09 100644
--- a/src/backend/utils/cache/inval.c
+++ b/src/backend/utils/cache/inval.c
@@ -549,11 +549,15 @@ LocalExecuteInvalidationMessage(SharedInvalidationMessage *msg)
 		if (msg->cc.dbId == MyDatabaseId || msg->cc.dbId == InvalidOid)
 		{
 			InvalidateCatalogSnapshot();
 
-			CatalogCacheIdInvalidate(msg->cc.id, msg->cc.hashValue);
-
+			/*
+			 * Call the callbacks first so that the callbacks can access the
+			 * entries corresponding to the hashValue.
+			 */
 			CallSyscacheCallbacks(msg->cc.id, msg->cc.hashValue);
+
+			CatalogCacheIdInvalidate(msg->cc.id, msg->cc.hashValue);
 		}
 	}
 	else if (msg->id == SHAREDINVALCATALOG_ID)
 	{
diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c
index c9f3bea..b7f622a 100644
--- a/src/backend/utils/cache/syscache.c
+++ b/src/backend/utils/cache/syscache.c
@@ -110,8 +110,18 @@
 *---------------------------------------------------------------------------
 */
 
 /*
+ *	struct for flushing negative cache by syscache invalidation
+ */
+typedef struct SysCacheCBParam_T
+{
+	int	trig_attnum;
+	int	target_cacheid;
+	ScanKeyData skey;
+} SysCacheCBParam;
+
+/*
  *		struct cachedesc: information defining a single syscache
  */
 struct cachedesc
 {
@@ -122,8 +132,16 @@ struct cachedesc
 	int			nbuckets;		/* number of hash buckets for this cache */
 
 	/* relcache invalidation stuff */
 	AttrNumber	relattrnum;		/* attr number of reloid, 0 if nothing to do */
+
+	/* catcache invalidation stuff */
+	int			trig_cacheid;	/* cache id of triggering syscache: -1 means
+								 * no triggering cache */
+	int16		trig_attnum;	/* key column in triggering cache. Must be an
+								 * OID */
+	int16		target_attnum;	/* corresponding column in this cache. Must be
+								 * an OID*/
 };
 
 static const struct cachedesc cacheinfo[] = {
 	{AggregateRelationId,		/* AGGFNOID */
@@ -135,9 +153,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		16,
-		0
+		0,
+		-1, 0, 0
 	},
 	{AccessMethodRelationId,	/* AMNAME */
 		AmNameIndexId,
 		1,
@@ -147,9 +166,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		4,
-		0
+		0,
+		-1, 0, 0
 	},
 	{AccessMethodRelationId,	/* AMOID */
 		AmOidIndexId,
 		1,
@@ -159,9 +179,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		4,
-		0
+		0,
+		-1, 0, 0
 	},
 	{AccessMethodOperatorRelationId,	/* AMOPOPID */
 		AccessMethodOperatorIndexId,
 		3,
@@ -171,9 +192,10 @@ static const struct cachedesc cacheinfo[] = {
 			Anum_pg_amop_amopfamily,
 			0
 		},
 		64,
-		0
+		0,
+		-1, 0, 0
 	},
 	{AccessMethodOperatorRelationId,	/* AMOPSTRATEGY */
 		AccessMethodStrategyIndexId,
 		4,
@@ -183,9 +205,10 @@ static const struct cachedesc cacheinfo[] = {
 			Anum_pg_amop_amoprighttype,
 			Anum_pg_amop_amopstrategy
 		},
 		64,
-		0
+		0,
+		-1, 0, 0
 	},
 	{AccessMethodProcedureRelationId,	/* AMPROCNUM */
 		AccessMethodProcedureIndexId,
 		4,
@@ -195,9 +218,10 @@ static const struct cachedesc cacheinfo[] = {
 			Anum_pg_amproc_amprocrighttype,
 			Anum_pg_amproc_amprocnum
 		},
 		16,
-		0
+		0,
+		-1, 0, 0
 	},
 	{AttributeRelationId,		/* ATTNAME */
 		AttributeRelidNameIndexId,
 		2,
@@ -207,9 +231,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		32,
-		Anum_pg_attribute_attrelid
+		Anum_pg_attribute_attrelid,
+		-1, 0, 0
 	},
 	{AttributeRelationId,		/* ATTNUM */
 		AttributeRelidNumIndexId,
 		2,
@@ -219,9 +244,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		128,
-		Anum_pg_attribute_attrelid
+		Anum_pg_attribute_attrelid,
+		-1, 0, 0
 	},
 	{AuthMemRelationId,			/* AUTHMEMMEMROLE */
 		AuthMemMemRoleIndexId,
 		2,
@@ -231,9 +257,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		8,
-		0
+		0,
+		-1, 0, 0
 	},
 	{AuthMemRelationId,			/* AUTHMEMROLEMEM */
 		AuthMemRoleMemIndexId,
 		2,
@@ -243,9 +270,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		8,
-		0
+		0,
+		-1, 0, 0
 	},
 	{AuthIdRelationId,			/* AUTHNAME */
 		AuthIdRolnameIndexId,
 		1,
@@ -255,9 +283,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		8,
-		0
+		0,
+		-1, 0, 0
 	},
 	{AuthIdRelationId,			/* AUTHOID */
 		AuthIdOidIndexId,
 		1,
@@ -267,9 +296,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		8,
-		0
+		0,
+		-1, 0, 0
 	},
 	{CastRelationId,			/* CASTSOURCETARGET */
 		CastSourceTargetIndexId,
 		2,
@@ -279,9 +309,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		256,
-		0
+		0,
+		-1, 0, 0
 	},
 	{OperatorClassRelationId,	/* CLAAMNAMENSP */
 		OpclassAmNameNspIndexId,
 		3,
@@ -291,9 +322,10 @@ static const struct cachedesc cacheinfo[] = {
 			Anum_pg_opclass_opcnamespace,
 			0
 		},
 		8,
-		0
+		0,
+		-1, 0, 0
 	},
 	{OperatorClassRelationId,	/* CLAOID */
 		OpclassOidIndexId,
 		1,
@@ -303,9 +335,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		8,
-		0
+		0,
+		-1, 0, 0
 	},
 	{CollationRelationId,		/* COLLNAMEENCNSP */
 		CollationNameEncNspIndexId,
 		3,
@@ -315,9 +348,10 @@ static const struct cachedesc cacheinfo[] = {
 			Anum_pg_collation_collnamespace,
 			0
 		},
 		8,
-		0
+		0,
+		-1, 0, 0
 	},
 	{CollationRelationId,		/* COLLOID */
 		CollationOidIndexId,
 		1,
@@ -327,9 +361,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		8,
-		0
+		0,
+		-1, 0, 0
 	},
 	{ConversionRelationId,		/* CONDEFAULT */
 		ConversionDefaultIndexId,
 		4,
@@ -339,9 +374,10 @@ static const struct cachedesc cacheinfo[] = {
 			Anum_pg_conversion_contoencoding,
 			ObjectIdAttributeNumber,
 		},
 		8,
-		0
+		0,
+		-1, 0, 0
 	},
 	{ConversionRelationId,		/* CONNAMENSP */
 		ConversionNameNspIndexId,
 		2,
@@ -351,9 +387,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		8,
-		0
+		0,
+		-1, 0, 0
 	},
 	{ConstraintRelationId,		/* CONSTROID */
 		ConstraintOidIndexId,
 		1,
@@ -363,9 +400,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		16,
-		0
+		0,
+		-1, 0, 0
 	},
 	{ConversionRelationId,		/* CONVOID */
 		ConversionOidIndexId,
 		1,
@@ -375,9 +413,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		8,
-		0
+		0,
+		-1, 0, 0
 	},
 	{DatabaseRelationId,		/* DATABASEOID */
 		DatabaseOidIndexId,
 		1,
@@ -387,9 +426,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		4,
-		0
+		0,
+		-1, 0, 0
 	},
 	{DefaultAclRelationId,		/* DEFACLROLENSPOBJ */
 		DefaultAclRoleNspObjIndexId,
 		3,
@@ -399,9 +439,10 @@ static const struct cachedesc cacheinfo[] = {
 			Anum_pg_default_acl_defaclobjtype,
 			0
 		},
 		8,
-		0
+		0,
+		-1, 0, 0
 	},
 	{EnumRelationId,			/* ENUMOID */
 		EnumOidIndexId,
 		1,
@@ -411,9 +452,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		8,
-		0
+		0,
+		-1, 0, 0
 	},
 	{EnumRelationId,			/* ENUMTYPOIDNAME */
 		EnumTypIdLabelIndexId,
 		2,
@@ -423,9 +465,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		8,
-		0
+		0,
+		-1, 0, 0
 	},
 	{EventTriggerRelationId,	/* EVENTTRIGGERNAME */
 		EventTriggerNameIndexId,
 		1,
@@ -435,9 +478,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		8,
-		0
+		0,
+		-1, 0, 0
 	},
 	{EventTriggerRelationId,	/* EVENTTRIGGEROID */
 		EventTriggerOidIndexId,
 		1,
@@ -447,9 +491,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		8,
-		0
+		0,
+		-1, 0, 0
 	},
 	{ForeignDataWrapperRelationId,		/* FOREIGNDATAWRAPPERNAME */
 		ForeignDataWrapperNameIndexId,
 		1,
@@ -459,9 +504,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		2,
-		0
+		0,
+		-1, 0, 0
 	},
 	{ForeignDataWrapperRelationId,		/* FOREIGNDATAWRAPPEROID */
 		ForeignDataWrapperOidIndexId,
 		1,
@@ -471,9 +517,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		2,
-		0
+		0,
+		-1, 0, 0
 	},
 	{ForeignServerRelationId,	/* FOREIGNSERVERNAME */
 		ForeignServerNameIndexId,
 		1,
@@ -483,9 +530,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		2,
-		0
+		0,
+		-1, 0, 0
 	},
 	{ForeignServerRelationId,	/* FOREIGNSERVEROID */
 		ForeignServerOidIndexId,
 		1,
@@ -495,9 +543,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		2,
-		0
+		0,
+		-1, 0, 0
 	},
 	{ForeignTableRelationId,	/* FOREIGNTABLEREL */
 		ForeignTableRelidIndexId,
 		1,
@@ -507,9 +556,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		4,
-		0
+		0,
+		-1, 0, 0
 	},
 	{IndexRelationId,			/* INDEXRELID */
 		IndexRelidIndexId,
 		1,
@@ -519,9 +569,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		64,
-		0
+		0,
+		-1, 0, 0
 	},
 	{LanguageRelationId,		/* LANGNAME */
 		LanguageNameIndexId,
 		1,
@@ -531,9 +582,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		4,
-		0
+		0,
+		-1, 0, 0
 	},
 	{LanguageRelationId,		/* LANGOID */
 		LanguageOidIndexId,
 		1,
@@ -543,9 +595,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		4,
-		0
+		0,
+		-1, 0, 0
 	},
 	{NamespaceRelationId,		/* NAMESPACENAME */
 		NamespaceNameIndexId,
 		1,
@@ -555,9 +608,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		4,
-		0
+		0,
+		-1, 0, 0
 	},
 	{NamespaceRelationId,		/* NAMESPACEOID */
 		NamespaceOidIndexId,
 		1,
@@ -567,9 +621,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		16,
-		0
+		0,
+		-1, 0, 0
 	},
 	{OperatorRelationId,		/* OPERNAMENSP */
 		OperatorNameNspIndexId,
 		4,
@@ -579,9 +634,10 @@ static const struct cachedesc cacheinfo[] = {
 			Anum_pg_operator_oprright,
 			Anum_pg_operator_oprnamespace
 		},
 		256,
-		0
+		0,
+		-1, 0, 0
 	},
 	{OperatorRelationId,		/* OPEROID */
 		OperatorOidIndexId,
 		1,
@@ -591,9 +647,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		32,
-		0
+		0,
+		-1, 0, 0
 	},
 	{OperatorFamilyRelationId,	/* OPFAMILYAMNAMENSP */
 		OpfamilyAmNameNspIndexId,
 		3,
@@ -603,9 +660,10 @@ static const struct cachedesc cacheinfo[] = {
 			Anum_pg_opfamily_opfnamespace,
 			0
 		},
 		8,
-		0
+		0,
+		-1, 0, 0
 	},
 	{OperatorFamilyRelationId,	/* OPFAMILYOID */
 		OpfamilyOidIndexId,
 		1,
@@ -615,9 +673,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		8,
-		0
+		0,
+		-1, 0, 0
 	},
 	{PartitionedRelationId,		/* PARTRELID */
 		PartitionedRelidIndexId,
 		1,
@@ -627,9 +686,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		32,
-		0
+		0,
+		-1, 0, 0
 	},
 	{ProcedureRelationId,		/* PROCNAMEARGSNSP */
 		ProcedureNameArgsNspIndexId,
 		3,
@@ -639,9 +699,10 @@ static const struct cachedesc cacheinfo[] = {
 			Anum_pg_proc_pronamespace,
 			0
 		},
 		128,
-		0
+		0,
+		-1, 0, 0
 	},
 	{ProcedureRelationId,		/* PROCOID */
 		ProcedureOidIndexId,
 		1,
@@ -651,9 +712,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		128,
-		0
+		0,
+		-1, 0, 0
 	},
 	{RangeRelationId,			/* RANGETYPE */
 		RangeTypidIndexId,
 		1,
@@ -663,9 +725,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		4,
-		0
+		0,
+		-1, 0, 0
 	},
 	{RelationRelationId,		/* RELNAMENSP */
 		ClassNameNspIndexId,
 		2,
@@ -675,9 +738,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		128,
-		0
+		0,
+		NAMESPACEOID, ObjectIdAttributeNumber, Anum_pg_class_relnamespace
 	},
 	{RelationRelationId,		/* RELOID */
 		ClassOidIndexId,
 		1,
@@ -687,9 +751,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		128,
-		0
+		0,
+		-1, 0, 0
 	},
 	{ReplicationOriginRelationId,		/* REPLORIGIDENT */
 		ReplicationOriginIdentIndex,
 		1,
@@ -699,9 +764,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		16,
-		0
+		0,
+		-1, 0, 0
 	},
 	{ReplicationOriginRelationId,		/* REPLORIGNAME */
 		ReplicationOriginNameIndex,
 		1,
@@ -711,9 +777,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		16,
-		0
+		0,
+		-1, 0, 0
 	},
 	{PublicationRelationId,			/* PUBLICATIONOID */
 		PublicationObjectIndexId,
 		1,
@@ -723,9 +790,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		8,
-		0
+		0,
+		-1, 0, 0
 	},
 	{PublicationRelationId,			/* PUBLICATIONNAME */
 		PublicationNameIndexId,
 		1,
@@ -735,9 +803,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		8,
-		0
+		0,
+		-1, 0, 0
 	},
 	{PublicationRelRelationId,		/* PUBLICATIONREL */
 		PublicationRelObjectIndexId,
 		1,
@@ -747,9 +816,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		64,
-		0
+		0,
+		-1, 0, 0
 	},
 	{PublicationRelRelationId,		/* PUBLICATIONRELMAP */
 		PublicationRelMapIndexId,
 		2,
@@ -759,9 +829,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		64,
-		0
+		0,
+		-1, 0, 0
 	},
 	{RewriteRelationId,			/* RULERELNAME */
 		RewriteRelRulenameIndexId,
 		2,
@@ -771,9 +842,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		8,
-		0
+		0,
+		-1, 0, 0
 	},
 	{SequenceRelationId,			/* SEQRELID */
 		SequenceRelidIndexId,
 		1,
@@ -783,9 +855,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		32,
-		0
+		0,
+		-1, 0, 0
 	},
 	{StatisticRelationId,		/* STATRELATTINH */
 		StatisticRelidAttnumInhIndexId,
 		3,
@@ -795,9 +868,10 @@ static const struct cachedesc cacheinfo[] = {
 			Anum_pg_statistic_stainherit,
 			0
 		},
 		128,
-		Anum_pg_statistic_starelid
+		Anum_pg_statistic_starelid,
+		-1, 0, 0
 	},
 	{SubscriptionRelationId,		/* SUBSCRIPTIONOID */
 		SubscriptionObjectIndexId,
 		1,
@@ -807,9 +881,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		4,
-		0
+		0,
+		-1, 0, 0
 	},
 	{SubscriptionRelationId,		/* SUBSCRIPTIONNAME */
 		SubscriptionNameIndexId,
 		2,
@@ -819,9 +894,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		4,
-		0
+		0,
+		-1, 0, 0
 	},
 	{TableSpaceRelationId,		/* TABLESPACEOID */
 		TablespaceOidIndexId,
 		1,
@@ -831,9 +907,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0,
 		},
 		4,
-		0
+		0,
+		-1, 0, 0
 	},
 	{TransformRelationId,		/* TRFOID */
 		TransformOidIndexId,
 		1,
@@ -843,9 +920,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0,
 		},
 		16,
-		0
+		0,
+		-1, 0, 0
 	},
 	{TransformRelationId,		/* TRFTYPELANG */
 		TransformTypeLangIndexId,
 		2,
@@ -855,9 +933,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0,
 		},
 		16,
-		0
+		0,
+		-1, 0, 0
 	},
 	{TSConfigMapRelationId,		/* TSCONFIGMAP */
 		TSConfigMapIndexId,
 		3,
@@ -867,9 +946,10 @@ static const struct cachedesc cacheinfo[] = {
 			Anum_pg_ts_config_map_mapseqno,
 			0
 		},
 		2,
-		0
+		0,
+		-1, 0, 0
 	},
 	{TSConfigRelationId,		/* TSCONFIGNAMENSP */
 		TSConfigNameNspIndexId,
 		2,
@@ -879,9 +959,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		2,
-		0
+		0,
+		-1, 0, 0
 	},
 	{TSConfigRelationId,		/* TSCONFIGOID */
 		TSConfigOidIndexId,
 		1,
@@ -891,9 +972,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		2,
-		0
+		0,
+		-1, 0, 0
 	},
 	{TSDictionaryRelationId,	/* TSDICTNAMENSP */
 		TSDictionaryNameNspIndexId,
 		2,
@@ -903,9 +985,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		2,
-		0
+		0,
+		-1, 0, 0
 	},
 	{TSDictionaryRelationId,	/* TSDICTOID */
 		TSDictionaryOidIndexId,
 		1,
@@ -915,9 +998,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		2,
-		0
+		0,
+		-1, 0, 0
 	},
 	{TSParserRelationId,		/* TSPARSERNAMENSP */
 		TSParserNameNspIndexId,
 		2,
@@ -927,9 +1011,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		2,
-		0
+		0,
+		-1, 0, 0
 	},
 	{TSParserRelationId,		/* TSPARSEROID */
 		TSParserOidIndexId,
 		1,
@@ -939,9 +1024,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		2,
-		0
+		0,
+		-1, 0, 0
 	},
 	{TSTemplateRelationId,		/* TSTEMPLATENAMENSP */
 		TSTemplateNameNspIndexId,
 		2,
@@ -951,9 +1037,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		2,
-		0
+		0,
+		-1, 0, 0
 	},
 	{TSTemplateRelationId,		/* TSTEMPLATEOID */
 		TSTemplateOidIndexId,
 		1,
@@ -963,9 +1050,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		2,
-		0
+		0,
+		-1, 0, 0
 	},
 	{TypeRelationId,			/* TYPENAMENSP */
 		TypeNameNspIndexId,
 		2,
@@ -975,9 +1063,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		64,
-		0
+		0,
+		-1, 0, 0
 	},
 	{TypeRelationId,			/* TYPEOID */
 		TypeOidIndexId,
 		1,
@@ -987,9 +1076,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		64,
-		0
+		0,
+		-1, 0, 0
 	},
 	{UserMappingRelationId,		/* USERMAPPINGOID */
 		UserMappingOidIndexId,
 		1,
@@ -999,9 +1089,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		2,
-		0
+		0,
+		-1, 0, 0
 	},
 	{UserMappingRelationId,		/* USERMAPPINGUSERSERVER */
 		UserMappingUserServerIndexId,
 		2,
@@ -1011,9 +1102,10 @@ static const struct cachedesc cacheinfo[] = {
 			0,
 			0
 		},
 		2,
-		0
+		0,
+		-1, 0, 0
 	}
 };
 
 #define SysCacheSize	((int) lengthof(cacheinfo))
@@ -1046,9 +1138,10 @@ static int relinval_callback_count = 0;
 static ScanKeyData	oideqscankey; /* ScanKey for reloid match  */
 
 static int	oid_compare(const void *a, const void *b);
 static void SysCacheRelInvalCallback(Datum arg, Oid reloid);
-
+static void SysCacheSysCacheInvalCallback(Datum arg, int cacheid,
+										  uint32 hashvalue);
 /*
  * InitCatalogCache - initialize the caches
  *
  * Note that no database access is done here; we only allocate memory
@@ -1101,8 +1194,36 @@ InitCatalogCache(void)
 			relinval_callback_list[relinval_callback_count].relkeynum =
 				cacheinfo[cacheId].relattrnum;
 			relinval_callback_count++;
 		}
+
+		/*
+		 * If this syscache has syscache invalidation trigger, register
+		 * it.
+		 */
+		if (cacheinfo[cacheId].trig_cacheid >= 0)
+		{
+			SysCacheCBParam *param;
+
+			param = MemoryContextAlloc(CacheMemoryContext,
+									   sizeof(SysCacheCBParam));
+			param->target_cacheid = cacheId;
+
+			/*
+			 * XXXX: Create a scankeydata for OID comparison. We don't have a
+			 * means to check the type of the column in the system catalog at
+			 * this time. So we have to belive the definition.
+			 */
+			fmgr_info_cxt(F_OIDEQ, &param->skey.sk_func, CacheMemoryContext);
+			param->skey.sk_attno = cacheinfo[cacheId].target_attnum;
+			param->trig_attnum = cacheinfo[cacheId].trig_attnum;
+			param->skey.sk_strategy = BTEqualStrategyNumber;
+			param->skey.sk_subtype = InvalidOid;
+			param->skey.sk_collation = InvalidOid;
+			CacheRegisterSyscacheCallback(cacheinfo[cacheId].trig_cacheid,
+										  SysCacheSysCacheInvalCallback,
+										  PointerGetDatum(param));
+		}
 	}
 
 	Assert(SysCacheRelationOidSize <= lengthof(SysCacheRelationOid));
 	Assert(SysCacheSupportingRelOidSize <= lengthof(SysCacheSupportingRelOid));
@@ -1477,8 +1598,56 @@ RelationInvalidatesSnapshotsOnly(Oid relid)
 	return false;
 }
 
 /*
+ * SysCacheSysCacheInvalCallback
+ *
+ * Callback function for negative cache flushing by syscache invalidation.
+ * Fetches an OID (not restricted to system oid column) from the invalidated
+ * tuple and flushes negative entries that matches the OID in the target
+ * syscache.
+ */
+static void
+SysCacheSysCacheInvalCallback(Datum arg, int cacheid, uint32 hashValue)
+{
+	SysCacheCBParam *param;
+	CatCache	*trigger_cache;		/* triggering catcache */
+	CatCache	*target_cache;		/* target catcache */
+	List *oids;
+	ListCell *lc;
+	int			trigger_cacheid = cacheid;
+	int			target_cacheid;
+
+	param = (SysCacheCBParam *)DatumGetPointer(arg);
+	target_cacheid = param->target_cacheid;
+
+	trigger_cache = SysCache[trigger_cacheid];
+	target_cache = SysCache[target_cacheid];
+
+	/*
+	 * collect OIDs for target syscache entries. oids contains one value for
+	 * most cases, but two or more for the case hashvalue has synonyms. At
+	 * least one of them is the right OID but is cannot be distinguished using
+	 * the given hash value.
+	 *
+	 * As the result some unnecessary entries may be flushed but it won't harm
+	 * so much than letting them bloat catcaches.
+	 */
+	oids =
+		CollectOIDsForHashValue(trigger_cache, hashValue, param->trig_attnum);
+
+	foreach (lc, oids)
+	{
+		ScanKeyData skey;
+		Oid oid = lfirst_oid (lc);
+
+		memcpy(&skey, &param->skey, sizeof(skey));
+		skey.sk_argument = ObjectIdGetDatum(oid);
+		CleanupCatCacheNegEntries(target_cache, &skey);
+	}
+}
+
+/*
  * Test whether a relation has a system cache.
  */
 bool
 RelationHasSysCache(Oid relid)
diff --git a/src/include/utils/catcache.h b/src/include/utils/catcache.h
index d56a1d7..48c2a4a 100644
--- a/src/include/utils/catcache.h
+++ b/src/include/utils/catcache.h
@@ -183,8 +183,11 @@ extern void ReleaseCatCache(HeapTuple tuple);
 extern uint32 GetCatCacheHashValue(CatCache *cache,
 					 Datum v1, Datum v2,
 					 Datum v3, Datum v4);
 
+extern List *CollectOIDsForHashValue(CatCache *cache,
+									 uint32 hashValue, int attnum);
+
 extern CatCList *SearchCatCacheList(CatCache *cache, int nkeys,
 				   Datum v1, Datum v2,
 				   Datum v3, Datum v4);
 extern void ReleaseCatCacheList(CatCList *list);
-- 
2.9.2

