Skip to content

Commit 7854e07

Browse files
michaelpqmichaelpq
committed
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
1 parent 4ba4bfa commit 7854e07

File tree

117 files changed

+147
-147
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+147
-147
lines changed

‎contrib/bloom/blinsert.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
*/
1313
#include "postgres.h"
1414

15+
#include "access/genam.h"
1516
#include "access/generic_xlog.h"
16-
#include "access/indexgenam.h"
1717
#include "access/tableam.h"
1818
#include "bloom.h"
1919
#include "catalog/index.h"

‎contrib/bloom/bloom.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
#ifndef _BLOOM_H_
1414
#define _BLOOM_H_
1515

16+
#include "access/amapi.h"
1617
#include "access/generic_xlog.h"
17-
#include "access/indexam.h"
1818
#include "access/itup.h"
1919
#include "access/xlog.h"
2020
#include "fmgr.h"

‎contrib/bloom/blutils.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
*/
1414
#include "postgres.h"
1515

16+
#include "access/amapi.h"
1617
#include "access/generic_xlog.h"
17-
#include "access/indexam.h"
1818
#include "access/reloptions.h"
1919
#include "bloom.h"
2020
#include "catalog/index.h"

‎contrib/bloom/blvacuum.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*/
1313
#include "postgres.h"
1414

15-
#include "access/indexgenam.h"
15+
#include "access/genam.h"
1616
#include "bloom.h"
1717
#include "catalog/storage.h"
1818
#include "commands/vacuum.h"

‎contrib/bloom/blvalidate.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
*/
1313
#include "postgres.h"
1414

15+
#include "access/amvalidate.h"
1516
#include "access/htup_details.h"
16-
#include "access/indexamvalidate.h"
1717
#include "bloom.h"
1818
#include "catalog/pg_amop.h"
1919
#include "catalog/pg_amproc.h"

‎contrib/sepgsql/database.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
*/
1111
#include "postgres.h"
1212

13+
#include "access/genam.h"
1314
#include "access/htup_details.h"
14-
#include "access/indexgenam.h"
1515
#include "access/sysattr.h"
1616
#include "access/table.h"
1717
#include "catalog/dependency.h"

‎contrib/sepgsql/label.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212

1313
#include <selinux/label.h>
1414

15+
#include "access/genam.h"
1516
#include "access/htup_details.h"
16-
#include "access/indexgenam.h"
1717
#include "access/table.h"
1818
#include "access/xact.h"
1919
#include "catalog/catalog.h"

‎contrib/sepgsql/proc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
*/
1111
#include "postgres.h"
1212

13+
#include "access/genam.h"
1314
#include "access/htup_details.h"
14-
#include "access/indexgenam.h"
1515
#include "access/sysattr.h"
1616
#include "access/table.h"
1717
#include "catalog/dependency.h"

‎contrib/sepgsql/relation.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
*/
1111
#include "postgres.h"
1212

13+
#include "access/genam.h"
1314
#include "access/htup_details.h"
14-
#include "access/indexgenam.h"
1515
#include "access/sysattr.h"
1616
#include "access/table.h"
1717
#include "catalog/dependency.h"

‎contrib/sepgsql/schema.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
*/
1111
#include "postgres.h"
1212

13+
#include "access/genam.h"
1314
#include "access/htup_details.h"
14-
#include "access/indexgenam.h"
1515
#include "access/sysattr.h"
1616
#include "access/table.h"
1717
#include "catalog/dependency.h"

‎src/backend/access/brin/brin_inclusion.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
#include "access/brin_internal.h"
2828
#include "access/brin_tuple.h"
29-
#include "access/indexgenam.h"
29+
#include "access/genam.h"
3030
#include "access/skey.h"
3131
#include "catalog/pg_amop.h"
3232
#include "catalog/pg_type.h"

‎src/backend/access/brin/brin_minmax.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
#include "access/brin_internal.h"
1414
#include "access/brin_tuple.h"
15-
#include "access/indexgenam.h"
15+
#include "access/genam.h"
1616
#include "access/stratnum.h"
1717
#include "catalog/pg_amop.h"
1818
#include "catalog/pg_type.h"

‎src/backend/access/brin/brin_validate.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
*/
1414
#include "postgres.h"
1515

16+
#include "access/amvalidate.h"
1617
#include "access/brin_internal.h"
1718
#include "access/htup_details.h"
18-
#include "access/indexamvalidate.h"
1919
#include "catalog/pg_amop.h"
2020
#include "catalog/pg_amproc.h"
2121
#include "catalog/pg_opclass.h"

‎src/backend/access/common/detoast.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "postgres.h"
1515

