Rename files and headers related to index AM

The following renaming is done so as source files related to index
access methods are more consistent with table access methods (the
original names used for index AMs ware too generic, and could be
confused as including features related to table AMs):
- amapi.h -> indexam.h.
- amapi.c -> indexamapi.c.  Here we have an equivalent with
backend/access/table/tableamapi.c.
- amvalidate.c -> indexamvalidate.c.
- amvalidate.h -> indexamvalidate.h.
- genam.c -> indexgenam.c.
- genam.h -> indexgenam.h.

This has been discussed during the development of v12 when table AM was
worked on, but the renaming never happened.

Author: Michael Paquier
Reviewed-by: Fabien Coelho, Julien Rouhaud
Discussion: https://postgr.es/m/20191223053434.GF34339@paquier.xyz

contrib/bloom/blinsert.c

@@ -12,8 +12,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/generic_xlog.h"
+#include "access/indexgenam.h"
 #include "access/tableam.h"
 #include "bloom.h"
 #include "catalog/index.h"

contrib/bloom/bloom.h

@@ -13,8 +13,8 @@
 #ifndef _BLOOM_H_
 #define _BLOOM_H_
 
-#include "access/amapi.h"
 #include "access/generic_xlog.h"
+#include "access/indexam.h"
 #include "access/itup.h"
 #include "access/xlog.h"
 #include "fmgr.h"

contrib/bloom/blutils.c

@@ -13,8 +13,8 @@
  */
 #include "postgres.h"
 
-#include "access/amapi.h"
 #include "access/generic_xlog.h"
+#include "access/indexam.h"
 #include "access/reloptions.h"
 #include "bloom.h"
 #include "catalog/index.h"

contrib/bloom/blvacuum.c

@@ -12,7 +12,7 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
+#include "access/indexgenam.h"
 #include "bloom.h"
 #include "catalog/storage.h"
 #include "commands/vacuum.h"

contrib/bloom/blvalidate.c

@@ -12,8 +12,8 @@
  */
 #include "postgres.h"
 
-#include "access/amvalidate.h"
 #include "access/htup_details.h"
+#include "access/indexamvalidate.h"
 #include "bloom.h"
 #include "catalog/pg_amop.h"
 #include "catalog/pg_amproc.h"

contrib/sepgsql/database.c

@@ -10,8 +10,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/sysattr.h"
 #include "access/table.h"
 #include "catalog/dependency.h"

contrib/sepgsql/label.c

@@ -12,8 +12,8 @@
 
 #include <selinux/label.h>
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/table.h"
 #include "access/xact.h"
 #include "catalog/catalog.h"

contrib/sepgsql/proc.c

@@ -10,8 +10,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/sysattr.h"
 #include "access/table.h"
 #include "catalog/dependency.h"

contrib/sepgsql/relation.c

@@ -10,8 +10,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/sysattr.h"
 #include "access/table.h"
 #include "catalog/dependency.h"

contrib/sepgsql/schema.c

@@ -10,8 +10,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/sysattr.h"
 #include "access/table.h"
 #include "catalog/dependency.h"

src/backend/access/brin/brin_inclusion.c

@@ -26,7 +26,7 @@
 
 #include "access/brin_internal.h"
 #include "access/brin_tuple.h"
-#include "access/genam.h"
+#include "access/indexgenam.h"
 #include "access/skey.h"
 #include "catalog/pg_amop.h"
 #include "catalog/pg_type.h"

src/backend/access/brin/brin_minmax.c

@@ -12,7 +12,7 @@
 
 #include "access/brin_internal.h"
 #include "access/brin_tuple.h"
-#include "access/genam.h"
+#include "access/indexgenam.h"
 #include "access/stratnum.h"
 #include "catalog/pg_amop.h"
 #include "catalog/pg_type.h"

src/backend/access/brin/brin_validate.c

@@ -13,9 +13,9 @@
  */
 #include "postgres.h"
 
