From e3453c6850b0862f497c29171a86060ad8bb8674 Mon Sep 17 00:00:00 2001 From: cichaoyun Date: Fri, 6 Mar 2026 15:04:09 +0800 Subject: [PATCH v1] Subject: [PATCH] Remove unused parameter from TeardownHistoricSnapshot The is_error parameter of TeardownHistoricSnapshot() was introduced in b89e151054a05f0f6d356ca52e3b725dd0505e53 as part of the logical decoding feature, but it has never been used. Simplify by removing the unused parameter. --- src/backend/replication/logical/reorderbuffer.c | 12 ++++++------ src/backend/utils/time/snapmgr.c | 2 +- src/include/utils/snapmgr.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/backend/replication/logical/reorderbuffer.c b/src/backend/replication/logical/reorderbuffer.c index e832fa0d8ea..b63681b0751 100644 --- a/src/backend/replication/logical/reorderbuffer.c +++ b/src/backend/replication/logical/reorderbuffer.c @@ -919,11 +919,11 @@ ReorderBufferQueueMessage(ReorderBuffer *rb, TransactionId xid, { rb->message(rb, txn, lsn, false, prefix, message_size, message); - TeardownHistoricSnapshot(false); + TeardownHistoricSnapshot(); } PG_CATCH(); { - TeardownHistoricSnapshot(true); + TeardownHistoricSnapshot(); PG_RE_THROW(); } PG_END_TRY(); @@ -2531,7 +2531,7 @@ ReorderBufferProcessTXN(ReorderBuffer *rb, ReorderBufferTXN *txn, case REORDER_BUFFER_CHANGE_INTERNAL_SNAPSHOT: /* get rid of the old */ - TeardownHistoricSnapshot(false); + TeardownHistoricSnapshot(); if (snapshot_now->copied) { @@ -2577,7 +2577,7 @@ ReorderBufferProcessTXN(ReorderBuffer *rb, ReorderBufferTXN *txn, snapshot_now->curcid = command_id; - TeardownHistoricSnapshot(false); + TeardownHistoricSnapshot(); SetupHistoricSnapshot(snapshot_now, txn->tuplecid_hash); } @@ -2671,7 +2671,7 @@ ReorderBufferProcessTXN(ReorderBuffer *rb, ReorderBufferTXN *txn, ReorderBufferFreeSnap(rb, snapshot_now); /* cleanup */ - TeardownHistoricSnapshot(false); + TeardownHistoricSnapshot(); /* * Aborting the current (sub-)transaction as a whole has the right @@ -2736,7 +2736,7 @@ ReorderBufferProcessTXN(ReorderBuffer *rb, ReorderBufferTXN *txn, if (iterstate) ReorderBufferIterTXNFinish(rb, iterstate); - TeardownHistoricSnapshot(true); + TeardownHistoricSnapshot(); /* * Force cache invalidation to happen outside of a valid transaction diff --git a/src/backend/utils/time/snapmgr.c b/src/backend/utils/time/snapmgr.c index 2e6197f5f35..5081388362e 100644 --- a/src/backend/utils/time/snapmgr.c +++ b/src/backend/utils/time/snapmgr.c @@ -1682,7 +1682,7 @@ SetupHistoricSnapshot(Snapshot historic_snapshot, HTAB *tuplecids) * Make catalog snapshots behave normally again. */ void -TeardownHistoricSnapshot(bool is_error) +TeardownHistoricSnapshot(void) { HistoricSnapshot = NULL; tuplecid_data = NULL; diff --git a/src/include/utils/snapmgr.h b/src/include/utils/snapmgr.h index b8c01a291a1..2753c3ea900 100644 --- a/src/include/utils/snapmgr.h +++ b/src/include/utils/snapmgr.h @@ -114,7 +114,7 @@ extern bool XidInMVCCSnapshot(TransactionId xid, Snapshot snapshot); struct HTAB; extern struct HTAB *HistoricSnapshotGetTupleCids(void); extern void SetupHistoricSnapshot(Snapshot historic_snapshot, struct HTAB *tuplecids); -extern void TeardownHistoricSnapshot(bool is_error); +extern void TeardownHistoricSnapshot(void); extern bool HistoricSnapshotActive(void); extern Size EstimateSnapshotSpace(Snapshot snapshot); -- 2.47.3