From: Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date: Fri, 22 Aug 2025 10:35:05 +0000 (+0300)
Subject: Use ereport() rather than elog()
X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fmaster;p=postgresql.git

Use ereport() rather than elog()

Noah pointed this out before I committed 50f770c3d9, but I
accidentally pushed the old version with elog() anyway. Oops.

Reported-by: Noah Misch <noah@leadboat.com>
Discussion: https://www.postgresql.org/message-id/20250820003756.31.nmisch@google.com
---

diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index ee692c03c3c..7491cc3cb93 100644
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -1148,8 +1148,10 @@ heap_beginscan(Relation relation, Snapshot snapshot,
 		IsHistoricMVCCSnapshot(snapshot) &&
 		!RelationIsAccessibleInLogicalDecoding(relation))
 	{
-		elog(ERROR, "cannot query non-catalog table \"%s\" during logical decoding",
-			 RelationGetRelationName(relation));
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_TRANSACTION_STATE),
+				 errmsg("cannot query non-catalog table \"%s\" during logical decoding",
+						RelationGetRelationName(relation))));
 	}
 
 	/*
diff --git a/src/backend/access/index/indexam.c b/src/backend/access/index/indexam.c
index 31b22d9f397..86d11f4ec79 100644
--- a/src/backend/access/index/indexam.c
+++ b/src/backend/access/index/indexam.c
@@ -267,8 +267,10 @@ index_beginscan(Relation heapRelation,
 	if (IsHistoricMVCCSnapshot(snapshot) &&
 		!RelationIsAccessibleInLogicalDecoding(heapRelation))
 	{
-		elog(ERROR, "cannot query non-catalog table \"%s\" during logical decoding",
-			 RelationGetRelationName(heapRelation));
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_TRANSACTION_STATE),
+				 errmsg("cannot query non-catalog table \"%s\" during logical decoding",
+						RelationGetRelationName(heapRelation))));
 	}
 
 	scan = index_beginscan_internal(indexRelation, nkeys, norderbys, snapshot, NULL, false);