-#include "access/amvalidate.h"
 #include "access/brin_internal.h"
 #include "access/htup_details.h"
+#include "access/indexamvalidate.h"
 #include "catalog/pg_amop.h"
 #include "catalog/pg_amproc.h"
 #include "catalog/pg_opclass.h"

src/backend/access/common/detoast.c

@@ -14,7 +14,7 @@
 #include "postgres.h"
 
 #include "access/detoast.h"
-#include "access/genam.h"
+#include "access/indexgenam.h"
 #include "access/heaptoast.h"
 #include "access/table.h"
 #include "access/toast_internals.h"

src/backend/access/common/toast_internals.c

@@ -14,9 +14,9 @@
 #include "postgres.h"
 
 #include "access/detoast.h"
-#include "access/genam.h"
 #include "access/heapam.h"
 #include "access/heaptoast.h"
+#include "access/indexgenam.h"
 #include "access/table.h"
 #include "access/toast_internals.h"
 #include "access/xact.h"

src/backend/access/gin/ginvalidate.c

@@ -13,9 +13,9 @@
  */
 #include "postgres.h"
 
-#include "access/amvalidate.h"
 #include "access/gin_private.h"
 #include "access/htup_details.h"
+#include "access/indexamvalidate.h"
 #include "catalog/pg_amop.h"
 #include "catalog/pg_amproc.h"
 #include "catalog/pg_opclass.h"

src/backend/access/gist/gistbuild.c

@@ -16,9 +16,9 @@
 
 #include <math.h>
 
-#include "access/genam.h"
 #include "access/gist_private.h"
 #include "access/gistxlog.h"
+#include "access/indexgenam.h"
 #include "access/tableam.h"
 #include "access/xloginsert.h"
 #include "catalog/index.h"

src/backend/access/gist/gistbuildbuffers.c

@@ -14,8 +14,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/gist_private.h"
+#include "access/indexgenam.h"
 #include "catalog/index.h"
 #include "miscadmin.h"
 #include "storage/buffile.h"

src/backend/access/gist/gistget.c

@@ -14,8 +14,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/gist_private.h"
+#include "access/indexgenam.h"
 #include "access/relscan.h"
 #include "lib/pairingheap.h"
 #include "miscadmin.h"

src/backend/access/gist/gistvacuum.c

@@ -14,8 +14,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/gist_private.h"
+#include "access/indexgenam.h"
 #include "access/transam.h"
 #include "commands/vacuum.h"
 #include "lib/integerset.h"

src/backend/access/gist/gistvalidate.c

@@ -13,9 +13,9 @@
  */
 #include "postgres.h"
 
-#include "access/amvalidate.h"
 #include "access/gist_private.h"
 #include "access/htup_details.h"
+#include "access/indexamvalidate.h"
 #include "catalog/pg_amop.h"
 #include "catalog/pg_amproc.h"
 #include "catalog/pg_opclass.h"

src/backend/access/hash/hashvalidate.c

@@ -13,9 +13,9 @@
  */
 #include "postgres.h"
 
-#include "access/amvalidate.h"
 #include "access/hash.h"
 #include "access/htup_details.h"
+#include "access/indexamvalidate.h"
 #include "catalog/pg_amop.h"
 #include "catalog/pg_amproc.h"
 #include "catalog/pg_opclass.h"

src/backend/access/heap/heapam.c

@@ -33,11 +33,11 @@
 #include "postgres.h"
 
 #include "access/bufmask.h"
-#include "access/genam.h"
 #include "access/heapam.h"
 #include "access/heapam_xlog.h"
 #include "access/heaptoast.h"
 #include "access/hio.h"
+#include "access/indexgenam.h"
 #include "access/multixact.h"
 #include "access/parallel.h"
 #include "access/relscan.h"

src/backend/access/heap/heapam_handler.c

@@ -19,9 +19,9 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/heapam.h"
 #include "access/heaptoast.h"
+#include "access/indexgenam.h"
 #include "access/multixact.h"
 #include "access/rewriteheap.h"
 #include "access/tableam.h"

