Revert "Rename files and headers related to index AM"

This follows multiple complains from Peter Geoghegan, Andres Freund and
Alvaro Herrera that this issue ought to be dug more before actually
happening, if it happens.

Discussion: https://postgr.es/m/20191226144606.GA5659@alvherre.pgsql

diff --git a/contrib/bloom/blinsert.c b/contrib/bloom/blinsert.c
index 5df616e96ee0e950d163504463190e2e03a1b0b0..adcbd168fb6959f3f4c696ecd899bf4abb1b9d68 100644 (file)
--- a/contrib/bloom/blinsert.c
+++ b/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"

diff --git a/contrib/bloom/bloom.h b/contrib/bloom/bloom.h
index 5a6e5e48a1a244f57ebbcb8dfe7bf9e6bc58f735..a7179981f47490969bd9b878c7c08d7faf3a680d 100644 (file)
--- a/contrib/bloom/bloom.h
+++ b/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"

diff --git a/contrib/bloom/blutils.c b/contrib/bloom/blutils.c
index 44b7e74c5cdb26591cafeb6b9884c309bc16f13e..e2063bac629c852532ff572c9c441031d0a4ded6 100644 (file)
--- a/contrib/bloom/blutils.c
+++ b/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"

diff --git a/contrib/bloom/blvacuum.c b/contrib/bloom/blvacuum.c
index f0a5d8cc5e984db9019fb018f10edbfcf6051466..0c33d1e1951b92489aee2307965130fb9204c8ce 100644 (file)
--- a/contrib/bloom/blvacuum.c
+++ b/contrib/bloom/blvacuum.c
@@ -12,7 +12,7 @@
  */
 #include "postgres.h"
 
-#include "access/indexgenam.h"
+#include "access/genam.h"
 #include "bloom.h"
 #include "catalog/storage.h"
 #include "commands/vacuum.h"

diff --git a/contrib/bloom/blvalidate.c b/contrib/bloom/blvalidate.c
index ca2cb095f01350e9df6e34eb028fb3c2f578f329..b3dfe030226359601e8744fe5268419c36665f0a 100644 (file)
--- a/contrib/bloom/blvalidate.c
+++ b/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"

diff --git a/contrib/sepgsql/database.c b/contrib/sepgsql/database.c
index 1fe30e34e4e74ac4922c9f4d6780adceacf4e3ad..5850e076eb987ac6a2553518f9bc8433797c555b 100644 (file)
--- a/contrib/sepgsql/database.c
+++ b/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"

diff --git a/contrib/sepgsql/label.c b/contrib/sepgsql/label.c
index 083897aa3911fe9bba6664452b593223ba151ceb..d8a1d129d29b447dab72a052c2c46dbff63564db 100644 (file)
--- a/contrib/sepgsql/label.c
+++ b/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"

diff --git a/contrib/sepgsql/proc.c b/contrib/sepgsql/proc.c
index 47382994e2ac4770f3bbc79c1df04a6e9a40c128..345a4c253d81763756dbfeb8d1f90c149b4ec2d3 100644 (file)
--- a/contrib/sepgsql/proc.c
+++ b/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"

diff --git a/contrib/sepgsql/relation.c b/contrib/sepgsql/relation.c
index 4b1f772fc2b8d0448ebd96a11133e140d28cfe77..fa34221509a615e9f55d79a4b8d9605e5423b73c 100644 (file)
--- a/contrib/sepgsql/relation.c
+++ b/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"

diff --git a/contrib/sepgsql/schema.c b/contrib/sepgsql/schema.c
index 42001bf133c6c7458d79bf703ea873967a2cef72..00c227d86c143c48e96934b6e4c64411b014d468 100644 (file)
--- a/contrib/sepgsql/schema.c
+++ b/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"

diff --git a/src/backend/access/brin/brin_inclusion.c b/src/backend/access/brin/brin_inclusion.c
index 152b8b70dab56c4a1656a909ae0b8a2b586250b9..86788024ef658c5ee0948dae73c385d99e2fbfb2 100644 (file)
--- a/src/backend/access/brin/brin_inclusion.c
+++ b/src/backend/access/brin/brin_inclusion.c
@@ -26,7 +26,7 @@
 
 #include "access/brin_internal.h"
 #include "access/brin_tuple.h"
-#include "access/indexgenam.h"
+#include "access/genam.h"
 #include "access/skey.h"
 #include "catalog/pg_amop.h"
 #include "catalog/pg_type.h"

diff --git a/src/backend/access/brin/brin_minmax.c b/src/backend/access/brin/brin_minmax.c
index d0d4389ea3c9a58502cb5acc7b9ed4042fcd930d..655c0b54b53299b04573b8169e9c644438aa3d4a 100644 (file)
--- a/src/backend/access/brin/brin_minmax.c
+++ b/src/backend/access/brin/brin_minmax.c
@@ -12,7 +12,7 @@
 
 #include "access/brin_internal.h"
 #include "access/brin_tuple.h"
-#include "access/indexgenam.h"
+#include "access/genam.h"
 #include "access/stratnum.h"
 #include "catalog/pg_amop.h"
 #include "catalog/pg_type.h"

diff --git a/src/backend/access/brin/brin_validate.c b/src/backend/access/brin/brin_validate.c
index 9b6f435e56b1ae254b094dd08648bf23b0f52b23..02337a767cef4b68f61c097fa2e04080004f5e74 100644 (file)
--- a/src/backend/access/brin/brin_validate.c
+++ b/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"

diff --git a/src/backend/access/common/detoast.c b/src/backend/access/common/detoast.c
index d6f45c8463a384b6b0ec05e76fa2193d3f8c2362..78fcc876dad3bef9e98eecd4eac52949dc42984e 100644 (file)
--- a/src/backend/access/common/detoast.c
+++ b/src/backend/access/common/detoast.c
@@ -14,7 +14,7 @@
 #include "postgres.h"
 
 #include "access/detoast.h"
-#include "access/indexgenam.h"
+#include "access/genam.h"
 #include "access/heaptoast.h"
 #include "access/table.h"
 #include "access/toast_internals.h"

diff --git a/src/backend/access/common/toast_internals.c b/src/backend/access/common/toast_internals.c
index 63517132d6d95448d24286d017398f02e8d65512..a97124249013830b037aa9591db31e97ad031da6 100644 (file)
--- a/src/backend/access/common/toast_internals.c
+++ b/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"

diff --git a/src/backend/access/gin/ginvalidate.c b/src/backend/access/gin/ginvalidate.c
index 5abd746894c42d232aad8c707ae4269c24d46d61..5d96f29cdef5449c6c8baa39b4511a1e37eb44a4 100644 (file)
--- a/src/backend/access/gin/ginvalidate.c
+++ b/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"

