Allow table AM's to use rd_amcache, too.

The rd_amcache allows an index AM to cache arbitrary information in a
relcache entry. This commit moves the cleanup of rd_amcache so that it
can also be used by table AMs. Nothing takes advantage of that yet, but
I'm sure it'll come handy for anyone writing new table AMs.

Backpatch to v12, where table AM interface was introduced.

Reviewed-by: Julien Rouhaud

diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index 2b992d783273a26a641bd0ecb4979dd3b1d33c8b..204e1eb7aade44b1985d603f09a3996e0a5665f2 100644 (file)
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -2358,6 +2358,10 @@ RelationDestroyRelation(Relation relation, bool remember_tupdesc)
        pfree(relation->rd_options);
    if (relation->rd_indextuple)
        pfree(relation->rd_indextuple);
+   if (relation->rd_amcache)
+       pfree(relation->rd_amcache);
+   if (relation->rd_fdwroutine)
+       pfree(relation->rd_fdwroutine);
    if (relation->rd_indexcxt)
        MemoryContextDelete(relation->rd_indexcxt);
    if (relation->rd_rulescxt)
@@ -2370,8 +2374,6 @@ RelationDestroyRelation(Relation relation, bool remember_tupdesc)
        MemoryContextDelete(relation->rd_pdcxt);
    if (relation->rd_partcheckcxt)
        MemoryContextDelete(relation->rd_partcheckcxt);
-   if (relation->rd_fdwroutine)
-       pfree(relation->rd_fdwroutine);
    pfree(relation);
 }
 
@@ -2416,6 +2418,11 @@ RelationClearRelation(Relation relation, bool rebuild)
     */
    RelationCloseSmgr(relation);
 
+   /* Free AM cached data, if any */
+   if (relation->rd_amcache)
+       pfree(relation->rd_amcache);
+   relation->rd_amcache = NULL;
+
    /*
     * Treat nailed-in system relations separately, they always need to be
     * accessible, so we can't blow them away.

diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h
index d7f33abce3f5670f33602be3fca21265ac70c1c3..9080a3c16097b1ee793d3f2ce498497761ca55a8 100644 (file)
--- a/src/include/utils/rel.h
+++ b/src/include/utils/rel.h
@@ -152,13 +152,6 @@ typedef struct RelationData
     * those with lefttype and righttype equal to the opclass's opcintype. The
     * arrays are indexed by support function number, which is a sufficient
     * identifier given that restriction.
-    *
-    * Note: rd_amcache is available for index AMs to cache private data about
-    * an index.  This must be just a cache since it may get reset at any time
-    * (in particular, it will get reset by a relcache inval message for the
-    * index).  If used, it must point to a single memory chunk palloc'd in
-    * rd_indexcxt.  A relcache reset will include freeing that chunk and
-    * setting rd_amcache = NULL.
     */
    MemoryContext rd_indexcxt;  /* private memory cxt for this stuff */
    /* use "struct" here to avoid needing to include amapi.h: */
@@ -173,9 +166,19 @@ typedef struct RelationData
    Oid        *rd_exclops;     /* OIDs of exclusion operators, if any */
    Oid        *rd_exclprocs;   /* OIDs of exclusion ops' procs, if any */
    uint16     *rd_exclstrats;  /* exclusion ops' strategy numbers, if any */
-   void       *rd_amcache;     /* available for use by index AM */
    Oid        *rd_indcollation;    /* OIDs of index collations */
 
+   /*
+    * rd_amcache is available for index and table AMs to cache private data
+    * about the relation.  This must be just a cache since it may get reset
+    * at any time (in particular, it will get reset by a relcache inval
+    * message for the relation).  If used, it must point to a single memory
+    * chunk palloc'd in CacheMemoryContext, or in rd_indexcxt for an index
+    * relation.  A relcache reset will include freeing that chunk and setting
+    * rd_amcache = NULL.
+    */
+   void       *rd_amcache;     /* available for use by index/table AM */
+
    /*
     * foreign-table support
     *