src/backend/access/heap/vacuumlazy.c

@@ -36,10 +36,10 @@
 
 #include <math.h>
 
-#include "access/genam.h"
 #include "access/heapam.h"
 #include "access/heapam_xlog.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/multixact.h"
 #include "access/transam.h"
 #include "access/visibilitymap.h"

src/backend/access/index/Makefile

@@ -13,9 +13,9 @@ top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
 OBJS = \
-	amapi.o \
-	amvalidate.o \
-	genam.o \
-	indexam.o
+	indexam.o \
+	indexamapi.o \
+	indexamvalidate.o \
+	indexgenam.o
 
 include $(top_srcdir)/src/backend/common.mk

src/backend/access/index/indexam.c

@@ -43,8 +43,8 @@
 
 #include "postgres.h"
 
-#include "access/amapi.h"
 #include "access/heapam.h"
+#include "access/indexam.h"
 #include "access/relscan.h"
 #include "access/tableam.h"
 #include "access/transam.h"

src/backend/access/index/indexamapi.c

@@ -1,20 +1,20 @@
 /*-------------------------------------------------------------------------
  *
- * amapi.c
+ * indexamapi.c
  *	  Support routines for API for Postgres index access methods.
  *
  * Copyright (c) 2015-2019, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
- *	  src/backend/access/index/amapi.c
+ *	  src/backend/access/index/indexamapi.c
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include "access/amapi.h"
 #include "access/htup_details.h"
+#include "access/indexam.h"
 #include "catalog/pg_am.h"
 #include "catalog/pg_opclass.h"
 #include "utils/builtins.h"

src/backend/access/index/indexamvalidate.c

@@ -1,20 +1,20 @@
 /*-------------------------------------------------------------------------
  *
- * amvalidate.c
+ * indexamvalidate.c
  *	  Support routines for index access methods' amvalidate functions.
  *
  * Copyright (c) 2016-2019, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
- *	  src/backend/access/index/amvalidate.c
+ *	  src/backend/access/index/indexamvalidate.c
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include "access/amvalidate.h"
 #include "access/htup_details.h"
+#include "access/indexamvalidate.h"
 #include "catalog/pg_am.h"
 #include "catalog/pg_amop.h"
 #include "catalog/pg_amproc.h"

src/backend/access/index/indexgenam.c

@@ -1,6 +1,6 @@
 /*-------------------------------------------------------------------------
  *
- * genam.c
+ * indexgenam.c
  *	  general index access method routines
  *
  * Portions Copyright (c) 1996-2019, PostgreSQL Global Development Group
@@ -8,19 +8,19 @@
  *
  *
  * IDENTIFICATION
- *	  src/backend/access/index/genam.c
+ *	  src/backend/access/index/indexgenam.c
  *
  * NOTES
  *	  many of the old access method routines have been turned into
- *	  macros and moved to genam.h -cim 4/30/91
+ *	  macros and moved to indexgenam.h -cim 4/30/91
  *
  *-------------------------------------------------------------------------
  */
 
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/heapam.h"
+#include "access/indexgenam.h"
 #include "access/relscan.h"
 #include "access/tableam.h"
 #include "access/transam.h"

src/backend/access/nbtree/nbtvalidate.c

@@ -13,8 +13,8 @@
  */
 #include "postgres.h"
 
-#include "access/amvalidate.h"
 #include "access/htup_details.h"
+#include "access/indexamvalidate.h"
 #include "access/nbtree.h"
 #include "catalog/pg_amop.h"
 #include "catalog/pg_amproc.h"

src/backend/access/spgist/spgdoinsert.c

@@ -15,7 +15,7 @@
 
 #include "postgres.h"
 
-#include "access/genam.h"
+#include "access/indexgenam.h"
 #include "access/spgist_private.h"
 #include "access/spgxlog.h"
 #include "access/xloginsert.h"

src/backend/access/spgist/spginsert.c