diff --git a/src/backend/access/gist/gistbuild.c b/src/backend/access/gist/gistbuild.c
index b9b31dd63e0cfa6e49830f95685f1973b17f7c42..739846a257da71f6c006877111c704229d50557d 100644 (file)
--- a/src/backend/access/gist/gistbuild.c
+++ b/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"

diff --git a/src/backend/access/gist/gistbuildbuffers.c b/src/backend/access/gist/gistbuildbuffers.c
index 39121d5597dd3af9581bd1e49293683650a8599f..38f786848de88440f025df68da3623f3ce8f11ee 100644 (file)
--- a/src/backend/access/gist/gistbuildbuffers.c
+++ b/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"

diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c
index dd1df12fc881605c0779a0ce59a20d6284aff527..98b68920138c137c46e2ca563b6289033d0d1795 100644 (file)
--- a/src/backend/access/gist/gistget.c
+++ b/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"

diff --git a/src/backend/access/gist/gistvacuum.c b/src/backend/access/gist/gistvacuum.c
index c8bb5f96b00e9daa4c2b609038f6672ed7eb4d28..710e4015b3d86ab457acbce7de9eaf6d4d662987 100644 (file)
--- a/src/backend/access/gist/gistvacuum.c
+++ b/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"

diff --git a/src/backend/access/gist/gistvalidate.c b/src/backend/access/gist/gistvalidate.c
index 3357689970ac271acfb3a0d301a7243d1a4e54d6..dfc1a87a757ccd970cb368b01922bf719c608583 100644 (file)
--- a/src/backend/access/gist/gistvalidate.c
+++ b/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"

diff --git a/src/backend/access/hash/hashvalidate.c b/src/backend/access/hash/hashvalidate.c
index 3ec9fcd0362b5410e98ec6b9dfcbb85ee2a20959..93158727512e566802cc8fa96adeac259d986ef5 100644 (file)
--- a/src/backend/access/hash/hashvalidate.c
+++ b/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"

diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index e6d2b5f007c74cb6da09637d518125609ac406d4..0128bb34ef65debc067d12e47299a339c7f395f5 100644 (file)
--- a/src/backend/access/heap/heapam.c
+++ b/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"

diff --git a/src/backend/access/heap/heapam_handler.c b/src/backend/access/heap/heapam_handler.c
index 72729f744bb32b2b2905a118d3e792a568a8aa7e..92073fec54d860628e315bb67eaf841f7c5eda57 100644 (file)
--- a/src/backend/access/heap/heapam_handler.c
+++ b/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"

diff --git a/src/backend/access/heap/vacuumlazy.c b/src/backend/access/heap/vacuumlazy.c
index 0cd989d57072d65ded1b6e070c8c5a70bc3bf9be..597d8b5f923401f5830ff22887397662e3d2db34 100644 (file)
--- a/src/backend/access/heap/vacuumlazy.c
+++ b/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"

diff --git a/src/backend/access/index/Makefile b/src/backend/access/index/Makefile
index 0d8cbbc88cba2233023883ee063f809c5d3d2b8e..6f2e3061a84aebd77045125e9b29f23876fd536c 100644 (file)
--- a/src/backend/access/index/Makefile
+++ b/src/backend/access/index/Makefile
@@ -13,9 +13,9 @@ top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
 OBJS = \
-   indexam.o \
-   indexamapi.o \
-   indexamvalidate.o \
-   indexgenam.o
+   amapi.o \
+   amvalidate.o \
+   genam.o \
+   indexam.o
 
 include $(top_srcdir)/src/backend/common.mk

