From 26e1015de344352c4cd73deda28ad59594914067 Mon Sep 17 00:00:00 2001 From: Justin Pryzby Date: Mon, 12 Apr 2021 19:07:34 -0500 Subject: [PATCH 1/2] Convert TRUNCATE_REL_CONTEXT_* to bits The values were defined as consecutive integers, but TRUNCATE_REL_CONTEXT_ONLY was tested with bitwise test. If specified as bits, NORMAL vs ONLY is redundant (there's only one bit). And CASCADING was unused. See also: 8ff1c94649f5c9184ac5f07981d8aea9dfd7ac19 --- src/backend/commands/tablecmds.c | 9 +++------ src/backend/replication/logical/worker.c | 4 ++-- src/include/commands/tablecmds.h | 6 +----- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index 096a6f2891..e8215d8dc8 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -1654,8 +1654,7 @@ ExecuteTruncate(TruncateStmt *stmt) rels = lappend(rels, rel); relids = lappend_oid(relids, myrelid); - relids_extra = lappend_int(relids_extra, (recurse ? - TRUNCATE_REL_CONTEXT_NORMAL : + relids_extra = lappend_int(relids_extra, (recurse ? 0 : TRUNCATE_REL_CONTEXT_ONLY)); /* Log this relation only if needed for logical decoding */ if (RelationIsLogicallyLogged(rel)) @@ -1704,8 +1703,7 @@ ExecuteTruncate(TruncateStmt *stmt) rels = lappend(rels, rel); relids = lappend_oid(relids, childrelid); - relids_extra = lappend_int(relids_extra, - TRUNCATE_REL_CONTEXT_CASCADING); + relids_extra = lappend_int(relids_extra, 0); /* Log this relation only if needed for logical decoding */ if (RelationIsLogicallyLogged(rel)) relids_logged = lappend_oid(relids_logged, childrelid); @@ -1799,8 +1797,7 @@ ExecuteTruncateGuts(List *explicit_rels, truncate_check_activity(rel); rels = lappend(rels, rel); relids = lappend_oid(relids, relid); - relids_extra = lappend_int(relids_extra, - TRUNCATE_REL_CONTEXT_CASCADING); + relids_extra = lappend_int(relids_extra, 0); /* Log this relation only if needed for logical decoding */ if (RelationIsLogicallyLogged(rel)) relids_logged = lappend_oid(relids_logged, relid); diff --git a/src/backend/replication/logical/worker.c b/src/backend/replication/logical/worker.c index fb3ba5c415..986b634525 100644 --- a/src/backend/replication/logical/worker.c +++ b/src/backend/replication/logical/worker.c @@ -1825,7 +1825,7 @@ apply_handle_truncate(StringInfo s) remote_rels = lappend(remote_rels, rel); rels = lappend(rels, rel->localrel); relids = lappend_oid(relids, rel->localreloid); - relids_extra = lappend_int(relids_extra, TRUNCATE_REL_CONTEXT_NORMAL); + relids_extra = lappend_int(relids_extra, 0); if (RelationIsLogicallyLogged(rel->localrel)) relids_logged = lappend_oid(relids_logged, rel->localreloid); @@ -1864,7 +1864,7 @@ apply_handle_truncate(StringInfo s) rels = lappend(rels, childrel); part_rels = lappend(part_rels, childrel); relids = lappend_oid(relids, childrelid); - relids_extra = lappend_int(relids_extra, TRUNCATE_REL_CONTEXT_CASCADING); + relids_extra = lappend_int(relids_extra, 0); /* Log this relation only if needed for logical decoding */ if (RelationIsLogicallyLogged(childrel)) relids_logged = lappend_oid(relids_logged, childrelid); diff --git a/src/include/commands/tablecmds.h b/src/include/commands/tablecmds.h index b808a07e46..9aa9f3c6c7 100644 --- a/src/include/commands/tablecmds.h +++ b/src/include/commands/tablecmds.h @@ -25,11 +25,7 @@ * These values indicate how a relation was specified as the target to * truncate in TRUNCATE command. */ -#define TRUNCATE_REL_CONTEXT_NORMAL 1 /* specified without ONLY clause */ -#define TRUNCATE_REL_CONTEXT_ONLY 2 /* specified with ONLY clause */ -#define TRUNCATE_REL_CONTEXT_CASCADING 3 /* not specified but truncated - * due to dependency (e.g., - * partition table) */ +#define TRUNCATE_REL_CONTEXT_ONLY 0x01 /* specified with ONLY clause */ struct AlterTableUtilityContext; /* avoid including tcop/utility.h here */ -- 2.17.0