@@ -16,7 +16,7 @@
 
 #include "postgres.h"
 
-#include "access/genam.h"
+#include "access/indexgenam.h"
 #include "access/spgist_private.h"
 #include "access/spgxlog.h"
 #include "access/tableam.h"

src/backend/access/spgist/spgscan.c

@@ -15,7 +15,7 @@
 
 #include "postgres.h"
 
-#include "access/genam.h"
+#include "access/indexgenam.h"
 #include "access/relscan.h"
 #include "access/spgist_private.h"
 #include "miscadmin.h"

src/backend/access/spgist/spgutils.c

@@ -15,8 +15,8 @@
 
 #include "postgres.h"
 
-#include "access/amvalidate.h"
 #include "access/htup_details.h"
+#include "access/indexamvalidate.h"
 #include "access/reloptions.h"
 #include "access/spgist_private.h"
 #include "access/transam.h"

src/backend/access/spgist/spgvacuum.c

@@ -15,7 +15,7 @@
 
 #include "postgres.h"
 
-#include "access/genam.h"
+#include "access/indexgenam.h"
 #include "access/spgist_private.h"
 #include "access/spgxlog.h"
 #include "access/transam.h"

src/backend/access/spgist/spgvalidate.c

@@ -13,8 +13,8 @@
  */
 #include "postgres.h"
 
-#include "access/amvalidate.h"
 #include "access/htup_details.h"
+#include "access/indexamvalidate.h"
 #include "access/spgist_private.h"
 #include "catalog/pg_amop.h"
 #include "catalog/pg_amproc.h"

src/backend/bootstrap/bootstrap.c

@@ -17,9 +17,9 @@
 #include <unistd.h>
 #include <signal.h>
 
-#include "access/genam.h"
 #include "access/heapam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/tableam.h"
 #include "access/xact.h"
 #include "access/xlog_internal.h"

src/backend/catalog/aclchk.c

@@ -17,9 +17,9 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/heapam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/sysattr.h"
 #include "access/tableam.h"
 #include "access/xact.h"

src/backend/catalog/catalog.c

@@ -20,8 +20,8 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/sysattr.h"
 #include "access/table.h"
 #include "access/transam.h"

src/backend/catalog/dependency.c

@@ -14,8 +14,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/table.h"
 #include "access/xact.h"
 #include "catalog/dependency.h"

src/backend/catalog/heap.c

@@ -29,8 +29,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/multixact.h"
 #include "access/relation.h"
 #include "access/sysattr.h"

src/backend/catalog/index.c

@@ -23,8 +23,8 @@
 
 #include <unistd.h>
 
-#include "access/amapi.h"
 #include "access/heapam.h"
+#include "access/indexam.h"
 #include "access/multixact.h"
 #include "access/relscan.h"
 #include "access/sysattr.h"

src/backend/catalog/indexing.c

@@ -15,9 +15,9 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/heapam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "catalog/index.h"
 #include "catalog/indexing.h"
 #include "executor/executor.h"

src/backend/catalog/objectaddress.c

@@ -15,7 +15,7 @@
 
 #include "postgres.h"
 
-#include "access/genam.h"
+#include "access/indexgenam.h"
 #include "access/htup_details.h"
 #include "access/relation.h"
 #include "access/sysattr.h"

src/backend/catalog/partition.c

@@ -15,8 +15,8 @@
 #include "postgres.h"
 
 #include "access/attmap.h"
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/sysattr.h"
 #include "access/table.h"
 #include "catalog/indexing.h"

src/backend/catalog/pg_collation.c

@@ -14,8 +14,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/sysattr.h"
 #include "access/table.h"
 #include "catalog/catalog.h"

src/backend/catalog/pg_constraint.c

@@ -14,8 +14,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/sysattr.h"
 #include "access/table.h"
 #include "access/xact.h"

src/backend/catalog/pg_db_role_setting.c

@@ -10,9 +10,9 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/heapam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/tableam.h"
 #include "catalog/indexing.h"
 #include "catalog/objectaccess.h"