diff --git a/src/backend/access/index/indexamapi.c b/src/backend/access/index/amapi.c
similarity index 97%
rename from src/backend/access/index/indexamapi.c
rename to src/backend/access/index/amapi.c
index bda667cf93404abbb99f1e6620163ff994e12ddc..450a7dce1fc001a3f59f58f4c97087109534228a 100644 (file)
--- a/src/backend/access/index/indexamapi.c
+++ b/src/backend/access/index/amapi.c
@@ -1,20 +1,20 @@
 /*-------------------------------------------------------------------------
  *
- * indexamapi.c
+ * amapi.c
  *   Support routines for API for Postgres index access methods.
  *
  * Copyright (c) 2015-2019, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
- *   src/backend/access/index/indexamapi.c
+ *   src/backend/access/index/amapi.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"

diff --git a/src/backend/access/index/indexamvalidate.c b/src/backend/access/index/amvalidate.c
similarity index 98%
rename from src/backend/access/index/indexamvalidate.c
rename to src/backend/access/index/amvalidate.c
index 8f00012d20970dedafaedeed8e54f889a9255471..5a2728502ce01d185ed799800831a731b30567cb 100644 (file)
--- a/src/backend/access/index/indexamvalidate.c
+++ b/src/backend/access/index/amvalidate.c
@@ -1,20 +1,20 @@
 /*-------------------------------------------------------------------------
  *
- * indexamvalidate.c
+ * amvalidate.c
  *   Support routines for index access methods' amvalidate functions.
  *
  * Copyright (c) 2016-2019, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
- *   src/backend/access/index/indexamvalidate.c
+ *   src/backend/access/index/amvalidate.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"

diff --git a/src/backend/access/index/indexgenam.c b/src/backend/access/index/genam.c
similarity index 99%
rename from src/backend/access/index/indexgenam.c
rename to src/backend/access/index/genam.c
index 6a1ac6cc3099c76b3bcf13c624e698cea122f0e7..2599b5d3425fc95ab8d13b8b37f85244a4576de6 100644 (file)
--- a/src/backend/access/index/indexgenam.c
+++ b/src/backend/access/index/genam.c
@@ -1,6 +1,6 @@
 /*-------------------------------------------------------------------------
  *
- * indexgenam.c
+ * genam.c
  *   general index access method routines
  *
  * Portions Copyright (c) 1996-2019, PostgreSQL Global Development Group
@@ -8,19 +8,19 @@
  *
  *
  * IDENTIFICATION
- *   src/backend/access/index/indexgenam.c
+ *   src/backend/access/index/genam.c
  *
  * NOTES
  *   many of the old access method routines have been turned into
- *   macros and moved to indexgenam.h -cim 4/30/91
+ *   macros and moved to genam.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"

diff --git a/src/backend/access/index/indexam.c b/src/backend/access/index/indexam.c
index d5d6e29e181f84d7faca9083052d38e8d3a25617..4af418287d22c53fcb7e6d8f866d0a9de59b2833 100644 (file)
--- a/src/backend/access/index/indexam.c
+++ b/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"

diff --git a/src/backend/access/nbtree/nbtvalidate.c b/src/backend/access/nbtree/nbtvalidate.c
index 2b40b0e21cf5da5e471077fe2ca7cad347bb3638..0148ea7892926e150b42c15bef9264f664f0464c 100644 (file)
--- a/src/backend/access/nbtree/nbtvalidate.c
+++ b/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"

diff --git a/src/backend/access/spgist/spgdoinsert.c b/src/backend/access/spgist/spgdoinsert.c
index 42a894cc54b6db030846b96b444633391ffd165f..c34c44cd8b565c5964ac84da744a2e4378045f97 100644 (file)
--- a/src/backend/access/spgist/spgdoinsert.c
+++ b/src/backend/access/spgist/spgdoinsert.c
@@ -15,7 +15,7 @@
 
 #include "postgres.h"
 
-#include "access/indexgenam.h"
+#include "access/genam.h"
 #include "access/spgist_private.h"
 #include "access/spgxlog.h"
 #include "access/xloginsert.h"

diff --git a/src/backend/access/spgist/spginsert.c b/src/backend/access/spgist/spginsert.c
index 043016fe8d6910ce4463b5e3b24882727e13949d..dd9088741cffa0e266467cdd6f16ef301b5a9467 100644 (file)
--- a/src/backend/access/spgist/spginsert.c
+++ b/src/backend/access/spgist/spginsert.c
@@ -16,7 +16,7 @@
 
 #include "postgres.h"
 
-#include "access/indexgenam.h"
+#include "access/genam.h"
 #include "access/spgist_private.h"
 #include "access/spgxlog.h"
 #include "access/tableam.h"

diff --git a/src/backend/access/spgist/spgscan.c b/src/backend/access/spgist/spgscan.c
index 8e5f01249734373f1f57d17b14e76918488bbe85..6e940fd3defdba1b7160d34cef28aa8929317fb9 100644 (file)
--- a/src/backend/access/spgist/spgscan.c
+++ b/src/backend/access/spgist/spgscan.c
@@ -15,7 +15,7 @@
 
 #include "postgres.h"
 
-#include "access/indexgenam.h"
+#include "access/genam.h"
 #include "access/relscan.h"
 #include "access/spgist_private.h"
 #include "miscadmin.h"

diff --git a/src/backend/access/spgist/spgutils.c b/src/backend/access/spgist/spgutils.c
index d01ea59e1419e7a7600c5109fa8e37e896f6f463..e2d391ee7540d8a9e5cf1fff1d0787d9d33e9a44 100644 (file)
--- a/src/backend/access/spgist/spgutils.c
+++ b/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"

diff --git a/src/backend/access/spgist/spgvacuum.c b/src/backend/access/spgist/spgvacuum.c
index 1b8cb9760f7e2049b1521ff7904a8851f26d44f6..478d4c0d612e5ccb74ad6d00278f2bf787f3d689 100644 (file)
--- a/src/backend/access/spgist/spgvacuum.c
+++ b/src/backend/access/spgist/spgvacuum.c
@@ -15,7 +15,7 @@
 
 #include "postgres.h"
 
-#include "access/indexgenam.h"
+#include "access/genam.h"
 #include "access/spgist_private.h"
 #include "access/spgxlog.h"
 #include "access/transam.h"

diff --git a/src/backend/access/spgist/spgvalidate.c b/src/backend/access/spgist/spgvalidate.c
index 3a599db86cdaf9f7e7e839572870eb23e568fa1d..4b9fdbd5d7836daf1680657d661376dd335342c8 100644 (file)
--- a/src/backend/access/spgist/spgvalidate.c
+++ b/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"

diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
index 9dcb7b66d3c3bff3b0eb53360b84b1be79491f51..8ea033610d674460267a37a528bd7e6f27ab282c 100644 (file)
--- a/src/backend/bootstrap/bootstrap.c
+++ b/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"

diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c
index b6dba91b9ad1a195e833ec84932b7231b5de1252..ea5666ebb8d315e87b1eb361a251cf0fd22ba3c6 100644 (file)
--- a/src/backend/catalog/aclchk.c
+++ b/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"

diff --git a/src/backend/catalog/catalog.c b/src/backend/catalog/catalog.c
index c4c4d9f6c8ca0a028c86ea5c18149ab7e64f1db1..6b104695c0c7f731e68de3723c99260ea4df7702 100644 (file)
--- a/src/backend/catalog/catalog.c
+++ b/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"

diff --git a/src/backend/catalog/dependency.c b/src/backend/catalog/dependency.c
index aea8cdde742ab952ed8ab55555d363ba21996ed7..d07bb4496e30109f56d12f89de4bc9b390bb3e3a 100644 (file)
--- a/src/backend/catalog/dependency.c
+++ b/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"

diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index b71178aa566b0dc1ffff2f8a570ba053fea6f7c7..8b68fb7b2dfce01e212acf978a6b937f033af620 100644 (file)
--- a/src/backend/catalog/heap.c
+++ b/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"

diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index 7529bf39b8edf31060395a18e64fdab122132e88..787aad636e7115fb112f5da49b6e884d92a236f7 100644 (file)
--- a/src/backend/catalog/index.c
+++ b/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"

diff --git a/src/backend/catalog/indexing.c b/src/backend/catalog/indexing.c
index 8f48e0076c24db279a8c18c7869bbf619cc738b6..f237e62bc90443057874e8bb374d4fa047587232 100644 (file)
--- a/src/backend/catalog/indexing.c
+++ b/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"

diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c
index 00a21c430c12cddb5ba3fc7720c72f3e31609d05..ae3002bb427a9f404b95006465f2089b7f6aa8b5 100644 (file)
--- a/src/backend/catalog/objectaddress.c
+++ b/src/backend/catalog/objectaddress.c
@@ -15,7 +15,7 @@
 
 #include "postgres.h"
 
-#include "access/indexgenam.h"
+#include "access/genam.h"
 #include "access/htup_details.h"
 #include "access/relation.h"
 #include "access/sysattr.h"

diff --git a/src/backend/catalog/partition.c b/src/backend/catalog/partition.c
index 3c2bec25b9e3d11de8c04e8378b6216c7c44fd44..00af844cc1add079cd20d824d6e20de05c787587 100644 (file)
--- a/src/backend/catalog/partition.c
+++ b/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"

diff --git a/src/backend/catalog/pg_collation.c b/src/backend/catalog/pg_collation.c
index ec5cea1bab02b08cd51eed872855f4bfec651fdd..dd99d53547f3563e71a123bdff50ce450e6f77a0 100644 (file)
--- a/src/backend/catalog/pg_collation.c
+++ b/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"

diff --git a/src/backend/catalog/pg_constraint.c b/src/backend/catalog/pg_constraint.c
index b12834a2c053c830b492c12c37b760bfa67b9d9f..25c52134f06420de605c5214ac91e0055ab3db7c 100644 (file)
--- a/src/backend/catalog/pg_constraint.c
+++ b/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"

diff --git a/src/backend/catalog/pg_db_role_setting.c b/src/backend/catalog/pg_db_role_setting.c
index 791fca9deef272bc27bbbae3c30ec688aaacf2e8..20acac2eea9a360213d7698613b13507a03db61e 100644 (file)
--- a/src/backend/catalog/pg_db_role_setting.c
+++ b/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"

diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c
index c9228cc90792c7337221bf7558b43565a3b10a60..a060c25d2eeafe22cfdb01ab5cf5406e50fb56b3 100644 (file)
--- a/src/backend/catalog/pg_depend.c
+++ b/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"

diff --git a/src/backend/catalog/pg_enum.c b/src/backend/catalog/pg_enum.c
index e43b1451709e7425e4750dfa052e749d1b815fdf..be0f06524d9da135332f5bb07d501690b18f9809 100644 (file)
--- a/src/backend/catalog/pg_enum.c
+++ b/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"

diff --git a/src/backend/catalog/pg_inherits.c b/src/backend/catalog/pg_inherits.c
index 62622cc6f9c79f1a21223fa2a8259cd647f74db7..59af16221eacacc1da2d9242cdf6b4a2c06af107 100644 (file)
--- a/src/backend/catalog/pg_inherits.c
+++ b/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"

diff --git a/src/backend/catalog/pg_largeobject.c b/src/backend/catalog/pg_largeobject.c
index 2c3e15e6bc004c42cfac24247ee14e42e0bc30ff..1a687028fe2825a6de4d2e05a4097effbdfa080e 100644 (file)
--- a/src/backend/catalog/pg_largeobject.c
+++ b/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"

diff --git a/src/backend/catalog/pg_publication.c b/src/backend/catalog/pg_publication.c
index 80a6a92a8267daf9a12c71a19ab43b1f49997012..f6e9a68bf70770558dac49b7f2a173dfebda78b2 100644 (file)
--- a/src/backend/catalog/pg_publication.c
+++ b/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"

diff --git a/src/backend/catalog/pg_range.c b/src/backend/catalog/pg_range.c
index c8808a78b33929dd61f3ab6b8a7802de76cba184..e6e138babdf1f5dd2faca086d0b5e3063b354c6d 100644 (file)
--- a/src/backend/catalog/pg_range.c
+++ b/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"

diff --git a/src/backend/catalog/pg_shdepend.c b/src/backend/catalog/pg_shdepend.c
index 89ebb849a291ddaeb200acdccee91a0abf4b86a9..59f97bf3d024baf2a44be1ffdbecb237f0364e25 100644 (file)
--- a/src/backend/catalog/pg_shdepend.c
+++ b/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"

diff --git a/src/backend/catalog/pg_subscription.c b/src/backend/catalog/pg_subscription.c
index f346ec959f31bef16e0b8c5999122f5fe029e856..68d88ff4991e3b4e5f34aaea55b6d6b2906b76e7 100644 (file)
--- a/src/backend/catalog/pg_subscription.c
+++ b/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"

diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c
index 70ee89d52f5feebc183bf2543ae61e66c7d8e3ed..71372ceb161cd8a755a9f6dd62fa36cd0ad92dd8 100644 (file)
--- a/src/backend/commands/analyze.c
+++ b/src/backend/commands/analyze.c
@@ -17,7 +17,7 @@
 #include <math.h>
 
 #include "access/detoast.h"
-#include "access/indexgenam.h"
+#include "access/genam.h"
 #include "access/multixact.h"
 #include "access/relation.h"
 #include "access/sysattr.h"

diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
index cc35811dc893a8779477070a5cd387f7a15401bd..b8c349f245bc77dab6bef635fe2008f2af32c461 100644 (file)
--- a/src/backend/commands/cluster.c
+++ b/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"

diff --git a/src/backend/commands/comment.c b/src/backend/commands/comment.c
index 7823dace9fa4333a7219e036e3cdcb08887499e7..1859fb628fd5899d667c3cb7a3df7c0faca02d40 100644 (file)
--- a/src/backend/commands/comment.c
+++ b/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"

diff --git a/src/backend/commands/constraint.c b/src/backend/commands/constraint.c
index 8a57a0ef99d06d50870adc24aff17d8e833f8332..806962a686bf2437ae1afdfa7d4be49f8ff5de77 100644 (file)
--- a/src/backend/commands/constraint.c
+++ b/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"

diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
index da0e5d8b94cd8a26e77a4847fdb4f004fe2cfe0b..a70e75a219e3a0c7d18a18845129a6a89886841b 100644 (file)
--- a/src/backend/commands/dbcommands.c
+++ b/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"

diff --git a/src/backend/commands/extension.c b/src/backend/commands/extension.c
index df04a82fe59fd6823fff0fad338eec883e390d1b..6eaa9cc4f3df1c11405fcf90d42b111c642b232f 100644 (file)
--- a/src/backend/commands/extension.c
+++ b/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"

diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c
index 4527aa15f710e9c843989a7e9c8123b7ebfc15c4..94411b50082c6a89a27035e1476597cb7c8c7a08 100644 (file)
--- a/src/backend/commands/functioncmds.c
+++ b/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"

diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c
index d38de78e1d7f7a72d556606a1ba17a406cb768d5..a143998a7ff2b3ed3531258ef7675f68b6bd5cf6 100644 (file)
--- a/src/backend/commands/indexcmds.c
+++ b/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"

diff --git a/src/backend/commands/matview.c b/src/backend/commands/matview.c
index 907c71dda0ce18ca80ac27fd0bb5f32877e74c95..537d0e8ceff656e89863961ce2bd439fb96d38da 100644 (file)
--- a/src/backend/commands/matview.c
+++ b/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"

diff --git a/src/backend/commands/opclasscmds.c b/src/backend/commands/opclasscmds.c
index cccd95a97a2ddd940732c0d18b6889feefd5cb81..cb7a6bd2d1464d801c0bec574a8e56546aae8c74 100644 (file)
--- a/src/backend/commands/opclasscmds.c
+++ b/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"

diff --git a/src/backend/commands/policy.c b/src/backend/commands/policy.c
index 72ba997e4c32912c02abb9e59009001e64393b19..36093dcd9568ddf491ada85e19bb69b269c297d2 100644 (file)
--- a/src/backend/commands/policy.c
+++ b/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"

diff --git a/src/backend/commands/proclang.c b/src/backend/commands/proclang.c
index 0182dc7202a0a8780714e0c2b64ff3646f99c11c..b51c373b93f77757ca2e14502b30cc45fb0cc79e 100644 (file)
--- a/src/backend/commands/proclang.c
+++ b/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"

diff --git a/src/backend/commands/publicationcmds.c b/src/backend/commands/publicationcmds.c
index 4252db4ec0502332492fe01a208288a01fc03340..fbf11c86aad491144f222952901b60b65ef936a2 100644 (file)
--- a/src/backend/commands/publicationcmds.c
+++ b/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"

diff --git a/src/backend/commands/seclabel.c b/src/backend/commands/seclabel.c
index 94d28b24fc8a1cb1e3dba1f29af44709f6105dfc..63219ad589f7a2fce66982bde124699194b4c650 100644 (file)
--- a/src/backend/commands/seclabel.c
+++ b/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"

diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index e19772aa9036091a733a43e7fdc4c1a2b6ee1125..5b882f80bf17bdc102c518c219052b0cc9efd72a 100644 (file)
--- a/src/backend/commands/tablecmds.c
+++ b/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"

diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c
index b9fca3af3c7eadbce18163d0994eb25294c50d60..36093a29a82505832058f21c59aa42eb2f52be02 100644 (file)
--- a/src/backend/commands/trigger.c
+++ b/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"

diff --git a/src/backend/commands/tsearchcmds.c b/src/backend/commands/tsearchcmds.c
index 714dff530485990a0886d29541c73915d6059571..5d6528f9cf878804231d7ea7c5a3e32c15459ce2 100644 (file)
--- a/src/backend/commands/tsearchcmds.c
+++ b/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"

diff --git a/src/backend/commands/typecmds.c b/src/backend/commands/typecmds.c
index d3df657fa0f5b2a9742622ce8455b1d1eeeb046d..89887b8fd75f9d09d731a827a7f495152cb78d81 100644 (file)
--- a/src/backend/commands/typecmds.c
+++ b/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"

diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
index f3572b1749a6ff78542532f02de74c4ee23ba488..aab5aa855d2851222dc7738c7575ad805f6bce94 100644 (file)
--- a/src/backend/commands/user.c
+++ b/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"

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 477b271aa39e6843060b73ad135b9fff0d72723e..da1da234000081711ecb86555d841f5f3fc64930 100644 (file)
--- a/src/backend/commands/vacuum.c
+++ b/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"

diff --git a/src/backend/executor/execAmi.c b/src/backend/executor/execAmi.c
index c1e2cedc081a5fc2c526a905ce7ae3aff91b8121..779d3dcceae121baf1e5221e06c4619850f61d07 100644 (file)
--- a/src/backend/executor/execAmi.c
+++ b/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"

diff --git a/src/backend/executor/execCurrent.c b/src/backend/executor/execCurrent.c
index 3853d154d8ebc3e3a0dcb756a710ff10584c254f..c7f909241b41a86518093daa69ef68c8170b9205 100644 (file)
--- a/src/backend/executor/execCurrent.c
+++ b/src/backend/executor/execCurrent.c
@@ -12,7 +12,7 @@
  */
 #include "postgres.h"
 