1616
#include "access/detoast.h"
17-
#include "access/indexgenam.h"
17+
#include "access/genam.h"
1818
#include "access/heaptoast.h"
1919
#include "access/table.h"
2020
#include "access/toast_internals.h"

‎src/backend/access/common/toast_internals.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
#include "postgres.h"
1515

1616
#include "access/detoast.h"
17+
#include "access/genam.h"
1718
#include "access/heapam.h"
1819
#include "access/heaptoast.h"
19-
#include "access/indexgenam.h"
2020
#include "access/table.h"
2121
#include "access/toast_internals.h"
2222
#include "access/xact.h"

‎src/backend/access/gin/ginvalidate.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
*/
1414
#include "postgres.h"
1515

16+
#include "access/amvalidate.h"
1617
#include "access/gin_private.h"
1718
#include "access/htup_details.h"
18-
#include "access/indexamvalidate.h"
1919
#include "catalog/pg_amop.h"
2020
#include "catalog/pg_amproc.h"
2121
#include "catalog/pg_opclass.h"

‎src/backend/access/gist/gistbuild.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
#include <math.h>
1818

19+
#include "access/genam.h"
1920
#include "access/gist_private.h"
2021
#include "access/gistxlog.h"
21-
#include "access/indexgenam.h"
2222
#include "access/tableam.h"
2323
#include "access/xloginsert.h"
2424
#include "catalog/index.h"

‎src/backend/access/gist/gistbuildbuffers.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
*/
1515
#include "postgres.h"
1616

17+
#include "access/genam.h"
1718
#include "access/gist_private.h"
18-
#include "access/indexgenam.h"
1919
#include "catalog/index.h"
2020
#include "miscadmin.h"
2121
#include "storage/buffile.h"

‎src/backend/access/gist/gistget.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
*/
1515
#include "postgres.h"
1616

17+
#include "access/genam.h"
1718
#include "access/gist_private.h"
18-
#include "access/indexgenam.h"
1919
#include "access/relscan.h"
2020
#include "lib/pairingheap.h"
2121
#include "miscadmin.h"

‎src/backend/access/gist/gistvacuum.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
*/
1515
#include "postgres.h"
1616

17+
#include "access/genam.h"
1718
#include "access/gist_private.h"
18-
#include "access/indexgenam.h"
1919
#include "access/transam.h"
2020
#include "commands/vacuum.h"
2121
#include "lib/integerset.h"

‎src/backend/access/gist/gistvalidate.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
*/
1414
#include "postgres.h"
1515

16+
#include "access/amvalidate.h"
1617
#include "access/gist_private.h"
1718
#include "access/htup_details.h"
18-
#include "access/indexamvalidate.h"
1919
#include "catalog/pg_amop.h"
2020
#include "catalog/pg_amproc.h"
2121
#include "catalog/pg_opclass.h"

‎src/backend/access/hash/hashvalidate.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
*/
1414
#include "postgres.h"
1515

16+
#include "access/amvalidate.h"
1617
#include "access/hash.h"
1718
#include "access/htup_details.h"
18-
#include "access/indexamvalidate.h"
1919
#include "catalog/pg_amop.h"
2020
#include "catalog/pg_amproc.h"
2121
#include "catalog/pg_opclass.h"

‎src/backend/access/heap/heapam.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@
3333
#include "postgres.h"
3434

3535
#include "access/bufmask.h"
36+
#include "access/genam.h"
3637
#include "access/heapam.h"
3738
#include "access/heapam_xlog.h"
3839
#include "access/heaptoast.h"
3940
#include "access/hio.h"
40-
#include "access/indexgenam.h"
4141
#include "access/multixact.h"
4242
#include "access/parallel.h"
4343
#include "access/relscan.h"

‎src/backend/access/heap/heapam_handler.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
*/
2020
#include "postgres.h"
2121

22+
#include "access/genam.h"
2223
#include "access/heapam.h"
2324
#include "access/heaptoast.h"
24-
#include "access/indexgenam.h"
2525
#include "access/multixact.h"
2626
#include "access/rewriteheap.h"
2727
#include "access/tableam.h"

‎src/backend/access/heap/vacuumlazy.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@
3636

3737
#include <math.h>
3838

39+
#include "access/genam.h"
3940
#include "access/heapam.h"
4041
#include "access/heapam_xlog.h"
4142
#include "access/htup_details.h"
42-
#include "access/indexgenam.h"
4343
#include "access/multixact.h"
4444
#include "access/transam.h"
4545
#include "access/visibilitymap.h"

‎src/backend/access/index/Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ top_builddir = ../../../..
1313
include $(top_builddir)/src/Makefile.global
1414