src/backend/catalog/pg_depend.c

@@ -14,8 +14,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/table.h"
 #include "catalog/dependency.h"
 #include "catalog/indexing.h"

src/backend/catalog/pg_enum.c

@@ -13,8 +13,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/table.h"
 #include "access/xact.h"
 #include "catalog/binary_upgrade.h"

src/backend/catalog/pg_inherits.c

@@ -19,8 +19,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/table.h"
 #include "catalog/indexing.h"
 #include "catalog/pg_inherits.h"

src/backend/catalog/pg_largeobject.c

@@ -14,8 +14,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/sysattr.h"
 #include "access/table.h"
 #include "catalog/catalog.h"

src/backend/catalog/pg_publication.c

@@ -14,9 +14,9 @@
 
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/heapam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/tableam.h"
 #include "access/xact.h"
 #include "catalog/catalog.h"

src/backend/catalog/pg_range.c

@@ -14,8 +14,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/table.h"
 #include "catalog/dependency.h"
 #include "catalog/indexing.h"

src/backend/catalog/pg_shdepend.c

@@ -14,8 +14,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/table.h"
 #include "access/xact.h"
 #include "catalog/catalog.h"

src/backend/catalog/pg_subscription.c

@@ -14,9 +14,9 @@
 
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/heapam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/tableam.h"
 #include "access/xact.h"
 #include "catalog/indexing.h"

src/backend/commands/analyze.c

@@ -17,7 +17,7 @@
 #include <math.h>
 
 #include "access/detoast.h"
-#include "access/genam.h"
+#include "access/indexgenam.h"
 #include "access/multixact.h"
 #include "access/relation.h"
 #include "access/sysattr.h"

src/backend/commands/cluster.c

@@ -17,8 +17,8 @@
  */
 #include "postgres.h"
 
-#include "access/amapi.h"
 #include "access/heapam.h"
+#include "access/indexam.h"
 #include "access/multixact.h"
 #include "access/relscan.h"
 #include "access/tableam.h"

src/backend/commands/comment.c

@@ -14,8 +14,8 @@
 
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/relation.h"
 #include "access/table.h"
 #include "catalog/indexing.h"

src/backend/commands/constraint.c

@@ -13,8 +13,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/heapam.h"
+#include "access/indexgenam.h"
 #include "access/tableam.h"
 #include "catalog/index.h"
 #include "commands/trigger.h"

src/backend/commands/dbcommands.c

@@ -23,9 +23,9 @@
 #include <unistd.h>
 #include <sys/stat.h>
 
-#include "access/genam.h"
 #include "access/heapam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/multixact.h"
 #include "access/tableam.h"
 #include "access/xact.h"

src/backend/commands/extension.c

@@ -29,8 +29,8 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/relation.h"
 #include "access/sysattr.h"
 #include "access/table.h"

src/backend/commands/functioncmds.c

@@ -32,8 +32,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/sysattr.h"
 #include "access/table.h"
 #include "catalog/catalog.h"

src/backend/commands/indexcmds.c

@@ -15,9 +15,9 @@
 
 #include "postgres.h"
 
-#include "access/amapi.h"
 #include "access/heapam.h"
 #include "access/htup_details.h"
+#include "access/indexam.h"
 #include "access/reloptions.h"
 #include "access/sysattr.h"
 #include "access/tableam.h"

src/backend/commands/matview.c

@@ -14,9 +14,9 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/heapam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/multixact.h"
 #include "access/tableam.h"
 #include "access/xact.h"

src/backend/commands/opclasscmds.c

@@ -17,9 +17,9 @@
 
 #include <limits.h>
 
-#include "access/genam.h"
 #include "access/hash.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/nbtree.h"
 #include "access/sysattr.h"
 #include "access/table.h"

src/backend/commands/policy.c

@@ -12,9 +12,9 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/relation.h"
 #include "access/sysattr.h"
 #include "access/table.h"