-#include "access/indexgenam.h"
+#include "access/genam.h"
 #include "access/relscan.h"
 #include "access/sysattr.h"
 #include "catalog/pg_type.h"

diff --git a/src/backend/executor/execIndexing.c b/src/backend/executor/execIndexing.c
index 823b6707605156a6ffa26ba00a0cdbd0c5601bb7..40bd8049f05ee25ef47c7b70b1cabf83e523e79c 100644 (file)
--- a/src/backend/executor/execIndexing.c
+++ b/src/backend/executor/execIndexing.c
@@ -106,7 +106,7 @@
  */
 #include "postgres.h"
 
-#include "access/indexgenam.h"
+#include "access/genam.h"
 #include "access/relscan.h"
 #include "access/tableam.h"
 #include "access/xact.h"

diff --git a/src/backend/executor/execReplication.c b/src/backend/executor/execReplication.c
index f311476071d51f13e9f0744f7d04e15503efbd23..95e027c970bf43fa1ad32bb71186ecbbbd0d138d 100644 (file)
--- a/src/backend/executor/execReplication.c
+++ b/src/backend/executor/execReplication.c
@@ -14,7 +14,7 @@
 
 #include "postgres.h"
 
-#include "access/indexgenam.h"
+#include "access/genam.h"
 #include "access/relscan.h"
 #include "access/tableam.h"
 #include "access/transam.h"

