From 617fffee8a6f350ff03069e2843ecd039ea06ccc Mon Sep 17 00:00:00 2001 From: Peter Geoghegan Date: Sun, 7 Feb 2021 10:11:14 -0800 Subject: [PATCH] Rename removable xid function for consistency. GlobalVisIsRemovableFullXid() is now GlobalVisCheckRemovableFullXid(). This is consistent with the general convention for FullTransactionId equivalents of functions that deal with TransactionId values. It now matches the nearby GlobalVisCheckRemovableXid() function, which performs the same check for callers that use TransactionId values. Oversight in commit dc7420c2c92. Discussion: https://postgr.es/m/CAH2-Wzmes12jFNDcVgpU89Vp=r6uLFrE-MT0fjSWGsE70UiNaA@mail.gmail.com --- src/backend/access/gist/gistutil.c | 2 +- src/backend/access/gist/gistxlog.c | 2 +- src/backend/storage/ipc/procarray.c | 2 +- src/include/utils/snapmgr.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/backend/access/gist/gistutil.c b/src/backend/access/gist/gistutil.c index cf53dad474..a3ec9f2cfe 100644 --- a/src/backend/access/gist/gistutil.c +++ b/src/backend/access/gist/gistutil.c @@ -914,7 +914,7 @@ gistPageRecyclable(Page page) */ FullTransactionId deletexid_full = GistPageGetDeleteXid(page); - return GlobalVisIsRemovableFullXid(NULL, deletexid_full); + return GlobalVisCheckRemovableFullXid(NULL, deletexid_full); } return false; } diff --git a/src/backend/access/gist/gistxlog.c b/src/backend/access/gist/gistxlog.c index c1d4b5d4f2..f2eda79bc1 100644 --- a/src/backend/access/gist/gistxlog.c +++ b/src/backend/access/gist/gistxlog.c @@ -388,7 +388,7 @@ gistRedoPageReuse(XLogReaderState *record) * pages in the index via the FSM. That's all they do though. * * latestRemovedXid was the page's deleteXid. The - * GlobalVisIsRemovableFullXid(deleteXid) test in gistPageRecyclable() + * GlobalVisCheckRemovableFullXid(deleteXid) test in gistPageRecyclable() * conceptually mirrors the PGPROC->xmin > limitXmin test in * GetConflictingVirtualXIDs(). Consequently, one XID value achieves the * same exclusion effect on primary and standby. diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c index cf12eda504..4085891237 100644 --- a/src/backend/storage/ipc/procarray.c +++ b/src/backend/storage/ipc/procarray.c @@ -4146,7 +4146,7 @@ GlobalVisTestNonRemovableHorizon(GlobalVisState *state) * GlobalVisTestIsRemovableFullXid(), see their comments. */ bool -GlobalVisIsRemovableFullXid(Relation rel, FullTransactionId fxid) +GlobalVisCheckRemovableFullXid(Relation rel, FullTransactionId fxid) { GlobalVisState *state; diff --git a/src/include/utils/snapmgr.h b/src/include/utils/snapmgr.h index c21ee3c289..2c8b881a09 100644 --- a/src/include/utils/snapmgr.h +++ b/src/include/utils/snapmgr.h @@ -155,7 +155,7 @@ extern bool GlobalVisTestIsRemovableFullXid(GlobalVisState *state, FullTransacti extern FullTransactionId GlobalVisTestNonRemovableFullHorizon(GlobalVisState *state); extern TransactionId GlobalVisTestNonRemovableHorizon(GlobalVisState *state); extern bool GlobalVisCheckRemovableXid(Relation rel, TransactionId xid); -extern bool GlobalVisIsRemovableFullXid(Relation rel, FullTransactionId fxid); +extern bool GlobalVisCheckRemovableFullXid(Relation rel, FullTransactionId fxid); /* * Utility functions for implementing visibility routines in table AMs. -- 2.39.5