src/backend/commands/proclang.c

@@ -13,8 +13,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/table.h"
 #include "catalog/catalog.h"
 #include "catalog/dependency.h"

src/backend/commands/publicationcmds.c

@@ -14,8 +14,8 @@
 
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/table.h"
 #include "access/xact.h"
 #include "catalog/catalog.h"

src/backend/commands/seclabel.c

@@ -10,8 +10,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/relation.h"
 #include "access/table.h"
 #include "catalog/catalog.h"

src/backend/commands/tablecmds.c

@@ -15,9 +15,9 @@
 #include "postgres.h"
 
 #include "access/attmap.h"
-#include "access/genam.h"
 #include "access/heapam.h"
 #include "access/heapam_xlog.h"
+#include "access/indexgenam.h"
 #include "access/multixact.h"
 #include "access/reloptions.h"
 #include "access/relscan.h"

src/backend/commands/trigger.c

@@ -13,8 +13,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/relation.h"
 #include "access/sysattr.h"
 #include "access/table.h"

src/backend/commands/tsearchcmds.c

@@ -17,8 +17,8 @@
 
 #include <ctype.h>
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/table.h"
 #include "access/xact.h"
 #include "catalog/catalog.h"

src/backend/commands/typecmds.c

@@ -31,9 +31,9 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/heapam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/tableam.h"
 #include "access/xact.h"
 #include "catalog/binary_upgrade.h"

src/backend/commands/user.c

@@ -12,8 +12,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/table.h"
 #include "access/xact.h"
 #include "catalog/binary_upgrade.h"

src/backend/commands/vacuum.c

@@ -24,9 +24,9 @@
 
 #include "access/clog.h"
 #include "access/commit_ts.h"
-#include "access/genam.h"
 #include "access/heapam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/multixact.h"
 #include "access/tableam.h"
 #include "access/transam.h"

src/backend/executor/execAmi.c

@@ -12,8 +12,8 @@
  */
 #include "postgres.h"
 
-#include "access/amapi.h"
 #include "access/htup_details.h"
+#include "access/indexam.h"
 #include "executor/execdebug.h"
 #include "executor/nodeAgg.h"
 #include "executor/nodeAppend.h"

src/backend/executor/execCurrent.c

@@ -12,7 +12,7 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
+#include "access/indexgenam.h"
 #include "access/relscan.h"
 #include "access/sysattr.h"
 #include "catalog/pg_type.h"

src/backend/executor/execIndexing.c

@@ -106,7 +106,7 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
+#include "access/indexgenam.h"
 #include "access/relscan.h"
 #include "access/tableam.h"
 #include "access/xact.h"

src/backend/executor/execReplication.c

@@ -14,7 +14,7 @@
 
 #include "postgres.h"
 
-#include "access/genam.h"
+#include "access/indexgenam.h"
 #include "access/relscan.h"
 #include "access/tableam.h"
 #include "access/transam.h"

src/backend/executor/nodeBitmapIndexscan.c

@@ -21,7 +21,7 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
+#include "access/indexgenam.h"
 #include "executor/execdebug.h"
 #include "executor/nodeBitmapIndexscan.h"
 #include "executor/nodeIndexscan.h"

src/backend/executor/nodeIndexonlyscan.c

@@ -30,7 +30,7 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
+#include "access/indexgenam.h"
 #include "access/relscan.h"
 #include "access/tableam.h"
 #include "access/tupdesc.h"

src/backend/optimizer/path/costsize.c

@@ -73,8 +73,8 @@
 
 #include <math.h>
 
-#include "access/amapi.h"
 #include "access/htup_details.h"
+#include "access/indexam.h"
 #include "access/tsmapi.h"
 #include "executor/executor.h"
 #include "executor/nodeHash.h"
