From 7a55aa18f22ba1b321071eaf5e4f50cbf6238b14 Mon Sep 17 00:00:00 2001 From: Sait Talha Nisanci Date: Thu, 26 Aug 2021 23:42:48 +0300 Subject: [PATCH] fixup! Introduces STATUS_WAITING_COMPAT macro --- src/backend/distributed/transaction/lock_graph.c | 4 ++-- src/include/distributed/version_compat.h | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/backend/distributed/transaction/lock_graph.c b/src/backend/distributed/transaction/lock_graph.c index ffd554da6..30dec5d80 100644 --- a/src/backend/distributed/transaction/lock_graph.c +++ b/src/backend/distributed/transaction/lock_graph.c @@ -456,7 +456,7 @@ BuildLocalWaitGraph(void) static bool IsProcessWaitingForSafeOperations(PGPROC *proc) { - if (proc->waitStatus != STATUS_WAITING_COMPAT) + if (proc->waitStatus != PROC_WAIT_STATUS_WAITING) { return false; } @@ -713,7 +713,7 @@ AddProcToVisit(PROCStack *remaining, PGPROC *proc) bool IsProcessWaitingForLock(PGPROC *proc) { - return proc->waitStatus == STATUS_WAITING_COMPAT; + return proc->waitStatus == PROC_WAIT_STATUS_WAITING; } diff --git a/src/include/distributed/version_compat.h b/src/include/distributed/version_compat.h index ab6328bb6..0a4b3a68d 100644 --- a/src/include/distributed/version_compat.h +++ b/src/include/distributed/version_compat.h @@ -32,7 +32,6 @@ #if PG_VERSION_NUM >= PG_VERSION_14 #define AlterTableStmtObjType(a) ((a)->objtype) -#define STATUS_WAITING_COMPAT PROC_WAIT_STATUS_WAITING #define getObjectTypeDescription_compat(a, b) getObjectTypeDescription(a, b) #define getObjectIdentity_compat(a, b) getObjectIdentity(a, b) @@ -65,7 +64,7 @@ #define AlterTableStmtObjType(a) ((a)->relkind) #define F_NEXTVAL F_NEXTVAL_OID #define ROLE_PG_MONITOR DEFAULT_ROLE_MONITOR -#define STATUS_WAITING_COMPAT STATUS_WAITING +#define PROC_WAIT_STATUS_WAITING STATUS_WAITING #define getObjectTypeDescription_compat(a, b) getObjectTypeDescription(a) #define getObjectIdentity_compat(a, b) getObjectIdentity(a)