1515
OBJS = \
16-
indexam.o \
17-
indexamapi.o \
18-
indexamvalidate.o \
19-
indexgenam.o
16+
amapi.o \
17+
amvalidate.o \
18+
genam.o \
19+
indexam.o
2020

2121
include $(top_srcdir)/src/backend/common.mk

‎src/backend/access/index/indexamapi.c renamed to ‎src/backend/access/index/amapi.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
/*-------------------------------------------------------------------------
22
*
3-
* indexamapi.c
3+
* amapi.c
44
* Support routines for API for Postgres index access methods.
55
*
66
* Copyright (c) 2015-2019, PostgreSQL Global Development Group
77
*
88
*
99
* IDENTIFICATION
10-
* src/backend/access/index/indexamapi.c
10+
* src/backend/access/index/amapi.c
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414
#include "postgres.h"
1515

16+
#include "access/amapi.h"
1617
#include "access/htup_details.h"
17-
#include "access/indexam.h"
1818
#include "catalog/pg_am.h"
1919
#include "catalog/pg_opclass.h"
2020
#include "utils/builtins.h"

‎src/backend/access/index/indexamvalidate.c renamed to ‎src/backend/access/index/amvalidate.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
/*-------------------------------------------------------------------------
22
*
3-
* indexamvalidate.c
3+
* amvalidate.c
44
* Support routines for index access methods' amvalidate functions.
55
*
66
* Copyright (c) 2016-2019, PostgreSQL Global Development Group
77
*
88
*
99
* IDENTIFICATION
10-
* src/backend/access/index/indexamvalidate.c
10+
* src/backend/access/index/amvalidate.c
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414
#include "postgres.h"
1515

16+
#include "access/amvalidate.h"
1617
#include "access/htup_details.h"
17-
#include "access/indexamvalidate.h"
1818
#include "catalog/pg_am.h"
1919
#include "catalog/pg_amop.h"
2020
#include "catalog/pg_amproc.h"

‎src/backend/access/index/indexgenam.c renamed to ‎src/backend/access/index/genam.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
/*-------------------------------------------------------------------------
22
*
3-
* indexgenam.c
3+
* genam.c
44
* general index access method routines
55
*
66
* Portions Copyright (c) 1996-2019, PostgreSQL Global Development Group
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
99
*
1010
* IDENTIFICATION
11-
* src/backend/access/index/indexgenam.c
11+
* src/backend/access/index/genam.c
1212
*
1313
* NOTES
1414
* many of the old access method routines have been turned into
15-
* macros and moved to indexgenam.h -cim 4/30/91
15+
* macros and moved to genam.h -cim 4/30/91
1616
*
1717
*-------------------------------------------------------------------------
1818
*/
1919

2020
#include "postgres.h"
2121

22+
#include "access/genam.h"
2223
#include "access/heapam.h"
23-
#include "access/indexgenam.h"
2424
#include "access/relscan.h"
2525
#include "access/tableam.h"
2626
#include "access/transam.h"

‎src/backend/access/index/indexam.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343

4444
#include "postgres.h"
4545

46+
#include "access/amapi.h"
4647
#include "access/heapam.h"
47-
#include "access/indexam.h"
4848
#include "access/relscan.h"
4949
#include "access/tableam.h"
5050
#include "access/transam.h"

‎src/backend/access/nbtree/nbtvalidate.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
*/
1414
#include "postgres.h"
1515

16+
#include "access/amvalidate.h"
1617
#include "access/htup_details.h"
17-
#include "access/indexamvalidate.h"
1818
#include "access/nbtree.h"
1919
#include "catalog/pg_amop.h"
2020
#include "catalog/pg_amproc.h"

‎src/backend/access/spgist/spgdoinsert.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
#include "postgres.h"
1717

18-
#include "access/indexgenam.h"
18+
#include "access/genam.h"
1919
#include "access/spgist_private.h"
2020
#include "access/spgxlog.h"
2121
#include "access/xloginsert.h"

‎src/backend/access/spgist/spginsert.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#include "postgres.h"
1818

19-
#include "access/indexgenam.h"
19+
#include "access/genam.h"
2020
#include "access/spgist_private.h"
2121
#include "access/spgxlog.h"
2222
#include "access/tableam.h"

‎src/backend/access/spgist/spgscan.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
#include "postgres.h"
1717

18-
#include "access/indexgenam.h"
18+
#include "access/genam.h"
1919
#include "access/relscan.h"
2020
#include "access/spgist_private.h"
2121
#include "miscadmin.h"

0 commit comments

Comments
 (0)