From 3292e928cc5f25eb63453c485d416792bcc62bb9 Mon Sep 17 00:00:00 2001 From: Andrey Borodin Date: Sat, 7 Aug 2021 20:27:14 +0500 Subject: [PATCH v12 5/6] PoC fix clear xid --- src/backend/access/transam/xact.c | 3 ++- src/backend/utils/cache/relcache.c | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c index 387f80419a..9b19d939eb 100644 --- a/src/backend/access/transam/xact.c +++ b/src/backend/access/transam/xact.c @@ -2500,7 +2500,6 @@ PrepareTransaction(void) * done *after* the prepared transaction has been marked valid, else * someone may think it is unlocked and recyclable. */ - ProcArrayClearTransaction(MyProc); /* * In normal commit-processing, this is all non-critical post-transaction @@ -2535,6 +2534,8 @@ PrepareTransaction(void) PostPrepare_MultiXact(xid); PostPrepare_Locks(xid); + + ProcArrayClearTransaction(MyProc); PostPrepare_PredicateLocks(xid); ResourceOwnerRelease(TopTransactionResourceOwner, diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c index 7eec7b1f41..c72c4c255d 100644 --- a/src/backend/utils/cache/relcache.c +++ b/src/backend/utils/cache/relcache.c @@ -2873,6 +2873,7 @@ RelationCacheInvalidate(void) List *rebuildFirstList = NIL; List *rebuildList = NIL; ListCell *l; + int i; /* * Reload relation mapping data before starting to reconstruct cache. @@ -2959,6 +2960,10 @@ RelationCacheInvalidate(void) RelationClearRelation(relation, true); } list_free(rebuildList); + + /* Any RelationBuildDesc() on the stack must start over. */ + for (i = 0; OidIsValid(inProgress[i].relid); i++) + inProgress[i].invalidated = true; } /* -- 2.24.3 (Apple Git-128)