Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit bdc4edb

Browse files
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 <[email protected]> Discussion: https://www.postgresql.org/message-id/flat/[email protected]
1 parent b4c9695 commit bdc4edb

Some content is hidden

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

91 files changed

+318
-370
lines changed

contrib/dblink/dblink.c

Lines 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

Lines 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

Lines 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

Lines 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

Lines 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

Lines 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

Lines 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

Lines 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

Lines 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

Lines 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"

0 commit comments

Comments
 (0)