@@ -539,7 +539,7 @@ cost_index(IndexPath *path, PlannerInfo *root, double loop_count,
 	 * for scanning the index, as well as the selectivity of the index (ie,
 	 * the fraction of main-table tuples we will have to retrieve) and its
 	 * correlation to the main-table tuple order.  We need a cast here because
-	 * pathnodes.h uses a weak function type to avoid including amapi.h.
+	 * pathnodes.h uses a weak function type to avoid including indexam.h.
 	 */
 	amcostestimate = (amcostestimate_function) index->amcostestimate;
 	amcostestimate(root, path, loop_count,

src/backend/optimizer/plan/planner.c

@@ -18,8 +18,8 @@
 #include <limits.h>
 #include <math.h>
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/parallel.h"
 #include "access/sysattr.h"
 #include "access/table.h"

src/backend/optimizer/util/plancat.c

@@ -17,8 +17,8 @@
 
 #include <math.h>
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/nbtree.h"
 #include "access/sysattr.h"
 #include "access/table.h"

src/backend/parser/parse_utilcmd.c

@@ -26,8 +26,8 @@
 
 #include "postgres.h"
 
-#include "access/amapi.h"
 #include "access/htup_details.h"
+#include "access/indexam.h"
 #include "access/relation.h"
 #include "access/reloptions.h"
 #include "access/table.h"

src/backend/partitioning/partdesc.c

@@ -14,8 +14,8 @@
 
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/table.h"
 #include "catalog/indexing.h"
 #include "catalog/partition.h"

src/backend/replication/logical/origin.c

@@ -70,8 +70,8 @@
 #include <unistd.h>
 #include <sys/stat.h>
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/table.h"
 #include "access/xact.h"
 #include "catalog/catalog.h"

src/backend/rewrite/rewriteRemove.c

@@ -14,8 +14,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/sysattr.h"
 #include "access/table.h"
 #include "catalog/catalog.h"

src/backend/statistics/extended_stats.c

@@ -17,8 +17,8 @@
 #include "postgres.h"
 
 #include "access/detoast.h"
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/table.h"
 #include "catalog/indexing.h"
 #include "catalog/pg_collation.h"

src/backend/storage/large_object/inv_api.c

@@ -33,8 +33,8 @@
 #include <limits.h>
 
 #include "access/detoast.h"
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/sysattr.h"
 #include "access/table.h"
 #include "access/xact.h"

src/backend/utils/adt/amutils.c

@@ -13,8 +13,8 @@
  */
 #include "postgres.h"
 
-#include "access/amapi.h"
 #include "access/htup_details.h"
+#include "access/indexam.h"
 #include "catalog/pg_class.h"
 #include "catalog/pg_index.h"
 #include "utils/builtins.h"

src/backend/utils/adt/enum.c

@@ -13,8 +13,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/table.h"
 #include "catalog/indexing.h"
 #include "catalog/pg_enum.h"

src/backend/utils/adt/ruleutils.c

@@ -19,8 +19,8 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#include "access/amapi.h"
 #include "access/htup_details.h"
+#include "access/indexam.h"
 #include "access/relation.h"
 #include "access/sysattr.h"
 #include "access/table.h"

src/backend/utils/cache/catcache.c

@@ -14,8 +14,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/heaptoast.h"
+#include "access/indexgenam.h"
 #include "access/relscan.h"
 #include "access/sysattr.h"
 #include "access/table.h"

src/backend/utils/cache/evtcache.c

@@ -13,8 +13,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/relation.h"
 #include "catalog/indexing.h"
 #include "catalog/pg_event_trigger.h"

src/backend/utils/cache/relfilenodemap.c

@@ -13,8 +13,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/table.h"
 #include "catalog/indexing.h"
 #include "catalog/pg_class.h"

src/backend/utils/cache/ts_cache.c

@@ -26,8 +26,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/table.h"
 #include "access/xact.h"
 #include "catalog/indexing.h"

src/backend/utils/init/postinit.c

@@ -19,9 +19,9 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "access/genam.h"
 #include "access/heapam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/session.h"
 #include "access/sysattr.h"
 #include "access/tableam.h"