diff --git a/src/backend/executor/nodeBitmapIndexscan.c b/src/backend/executor/nodeBitmapIndexscan.c
index fbe434ce2f865ee62269fd3420fb70eccf80e84e..604f4f1132f5c5f3ebe0368e8ff66c9e0c2c6feb 100644 (file)
--- a/src/backend/executor/nodeBitmapIndexscan.c
+++ b/src/backend/executor/nodeBitmapIndexscan.c
@@ -21,7 +21,7 @@
  */
 #include "postgres.h"
 
-#include "access/indexgenam.h"
+#include "access/genam.h"
 #include "executor/execdebug.h"
 #include "executor/nodeBitmapIndexscan.h"
 #include "executor/nodeIndexscan.h"

diff --git a/src/backend/executor/nodeIndexonlyscan.c b/src/backend/executor/nodeIndexonlyscan.c
index a4ea390d2bfcb2d6909a23db34a53c0ab4cc2bcc..784486f0c80fcf2fea7d3972086214466386693a 100644 (file)
--- a/src/backend/executor/nodeIndexonlyscan.c
+++ b/src/backend/executor/nodeIndexonlyscan.c
@@ -30,7 +30,7 @@
  */
 #include "postgres.h"
 
-#include "access/indexgenam.h"
+#include "access/genam.h"
 #include "access/relscan.h"
 #include "access/tableam.h"
 #include "access/tupdesc.h"

diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c
index 2911c7a461bc0897036f347d6f5a4e5786dd9546..c5f6593485982359ddadd00323135171ecc6343a 100644 (file)
--- a/src/backend/optimizer/path/costsize.c
+++ b/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 indexam.h.
+    * pathnodes.h uses a weak function type to avoid including amapi.h.
     */
    amcostestimate = (amcostestimate_function) index->amcostestimate;
    amcostestimate(root, path, loop_count,

diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index d63ebb7287c11e010db08fdebd4ba50bee218009..cb54b15507be20201a641451551e932bb85f4683 100644 (file)
--- a/src/backend/optimizer/plan/planner.c
+++ b/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"

diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c
index c15654e660cbbe9cd3ccbb7e47ee72eba95f3bf4..5e889d186144ed551b565eb4d4ac52957f4e775e 100644 (file)
--- a/src/backend/optimizer/util/plancat.c
+++ b/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"

diff --git a/src/backend/parser/parse_utilcmd.c b/src/backend/parser/parse_utilcmd.c
index 3fafa920f38ef9fb9f5e7a6c0edf2b352246eeda..45bb31ecf8fb032686214b359a9bf5eaedc2eb15 100644 (file)
--- a/src/backend/parser/parse_utilcmd.c
+++ b/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"

diff --git a/src/backend/partitioning/partdesc.c b/src/backend/partitioning/partdesc.c
index 694ed923e02a3d2a7030732e05d1670f70a4d3dd..a37cdd5562d2d039b217c203af854c8c5218552c 100644 (file)
--- a/src/backend/partitioning/partdesc.c
+++ b/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"

diff --git a/src/backend/replication/logical/origin.c b/src/backend/replication/logical/origin.c
index f965bdb0270770b7e32b2450bcb77beb50f5d383..fffc330c94ff5993d0184809906ad98c5f811eec 100644 (file)
--- a/src/backend/replication/logical/origin.c
+++ b/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"

diff --git a/src/backend/rewrite/rewriteRemove.c b/src/backend/rewrite/rewriteRemove.c
index 6dbe010f6a8febae5cfe9d0d7d0887c24f321c6d..bb98b6936a06a2edb72d032dafd8de81748087ae 100644 (file)
--- a/src/backend/rewrite/rewriteRemove.c
+++ b/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"

diff --git a/src/backend/statistics/extended_stats.c b/src/backend/statistics/extended_stats.c
index 98b70760adc058a8ded8cc85e102cf16495bb6a2..9d339433f65a34f5a71f3bde2ae3ac4292b4fad9 100644 (file)
--- a/src/backend/statistics/extended_stats.c
+++ b/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"

diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c
index cd823622877e34c605b655ae401be148b3e379fd..263d5be12eb711f4f8577954efc2a0e99f52ca30 100644 (file)
--- a/src/backend/storage/large_object/inv_api.c
+++ b/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"

diff --git a/src/backend/utils/adt/amutils.c b/src/backend/utils/adt/amutils.c
index 6de33886dba5442f6d553525735cf6b91dde72b9..e81d6cc05629022b1c4754b47ed1281257026408 100644 (file)
--- a/src/backend/utils/adt/amutils.c
+++ b/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"

diff --git a/src/backend/utils/adt/enum.c b/src/backend/utils/adt/enum.c
index 000572c5b33e5001504f3003294f1567916ff0e1..3402ff860d36395315cddee6b82a398e94d335f1 100644 (file)
--- a/src/backend/utils/adt/enum.c
+++ b/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"

diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c
index bdf78db8c80ba407cc625ead57b6bc90508cffb1..4af1603e7cea7f2cf44108086ebd538b00e2b64b 100644 (file)
--- a/src/backend/utils/adt/ruleutils.c
+++ b/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"

diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c
index 9ce04af9a9cbfa54771b131a61014c1012669a38..c3e7d94aa5b325046b8c014b1093abe54d7ff881 100644 (file)
--- a/src/backend/utils/cache/catcache.c
+++ b/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"

diff --git a/src/backend/utils/cache/evtcache.c b/src/backend/utils/cache/evtcache.c
index 510160c88705f93fb275754e8a8b698ac20f605f..1b0f73832122f51235b432e3b3f925a8e17f7d5a 100644 (file)
--- a/src/backend/utils/cache/evtcache.c
+++ b/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"

diff --git a/src/backend/utils/cache/relfilenodemap.c b/src/backend/utils/cache/relfilenodemap.c
index 693501067adccc57ac5cbed72b75b07c3c01a6f6..d244eaf4d8c311c99266e5c8ba7fb672108ac3ce 100644 (file)
--- a/src/backend/utils/cache/relfilenodemap.c
+++ b/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"

diff --git a/src/backend/utils/cache/ts_cache.c b/src/backend/utils/cache/ts_cache.c
index 487d3cadeee75e89259c0613fc79a0115aeb091f..68c04d87d51e3b8b169877ef84998721af3e35ae 100644 (file)
--- a/src/backend/utils/cache/ts_cache.c
+++ b/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"

diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 5375653a42b750e20b15330129501dd0ffbaac97..cc38669a1ebadac94d9b75de94fab7a8749da105 100644 (file)
--- a/src/backend/utils/init/postinit.c
+++ b/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"

diff --git a/src/include/access/indexam.h b/src/include/access/amapi.h
similarity index 97%
rename from src/include/access/indexam.h
rename to src/include/access/amapi.h
index 9b2eefb531900748297219c65fad1569d4ae7007..6e3db06eed23aa2bc8d054d991e8900a455b5872 100644 (file)
--- a/src/include/access/indexam.h
+++ b/src/include/access/amapi.h
@@ -1,18 +1,18 @@
 /*-------------------------------------------------------------------------
  *
- * indexam.h
+ * amapi.h
  *   API for Postgres index access methods.
  *
  * Copyright (c) 2015-2019, PostgreSQL Global Development Group
  *
- * src/include/access/indexam.h
+ * src/include/access/amapi.h
  *
  *-------------------------------------------------------------------------
  */
-#ifndef INDEXAM_H
-#define INDEXAM_H
+#ifndef AMAPI_H
+#define AMAPI_H
 
-#include "access/indexgenam.h"
+#include "access/genam.h"
 
 /*
  * We don't wish to include planner header files here, since most of an index
@@ -233,8 +233,8 @@ typedef struct IndexAmRoutine
 } IndexAmRoutine;
 
 
-/* Functions in access/index/indexamapi.c */
+/* Functions in access/index/amapi.c */
 extern IndexAmRoutine *GetIndexAmRoutine(Oid amhandler);
 extern IndexAmRoutine *GetIndexAmRoutineByAmId(Oid amoid, bool noerror);
 
-#endif                         /* INDEXAM_H */
+#endif                         /* AMAPI_H */

diff --git a/src/include/access/indexamvalidate.h b/src/include/access/amvalidate.h
similarity index 84%
rename from src/include/access/indexamvalidate.h
rename to src/include/access/amvalidate.h
index 69a0520c0a6b7349b50cd67066548680c31d3772..317e1e6893801e488e3797e6245354671d47ec5c 100644 (file)
--- a/src/include/access/indexamvalidate.h
+++ b/src/include/access/amvalidate.h
@@ -1,16 +1,16 @@
 /*-------------------------------------------------------------------------
  *
- * indexamvalidate.h
+ * amvalidate.h
  *   Support routines for index access methods' amvalidate functions.
  *
  * Copyright (c) 2016-2019, PostgreSQL Global Development Group
  *
- * src/include/access/indexamvalidate.h
+ * src/include/access/amvalidate.h
  *
  *-------------------------------------------------------------------------
  */
-#ifndef INDEXAMVALIDATE_H
-#define INDEXAMVALIDATE_H
+#ifndef AMVALIDATE_H
+#define AMVALIDATE_H
 
 #include "utils/catcache.h"
 
@@ -25,7 +25,7 @@ typedef struct OpFamilyOpFuncGroup
 } OpFamilyOpFuncGroup;
 
 
