agora inbox for pgsql-hackers@postgresql.org
help / color / mirror / Atom feedFrom: Alvaro Herrera <alvherre@alvh.no-ip.org>
Subject: [PATCH] Repurpose PROC_COPYABLE_FLAGS as PROC_XMIN_FLAGS
Date: Sat, 14 May 2022 16:51:23 +0200
This is a slight, convenient semantics change from what commit
0f0cfb494004 introduced that lets us simplify the coding in the one
place where it is used.
---
src/backend/storage/ipc/procarray.c | 11 ++++++-----
src/include/storage/proc.h | 7 +++----
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c
index 6ff8d8699b..447b6e3de7 100644
--- a/src/backend/storage/ipc/procarray.c
+++ b/src/backend/storage/ipc/procarray.c
@@ -1916,12 +1916,13 @@ ProcArrayInstallRestoredXmin(TransactionId xmin, PGPROC *proc)
TransactionIdIsNormal(xid) &&
TransactionIdPrecedesOrEquals(xid, xmin))
{
- /* Install xmin */
+ /*
+ * Install xmin and propagate the vacuumFlags that affect how the
+ * value is interpreted by vacuum.
+ */
MyPgXact->xmin = TransactionXmin = xmin;
-
- /* Flags being copied must be valid copy-able flags. */
- Assert((pgxact->vacuumFlags & (~PROC_COPYABLE_FLAGS)) == 0);
- MyPgXact->vacuumFlags = pgxact->vacuumFlags;
+ MyPgXact->vacuumFlags = (MyPgXact->vacuumFlags & ~PROC_XMIN_FLAGS) |
+ (pgxact->vacuumFlags & PROC_XMIN_FLAGS);
result = true;
}
diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h
index 9cf9684b41..7c85b5645b 100644
--- a/src/include/storage/proc.h
+++ b/src/include/storage/proc.h
@@ -63,11 +63,10 @@ struct XidCache
(PROC_IN_VACUUM | PROC_IN_ANALYZE | PROC_VACUUM_FOR_WRAPAROUND)
/*
- * Flags that are valid to copy from another proc, the parallel leader
- * process in practice. Currently, a flag that is set during parallel
- * vacuum is allowed.
+ * Xmin-related flags. Make sure any flags that affect how the process' Xmin
+ * value is interpreted by VACUUM are included here.
*/
-#define PROC_COPYABLE_FLAGS (PROC_IN_VACUUM)
+#define PROC_XMIN_FLAGS (PROC_IN_VACUUM)
/*
* We allow a small number of "weak" relation locks (AccessShareLock,
--
2.30.2
--gseizntho2k3boor
Content-Type: text/x-diff; charset=utf-8
Content-Disposition: attachment;
filename="v14-0001-Repurpose-PROC_COPYABLE_FLAGS-as-PROC_XMIN_FLAGS.patch"
view thread (7+ messages) latest in thread
reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients using the --to and --cc options:
reply via email
To: pgsql-hackers@postgresql.org
Cc: alvherre@alvh.no-ip.org
Subject: Re: [PATCH] Repurpose PROC_COPYABLE_FLAGS as PROC_XMIN_FLAGS
In-Reply-To: <no-message-id-648513@localhost>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox