Hello, recently one of my customer stumbled over an immoderate
catcache bloat.
This is a known issue living on the Todo page in the PostgreSQL
wiki.
https://wiki.postgresql.org/wiki/Todo#Cache_Usage
> Fix memory leak caused by negative catcache entries
https://www.postgresql.org/message-id/51c0a1ff.2050...@vmware.com
This patch addresses the two cases of syscache bloat by using
invalidation callback mechanism.
Overview of the patch
The bloat is caused by negative cache entries in catcaches. They
are crucial for performance but it is a problem that there's no
way to remove them. They last for the backends' lifetime.
The first patch provides a means to flush catcache negative
entries, then defines a relcache invalidation callback to flush
negative entries in syscaches for pg_statistic(STATRELATTINH) and
pg_attributes(ATTNAME, ATTNUM). The second patch implements a
syscache invalidation callback so that deletion of a schema
causes a flush for pg_class (RELNAMENSP).
Both of the aboves are not hard-coded and defined in cacheinfo
using additional four members.
Remaining problems
Still, catcache can bloat by repeatedly accessing non-existent
table with unique names in a permanently-living schema but it
seems a bit too artificial (or malicious). Since such negative
entries don't have a trigger to remove, caps are needed to
prevent them from bloating syscaches, but the limits are hardly
seem reasonably determinable.
Defects or disadvantages
This patch scans over whole the target catcache to find negative
entries to remove and it might take a (comparably) long time on a
catcache with so many entries. By the second patch, unrelated
negative caches may be involved in flushing since they are keyd
by hashvalue, not by the exact key values.
The attached files are the following.
1. 0001-Cleanup-negative-cache-of-pg_statistic-when-dropping.patch
Negative entry flushing by relcache invalidation using
relcache invalidation callback.
2. 0002-Cleanup-negative-cache-of-pg_class-when-dropping-a-s.patch
Negative entry flushing by catcache invalidation using
catcache invalidation callback.
3. gen.pl
a test script for STATRELATTINH bloating.
4. gen2.pl
a test script for RELNAMENSP bloating.
3 and 4 are used as the following,
./gen.pl | psql postgres > /dev/null
regards,
--
Kyotaro Horiguchi
NTT Open Source Software Center
>From 203735e13d2b8584e1ddc652b602465a4f839355 Mon Sep 17 00:00:00 2001
From: Kyotaro Horiguchi <horiguchi.kyot...@lab.ntt.co.jp>
Date: Thu, 15 Dec 2016 17:43:03 +0900
Subject: [PATCH 1/2] Cleanup negative cache of pg_statistic when dropping a
relation.
Accessing columns that don't have statistics causes leaves negative
entries in catcache for pg_statstic, but there's no chance to remove
them. Especially when repeatedly creating then dropping temporary
tables bloats catcache so much that memory pressure can be
significant. This patch removes negative entries in STATRELATTINH,
ATTNAME and ATTNUM when corresponding relation is dropped.
---
src/backend/utils/cache/catcache.c | 57 +++++++-
src/backend/utils/cache/syscache.c | 274 +++++++++++++++++++++++++++----------
src/include/utils/catcache.h | 3 +
src/include/utils/syscache.h | 2 +
4 files changed, 263 insertions(+), 73 deletions(-)
diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c
index 6016d19..c1d9d2f 100644
--- a/src/backend/utils/cache/catcache.c
+++ b/src/backend/utils/cache/catcache.c
@@ -304,10 +304,11 @@ CatCachePrintStats(int code, Datum arg)
if (cache->cc_ntup == 0 && cache->cc_searches == 0)
continue; /* don't print unused caches */
- elog(DEBUG2, "catcache %s/%u: %d tup, %ld srch, %ld+%ld=%ld hits, %ld+%ld=%ld loads, %ld invals, %ld lsrch, %ld lhits",
+ elog(DEBUG2, "catcache %s/%u: %d tup, %d negtup, %ld srch, %ld+%ld=%ld hits, %ld+%ld=%ld loads, %ld invals, %ld lsrch, %ld lhits",
cache->cc_relname,
cache->cc_indexoid,
cache->cc_ntup,
+ cache->cc_nnegtup,
cache->cc_searches,
cache->cc_hits,
cache->cc_neg_hits,
@@ -374,6 +375,10 @@ CatCacheRemoveCTup(CatCache *cache, CatCTup *ct)
/* free associated tuple data */
if (ct->tuple.t_data != NULL)
pfree(ct->tuple.t_data);
+
+ if (ct->negative)
+ --cache->cc_nnegtup;
+
pfree(ct);
--cache->cc_ntup;
@@ -637,6 +642,49 @@ ResetCatalogCache(CatCache *cache)
}
/*
+ * CleanupCatCacheNegEntries
+ *
+ * Remove negative cache tuples maching a partial key.
+ *
+ */
+void
+CleanupCatCacheNegEntries(CatCache *cache, ScanKeyData *skey)
+{
+ int i;
+
+ /* If this cache has no negative entries, nothing to do */
+ if (cache->cc_nnegtup == 0)
+ return;
+
+ /* searching with a paritial key needs scanning the whole cache */
+ for (i = 0; i < cache->cc_nbuckets; i++)
+ {
+ dlist_head *bucket = &cache->cc_bucket[i];
+ dlist_mutable_iter iter;
+
+ dlist_foreach_modify(iter, bucket)
+ {
+ CatCTup *ct = dlist_container(CatCTup, cache_elem, iter.cur);
+ bool res;
+
+ if (!ct->negative)
+ continue;
+
+ HeapKeyTest(&ct->tuple, cache->cc_tupdesc, 1, skey, res);
+ if (!res)
+ continue;
+
+ /*
+ * a negative cache entry cannot be refferenced so we can remove
+ * it unconditionally
+ */
+ CatCacheRemoveCTup(cache, ct);
+ }
+ }
+}
+
+
+/*
* ResetCatalogCaches
*
* Reset all caches when a shared cache inval event forces it
@@ -783,6 +831,7 @@ InitCatCache(int id,
cp->cc_relisshared = false; /* temporary */
cp->cc_tupdesc = (TupleDesc) NULL;
cp->cc_ntup = 0;
+ cp->cc_nnegtup = 0;
cp->cc_nbuckets = nbuckets;
cp->cc_nkeys = nkeys;
for (i = 0; i < nkeys; ++i)
@@ -1279,8 +1328,8 @@ SearchCatCache(CatCache *cache,
CACHE4_elog(DEBUG2, "SearchCatCache(%s): Contains %d/%d tuples",
cache->cc_relname, cache->cc_ntup, CacheHdr->ch_ntup);
- CACHE3_elog(DEBUG2, "SearchCatCache(%s): put neg entry in bucket %d",
- cache->cc_relname, hashIndex);
+ CACHE4_elog(DEBUG2, "SearchCatCache(%s): put neg entry in bucket %d, total %d",
+ cache->cc_relname, hashIndex, cache->cc_nnegtup);
/*
* We are not returning the negative entry to the caller, so leave its
@@ -1731,6 +1780,8 @@ CatalogCacheCreateEntry(CatCache *cache, HeapTuple ntp,
cache->cc_ntup++;
CacheHdr->ch_ntup++;
+ if (negative)
+ cache->cc_nnegtup++;
/*
* If the hash table has become too full, enlarge the buckets array. Quite
diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c
index a3e0517..bc38113 100644
--- a/src/backend/utils/cache/syscache.c
+++ b/src/backend/utils/cache/syscache.c
@@ -69,6 +69,8 @@
#include "catalog/pg_user_mapping.h"
#include "utils/rel.h"
#include "utils/catcache.h"
+#include "utils/fmgroids.h"
+#include "utils/inval.h"
#include "utils/syscache.h"
@@ -114,6 +116,9 @@ struct cachedesc
int nkeys; /* # of keys needed for cache lookup */
int key[4]; /* attribute numbers of key attrs */
int nbuckets; /* number of hash buckets for this cache */
+
+ /* relcache invalidation stuff */
+ AttrNumber relattrnum; /* attr number of reloid, 0 if nothing to do */
};
static const struct cachedesc cacheinfo[] = {
@@ -126,7 +131,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 16
+ 16,
+ 0
},
{AccessMethodRelationId, /* AMNAME */
AmNameIndexId,
@@ -137,7 +143,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 4
+ 4,
+ 0
},
{AccessMethodRelationId, /* AMOID */
AmOidIndexId,
@@ -148,7 +155,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 4
+ 4,
+ 0
},
{AccessMethodOperatorRelationId, /* AMOPOPID */
AccessMethodOperatorIndexId,
@@ -159,7 +167,8 @@ static const struct cachedesc cacheinfo[] = {
Anum_pg_amop_amopfamily,
0
},
- 64
+ 64,
+ 0
},
{AccessMethodOperatorRelationId, /* AMOPSTRATEGY */
AccessMethodStrategyIndexId,
@@ -170,7 +179,8 @@ static const struct cachedesc cacheinfo[] = {
Anum_pg_amop_amoprighttype,
Anum_pg_amop_amopstrategy
},
- 64
+ 64,
+ 0
},
{AccessMethodProcedureRelationId, /* AMPROCNUM */
AccessMethodProcedureIndexId,
@@ -181,7 +191,8 @@ static const struct cachedesc cacheinfo[] = {
Anum_pg_amproc_amprocrighttype,
Anum_pg_amproc_amprocnum
},
- 16
+ 16,
+ 0
},
{AttributeRelationId, /* ATTNAME */
AttributeRelidNameIndexId,
@@ -192,7 +203,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 32
+ 32,
+ Anum_pg_attribute_attrelid
},
{AttributeRelationId, /* ATTNUM */
AttributeRelidNumIndexId,
@@ -203,7 +215,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 128
+ 128,
+ Anum_pg_attribute_attrelid
},
{AuthMemRelationId, /* AUTHMEMMEMROLE */
AuthMemMemRoleIndexId,
@@ -214,7 +227,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 8
+ 8,
+ 0
},
{AuthMemRelationId, /* AUTHMEMROLEMEM */
AuthMemRoleMemIndexId,
@@ -225,7 +239,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 8
+ 8,
+ 0
},
{AuthIdRelationId, /* AUTHNAME */
AuthIdRolnameIndexId,
@@ -236,7 +251,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 8
+ 8,
+ 0
},
{AuthIdRelationId, /* AUTHOID */
AuthIdOidIndexId,
@@ -247,10 +263,10 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 8
+ 8,
+ 0
},
- {
- CastRelationId, /* CASTSOURCETARGET */
+ {CastRelationId, /* CASTSOURCETARGET */
CastSourceTargetIndexId,
2,
{
@@ -259,7 +275,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 256
+ 256,
+ 0
},
{OperatorClassRelationId, /* CLAAMNAMENSP */
OpclassAmNameNspIndexId,
@@ -270,7 +287,8 @@ static const struct cachedesc cacheinfo[] = {
Anum_pg_opclass_opcnamespace,
0
},
- 8
+ 8,
+ 0
},
{OperatorClassRelationId, /* CLAOID */
OpclassOidIndexId,
@@ -281,7 +299,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 8
+ 8,
+ 0
},
{CollationRelationId, /* COLLNAMEENCNSP */
CollationNameEncNspIndexId,
@@ -292,7 +311,8 @@ static const struct cachedesc cacheinfo[] = {
Anum_pg_collation_collnamespace,
0
},
- 8
+ 8,
+ 0
},
{CollationRelationId, /* COLLOID */
CollationOidIndexId,
@@ -303,7 +323,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 8
+ 8,
+ 0
},
{ConversionRelationId, /* CONDEFAULT */
ConversionDefaultIndexId,
@@ -314,7 +335,8 @@ static const struct cachedesc cacheinfo[] = {
Anum_pg_conversion_contoencoding,
ObjectIdAttributeNumber,
},
- 8
+ 8,
+ 0
},
{ConversionRelationId, /* CONNAMENSP */
ConversionNameNspIndexId,
@@ -325,7 +347,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 8
+ 8,
+ 0
},
{ConstraintRelationId, /* CONSTROID */
ConstraintOidIndexId,
@@ -336,7 +359,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 16
+ 16,
+ 0
},
{ConversionRelationId, /* CONVOID */
ConversionOidIndexId,
@@ -347,7 +371,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 8
+ 8,
+ 0
},
{DatabaseRelationId, /* DATABASEOID */
DatabaseOidIndexId,
@@ -358,7 +383,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 4
+ 4,
+ 0
},
{DefaultAclRelationId, /* DEFACLROLENSPOBJ */
DefaultAclRoleNspObjIndexId,
@@ -369,7 +395,8 @@ static const struct cachedesc cacheinfo[] = {
Anum_pg_default_acl_defaclobjtype,
0
},
- 8
+ 8,
+ 0
},
{EnumRelationId, /* ENUMOID */
EnumOidIndexId,
@@ -380,7 +407,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 8
+ 8,
+ 0
},
{EnumRelationId, /* ENUMTYPOIDNAME */
EnumTypIdLabelIndexId,
@@ -391,7 +419,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 8
+ 8,
+ 0
},
{EventTriggerRelationId, /* EVENTTRIGGERNAME */
EventTriggerNameIndexId,
@@ -402,7 +431,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 8
+ 8,
+ 0
},
{EventTriggerRelationId, /* EVENTTRIGGEROID */
EventTriggerOidIndexId,
@@ -413,7 +443,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 8
+ 8,
+ 0
},
{ForeignDataWrapperRelationId, /* FOREIGNDATAWRAPPERNAME */
ForeignDataWrapperNameIndexId,
@@ -424,7 +455,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 2
+ 2,
+ 0
},
{ForeignDataWrapperRelationId, /* FOREIGNDATAWRAPPEROID */
ForeignDataWrapperOidIndexId,
@@ -435,7 +467,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 2
+ 2,
+ 0
},
{ForeignServerRelationId, /* FOREIGNSERVERNAME */
ForeignServerNameIndexId,
@@ -446,7 +479,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 2
+ 2,
+ 0
},
{ForeignServerRelationId, /* FOREIGNSERVEROID */
ForeignServerOidIndexId,
@@ -457,7 +491,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 2
+ 2,
+ 0
},
{ForeignTableRelationId, /* FOREIGNTABLEREL */
ForeignTableRelidIndexId,
@@ -468,7 +503,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 4
+ 4,
+ 0
},
{IndexRelationId, /* INDEXRELID */
IndexRelidIndexId,
@@ -479,7 +515,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 64
+ 64,
+ 0
},
{LanguageRelationId, /* LANGNAME */
LanguageNameIndexId,
@@ -490,7 +527,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 4
+ 4,
+ 0
},
{LanguageRelationId, /* LANGOID */
LanguageOidIndexId,
@@ -501,7 +539,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 4
+ 4,
+ 0
},
{NamespaceRelationId, /* NAMESPACENAME */
NamespaceNameIndexId,
@@ -512,7 +551,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 4
+ 4,
+ 0
},
{NamespaceRelationId, /* NAMESPACEOID */
NamespaceOidIndexId,
@@ -523,7 +563,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 16
+ 16,
+ 0
},
{OperatorRelationId, /* OPERNAMENSP */
OperatorNameNspIndexId,
@@ -534,7 +575,8 @@ static const struct cachedesc cacheinfo[] = {
Anum_pg_operator_oprright,
Anum_pg_operator_oprnamespace
},
- 256
+ 256,
+ 0
},
{OperatorRelationId, /* OPEROID */
OperatorOidIndexId,
@@ -545,7 +587,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 32
+ 32,
+ 0
},
{OperatorFamilyRelationId, /* OPFAMILYAMNAMENSP */
OpfamilyAmNameNspIndexId,
@@ -556,7 +599,8 @@ static const struct cachedesc cacheinfo[] = {
Anum_pg_opfamily_opfnamespace,
0
},
- 8
+ 8,
+ 0
},
{OperatorFamilyRelationId, /* OPFAMILYOID */
OpfamilyOidIndexId,
@@ -567,7 +611,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 8
+ 8,
+ 0
},
{PartitionedRelationId, /* PARTRELID */
PartitionedRelidIndexId,
@@ -578,7 +623,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 32
+ 32,
+ 0
},
{ProcedureRelationId, /* PROCNAMEARGSNSP */
ProcedureNameArgsNspIndexId,
@@ -589,7 +635,8 @@ static const struct cachedesc cacheinfo[] = {
Anum_pg_proc_pronamespace,
0
},
- 128
+ 128,
+ 0
},
{ProcedureRelationId, /* PROCOID */
ProcedureOidIndexId,
@@ -600,7 +647,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 128
+ 128,
+ 0
},
{RangeRelationId, /* RANGETYPE */
RangeTypidIndexId,
@@ -611,7 +659,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 4
+ 4,
+ 0
},
{RelationRelationId, /* RELNAMENSP */
ClassNameNspIndexId,
@@ -622,7 +671,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 128
+ 128,
+ 0
},
{RelationRelationId, /* RELOID */
ClassOidIndexId,
@@ -633,7 +683,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 128
+ 128,
+ 0
},
{ReplicationOriginRelationId, /* REPLORIGIDENT */
ReplicationOriginIdentIndex,
@@ -644,7 +695,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 16
+ 16,
+ 0
},
{ReplicationOriginRelationId, /* REPLORIGNAME */
ReplicationOriginNameIndex,
@@ -655,7 +707,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 16
+ 16,
+ 0
},
{RewriteRelationId, /* RULERELNAME */
RewriteRelRulenameIndexId,
@@ -666,7 +719,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 8
+ 8,
+ 0
},
{StatisticRelationId, /* STATRELATTINH */
StatisticRelidAttnumInhIndexId,
@@ -677,7 +731,8 @@ static const struct cachedesc cacheinfo[] = {
Anum_pg_statistic_stainherit,
0
},
- 128
+ 128,
+ Anum_pg_statistic_starelid
},
{TableSpaceRelationId, /* TABLESPACEOID */
TablespaceOidIndexId,
@@ -688,7 +743,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0,
},
- 4
+ 4,
+ 0
},
{TransformRelationId, /* TRFOID */
TransformOidIndexId,
@@ -699,7 +755,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0,
},
- 16
+ 16,
+ 0
},
{TransformRelationId, /* TRFTYPELANG */
TransformTypeLangIndexId,
@@ -710,7 +767,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0,
},
- 16
+ 16,
+ 0
},
{TSConfigMapRelationId, /* TSCONFIGMAP */
TSConfigMapIndexId,
@@ -721,7 +779,8 @@ static const struct cachedesc cacheinfo[] = {
Anum_pg_ts_config_map_mapseqno,
0
},
- 2
+ 2,
+ 0
},
{TSConfigRelationId, /* TSCONFIGNAMENSP */
TSConfigNameNspIndexId,
@@ -732,7 +791,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 2
+ 2,
+ 0
},
{TSConfigRelationId, /* TSCONFIGOID */
TSConfigOidIndexId,
@@ -743,7 +803,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 2
+ 2,
+ 0
},
{TSDictionaryRelationId, /* TSDICTNAMENSP */
TSDictionaryNameNspIndexId,
@@ -754,7 +815,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 2
+ 2,
+ 0
},
{TSDictionaryRelationId, /* TSDICTOID */
TSDictionaryOidIndexId,
@@ -765,7 +827,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 2
+ 2,
+ 0
},
{TSParserRelationId, /* TSPARSERNAMENSP */
TSParserNameNspIndexId,
@@ -776,7 +839,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 2
+ 2,
+ 0
},
{TSParserRelationId, /* TSPARSEROID */
TSParserOidIndexId,
@@ -787,7 +851,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 2
+ 2,
+ 0
},
{TSTemplateRelationId, /* TSTEMPLATENAMENSP */
TSTemplateNameNspIndexId,
@@ -798,7 +863,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 2
+ 2,
+ 0
},
{TSTemplateRelationId, /* TSTEMPLATEOID */
TSTemplateOidIndexId,
@@ -809,7 +875,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 2
+ 2,
+ 0
},
{TypeRelationId, /* TYPENAMENSP */
TypeNameNspIndexId,
@@ -820,7 +887,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 64
+ 64,
+ 0
},
{TypeRelationId, /* TYPEOID */
TypeOidIndexId,
@@ -831,7 +899,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 64
+ 64,
+ 0
},
{UserMappingRelationId, /* USERMAPPINGOID */
UserMappingOidIndexId,
@@ -842,7 +911,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 2
+ 2,
+ 0
},
{UserMappingRelationId, /* USERMAPPINGUSERSERVER */
UserMappingUserServerIndexId,
@@ -853,7 +923,8 @@ static const struct cachedesc cacheinfo[] = {
0,
0
},
- 2
+ 2,
+ 0
}
};
@@ -871,8 +942,23 @@ static int SysCacheRelationOidSize;
static Oid SysCacheSupportingRelOid[SysCacheSize * 2];
static int SysCacheSupportingRelOidSize;
-static int oid_compare(const void *a, const void *b);
+/*
+ * stuff for negative cache flushing by relcache invalidation
+ */
+#define MAX_RELINVAL_CALLBACKS 4
+typedef struct RELINVALCBParam
+{
+ CatCache *cache;
+ int relkeynum;
+} RELINVALCBParam;
+
+RELINVALCBParam relinval_callback_list[MAX_RELINVAL_CALLBACKS];
+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);
/*
* InitCatalogCache - initialize the caches
@@ -913,6 +999,21 @@ InitCatalogCache(void)
cacheinfo[cacheId].indoid;
/* see comments for RelationInvalidatesSnapshotsOnly */
Assert(!RelationInvalidatesSnapshotsOnly(cacheinfo[cacheId].reloid));
+
+ /*
+ * If this syscache has something to do with relcache invalidation,
+ * register a callback
+ */
+ if (cacheinfo[cacheId].relattrnum > 0)
+ {
+ Assert(relinval_callback_count < MAX_RELINVAL_CALLBACKS);
+
+ relinval_callback_list[relinval_callback_count].cache =
+ SysCache[cacheId];
+ relinval_callback_list[relinval_callback_count].relkeynum =
+ cacheinfo[cacheId].relattrnum;
+ relinval_callback_count++;
+ }
}
Assert(SysCacheRelationOidSize <= lengthof(SysCacheRelationOid));
@@ -937,10 +1038,43 @@ InitCatalogCache(void)
}
SysCacheSupportingRelOidSize = j + 1;
+ /*
+ * If any of syscache needs relcache invalidation callback, prepare the
+ * scankey for reloid comparison and register a relcache inval callback.
+ */
+ if (relinval_callback_count > 0)
+ {
+ oideqscankey.sk_strategy = BTEqualStrategyNumber;
+ oideqscankey.sk_subtype = InvalidOid;
+ oideqscankey.sk_collation = InvalidOid;
+ fmgr_info_cxt(F_OIDEQ, &oideqscankey.sk_func, CacheMemoryContext);
+ CacheRegisterRelcacheCallback(SysCacheRelInvalCallback, (Datum) 0);
+ }
+
CacheInitialized = true;
}
/*
+ * Callback function for negative cache flushing by relcache invalidation
+ * scankey for this funciton is prepared in InitCatalogCache.
+ */
+static void
+SysCacheRelInvalCallback(Datum arg, Oid reloid)
+{
+ int i;
+
+ for(i = 0 ; i < relinval_callback_count ; i++)
+ {
+ ScanKeyData skey;
+
+ memcpy(&skey, &oideqscankey, sizeof(skey));
+ skey.sk_attno = relinval_callback_list[i].relkeynum;
+ skey.sk_argument = ObjectIdGetDatum(reloid);
+ CleanupCatCacheNegEntries(relinval_callback_list[i].cache, &skey);
+ }
+}
+
+/*
* InitCatalogCachePhase2 - finish initializing the caches
*
* Finish initializing all the caches, including necessary database
diff --git a/src/include/utils/catcache.h b/src/include/utils/catcache.h
index 253c7b5..cb662c0 100644
--- a/src/include/utils/catcache.h
+++ b/src/include/utils/catcache.h
@@ -44,6 +44,7 @@ typedef struct catcache
bool cc_relisshared; /* is relation shared across databases? */
TupleDesc cc_tupdesc; /* tuple descriptor (copied from reldesc) */
int cc_ntup; /* # of tuples currently in this cache */
+ int cc_nnegtup; /* # of negative tuples */
int cc_nbuckets; /* # of hash buckets in this cache */
int cc_nkeys; /* # of keys (1..CATCACHE_MAXKEYS) */
int cc_key[CATCACHE_MAXKEYS]; /* AttrNumber of each key */
@@ -183,6 +184,8 @@ extern CatCList *SearchCatCacheList(CatCache *cache, int nkeys,
Datum v3, Datum v4);
extern void ReleaseCatCacheList(CatCList *list);
+extern void
+CleanupCatCacheNegEntries(CatCache *cache, ScanKeyData *skey);
extern void ResetCatalogCaches(void);
extern void CatalogCacheFlushCatalog(Oid catId);
extern void CatalogCacheIdInvalidate(int cacheId, uint32 hashValue);
diff --git a/src/include/utils/syscache.h b/src/include/utils/syscache.h
index 39fe947..145addf 100644
--- a/src/include/utils/syscache.h
+++ b/src/include/utils/syscache.h
@@ -106,6 +106,8 @@ extern void InitCatalogCachePhase2(void);
extern HeapTuple SearchSysCache(int cacheId,
Datum key1, Datum key2, Datum key3, Datum key4);
extern void ReleaseSysCache(HeapTuple tuple);
+extern void CleanupNegativeCache(int cacheid, int nkeys,
+ Datum key1, Datum key2, Datum key3, Datum key4);
/* convenience routines */
extern HeapTuple SearchSysCacheCopy(int cacheId,
--
2.9.2
>From 1b42210b5506a11ffd4d8a87a24f44a75d47c652 Mon Sep 17 00:00:00 2001
From: Kyotaro Horiguchi <horiguchi.kyot...@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 inturn is triggered by catcache invalidation. This patch
provides a syscache invalidation callback to flush negative cache
entries corresponding to the invalidated object.
---
src/backend/utils/cache/catcache.c | 42 ++++++
src/backend/utils/cache/inval.c | 8 +-
src/backend/utils/cache/syscache.c | 301 ++++++++++++++++++++++++++++---------
src/include/utils/catcache.h | 3 +
4 files changed, 284 insertions(+), 70 deletions(-)
diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c
index c1d9d2f..094bc60 100644
--- a/src/backend/utils/cache/catcache.c
+++ b/src/backend/utils/cache/catcache.c
@@ -1424,6 +1424,48 @@ 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 5803518..0290974 100644
--- a/src/backend/utils/cache/inval.c
+++ b/src/backend/utils/cache/inval.c
@@ -543,9 +543,13 @@ LocalExecuteInvalidationMessage(SharedInvalidationMessage *msg)
{
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 bc38113..f1fc5f3 100644
--- a/src/backend/utils/cache/syscache.c
+++ b/src/backend/utils/cache/syscache.c
@@ -107,6 +107,16 @@
*/
/*
+ * 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
@@ -119,6 +129,14 @@ struct cachedesc
/* 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[] = {
@@ -132,7 +150,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
16,
- 0
+ 0,
+ -1, 0, 0
},
{AccessMethodRelationId, /* AMNAME */
AmNameIndexId,
@@ -144,7 +163,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
4,
- 0
+ 0,
+ -1, 0, 0
},
{AccessMethodRelationId, /* AMOID */
AmOidIndexId,
@@ -156,7 +176,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
4,
- 0
+ 0,
+ -1, 0, 0
},
{AccessMethodOperatorRelationId, /* AMOPOPID */
AccessMethodOperatorIndexId,
@@ -168,7 +189,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
64,
- 0
+ 0,
+ -1, 0, 0
},
{AccessMethodOperatorRelationId, /* AMOPSTRATEGY */
AccessMethodStrategyIndexId,
@@ -180,7 +202,8 @@ static const struct cachedesc cacheinfo[] = {
Anum_pg_amop_amopstrategy
},
64,
- 0
+ 0,
+ -1, 0, 0
},
{AccessMethodProcedureRelationId, /* AMPROCNUM */
AccessMethodProcedureIndexId,
@@ -192,7 +215,8 @@ static const struct cachedesc cacheinfo[] = {
Anum_pg_amproc_amprocnum
},
16,
- 0
+ 0,
+ -1, 0, 0
},
{AttributeRelationId, /* ATTNAME */
AttributeRelidNameIndexId,
@@ -204,7 +228,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
32,
- Anum_pg_attribute_attrelid
+ Anum_pg_attribute_attrelid,
+ -1, 0, 0
},
{AttributeRelationId, /* ATTNUM */
AttributeRelidNumIndexId,
@@ -216,7 +241,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
128,
- Anum_pg_attribute_attrelid
+ Anum_pg_attribute_attrelid,
+ -1, 0, 0
},
{AuthMemRelationId, /* AUTHMEMMEMROLE */
AuthMemMemRoleIndexId,
@@ -228,7 +254,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
8,
- 0
+ 0,
+ -1, 0, 0
},
{AuthMemRelationId, /* AUTHMEMROLEMEM */
AuthMemRoleMemIndexId,
@@ -240,7 +267,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
8,
- 0
+ 0,
+ -1, 0, 0
},
{AuthIdRelationId, /* AUTHNAME */
AuthIdRolnameIndexId,
@@ -252,7 +280,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
8,
- 0
+ 0,
+ -1, 0, 0
},
{AuthIdRelationId, /* AUTHOID */
AuthIdOidIndexId,
@@ -264,7 +293,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
8,
- 0
+ 0,
+ -1, 0, 0
},
{CastRelationId, /* CASTSOURCETARGET */
CastSourceTargetIndexId,
@@ -276,7 +306,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
256,
- 0
+ 0,
+ -1, 0, 0
},
{OperatorClassRelationId, /* CLAAMNAMENSP */
OpclassAmNameNspIndexId,
@@ -288,7 +319,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
8,
- 0
+ 0,
+ -1, 0, 0
},
{OperatorClassRelationId, /* CLAOID */
OpclassOidIndexId,
@@ -300,7 +332,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
8,
- 0
+ 0,
+ -1, 0, 0
},
{CollationRelationId, /* COLLNAMEENCNSP */
CollationNameEncNspIndexId,
@@ -312,7 +345,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
8,
- 0
+ 0,
+ -1, 0, 0
},
{CollationRelationId, /* COLLOID */
CollationOidIndexId,
@@ -324,7 +358,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
8,
- 0
+ 0,
+ -1, 0, 0
},
{ConversionRelationId, /* CONDEFAULT */
ConversionDefaultIndexId,
@@ -336,7 +371,8 @@ static const struct cachedesc cacheinfo[] = {
ObjectIdAttributeNumber,
},
8,
- 0
+ 0,
+ -1, 0, 0
},
{ConversionRelationId, /* CONNAMENSP */
ConversionNameNspIndexId,
@@ -348,7 +384,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
8,
- 0
+ 0,
+ -1, 0, 0
},
{ConstraintRelationId, /* CONSTROID */
ConstraintOidIndexId,
@@ -360,7 +397,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
16,
- 0
+ 0,
+ -1, 0, 0
},
{ConversionRelationId, /* CONVOID */
ConversionOidIndexId,
@@ -372,7 +410,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
8,
- 0
+ 0,
+ -1, 0, 0
},
{DatabaseRelationId, /* DATABASEOID */
DatabaseOidIndexId,
@@ -384,7 +423,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
4,
- 0
+ 0,
+ -1, 0, 0
},
{DefaultAclRelationId, /* DEFACLROLENSPOBJ */
DefaultAclRoleNspObjIndexId,
@@ -396,7 +436,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
8,
- 0
+ 0,
+ -1, 0, 0
},
{EnumRelationId, /* ENUMOID */
EnumOidIndexId,
@@ -408,7 +449,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
8,
- 0
+ 0,
+ -1, 0, 0
},
{EnumRelationId, /* ENUMTYPOIDNAME */
EnumTypIdLabelIndexId,
@@ -420,7 +462,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
8,
- 0
+ 0,
+ -1, 0, 0
},
{EventTriggerRelationId, /* EVENTTRIGGERNAME */
EventTriggerNameIndexId,
@@ -432,7 +475,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
8,
- 0
+ 0,
+ -1, 0, 0
},
{EventTriggerRelationId, /* EVENTTRIGGEROID */
EventTriggerOidIndexId,
@@ -444,7 +488,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
8,
- 0
+ 0,
+ -1, 0, 0
},
{ForeignDataWrapperRelationId, /* FOREIGNDATAWRAPPERNAME */
ForeignDataWrapperNameIndexId,
@@ -456,7 +501,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
2,
- 0
+ 0,
+ -1, 0, 0
},
{ForeignDataWrapperRelationId, /* FOREIGNDATAWRAPPEROID */
ForeignDataWrapperOidIndexId,
@@ -468,7 +514,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
2,
- 0
+ 0,
+ -1, 0, 0
},
{ForeignServerRelationId, /* FOREIGNSERVERNAME */
ForeignServerNameIndexId,
@@ -480,7 +527,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
2,
- 0
+ 0,
+ -1, 0, 0
},
{ForeignServerRelationId, /* FOREIGNSERVEROID */
ForeignServerOidIndexId,
@@ -492,7 +540,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
2,
- 0
+ 0,
+ -1, 0, 0
},
{ForeignTableRelationId, /* FOREIGNTABLEREL */
ForeignTableRelidIndexId,
@@ -504,7 +553,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
4,
- 0
+ 0,
+ -1, 0, 0
},
{IndexRelationId, /* INDEXRELID */
IndexRelidIndexId,
@@ -516,7 +566,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
64,
- 0
+ 0,
+ -1, 0, 0
},
{LanguageRelationId, /* LANGNAME */
LanguageNameIndexId,
@@ -528,7 +579,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
4,
- 0
+ 0,
+ -1, 0, 0
},
{LanguageRelationId, /* LANGOID */
LanguageOidIndexId,
@@ -540,7 +592,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
4,
- 0
+ 0,
+ -1, 0, 0
},
{NamespaceRelationId, /* NAMESPACENAME */
NamespaceNameIndexId,
@@ -552,7 +605,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
4,
- 0
+ 0,
+ -1, 0, 0
},
{NamespaceRelationId, /* NAMESPACEOID */
NamespaceOidIndexId,
@@ -564,7 +618,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
16,
- 0
+ 0,
+ -1, 0, 0
},
{OperatorRelationId, /* OPERNAMENSP */
OperatorNameNspIndexId,
@@ -576,7 +631,8 @@ static const struct cachedesc cacheinfo[] = {
Anum_pg_operator_oprnamespace
},
256,
- 0
+ 0,
+ -1, 0, 0
},
{OperatorRelationId, /* OPEROID */
OperatorOidIndexId,
@@ -588,7 +644,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
32,
- 0
+ 0,
+ -1, 0, 0
},
{OperatorFamilyRelationId, /* OPFAMILYAMNAMENSP */
OpfamilyAmNameNspIndexId,
@@ -600,7 +657,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
8,
- 0
+ 0,
+ -1, 0, 0
},
{OperatorFamilyRelationId, /* OPFAMILYOID */
OpfamilyOidIndexId,
@@ -612,7 +670,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
8,
- 0
+ 0,
+ -1, 0, 0
},
{PartitionedRelationId, /* PARTRELID */
PartitionedRelidIndexId,
@@ -624,7 +683,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
32,
- 0
+ 0,
+ -1, 0, 0
},
{ProcedureRelationId, /* PROCNAMEARGSNSP */
ProcedureNameArgsNspIndexId,
@@ -636,7 +696,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
128,
- 0
+ 0,
+ -1, 0, 0
},
{ProcedureRelationId, /* PROCOID */
ProcedureOidIndexId,
@@ -648,7 +709,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
128,
- 0
+ 0,
+ -1, 0, 0
},
{RangeRelationId, /* RANGETYPE */
RangeTypidIndexId,
@@ -660,7 +722,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
4,
- 0
+ 0,
+ -1, 0, 0
},
{RelationRelationId, /* RELNAMENSP */
ClassNameNspIndexId,
@@ -672,7 +735,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
128,
- 0
+ 0,
+ NAMESPACEOID, ObjectIdAttributeNumber, Anum_pg_class_relnamespace
},
{RelationRelationId, /* RELOID */
ClassOidIndexId,
@@ -684,7 +748,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
128,
- 0
+ 0,
+ -1, 0, 0
},
{ReplicationOriginRelationId, /* REPLORIGIDENT */
ReplicationOriginIdentIndex,
@@ -696,7 +761,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
16,
- 0
+ 0,
+ -1, 0, 0
},
{ReplicationOriginRelationId, /* REPLORIGNAME */
ReplicationOriginNameIndex,
@@ -708,7 +774,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
16,
- 0
+ 0,
+ -1, 0, 0
},
{RewriteRelationId, /* RULERELNAME */
RewriteRelRulenameIndexId,
@@ -720,7 +787,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
8,
- 0
+ 0,
+ -1, 0, 0
},
{StatisticRelationId, /* STATRELATTINH */
StatisticRelidAttnumInhIndexId,
@@ -732,7 +800,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
128,
- Anum_pg_statistic_starelid
+ Anum_pg_statistic_starelid,
+ -1, 0, 0
},
{TableSpaceRelationId, /* TABLESPACEOID */
TablespaceOidIndexId,
@@ -744,7 +813,8 @@ static const struct cachedesc cacheinfo[] = {
0,
},
4,
- 0
+ 0,
+ -1, 0, 0
},
{TransformRelationId, /* TRFOID */
TransformOidIndexId,
@@ -756,7 +826,8 @@ static const struct cachedesc cacheinfo[] = {
0,
},
16,
- 0
+ 0,
+ -1, 0, 0
},
{TransformRelationId, /* TRFTYPELANG */
TransformTypeLangIndexId,
@@ -768,7 +839,8 @@ static const struct cachedesc cacheinfo[] = {
0,
},
16,
- 0
+ 0,
+ -1, 0, 0
},
{TSConfigMapRelationId, /* TSCONFIGMAP */
TSConfigMapIndexId,
@@ -780,7 +852,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
2,
- 0
+ 0,
+ -1, 0, 0
},
{TSConfigRelationId, /* TSCONFIGNAMENSP */
TSConfigNameNspIndexId,
@@ -792,7 +865,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
2,
- 0
+ 0,
+ -1, 0, 0
},
{TSConfigRelationId, /* TSCONFIGOID */
TSConfigOidIndexId,
@@ -804,7 +878,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
2,
- 0
+ 0,
+ -1, 0, 0
},
{TSDictionaryRelationId, /* TSDICTNAMENSP */
TSDictionaryNameNspIndexId,
@@ -816,7 +891,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
2,
- 0
+ 0,
+ -1, 0, 0
},
{TSDictionaryRelationId, /* TSDICTOID */
TSDictionaryOidIndexId,
@@ -828,7 +904,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
2,
- 0
+ 0,
+ -1, 0, 0
},
{TSParserRelationId, /* TSPARSERNAMENSP */
TSParserNameNspIndexId,
@@ -840,7 +917,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
2,
- 0
+ 0,
+ -1, 0, 0
},
{TSParserRelationId, /* TSPARSEROID */
TSParserOidIndexId,
@@ -852,7 +930,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
2,
- 0
+ 0,
+ -1, 0, 0
},
{TSTemplateRelationId, /* TSTEMPLATENAMENSP */
TSTemplateNameNspIndexId,
@@ -864,7 +943,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
2,
- 0
+ 0,
+ -1, 0, 0
},
{TSTemplateRelationId, /* TSTEMPLATEOID */
TSTemplateOidIndexId,
@@ -876,7 +956,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
2,
- 0
+ 0,
+ -1, 0, 0
},
{TypeRelationId, /* TYPENAMENSP */
TypeNameNspIndexId,
@@ -888,7 +969,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
64,
- 0
+ 0,
+ -1, 0, 0
},
{TypeRelationId, /* TYPEOID */
TypeOidIndexId,
@@ -900,7 +982,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
64,
- 0
+ 0,
+ -1, 0, 0
},
{UserMappingRelationId, /* USERMAPPINGOID */
UserMappingOidIndexId,
@@ -912,7 +995,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
2,
- 0
+ 0,
+ -1, 0, 0
},
{UserMappingRelationId, /* USERMAPPINGUSERSERVER */
UserMappingUserServerIndexId,
@@ -924,7 +1008,8 @@ static const struct cachedesc cacheinfo[] = {
0
},
2,
- 0
+ 0,
+ -1, 0, 0
}
};
@@ -959,7 +1044,8 @@ 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
*
@@ -1014,6 +1100,37 @@ InitCatalogCache(void)
cacheinfo[cacheId].relattrnum;
relinval_callback_count++;
}
+
+ /*
+ * If this syscache has syscache invalidation trigger, register
+ * it.
+ */
+ if (cacheinfo[cacheId].trig_cacheid >= 0)
+ {
+ SysCacheCBParam *param;
+ RegProcedure eqfunc;
+
+ 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 is correct.
+ */
+ eqfunc = F_OIDEQ;
+
+ fmgr_info_cxt(eqfunc, ¶m->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));
@@ -1390,6 +1507,54 @@ RelationInvalidatesSnapshotsOnly(Oid relid)
}
/*
+ * 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, ¶m->skey, sizeof(skey));
+ skey.sk_argument = ObjectIdGetDatum(oid);
+ CleanupCatCacheNegEntries(target_cache, &skey);
+ }
+}
+
+/*
* Test whether a relation has a system cache.
*/
bool
diff --git a/src/include/utils/catcache.h b/src/include/utils/catcache.h
index cb662c0..b279174 100644
--- a/src/include/utils/catcache.h
+++ b/src/include/utils/catcache.h
@@ -179,6 +179,9 @@ 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);
--
2.9.2
#! /usr/bin/perl
while (1) {
print "begin; create temp table t1 (a int, b int, c int, d int, e int,
f int, g int, h int, i int, j int) on commit drop; insert into t1 values (1, 2,
3, 4, 5, 6, 7, 8, 9, 10); select * from t1; commit;\n";
}
#! /usr/bin/perl
while (1) {
print "set log_min_messages=fatal; set client_min_messages=fatal;create
schema foo; select * from foo.invalid; drop schema foo;\n";
}
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers
