Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit bdc4edb

Browse filesBrowse files
peterepetere
committed
Move catalog index declarations
Move the system catalog index declarations from catalog/indexing.h to the respective parent tables' catalog/pg_*.h files. The original reason for having it split was that the old genbki system produced the output in the order of the catalog files it read, so all the indexing stuff needed to come separately. But this is no longer the case, and keeping it together makes more sense. Reviewed-by: John Naylor <john.naylor@enterprisedb.com> Discussion: https://www.postgresql.org/message-id/flat/c7cc82d6-f976-75d6-2e3e-b03d2cab26bb@2ndquadrant.com
1 parent b4c9695 commit bdc4edb
Copy full SHA for bdc4edb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

91 files changed

+318
-370
lines changed

‎contrib/dblink/dblink.c

Copy file name to clipboardExpand all lines: contrib/dblink/dblink.c
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
#include "access/relation.h"
3939
#include "access/reloptions.h"
4040
#include "access/table.h"
41-
#include "catalog/indexing.h"
4241
#include "catalog/namespace.h"
4342
#include "catalog/pg_foreign_data_wrapper.h"
4443
#include "catalog/pg_foreign_server.h"

‎contrib/sepgsql/database.c

Copy file name to clipboardExpand all lines: contrib/sepgsql/database.c
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include "access/sysattr.h"
1616
#include "access/table.h"
1717
#include "catalog/dependency.h"
18-
#include "catalog/indexing.h"
1918
#include "catalog/pg_database.h"
2019
#include "commands/dbcommands.h"
2120
#include "commands/seclabel.h"

‎contrib/sepgsql/label.c

Copy file name to clipboardExpand all lines: contrib/sepgsql/label.c
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#include "access/xact.h"
1919
#include "catalog/catalog.h"
2020
#include "catalog/dependency.h"
21-
#include "catalog/indexing.h"
2221
#include "catalog/pg_attribute.h"
2322
#include "catalog/pg_class.h"
2423
#include "catalog/pg_database.h"

‎contrib/sepgsql/proc.c

Copy file name to clipboardExpand all lines: contrib/sepgsql/proc.c
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include "access/sysattr.h"
1616
#include "access/table.h"
1717
#include "catalog/dependency.h"
18-
#include "catalog/indexing.h"
1918
#include "catalog/pg_namespace.h"
2019
#include "catalog/pg_proc.h"
2120
#include "catalog/pg_type.h"

‎contrib/sepgsql/relation.c

Copy file name to clipboardExpand all lines: contrib/sepgsql/relation.c
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include "access/sysattr.h"
1616
#include "access/table.h"
1717
#include "catalog/dependency.h"
18-
#include "catalog/indexing.h"
1918
#include "catalog/pg_attribute.h"
2019
#include "catalog/pg_class.h"
2120
#include "catalog/pg_namespace.h"

‎contrib/sepgsql/schema.c

Copy file name to clipboardExpand all lines: contrib/sepgsql/schema.c
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include "access/sysattr.h"
1616
#include "access/table.h"
1717
#include "catalog/dependency.h"
18-
#include "catalog/indexing.h"
1918
#include "catalog/pg_database.h"
2019
#include "catalog/pg_namespace.h"
2120
#include "commands/seclabel.h"

‎doc/src/sgml/bki.sgml

Copy file name to clipboardExpand all lines: doc/src/sgml/bki.sgml
+1-4Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,10 @@
1818
<para>
1919
The structures of the catalogs are declared in specially formatted C
2020
header files in the <filename>src/include/catalog/</filename> directory of
21-
the source tree. In particular, for each catalog there is a header file
21+
the source tree. For each catalog there is a header file
2222
named after the catalog (e.g., <filename>pg_class.h</filename>
2323
for <structname>pg_class</structname>), which defines the set of columns
2424
the catalog has, as well as some other basic properties such as its OID.
25-
Other critical files defining the catalog structure
26-
include <filename>indexing.h</filename>, which defines the indexes present
27-
on all the system catalogs.
2825
</para>
2926

3027
<para>

‎src/backend/catalog/Makefile

Copy file name to clipboardExpand all lines: src/backend/catalog/Makefile
+1-3Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,7 @@ CATALOG_HEADERS := \
7272

7373
GENERATED_HEADERS := $(CATALOG_HEADERS:%.h=%_d.h) schemapg.h
7474

75-
POSTGRES_BKI_SRCS := $(addprefix $(top_srcdir)/src/include/catalog/,\
76-
$(CATALOG_HEADERS) indexing.h \
77-
)
75+
POSTGRES_BKI_SRCS := $(addprefix $(top_srcdir)/src/include/catalog/, $(CATALOG_HEADERS))
7876

7977
# The .dat files we need can just be listed alphabetically.
8078
POSTGRES_BKI_DATA = $(addprefix $(top_srcdir)/src/include/catalog/,\

‎src/backend/catalog/catalog.c

Copy file name to clipboardExpand all lines: src/backend/catalog/catalog.c
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include "access/table.h"
2727
#include "access/transam.h"
2828
#include "catalog/catalog.h"
29-
#include "catalog/indexing.h"
3029
#include "catalog/namespace.h"
3130
#include "catalog/pg_auth_members.h"
3231
#include "catalog/pg_authid.h"
@@ -248,7 +247,7 @@ IsSharedRelation(Oid relationId)
248247
relationId == ReplicationOriginRelationId ||
249248
relationId == SubscriptionRelationId)
250249
return true;
251-
/* These are their indexes (see indexing.h) */
250+
/* These are their indexes */
252251
if (relationId == AuthIdRolnameIndexId ||
253252
relationId == AuthIdOidIndexId ||
254253
relationId == AuthMemRoleMemIndexId ||

‎src/backend/catalog/objectaddress.c

Copy file name to clipboardExpand all lines: src/backend/catalog/objectaddress.c
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include "access/sysattr.h"
2222
#include "access/table.h"
2323
#include "catalog/catalog.h"
24-
#include "catalog/indexing.h"
2524
#include "catalog/objectaddress.h"
2625
#include "catalog/pg_am.h"
2726
#include "catalog/pg_amop.h"

‎src/backend/commands/aggregatecmds.c

Copy file name to clipboardExpand all lines: src/backend/commands/aggregatecmds.c
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
#include "access/htup_details.h"
2626
#include "catalog/dependency.h"
27-
#include "catalog/indexing.h"
2827
#include "catalog/pg_aggregate.h"
2928
#include "catalog/pg_proc.h"
3029
#include "catalog/pg_type.h"

‎src/backend/commands/tablecmds.c

Copy file name to clipboardExpand all lines: src/backend/commands/tablecmds.c
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#include "catalog/dependency.h"
3030
#include "catalog/heap.h"
3131
#include "catalog/index.h"
32-
#include "catalog/indexing.h"
3332
#include "catalog/namespace.h"
3433
#include "catalog/objectaccess.h"
3534
#include "catalog/partition.h"

‎src/backend/partitioning/partdesc.c

Copy file name to clipboardExpand all lines: src/backend/partitioning/partdesc.c
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include "access/genam.h"
1818
#include "access/htup_details.h"
1919
#include "access/table.h"
20-
#include "catalog/indexing.h"
2120
#include "catalog/partition.h"
2221
#include "catalog/pg_inherits.h"
2322
#include "partitioning/partbounds.h"

‎src/backend/replication/logical/message.c

Copy file name to clipboardExpand all lines: src/backend/replication/logical/message.c
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
#include "postgres.h"
3333

3434
#include "access/xact.h"
35-
#include "catalog/indexing.h"
3635
#include "miscadmin.h"
3736
#include "nodes/execnodes.h"
3837
#include "replication/logical.h"

‎src/backend/rewrite/rewriteDefine.c

Copy file name to clipboardExpand all lines: src/backend/rewrite/rewriteDefine.c
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#include "catalog/catalog.h"
2424
#include "catalog/dependency.h"
2525
#include "catalog/heap.h"
26-
#include "catalog/indexing.h"
2726
#include "catalog/namespace.h"
2827
#include "catalog/objectaccess.h"
2928
#include "catalog/pg_rewrite.h"

‎src/backend/utils/adt/enum.c

Copy file name to clipboardExpand all lines: src/backend/utils/adt/enum.c
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#include "access/genam.h"
1717
#include "access/htup_details.h"
1818
#include "access/table.h"
19-
#include "catalog/indexing.h"
2019
#include "catalog/pg_enum.h"
2120
#include "libpq/pqformat.h"
2221
#include "storage/procarray.h"

‎src/backend/utils/adt/ruleutils.c

Copy file name to clipboardExpand all lines: src/backend/utils/adt/ruleutils.c
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include "access/sysattr.h"
2626
#include "access/table.h"
2727
#include "catalog/dependency.h"
28-
#include "catalog/indexing.h"
2928
#include "catalog/pg_aggregate.h"
3029
#include "catalog/pg_am.h"
3130
#include "catalog/pg_authid.h"

‎src/backend/utils/cache/evtcache.c

Copy file name to clipboardExpand all lines: src/backend/utils/cache/evtcache.c
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#include "access/genam.h"
1717
#include "access/htup_details.h"
1818
#include "access/relation.h"
19-
#include "catalog/indexing.h"
2019
#include "catalog/pg_event_trigger.h"
2120
#include "catalog/pg_type.h"
2221
#include "commands/trigger.h"

‎src/backend/utils/cache/relfilenodemap.c

Copy file name to clipboardExpand all lines: src/backend/utils/cache/relfilenodemap.c
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#include "access/genam.h"
1717
#include "access/htup_details.h"
1818
#include "access/table.h"
19-
#include "catalog/indexing.h"
2019
#include "catalog/pg_class.h"
2120
#include "catalog/pg_tablespace.h"
2221
#include "miscadmin.h"

‎src/backend/utils/cache/syscache.c

Copy file name to clipboardExpand all lines: src/backend/utils/cache/syscache.c
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
#include "access/htup_details.h"
2424
#include "access/sysattr.h"
25-
#include "catalog/indexing.h"
2625
#include "catalog/pg_aggregate.h"
2726
#include "catalog/pg_am.h"
2827
#include "catalog/pg_amop.h"
@@ -97,7 +96,7 @@
9796
9897
There must be a unique index underlying each syscache (ie, an index
9998
whose key is the same as that of the cache). If there is not one
100-
already, add definitions for it to include/catalog/indexing.h: you need
99+
already, add definitions for it to include/catalog/pg_*.h: you need
101100
to add a DECLARE_UNIQUE_INDEX macro and a #define for the index OID.
102101
(Adding an index requires a catversion.h update, while simply
103102
adding/deleting caches only requires a recompile.)

‎src/backend/utils/cache/ts_cache.c

Copy file name to clipboardExpand all lines: src/backend/utils/cache/ts_cache.c
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#include "access/htup_details.h"
3131
#include "access/table.h"
3232
#include "access/xact.h"
33-
#include "catalog/indexing.h"
3433
#include "catalog/namespace.h"
3534
#include "catalog/pg_ts_config.h"
3635
#include "catalog/pg_ts_config_map.h"

‎src/backend/utils/cache/typcache.c

Copy file name to clipboardExpand all lines: src/backend/utils/cache/typcache.c
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
#include "access/relation.h"
5151
#include "access/session.h"
5252
#include "access/table.h"
53-
#include "catalog/indexing.h"
5453
#include "catalog/pg_am.h"
5554
#include "catalog/pg_constraint.h"
5655
#include "catalog/pg_enum.h"

‎src/backend/utils/init/postinit.c

Copy file name to clipboardExpand all lines: src/backend/utils/init/postinit.c
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
#include "access/xact.h"
2929
#include "access/xlog.h"
3030
#include "catalog/catalog.h"
31-
#include "catalog/indexing.h"
3231
#include "catalog/namespace.h"
3332
#include "catalog/pg_authid.h"
3433
#include "catalog/pg_database.h"

‎src/include/catalog/duplicate_oids

Copy file name to clipboardExpand all lines: src/include/catalog/duplicate_oids
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ chdir $FindBin::RealBin or die "could not cd to $FindBin::RealBin: $!\n";
2626
use lib "$FindBin::RealBin/../../backend/catalog/";
2727
use Catalog;
2828

29-
my @input_files = (glob("pg_*.h"), qw(indexing.h));
29+
my @input_files = glob("pg_*.h");
3030

3131
my $oids = Catalog::FindAllOidsFromHeaders(@input_files);
3232

‎src/include/catalog/genbki.h

Copy file name to clipboardExpand all lines: src/include/catalog/genbki.h
+17Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,23 @@
5454
*/
5555
#define DECLARE_TOAST(name,toastoid,indexoid) extern int no_such_variable
5656

57+
/*
58+
* These lines processed by genbki.pl to create the statements
59+
* the bootstrap parser will turn into DefineIndex calls.
60+
*
61+
* The keyword is DECLARE_INDEX or DECLARE_UNIQUE_INDEX. The first two
62+
* arguments are the index name and OID, the rest is much like a standard
63+
* 'create index' SQL command.
64+
*
65+
* For each index, we also provide a #define for its OID. References to
66+
* the index in the C code should always use these #defines, not the actual
67+
* index name (much less the numeric OID).
68+
*
69+
* The macro definitions are just to keep the C compiler from spitting up.
70+
*/
71+
#define DECLARE_INDEX(name,oid,decl) extern int no_such_variable
72+
#define DECLARE_UNIQUE_INDEX(name,oid,decl) extern int no_such_variable
73+
5774
/* The following are never defined; they are here only for documentation. */
5875

5976
/*

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.