Purge CheckXidAlive checks in heap_getnext.

arssher · arssher · commit 30d248bf2f51 · 2018-10-11T16:29:36.000+03:00
They were broken since birth. If we want to add something like that, we should
reset CheckXidAlive before coming there or pass some flag not to check it.

(cherry picked from commit 31accac456987a06307dafafc4d5862495e786a8)
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
@@ -1834,17 +1834,6 @@ heap_update_snapshot(HeapScanDesc scan, Snapshot snapshot)
 HeapTuple
 heap_getnext(HeapScanDesc scan, ScanDirection direction)
 {
-	/*
-	 * We don't expect direct calls to heap_getnext with valid
-	 * CheckXidAlive for regular tables. Track that below.
-	 */
-	if (unlikely(TransactionIdIsValid(CheckXidAlive) &&
-		!(IsCatalogRelation(scan->rs_rd) ||
-		  RelationIsUsedAsCatalogTable(scan->rs_rd))))
-		ereport(ERROR,
-			(errcode(ERRCODE_INVALID_TRANSACTION_STATE),
-			 errmsg("improper heap_getnext call")));
-
 	/* Note: no locking manipulations needed */
 
 	HEAPDEBUG_1;				/* heap_getnext( info ) */
@@ -1925,16 +1914,6 @@ heap_fetch(Relation relation,
 	OffsetNumber offnum;
 	bool		valid;
 
-	/*
-	 * We don't expect direct calls to heap_fetch with valid
-	 * CheckXidAlive for regular tables. Track that below.
-	 */
-	if (unlikely(TransactionIdIsValid(CheckXidAlive) &&
-		!(IsCatalogRelation(relation) || RelationIsUsedAsCatalogTable(relation))))
-		ereport(ERROR,
-			(errcode(ERRCODE_INVALID_TRANSACTION_STATE),
-			 errmsg("improper heap_fetch call")));
-
 	/*
 	 * Fetch and pin the appropriate page of the relation.
 	 */
@@ -2067,16 +2046,6 @@ heap_hot_search_buffer(ItemPointer tid, Relation relation, Buffer buffer,
 	bool		valid;
 	bool		skip;
 
-	/*
-	 * We don't expect direct calls to heap_hot_search_buffer with
-	 * valid CheckXidAlive for regular tables. Track that below.
-	 */
-	if (unlikely(TransactionIdIsValid(CheckXidAlive) &&
-		!(IsCatalogRelation(relation) || RelationIsUsedAsCatalogTable(relation))))
-		ereport(ERROR,
-			(errcode(ERRCODE_INVALID_TRANSACTION_STATE),
-			 errmsg("improper heap_hot_search_buffer call")));
-
 	/* If this is not the first call, previous call returned a (live!) tuple */
 	if (all_dead)
 		*all_dead = first_call;
@@ -2218,16 +2187,6 @@ heap_hot_search(ItemPointer tid, Relation relation, Snapshot snapshot,
 	Buffer		buffer;
 	HeapTupleData heapTuple;
 
-	/*
-	 * We don't expect direct calls to heap_hot_search with
-	 * valid CheckXidAlive for regular tables. Track that below.
-	 */
-	if (unlikely(TransactionIdIsValid(CheckXidAlive) &&
-		!(IsCatalogRelation(relation) || RelationIsUsedAsCatalogTable(relation))))
-		ereport(ERROR,
-			(errcode(ERRCODE_INVALID_TRANSACTION_STATE),
-			 errmsg("improper heap_hot_search call")));
-
 	buffer = ReadBuffer(relation, ItemPointerGetBlockNumber(tid));
 	LockBuffer(buffer, BUFFER_LOCK_SHARE);
 	result = heap_hot_search_buffer(tid, relation, buffer, snapshot,
@@ -2257,16 +2216,6 @@ heap_get_latest_tid(Relation relation,
 	ItemPointerData ctid;
 	TransactionId priorXmax;
 
-	/*
-	 * We don't expect direct calls to heap_get_latest_tid with valid
-	 * CheckXidAlive for regular tables. Track that below.
-	 */
-	if (unlikely(TransactionIdIsValid(CheckXidAlive) &&
-		!(IsCatalogRelation(relation) || RelationIsUsedAsCatalogTable(relation))))
-		ereport(ERROR,
-			(errcode(ERRCODE_INVALID_TRANSACTION_STATE),
-			 errmsg("improper heap_get_latest_tid call")));
-
 	/* this is to avoid Assert failures on bad input */
 	if (!ItemPointerIsValid(tid))
 		return;
