Use ereport() rather than elog()

hlinnaka · hlinnaka · commit 661f821ef0c3 · 2025-08-22T13:35:05.000+03:00
Noah pointed this out before I committed 50f770c, 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
@@ -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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -1148,8 +1148,10 @@ heap_beginscan(Relation relation, Snapshot snapshot,`
`1148`	`1148`	`IsHistoricMVCCSnapshot(snapshot) &&`
`1149`	`1149`	`!RelationIsAccessibleInLogicalDecoding(relation))`
`1150`	`1150`	`{`
`1151`		`- elog(ERROR, "cannot query non-catalog table \"%s\" during logical decoding",`
`1152`		`- RelationGetRelationName(relation));`
	`1151`	`+ ereport(ERROR,`
	`1152`	`+ (errcode(ERRCODE_INVALID_TRANSACTION_STATE),`
	`1153`	`+ errmsg("cannot query non-catalog table \"%s\" during logical decoding",`
	`1154`	`+ RelationGetRelationName(relation))));`
`1153`	`1155`	`}`
`1154`	`1156`
`1155`	`1157`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -267,8 +267,10 @@ index_beginscan(Relation heapRelation,`
`267`	`267`	`if (IsHistoricMVCCSnapshot(snapshot) &&`
`268`	`268`	`!RelationIsAccessibleInLogicalDecoding(heapRelation))`
`269`	`269`	`{`
`270`		`- elog(ERROR, "cannot query non-catalog table \"%s\" during logical decoding",`
`271`		`- RelationGetRelationName(heapRelation));`
	`270`	`+ ereport(ERROR,`
	`271`	`+ (errcode(ERRCODE_INVALID_TRANSACTION_STATE),`
	`272`	`+ errmsg("cannot query non-catalog table \"%s\" during logical decoding",`
	`273`	`+ RelationGetRelationName(heapRelation))));`
`272`	`274`	`}`
`273`	`275`
`274`	`276`	`scan = index_beginscan_internal(indexRelation, nkeys, norderbys, snapshot, NULL, false);`