From 7589a1d666ead07ac838b155685e37a16e497f1b Mon Sep 17 00:00:00 2001 From: Melih Mutlu Date: Tue, 13 Jun 2023 16:43:24 +0300 Subject: [PATCH] Separate memory contexts for relcache and catcache This patch introduces two new memory contexts under CacheMemoryContext for relcache and catcache. Most of the time relcache and catcache constitutes a large part of CacheMemoryContext. Before this patch, it was hard to see the contribution of both caches in memory usage of CacheMemoryContext. Having separate contexts for these two aims to help to understand more about memory usage of contexts. --- src/backend/utils/cache/catcache.c | 35 ++++++++--- src/backend/utils/cache/relcache.c | 99 +++++++++++++++++------------- 2 files changed, 82 insertions(+), 52 deletions(-) diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index 1aacb736c2..ce30bdbc0a 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -99,6 +99,9 @@ static void CatCacheFreeKeys(TupleDesc tupdesc, int nkeys, int *attnos, static void CatCacheCopyKeys(TupleDesc tupdesc, int nkeys, int *attnos, Datum *srckeys, Datum *dstkeys); +/* Separate memory context for catcache */ +static MemoryContext CatCacheMemoryContext = NULL; +static void CreateCatCacheMemoryContext(void); /* * internal support functions @@ -782,10 +785,10 @@ InitCatCache(int id, * first switch to the cache context so our allocations do not vanish at * the end of a transaction */ - if (!CacheMemoryContext) - CreateCacheMemoryContext(); + if (!CatCacheMemoryContext) + CreateCatCacheMemoryContext(); - oldcxt = MemoryContextSwitchTo(CacheMemoryContext); + oldcxt = MemoryContextSwitchTo(CatCacheMemoryContext); /* * if first time through, initialize the cache group header @@ -864,7 +867,7 @@ RehashCatCache(CatCache *cp) /* Allocate a new, larger, hash table. */ newnbuckets = cp->cc_nbuckets * 2; - newbucket = (dlist_head *) MemoryContextAllocZero(CacheMemoryContext, newnbuckets * sizeof(dlist_head)); + newbucket = (dlist_head *) MemoryContextAllocZero(CatCacheMemoryContext, newnbuckets * sizeof(dlist_head)); /* Move all entries from old hash table to new. */ for (i = 0; i < cp->cc_nbuckets; i++) @@ -931,9 +934,9 @@ CatalogCacheInitializeCache(CatCache *cache) * switch to the cache context so our allocations do not vanish at the end * of a transaction */ - Assert(CacheMemoryContext != NULL); + Assert(CatCacheMemoryContext != NULL); - oldcxt = MemoryContextSwitchTo(CacheMemoryContext); + oldcxt = MemoryContextSwitchTo(CatCacheMemoryContext); /* * copy the relcache's tuple descriptor to permanent cache storage @@ -994,7 +997,7 @@ CatalogCacheInitializeCache(CatCache *cache) */ fmgr_info_cxt(eqfunc, &cache->cc_skey[i].sk_func, - CacheMemoryContext); + CatCacheMemoryContext); /* Initialize sk_attno suitably for HeapKeyTest() and heap scans */ cache->cc_skey[i].sk_attno = cache->cc_keyno[i]; @@ -1695,7 +1698,7 @@ SearchCatCacheList(CatCache *cache, table_close(relation, AccessShareLock); /* Now we can build the CatCList entry. */ - oldcxt = MemoryContextSwitchTo(CacheMemoryContext); + oldcxt = MemoryContextSwitchTo(CatCacheMemoryContext); nmembers = list_length(ctlist); cl = (CatCList *) palloc(offsetof(CatCList, members) + nmembers * sizeof(CatCTup *)); @@ -1827,7 +1830,7 @@ CatalogCacheCreateEntry(CatCache *cache, HeapTuple ntp, Datum *arguments, dtp = ntp; /* Allocate memory for CatCTup and the cached tuple in one go */ - oldcxt = MemoryContextSwitchTo(CacheMemoryContext); + oldcxt = MemoryContextSwitchTo(CatCacheMemoryContext); ct = (CatCTup *) palloc(sizeof(CatCTup) + MAXIMUM_ALIGNOF + dtp->t_len); @@ -1862,7 +1865,7 @@ CatalogCacheCreateEntry(CatCache *cache, HeapTuple ntp, Datum *arguments, else { Assert(negative); - oldcxt = MemoryContextSwitchTo(CacheMemoryContext); + oldcxt = MemoryContextSwitchTo(CatCacheMemoryContext); ct = (CatCTup *) palloc(sizeof(CatCTup)); /* @@ -2086,3 +2089,15 @@ PrintCatCacheListLeakWarning(CatCList *list) list->my_cache->cc_relname, list->my_cache->id, list, list->refcount); } + +static void +CreateCatCacheMemoryContext() +{ + if (!CacheMemoryContext) + CreateCacheMemoryContext(); + + if (!CatCacheMemoryContext) + CatCacheMemoryContext = AllocSetContextCreate(CacheMemoryContext, + "CatCacheMemoryContext", + ALLOCSET_DEFAULT_SIZES); +} \ No newline at end of file diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c index 8e28335915..8eaa6df9ac 100644 --- a/src/backend/utils/cache/relcache.c +++ b/src/backend/utils/cache/relcache.c @@ -318,6 +318,9 @@ static OpClassCacheEnt *LookupOpclassInfo(Oid operatorClassOid, static void RelationCacheInitFileRemoveInDir(const char *tblspcpath); static void unlink_initfile(const char *initfilename, int elevel); +/* Separate memory context for relcache */ +static MemoryContext RelCacheMemoryContext = NULL; +static void CreateRelCacheMemoryContext(void); /* * ScanPgRelation @@ -410,8 +413,8 @@ AllocateRelationDesc(Form_pg_class relp) MemoryContext oldcxt; Form_pg_class relationForm; - /* Relcache entries must live in CacheMemoryContext */ - oldcxt = MemoryContextSwitchTo(CacheMemoryContext); + /* Relcache entries must live in RelCacheMemoryContext */ + oldcxt = MemoryContextSwitchTo(RelCacheMemoryContext); /* * allocate and zero space for new relation descriptor @@ -495,14 +498,14 @@ RelationParseRelOptions(Relation relation, HeapTuple tuple) options = extractRelOptions(tuple, GetPgClassDescriptor(), amoptsfn); /* - * Copy parsed data into CacheMemoryContext. To guard against the + * Copy parsed data into RelCacheMemoryContext. To guard against the * possibility of leaks in the reloptions code, we want to do the actual * parsing in the caller's memory context and copy the results into - * CacheMemoryContext after the fact. + * RelCacheMemoryContext after the fact. */ if (options) { - relation->rd_options = MemoryContextAlloc(CacheMemoryContext, + relation->rd_options = MemoryContextAlloc(RelCacheMemoryContext, VARSIZE(options)); memcpy(relation->rd_options, options, VARSIZE(options)); pfree(options); @@ -532,7 +535,7 @@ RelationBuildTupleDesc(Relation relation) relation->rd_rel->reltype ? relation->rd_rel->reltype : RECORDOID; relation->rd_att->tdtypmod = -1; /* just to be sure */ - constr = (TupleConstr *) MemoryContextAllocZero(CacheMemoryContext, + constr = (TupleConstr *) MemoryContextAllocZero(RelCacheMemoryContext, sizeof(TupleConstr)); constr->has_not_null = false; constr->has_generated_stored = false; @@ -613,7 +616,7 @@ RelationBuildTupleDesc(Relation relation) if (attrmiss == NULL) attrmiss = (AttrMissing *) - MemoryContextAllocZero(CacheMemoryContext, + MemoryContextAllocZero(RelCacheMemoryContext, relation->rd_rel->relnatts * sizeof(AttrMissing)); @@ -634,7 +637,7 @@ RelationBuildTupleDesc(Relation relation) else { /* otherwise copy in the correct context */ - oldcxt = MemoryContextSwitchTo(CacheMemoryContext); + oldcxt = MemoryContextSwitchTo(RelCacheMemoryContext); attrmiss[attnum - 1].am_value = datumCopy(missval, attp->attbyval, attp->attlen); @@ -745,7 +748,7 @@ RelationBuildRuleLock(Relation relation) /* * Make the private context. Assume it'll not contain much data. */ - rulescxt = AllocSetContextCreate(CacheMemoryContext, + rulescxt = AllocSetContextCreate(RelCacheMemoryContext, "relation rules", ALLOCSET_SMALL_SIZES); relation->rd_rulescxt = rulescxt; @@ -1441,7 +1444,7 @@ RelationInitIndexAccessInfo(Relation relation) if (!HeapTupleIsValid(tuple)) elog(ERROR, "cache lookup failed for index %u", RelationGetRelid(relation)); - oldcontext = MemoryContextSwitchTo(CacheMemoryContext); + oldcontext = MemoryContextSwitchTo(RelCacheMemoryContext); relation->rd_indextuple = heap_copytuple(tuple); relation->rd_index = (Form_pg_index) GETSTRUCT(relation->rd_indextuple); MemoryContextSwitchTo(oldcontext); @@ -1470,7 +1473,7 @@ RelationInitIndexAccessInfo(Relation relation) * a context, and not just a couple of pallocs, is so that we won't leak * any subsidiary info attached to fmgr lookup records. */ - indexcxt = AllocSetContextCreate(CacheMemoryContext, + indexcxt = AllocSetContextCreate(RelCacheMemoryContext, "index info", ALLOCSET_SMALL_SIZES); relation->rd_indexcxt = indexcxt; @@ -1652,9 +1655,9 @@ LookupOpclassInfo(Oid operatorClassOid, /* First time through: initialize the opclass cache */ HASHCTL ctl; - /* Also make sure CacheMemoryContext exists */ - if (!CacheMemoryContext) - CreateCacheMemoryContext(); + /* Also make sure RelCacheMemoryContext exists */ + if (!RelCacheMemoryContext) + CreateRelCacheMemoryContext(); ctl.keysize = sizeof(Oid); ctl.entrysize = sizeof(OpClassCacheEnt); @@ -1701,7 +1704,7 @@ LookupOpclassInfo(Oid operatorClassOid, */ if (opcentry->supportProcs == NULL && numSupport > 0) opcentry->supportProcs = (RegProcedure *) - MemoryContextAllocZero(CacheMemoryContext, + MemoryContextAllocZero(RelCacheMemoryContext, numSupport * sizeof(RegProcedure)); /* @@ -1860,7 +1863,7 @@ RelationInitTableAccessMethod(Relation relation) * during bootstrap or before RelationCacheInitializePhase3 runs, and none of * these properties matter then...) * - * NOTE: we assume we are already switched into CacheMemoryContext. + * NOTE: we assume we are already switched into RelCacheMemoryContext. */ static void formrdesc(const char *relationName, Oid relationReltype, @@ -3059,7 +3062,7 @@ RememberToFreeTupleDescAtEOX(TupleDesc td) { MemoryContext oldcxt; - oldcxt = MemoryContextSwitchTo(CacheMemoryContext); + oldcxt = MemoryContextSwitchTo(RelCacheMemoryContext); EOXactTupleDescArray = (TupleDesc *) palloc(16 * sizeof(TupleDesc)); EOXactTupleDescArrayLen = 16; @@ -3523,10 +3526,10 @@ RelationBuildLocalRelation(const char *relname, /* * switch to the cache context to create the relcache entry. */ - if (!CacheMemoryContext) - CreateCacheMemoryContext(); + if (!RelCacheMemoryContext) + CreateRelCacheMemoryContext(); - oldcxt = MemoryContextSwitchTo(CacheMemoryContext); + oldcxt = MemoryContextSwitchTo(RelCacheMemoryContext); /* * allocate a new relation descriptor and fill in basic state fields. @@ -3655,7 +3658,7 @@ RelationBuildLocalRelation(const char *relname, /* * RelationInitTableAccessMethod will do syscache lookups, so we mustn't - * run it in CacheMemoryContext. Fortunately, the remaining steps don't + * run it in RelCacheMemoryContext. Fortunately, the remaining steps don't * require a long-lived current context. */ MemoryContextSwitchTo(oldcxt); @@ -3940,8 +3943,8 @@ RelationCacheInitialize(void) /* * make sure cache memory context exists */ - if (!CacheMemoryContext) - CreateCacheMemoryContext(); + if (!RelCacheMemoryContext) + CreateRelCacheMemoryContext(); /* * create hashtable that indexes the relcache @@ -3956,7 +3959,7 @@ RelationCacheInitialize(void) */ allocsize = 4; in_progress_list = - MemoryContextAlloc(CacheMemoryContext, + MemoryContextAlloc(RelCacheMemoryContext, allocsize * sizeof(*in_progress_list)); in_progress_list_maxlen = allocsize; @@ -3995,9 +3998,9 @@ RelationCacheInitializePhase2(void) return; /* - * switch to cache memory context + * switch to relcache memory context */ - oldcxt = MemoryContextSwitchTo(CacheMemoryContext); + oldcxt = MemoryContextSwitchTo(RelCacheMemoryContext); /* * Try to load the shared relcache cache file. If unsuccessful, bootstrap @@ -4050,9 +4053,9 @@ RelationCacheInitializePhase3(void) RelationMapInitializePhase3(); /* - * switch to cache memory context + * switch to relcache memory context */ - oldcxt = MemoryContextSwitchTo(CacheMemoryContext); + oldcxt = MemoryContextSwitchTo(RelCacheMemoryContext); /* * Try to load the local relcache cache file. If unsuccessful, bootstrap @@ -4362,7 +4365,7 @@ BuildHardcodedDescriptor(int natts, const FormData_pg_attribute *attrs) MemoryContext oldcxt; int i; - oldcxt = MemoryContextSwitchTo(CacheMemoryContext); + oldcxt = MemoryContextSwitchTo(RelCacheMemoryContext); result = CreateTemplateTupleDesc(natts); result->tdtypeid = RECORDOID; /* not right, but we don't care */ @@ -4432,7 +4435,7 @@ AttrDefaultFetch(Relation relation, int ndef) /* Allocate array with room for as many entries as expected */ attrdef = (AttrDefault *) - MemoryContextAllocZero(CacheMemoryContext, + MemoryContextAllocZero(RelCacheMemoryContext, ndef * sizeof(AttrDefault)); /* Search pg_attrdef for relevant entries */ @@ -4471,7 +4474,7 @@ AttrDefaultFetch(Relation relation, int ndef) char *s = TextDatumGetCString(val); attrdef[found].adnum = adform->adnum; - attrdef[found].adbin = MemoryContextStrdup(CacheMemoryContext, s); + attrdef[found].adbin = MemoryContextStrdup(RelCacheMemoryContext, s); pfree(s); found++; } @@ -4528,7 +4531,7 @@ CheckConstraintFetch(Relation relation) /* Allocate array with room for as many entries as expected */ check = (ConstrCheck *) - MemoryContextAllocZero(CacheMemoryContext, + MemoryContextAllocZero(RelCacheMemoryContext, ncheck * sizeof(ConstrCheck)); /* Search pg_constraint for relevant entries */ @@ -4561,7 +4564,7 @@ CheckConstraintFetch(Relation relation) check[found].ccvalid = conform->convalidated; check[found].ccnoinherit = conform->connoinherit; - check[found].ccname = MemoryContextStrdup(CacheMemoryContext, + check[found].ccname = MemoryContextStrdup(RelCacheMemoryContext, NameStr(conform->conname)); /* Grab and test conbin is actually set */ @@ -4576,7 +4579,7 @@ CheckConstraintFetch(Relation relation) /* detoast and convert to cstring in caller's context */ char *s = TextDatumGetCString(val); - check[found].ccbin = MemoryContextStrdup(CacheMemoryContext, s); + check[found].ccbin = MemoryContextStrdup(RelCacheMemoryContext, s); pfree(s); found++; } @@ -4693,7 +4696,7 @@ RelationGetFKeyList(Relation relation) table_close(conrel, AccessShareLock); /* Now save a copy of the completed list in the relcache entry. */ - oldcxt = MemoryContextSwitchTo(CacheMemoryContext); + oldcxt = MemoryContextSwitchTo(RelCacheMemoryContext); oldlist = relation->rd_fkeylist; relation->rd_fkeylist = copyObject(result); relation->rd_fkeyvalid = true; @@ -4815,7 +4818,7 @@ RelationGetIndexList(Relation relation) list_sort(result, list_oid_cmp); /* Now save a copy of the completed list in the relcache entry. */ - oldcxt = MemoryContextSwitchTo(CacheMemoryContext); + oldcxt = MemoryContextSwitchTo(RelCacheMemoryContext); oldlist = relation->rd_indexlist; relation->rd_indexlist = list_copy(result); relation->rd_pkindex = pkeyIndex; @@ -4906,7 +4909,7 @@ RelationGetStatExtList(Relation relation) list_sort(result, list_oid_cmp); /* Now save a copy of the completed list in the relcache entry. */ - oldcxt = MemoryContextSwitchTo(CacheMemoryContext); + oldcxt = MemoryContextSwitchTo(RelCacheMemoryContext); oldlist = relation->rd_statlist; relation->rd_statlist = list_copy(result); @@ -5396,7 +5399,7 @@ restart: * leave the relcache entry looking like the other ones are valid but * empty. */ - oldcxt = MemoryContextSwitchTo(CacheMemoryContext); + oldcxt = MemoryContextSwitchTo(RelCacheMemoryContext); relation->rd_keyattr = bms_copy(uindexattrs); relation->rd_pkattr = bms_copy(pkindexattrs); relation->rd_idattr = bms_copy(idindexattrs); @@ -5496,7 +5499,7 @@ RelationGetIdentityKeyBitmap(Relation relation) relation->rd_idattr = NULL; /* Now save copy of the bitmap in the relcache entry */ - oldcxt = MemoryContextSwitchTo(CacheMemoryContext); + oldcxt = MemoryContextSwitchTo(RelCacheMemoryContext); relation->rd_idattr = bms_copy(idindexattrs); MemoryContextSwitchTo(oldcxt); @@ -5787,7 +5790,7 @@ RelationBuildPublicationDesc(Relation relation, PublicationDesc *pubdesc) } /* Now save copy of the descriptor in the relcache entry. */ - oldcxt = MemoryContextSwitchTo(CacheMemoryContext); + oldcxt = MemoryContextSwitchTo(RelCacheMemoryContext); relation->rd_pubdesc = palloc(sizeof(PublicationDesc)); memcpy(relation->rd_pubdesc, pubdesc, sizeof(PublicationDesc)); MemoryContextSwitchTo(oldcxt); @@ -6019,7 +6022,7 @@ errtableconstraint(Relation rel, const char *conname) * criticalSharedRelcachesBuilt to true. * If not successful, return false. * - * NOTE: we assume we are already switched into CacheMemoryContext. + * NOTE: we assume we are already switched into RelCacheMemoryContext. */ static bool load_relcache_init_file(bool shared) @@ -6188,7 +6191,7 @@ load_relcache_init_file(bool shared) * prepare index info context --- parameters should match * RelationInitIndexAccessInfo */ - indexcxt = AllocSetContextCreate(CacheMemoryContext, + indexcxt = AllocSetContextCreate(RelCacheMemoryContext, "index info", ALLOCSET_SMALL_SIZES); rel->rd_indexcxt = indexcxt; @@ -6814,3 +6817,15 @@ unlink_initfile(const char *initfilename, int elevel) initfilename))); } } + +static void +CreateRelCacheMemoryContext() +{ + if (!CacheMemoryContext) + CreateCacheMemoryContext(); + + if (!RelCacheMemoryContext) + RelCacheMemoryContext = AllocSetContextCreate(CacheMemoryContext, + "RelCacheMemoryContext", + ALLOCSET_DEFAULT_SIZES); +} \ No newline at end of file -- 2.25.1