From 6862249f05eca368fb51ebd4ebb9edc0cc4843a7 Mon Sep 17 00:00:00 2001
From: Jakub Wartak <jakub.wartak@enterprisedb.com>
Date: Wed, 18 Nov 2026 10:35:32 +0100
Subject: [PATCH v18112026 9/9] amcheck: warn user that non-heapAMs tables are
 not checked for short relations

---
 contrib/amcheck/verify_nbtree.c | 15 +++++++++++----
 doc/src/sgml/amcheck.sgml       |  3 ++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/contrib/amcheck/verify_nbtree.c b/contrib/amcheck/verify_nbtree.c
index 55607dcf60a..d203dce71fe 100644
--- a/contrib/amcheck/verify_nbtree.c
+++ b/contrib/amcheck/verify_nbtree.c
@@ -446,11 +446,18 @@ bt_check_every_level(Relation rel, Relation heaprel, bool heapkeyspace,
 	 * user may have deliberately excluded the corrupt table from table-level
 	 * verification, which is what reports a missing main fork.
 	 */
-	if (state->heaprel->rd_rel->relam == HEAP_TABLE_AM_OID &&
-		smgrexists(RelationGetSmgr(state->heaprel), MAIN_FORKNUM))
-		state->heapnblocks = RelationGetNumberOfBlocks(state->heaprel);
-	else
+	if (state->heaprel->rd_rel->relam != HEAP_TABLE_AM_OID)
+	{
+		ereport(NOTICE,
+				(errmsg_internal("skipping beyond-end-of-table checks for index \"%s\" because table \"%s\" does not use the heap access method",
+								 RelationGetRelationName(state->rel),
+								 RelationGetRelationName(state->heaprel))));
 		state->heapnblocks = InvalidBlockNumber;
+	}
+	else if (!smgrexists(RelationGetSmgr(state->heaprel), MAIN_FORKNUM))
+		state->heapnblocks = InvalidBlockNumber;
+	else
+		state->heapnblocks = RelationGetNumberOfBlocks(state->heaprel);
 	state->heapallindexed = heapallindexed;
 	state->indexallkeysmatch = indexallkeysmatch;
 	state->rootdescend = rootdescend;
diff --git a/doc/src/sgml/amcheck.sgml b/doc/src/sgml/amcheck.sgml
index e465ce06efc..f130943d1cf 100644
--- a/doc/src/sgml/amcheck.sgml
+++ b/doc/src/sgml/amcheck.sgml
@@ -136,7 +136,8 @@ ORDER BY c.relpages DESC LIMIT 10;
       <parameter>indexallkeysmatch</parameter> is <literal>false</literal>.
       This can detect a lost relation segment.  The check is skipped if the
       table's main relation fork is absent, allowing indexes to be checked
-      independently of heap verification.
+      independently of heap verification.  It is also skipped for tables
+      that do not use the <literal>heap</literal> table access method.
      </para>
     </listitem>
    </varlistentry>
-- 
2.43.0

