diff options
117 files changed, 147 insertions, 147 deletions
diff --git a/contrib/bloom/blinsert.c b/contrib/bloom/blinsert.c index 5df616e96e..adcbd168fb 100644 --- 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 5a6e5e48a1..a7179981f4 100644 --- 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 44b7e74c5c..e2063bac62 100644 --- 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 f0a5d8cc5e..0c33d1e195 100644 --- 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 ca2cb095f0..b3dfe03022 100644 --- 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 1fe30e34e4..5850e076eb 100644 --- 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 083897aa39..d8a1d129d2 100644 --- 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 47382994e2..345a4c253d 100644 --- 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 4b1f772fc2..fa34221509 100644 --- 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 42001bf133..00c227d86c 100644 --- 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 152b8b70da..86788024ef 100644 --- 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 d0d4389ea3..655c0b54b5 100644 --- 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 9b6f435e56..02337a767c 100644 --- 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 d6f45c8463..78fcc876da 100644 --- 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 63517132d6..a971242490 100644 --- 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 5abd746894..5d96f29cde 100644 --- 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 b9b31dd63e..739846a257 100644 --- 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 39121d5597..38f786848d 100644 --- 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 dd1df12fc8..98b6892013 100644 --- 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 c8bb5f96b0..710e4015b3 100644 --- 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 3357689970..dfc1a87a75 100644 --- 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 3ec9fcd036..9315872751 100644 --- 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 e6d2b5f007..0128bb34ef 100644 --- 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 72729f744b..92073fec54 100644 --- 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 0cd989d570..597d8b5f92 100644 --- 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 0d8cbbc88c..6f2e3061a8 100644 --- 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 index bda667cf93..450a7dce1f 100644 --- 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 index 8f00012d20..5a2728502c 100644 --- 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 index 6a1ac6cc30..2599b5d342 100644 --- 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 d5d6e29e18..4af418287d 100644 --- 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 2b40b0e21c..0148ea7892 100644 --- 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 42a894cc54..c34c44cd8b 100644 --- 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 043016fe8d..dd9088741c 100644 --- 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 8e5f012497..6e940fd3de 100644 --- 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 d01ea59e14..e2d391ee75 100644 --- 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 1b8cb9760f..478d4c0d61 100644 --- 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 3a599db86c..4b9fdbd5d7 100644 --- 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 9dcb7b66d3..8ea033610d 100644 --- 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 b6dba91b9a..ea5666ebb8 100644 --- 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 c4c4d9f6c8..6b104695c0 100644 --- 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 aea8cdde74..d07bb4496e 100644 --- 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 b71178aa56..8b68fb7b2d 100644 --- 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 7529bf39b8..787aad636e 100644 --- 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 8f48e0076c..f237e62bc9 100644 --- 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 00a21c430c..ae3002bb42 100644 --- 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 3c2bec25b9..00af844cc1 100644 --- 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 ec5cea1bab..dd99d53547 100644 --- 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 b12834a2c0..25c52134f0 100644 --- 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 791fca9dee..20acac2eea 100644 --- 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 c9228cc907..a060c25d2e 100644 --- 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 e43b145170..be0f06524d 100644 --- 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 62622cc6f9..59af16221e 100644 --- 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 2c3e15e6bc..1a687028fe 100644 --- 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 80a6a92a82..f6e9a68bf7 100644 --- 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 c8808a78b3..e6e138babd 100644 --- 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 89ebb849a2..59f97bf3d0 100644 --- 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 f346ec959f..68d88ff499 100644 --- 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 70ee89d52f..71372ceb16 100644 --- 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 cc35811dc8..b8c349f245 100644 --- 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 7823dace9f..1859fb628f 100644 --- 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 8a57a0ef99..806962a686 100644 --- 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 da0e5d8b94..a70e75a219 100644 --- 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 df04a82fe5..6eaa9cc4f3 100644 --- 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 4527aa15f7..94411b5008 100644 --- 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 d38de78e1d..a143998a7f 100644 --- 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 907c71dda0..537d0e8cef 100644 --- 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 cccd95a97a..cb7a6bd2d1 100644 --- 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 72ba997e4c..36093dcd95 100644 --- 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 0182dc7202..b51c373b93 100644 --- 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 4252db4ec0..fbf11c86aa 100644 --- 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 94d28b24fc..63219ad589 100644 --- 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 e19772aa90..5b882f80bf 100644 --- 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 b9fca3af3c..36093a29a8 100644 --- 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 714dff5304..5d6528f9cf 100644 --- 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 d3df657fa0..89887b8fd7 100644 --- 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 f3572b1749..aab5aa855d 100644 --- 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 477b271aa3..da1da23400 100644 --- 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 c1e2cedc08..779d3dccea 100644 --- 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 3853d154d8..c7f909241b 100644 --- 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 823b670760..40bd8049f0 100644 --- 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 f311476071..95e027c970 100644 --- 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 fbe434ce2f..604f4f1132 100644 --- 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 a4ea390d2b..784486f0c8 100644 --- 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 2911c7a461..c5f6593485 100644 --- 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 d63ebb7287..cb54b15507 100644 --- 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 c15654e660..5e889d1861 100644 --- 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 3fafa920f3..45bb31ecf8 100644 --- 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 694ed923e0..a37cdd5562 100644 --- 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 f965bdb027..fffc330c94 100644 --- 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 6dbe010f6a..bb98b6936a 100644 --- 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 98b70760ad..9d339433f6 100644 --- 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 cd82362287..263d5be12e 100644 --- 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 6de33886db..e81d6cc056 100644 --- 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 000572c5b3..3402ff860d 100644 --- 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 bdf78db8c8..4af1603e7c 100644 --- 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 9ce04af9a9..c3e7d94aa5 100644 --- 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 510160c887..1b0f738321 100644 --- 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 693501067a..d244eaf4d8 100644 --- 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 487d3cadee..68c04d87d5 100644 --- 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 5375653a42..cc38669a1e 100644 --- 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 index 9b2eefb531..6e3db06eed 100644 --- 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 index 69a0520c0a..317e1e6893 100644 --- 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 f78387d891..b1c9199946 100644 --- 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 index a25cf110e7..a813b004be 100644 --- 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 8a8ab3b94e..b779cc8c7c 100644 --- 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 b89107d09e..a409975db1 100644 --- 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 bec23b4604..c02445a698 100644 --- 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 07db6466ae..ba58cb31bb 100644 --- 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 0bcb2ec2cd..5e56aac63f 100644 --- 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 e7abb41193..d21c513be4 100644 --- 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 1f9b9eb5e1..d5fd7bcc02 100644 --- 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 dd3a323891..e895ec5b7b 100644 --- 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 8692a32172..bce2d59b0d 100644 --- 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 6fe1ba9a96..31b631cfe0 100644 --- 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 2a15f5abf6..b81556d7a1 100644 --- 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 5ce9d8a086..75fc4e85f1 100644 --- 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 bade886866..053636e4b4 100644 --- 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" |