Fix temp relation handling for indexes, cleanup

diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index 86aaffd7f4115ea2317921e7c3050d6e868e6166..2dfdcffdf84b52a45954b011cbb438b2b57bc368 100644 (file)
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -1119,7 +1119,7 @@ AbortTransaction()
        AtEOXact_portals();
        RecordTransactionAbort();
        RelationPurgeLocalRelation(false);
-       invalidate_temp_relations();
+       remove_temp_rel_in_myxid();
        AtEOXact_SPI();
        AtEOXact_nbtree();
        AtAbort_Cache();

diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index a287a89b4dbe0defd4748e4be85e2535f59d8a10..a88990e8176e28817cd6483557b07192655bbb41 100644 (file)
--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@@ -131,11 +131,11 @@ static FormData_pg_attribute a6 = {
        MaxCommandIdAttributeNumber, 0, -1, -1, '\001', 'p', '\0', 'i', '\0', '\0'
 };
 
-/* 
+/*
    We decide to call this attribute "tableoid" rather than say
 "classoid" on the basis that in the future there may be more than one
 table of a particular class/type. In any case table is still the word
-used in SQL. 
+used in SQL.
 */
 static FormData_pg_attribute a7 = {
        0xffffffff, {"tableoid"}, OIDOID, 0, sizeof(Oid),
@@ -1489,7 +1489,7 @@ heap_drop_with_catalog(const char *relname,
        RelationForgetRelation(rid);
 
        if (istemp)
-               remove_temp_relation(rid);
+               remove_temp_rel_by_relid(rid);
 
        if (has_toasttable)
        {

diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index a5c703297b24cecacea428694fb8d40c89bbd8c1..cc0ed87419304a75255ef0c1b32a25413306ea14 100644 (file)
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -1145,7 +1145,7 @@ index_drop(Oid indexId)
        RelationForgetRelation(indexId);
 
        /* does something only if it is a temp index */
-       remove_temp_relation(indexId);
+       remove_temp_rel_by_relid(indexId);
 }
 
 /* ----------------------------------------------------------------
@@ -1374,7 +1374,7 @@ IndexesAreActive(Oid relid, bool confirmCommitted)
        if (!LockClassinfoForUpdate(relid, &tuple, &buffer, confirmCommitted))
                elog(ERROR, "IndexesAreActive couldn't lock %u", relid);
        if (((Form_pg_class) GETSTRUCT(&tuple))->relkind != RELKIND_RELATION &&
-           ((Form_pg_class) GETSTRUCT(&tuple))->relkind != RELKIND_TOASTVALUE)
+               ((Form_pg_class) GETSTRUCT(&tuple))->relkind != RELKIND_TOASTVALUE)
                elog(ERROR, "relation %u isn't an indexable relation", relid);
        isactive = ((Form_pg_class) GETSTRUCT(&tuple))->relhasindex;
        ReleaseBuffer(buffer);

diff --git a/src/backend/utils/cache/temprel.c b/src/backend/utils/cache/temprel.c
index 89fe74f5161287b20e7f37cb6c76faca1ff1d1d2..e4b881d760d9fcbf22c2179b3d90aecb0162d418 100644 (file)
--- a/src/backend/utils/cache/temprel.c
+++ b/src/backend/utils/cache/temprel.c
@@ -91,35 +91,24 @@ create_temp_relation(const char *relname, HeapTuple pg_class_tuple)
 void
 remove_all_temp_relations(void)
 {
-       List       *l,
-                          *next;
-
-       if (temp_rels == NIL)
-               return;
-
        AbortOutOfAnyTransaction();
        StartTransactionCommand();
 
-       l = temp_rels;
-       while (l != NIL)
+       while (temp_rels != NIL)
        {
-               TempTable  *temp_rel = (TempTable *) lfirst(l);
-
-               next = lnext(l);                /* do this first, l is deallocated */
+               char            relname[NAMEDATALEN];
+               TempTable  *temp_rel = (TempTable *) lfirst(temp_rels);
 
-               /* Indexes are dropped during heap drop */
                if (temp_rel->relkind != RELKIND_INDEX)
                {
-                       char            relname[NAMEDATALEN];
-
                        /* safe from deallocation */
                        strcpy(relname, temp_rel->user_relname);
                        heap_drop_with_catalog(relname, allowSystemTableMods);
                }
-
-               l = next;
+               else
+                       index_drop(temp_rel->relid);
+               CommandCounterIncrement();
        }
-       temp_rels = NIL;
        CommitTransactionCommand();
 }
 
@@ -129,7 +118,7 @@ remove_all_temp_relations(void)
  * we don't have the relname for indexes, so we just pass the oid
  */
 void
-remove_temp_relation(Oid relid)
+remove_temp_rel_by_relid(Oid relid)
 {
        MemoryContext oldcxt;
        List       *l,
@@ -179,7 +168,7 @@ remove_temp_relation(Oid relid)
  * We just have to delete the map entry.
  */
 void
-invalidate_temp_relations(void)
+remove_temp_rel_in_myxid(void)
 {
        MemoryContext oldcxt;
        List       *l,

diff --git a/src/include/utils/temprel.h b/src/include/utils/temprel.h
index c38f1cab1e4d69dc2d5699b1a4bd439e190543c3..b744eeaff996fa00d394ad55c0de355f0f9969d0 100644 (file)
--- a/src/include/utils/temprel.h
+++ b/src/include/utils/temprel.h
@@ -18,12 +18,12 @@
 
 extern void create_temp_relation(const char *relname,
                                                                 HeapTuple pg_class_tuple);
-extern void remove_temp_relation(Oid relid);
+extern void remove_temp_rel_by_relid(Oid relid);
 extern bool rename_temp_relation(const char *oldname,
                                                                 const char *newname);
 
 extern void remove_all_temp_relations(void);
-extern void invalidate_temp_relations(void);
+extern void remove_temp_rel_in_myxid(void);
 
 extern char *get_temp_rel_by_username(const char *user_relname);
 extern char *get_temp_rel_by_physicalname(const char *relname);