-/* Functions in access/index/indexamvalidate.c */
+/* Functions in access/index/amvalidate.c */
 extern List *identify_opfamily_groups(CatCList *oprlist, CatCList *proclist);
 extern bool check_amproc_signature(Oid funcid, Oid restype, bool exact,
                                   int minargs, int maxargs,...);
@@ -33,4 +33,4 @@ extern bool check_amop_signature(Oid opno, Oid restype,
                                 Oid lefttype, Oid righttype);
 extern bool opfamily_can_sort_type(Oid opfamilyoid, Oid datatypeoid);
 
-#endif                         /* INDEXAMVALIDATE_H */
+#endif                         /* AMVALIDATE_H */

diff --git a/src/include/access/brin_internal.h b/src/include/access/brin_internal.h
index f78387d891f75cb51d033558ea44a9b0d8196a47..b1c91999469f1360bf61d229d1b731990278890c 100644 (file)
--- a/src/include/access/brin_internal.h
+++ b/src/include/access/brin_internal.h
@@ -11,7 +11,7 @@
 #ifndef BRIN_INTERNAL_H
 #define BRIN_INTERNAL_H
 
-#include "access/indexam.h"
+#include "access/amapi.h"
 #include "storage/bufpage.h"
 #include "utils/typcache.h"
 

diff --git a/src/include/access/indexgenam.h b/src/include/access/genam.h
similarity index 97%
rename from src/include/access/indexgenam.h
rename to src/include/access/genam.h
index a25cf110e7e170023b4bc8591ab4f0dadcba0c65..a813b004be7d797d8ed264e5b8a6941dcad2dc78 100644 (file)
--- a/src/include/access/indexgenam.h
+++ b/src/include/access/genam.h
@@ -1,18 +1,18 @@
 /*-------------------------------------------------------------------------
  *
- * indexgenam.h
+ * genam.h
  *   POSTGRES generalized index access method definitions.
  *
  *
  * Portions Copyright (c) 1996-2019, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * src/include/access/indexgenam.h
+ * src/include/access/genam.h
  *
  *-------------------------------------------------------------------------
  */
-#ifndef INDEXGENAM_H
-#define INDEXGENAM_H
+#ifndef GENAM_H
+#define GENAM_H
 
 #include "access/sdir.h"
 #include "access/skey.h"
@@ -190,7 +190,7 @@ extern void index_store_float8_orderby_distances(IndexScanDesc scan,
                                                 bool recheckOrderBy);
 
 /*
- * index access method support routines (in indexgenam.c)
+ * index access method support routines (in genam.c)
  */
 extern IndexScanDesc RelationGetIndexScan(Relation indexRelation,
                                          int nkeys, int norderbys);
@@ -204,7 +204,7 @@ extern TransactionId index_compute_xid_horizon_for_tuples(Relation irel,
                                                          int nitems);
 
 /*
- * heap-or-index access to system catalogs (in indexgenam.c)
+ * heap-or-index access to system catalogs (in genam.c)
  */
 extern SysScanDesc systable_beginscan(Relation heapRelation,
                                      Oid indexId,
@@ -222,4 +222,4 @@ extern HeapTuple systable_getnext_ordered(SysScanDesc sysscan,
                                          ScanDirection direction);
 extern void systable_endscan_ordered(SysScanDesc sysscan);
 
-#endif                         /* INDEXGENAM_H */
+#endif                         /* GENAM_H */

diff --git a/src/include/access/gin_private.h b/src/include/access/gin_private.h
index 8a8ab3b94eb30c9dc67e09cdd3ec3ebef6beab0e..b779cc8c7cac3f983fef8890803ccfa41b798c07 100644 (file)
--- a/src/include/access/gin_private.h
+++ b/src/include/access/gin_private.h
@@ -10,9 +10,9 @@
 #ifndef GIN_PRIVATE_H
 #define GIN_PRIVATE_H
 
+#include "access/amapi.h"
 #include "access/gin.h"
 #include "access/ginblock.h"
-#include "access/indexam.h"
 #include "access/itup.h"
 #include "catalog/pg_am_d.h"
 #include "fmgr.h"

diff --git a/src/include/access/gist_private.h b/src/include/access/gist_private.h
index b89107d09ef264dfea4e3f7d32ef1b525fd0940c..a409975db1605f5bf5ad760c8c01e6b836bd0467 100644 (file)
--- a/src/include/access/gist_private.h
+++ b/src/include/access/gist_private.h
@@ -14,14 +14,14 @@
 #ifndef GIST_PRIVATE_H
 #define GIST_PRIVATE_H
 
+#include "access/amapi.h"
 #include "access/gist.h"
-#include "access/indexam.h"
-#include "access/indexgenam.h"
 #include "access/itup.h"
 #include "lib/pairingheap.h"
 #include "storage/bufmgr.h"
 #include "storage/buffile.h"
 #include "utils/hsearch.h"
+#include "access/genam.h"
 
 /*
  * Maximum number of "halves" a page can be split into in one operation.

diff --git a/src/include/access/gistscan.h b/src/include/access/gistscan.h
index bec23b46046da3516300f0b0ea07761efc8a29b5..c02445a698086145f575ef52ac2c632eae1ee0da 100644 (file)
--- a/src/include/access/gistscan.h
+++ b/src/include/access/gistscan.h
@@ -14,7 +14,7 @@
 #ifndef GISTSCAN_H
 #define GISTSCAN_H
 
-#include "access/indexam.h"
+#include "access/amapi.h"
 
 extern IndexScanDesc gistbeginscan(Relation r, int nkeys, int norderbys);
 extern void gistrescan(IndexScanDesc scan, ScanKey key, int nkeys,

diff --git a/src/include/access/hash.h b/src/include/access/hash.h
index 07db6466aeaa87bfa9820cb6cede0c38feca5de5..ba58cb31bb80a1a1813c105a5770b7927c107a94 100644 (file)
--- a/src/include/access/hash.h
+++ b/src/include/access/hash.h
@@ -17,7 +17,7 @@
 #ifndef HASH_H
 #define HASH_H
 
-#include "access/indexam.h"
+#include "access/amapi.h"
 #include "access/itup.h"
 #include "access/sdir.h"
 #include "catalog/pg_am_d.h"

diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h
index 0bcb2ec2cd1a9d30a872889b93fffa095fab41a9..5e56aac63f3dc41c833a4746c90cb63a684a6088 100644 (file)
--- a/src/include/access/nbtree.h
+++ b/src/include/access/nbtree.h
@@ -14,7 +14,7 @@
 #ifndef NBTREE_H
 #define NBTREE_H
 
-#include "access/indexam.h"
+#include "access/amapi.h"
 #include "access/itup.h"
 #include "access/sdir.h"
 #include "access/xlogreader.h"

diff --git a/src/include/access/reloptions.h b/src/include/access/reloptions.h
index e7abb411934d4c448676c26b8d54152e0ba0d65f..d21c513be4dddaa27527ee57be73553e1cc5a3bd 100644 (file)
--- a/src/include/access/reloptions.h
+++ b/src/include/access/reloptions.h
@@ -19,8 +19,8 @@
 #ifndef RELOPTIONS_H
 #define RELOPTIONS_H
 
+#include "access/amapi.h"
 #include "access/htup.h"
-#include "access/indexam.h"
 #include "access/tupdesc.h"
 #include "nodes/pg_list.h"
 #include "storage/lock.h"

diff --git a/src/include/access/spgist.h b/src/include/access/spgist.h
index 1f9b9eb5e1c147ab5292063c1ab0c577fc258598..d5fd7bcc02b60e559efe18f08b0d8424ae9cb7aa 100644 (file)
--- a/src/include/access/spgist.h
+++ b/src/include/access/spgist.h
@@ -14,7 +14,7 @@
 #ifndef SPGIST_H
 #define SPGIST_H
 
-#include "access/indexam.h"
+#include "access/amapi.h"
 #include "access/xlogreader.h"
 #include "lib/stringinfo.h"
 

diff --git a/src/include/executor/nodeIndexscan.h b/src/include/executor/nodeIndexscan.h
index dd3a323891843ffee0fbab4cf17731de14bc4f09..e895ec5b7b3d48cc234eef34cd3faab28a146ba2 100644 (file)
--- a/src/include/executor/nodeIndexscan.h
+++ b/src/include/executor/nodeIndexscan.h
@@ -14,7 +14,7 @@
 #ifndef NODEINDEXSCAN_H
 #define NODEINDEXSCAN_H
 
-#include "access/indexgenam.h"
+#include "access/genam.h"
 #include "access/parallel.h"
 #include "nodes/execnodes.h"
 

diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h
index 8692a32172fff3708b7ba35cbbfb4af16988e039..bce2d59b0dbcf871289e396f66c9e2c5295f2a1a 100644 (file)
--- a/src/include/nodes/nodes.h
+++ b/src/include/nodes/nodes.h
@@ -504,7 +504,7 @@ typedef enum NodeTag
    T_TIDBitmap,                /* in nodes/tidbitmap.h */
    T_InlineCodeBlock,          /* in nodes/parsenodes.h */
    T_FdwRoutine,               /* in foreign/fdwapi.h */
-   T_IndexAmRoutine,           /* in access/indexam.h */
+   T_IndexAmRoutine,           /* in access/amapi.h */
    T_TableAmRoutine,           /* in access/tableam.h */
    T_TsmRoutine,               /* in access/tsmapi.h */
    T_ForeignKeyCacheInfo,      /* in utils/rel.h */

diff --git a/src/include/nodes/pathnodes.h b/src/include/nodes/pathnodes.h
index 6fe1ba9a9638abb8bea2cac3a986bb2682afb8a6..31b631cfe0f1dd8efe8b2d39097ffcb83fcb5d53 100644 (file)
--- a/src/include/nodes/pathnodes.h
+++ b/src/include/nodes/pathnodes.h
@@ -836,7 +836,7 @@ struct IndexOptInfo
    bool        amhasgettuple;  /* does AM have amgettuple interface? */
    bool        amhasgetbitmap; /* does AM have amgetbitmap interface? */
    bool        amcanparallel;  /* does AM support parallel scan? */
-   /* Rather than include indexam.h here, we declare amcostestimate like this */
+   /* Rather than include amapi.h here, we declare amcostestimate like this */
    void        (*amcostestimate) ();   /* AM's cost estimator */
 };
 

diff --git a/src/include/utils/index_selfuncs.h b/src/include/utils/index_selfuncs.h
index 2a15f5abf611a5bac9fdf02aab555e0f67add28d..b81556d7a1ec2d80e66652c60b528c94cc71be3b 100644 (file)
--- a/src/include/utils/index_selfuncs.h
+++ b/src/include/utils/index_selfuncs.h
@@ -6,7 +6,7 @@
  *
  * Note: this is split out of selfuncs.h mainly to avoid importing all of the
  * planner's data structures into the non-planner parts of the index AMs.
- * If you make it depend on anything besides access/indexam.h, that's likely
+ * If you make it depend on anything besides access/amapi.h, that's likely
  * a mistake.
  *
  * Portions Copyright (c) 1996-2019, PostgreSQL Global Development Group
@@ -19,7 +19,7 @@
 #ifndef INDEX_SELFUNCS_H
 #define INDEX_SELFUNCS_H
 
-#include "access/indexam.h"
+#include "access/amapi.h"
 
 /* Functions in selfuncs.c */
 extern void brincostestimate(struct PlannerInfo *root,

diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h
index 5ce9d8a0867bcf0e6d95ed922c46475c491ffb85..75fc4e85f1e7ac1f58ce088e1aefb9e834795cde 100644 (file)
--- a/src/include/utils/rel.h
+++ b/src/include/utils/rel.h
@@ -159,7 +159,7 @@ typedef struct RelationData
     * identifier given that restriction.
     */
    MemoryContext rd_indexcxt;  /* private memory cxt for this stuff */
-   /* use "struct" here to avoid needing to include indexam.h: */
+   /* use "struct" here to avoid needing to include amapi.h: */
    struct IndexAmRoutine *rd_indam;    /* index AM's API struct */
    Oid        *rd_opfamily;    /* OIDs of op families for each index col */
    Oid        *rd_opcintype;   /* OIDs of opclass declared input data types */

diff --git a/src/test/modules/dummy_index_am/dummy_index_am.c b/src/test/modules/dummy_index_am/dummy_index_am.c
index bade8868662919208b810e4a9073af28f9c4d4dd..053636e4b496746adea3e431e4e6b5eeb77b47ac 100644 (file)
--- a/src/test/modules/dummy_index_am/dummy_index_am.c
+++ b/src/test/modules/dummy_index_am/dummy_index_am.c
@@ -13,7 +13,7 @@
  */
 #include "postgres.h"
 
-#include "access/indexam.h"
+#include "access/amapi.h"
 #include "access/reloptions.h"
 #include "catalog/index.h"
 #include "nodes/pathnodes.h"