Movatterモバイル変換


[0]ホーム

URL:


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

Sign up
Appearance settings

Commitcefa387

Browse files
committed
Merge catalog/pg_foo_fn.h headers back into pg_foo.h headers.
Traditionally, include/catalog/pg_foo.h contains extern declarationsfor functions in backend/catalog/pg_foo.c, in addition to its functionas the authoritative definition of the pg_foo catalog's rowtype.In some cases, we'd been forced to split out those extern declarationsinto separate pg_foo_fn.h headers so that the catalog definitionscould be #include'd by frontend code. That problem is gone as ofcommit9c0a0de, so let's undo the splits to make things lessconfusing.Discussion:https://postgr.es/m/23690.1523031777@sss.pgh.pa.us
1 parent9c0a0de commitcefa387

File tree

63 files changed

+304
-464
lines changed

Some content is hidden

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

63 files changed

+304
-464
lines changed

‎contrib/sepgsql/dml.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include"catalog/dependency.h"
1919
#include"catalog/pg_attribute.h"
2020
#include"catalog/pg_class.h"
21-
#include"catalog/pg_inherits_fn.h"
21+
#include"catalog/pg_inherits.h"
2222
#include"commands/seclabel.h"
2323
#include"commands/tablecmds.h"
2424
#include"executor/executor.h"

‎src/backend/catalog/dependency.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,8 @@
2727
#include"catalog/pg_authid.h"
2828
#include"catalog/pg_cast.h"
2929
#include"catalog/pg_collation.h"
30-
#include"catalog/pg_collation_fn.h"
3130
#include"catalog/pg_constraint.h"
32-
#include"catalog/pg_constraint_fn.h"
3331
#include"catalog/pg_conversion.h"
34-
#include"catalog/pg_conversion_fn.h"
3532
#include"catalog/pg_database.h"
3633
#include"catalog/pg_default_acl.h"
3734
#include"catalog/pg_depend.h"

‎src/backend/catalog/heap.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
#include"catalog/pg_attrdef.h"
4646
#include"catalog/pg_collation.h"
4747
#include"catalog/pg_constraint.h"
48-
#include"catalog/pg_constraint_fn.h"
4948
#include"catalog/pg_foreign_table.h"
5049
#include"catalog/pg_inherits.h"
5150
#include"catalog/pg_namespace.h"
@@ -55,7 +54,6 @@
5554
#include"catalog/pg_subscription_rel.h"
5655
#include"catalog/pg_tablespace.h"
5756
#include"catalog/pg_type.h"
58-
#include"catalog/pg_type_fn.h"
5957
#include"catalog/storage.h"
6058
#include"catalog/storage_xlog.h"
6159
#include"commands/tablecmds.h"

‎src/backend/catalog/index.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,8 @@
4141
#include"catalog/pg_am.h"
4242
#include"catalog/pg_collation.h"
4343
#include"catalog/pg_constraint.h"
44-
#include"catalog/pg_constraint_fn.h"
4544
#include"catalog/pg_depend.h"
46-
#include"catalog/pg_inherits_fn.h"
45+
#include"catalog/pg_inherits.h"
4746
#include"catalog/pg_operator.h"
4847
#include"catalog/pg_opclass.h"
4948
#include"catalog/pg_tablespace.h"

‎src/backend/catalog/namespace.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
#include"catalog/pg_authid.h"
2929
#include"catalog/pg_collation.h"
3030
#include"catalog/pg_conversion.h"
31-
#include"catalog/pg_conversion_fn.h"
3231
#include"catalog/pg_namespace.h"
3332
#include"catalog/pg_opclass.h"
3433
#include"catalog/pg_operator.h"

‎src/backend/catalog/objectaddress.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#include"catalog/pg_event_trigger.h"
3131
#include"catalog/pg_collation.h"
3232
#include"catalog/pg_constraint.h"
33-
#include"catalog/pg_constraint_fn.h"
3433
#include"catalog/pg_conversion.h"
3534
#include"catalog/pg_database.h"
3635
#include"catalog/pg_extension.h"

‎src/backend/catalog/partition.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include"catalog/partition.h"
2727
#include"catalog/pg_collation.h"
2828
#include"catalog/pg_inherits.h"
29-
#include"catalog/pg_inherits_fn.h"
3029
#include"catalog/pg_opclass.h"
3130
#include"catalog/pg_partitioned_table.h"
3231
#include"catalog/pg_type.h"

‎src/backend/catalog/pg_aggregate.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,9 @@
1919
#include"catalog/dependency.h"
2020
#include"catalog/indexing.h"
2121
#include"catalog/pg_aggregate.h"
22-
#include"catalog/pg_aggregate_fn.h"
2322
#include"catalog/pg_language.h"
2423
#include"catalog/pg_operator.h"
2524
#include"catalog/pg_proc.h"
26-
#include"catalog/pg_proc_fn.h"
2725
#include"catalog/pg_type.h"
2826
#include"miscadmin.h"
2927
#include"parser/parse_coerce.h"

‎src/backend/catalog/pg_collation.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include"catalog/indexing.h"
2323
#include"catalog/objectaccess.h"
2424
#include"catalog/pg_collation.h"
25-
#include"catalog/pg_collation_fn.h"
2625
#include"catalog/pg_namespace.h"
2726
#include"mb/pg_wchar.h"
2827
#include"utils/builtins.h"

‎src/backend/catalog/pg_constraint.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include"catalog/indexing.h"
2323
#include"catalog/objectaccess.h"
2424
#include"catalog/pg_constraint.h"
25-
#include"catalog/pg_constraint_fn.h"
2625
#include"catalog/pg_operator.h"
2726
#include"catalog/pg_type.h"
2827
#include"commands/defrem.h"

‎src/backend/catalog/pg_conversion.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include"catalog/indexing.h"
2222
#include"catalog/objectaccess.h"
2323
#include"catalog/pg_conversion.h"
24-
#include"catalog/pg_conversion_fn.h"
2524
#include"catalog/pg_namespace.h"
2625
#include"catalog/pg_proc.h"
2726
#include"mb/pg_wchar.h"

‎src/backend/catalog/pg_inherits.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include"access/htup_details.h"
2525
#include"catalog/indexing.h"
2626
#include"catalog/pg_inherits.h"
27-
#include"catalog/pg_inherits_fn.h"
2827
#include"parser/parse_type.h"
2928
#include"storage/lmgr.h"
3029
#include"utils/builtins.h"

‎src/backend/catalog/pg_operator.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include"catalog/objectaccess.h"
2727
#include"catalog/pg_namespace.h"
2828
#include"catalog/pg_operator.h"
29-
#include"catalog/pg_operator_fn.h"
3029
#include"catalog/pg_proc.h"
3130
#include"catalog/pg_type.h"
3231
#include"miscadmin.h"

‎src/backend/catalog/pg_proc.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include"catalog/pg_language.h"
2323
#include"catalog/pg_namespace.h"
2424
#include"catalog/pg_proc.h"
25-
#include"catalog/pg_proc_fn.h"
2625
#include"catalog/pg_transform.h"
2726
#include"catalog/pg_type.h"
2827
#include"commands/defrem.h"
@@ -60,7 +59,7 @@ static bool match_prosrc_to_literal(const char *prosrc, const char *literal,
6059
*
6160
* Note: allParameterTypes, parameterModes, parameterNames, trftypes, and proconfig
6261
* are either arrays of the proper types or NULL. We declare them Datum,
63-
* not "ArrayType *", to avoid importing array.h intopg_proc_fn.h.
62+
* not "ArrayType *", to avoid importing array.h intopg_proc.h.
6463
* ----------------------------------------------------------------
6564
*/
6665
ObjectAddress

‎src/backend/catalog/pg_type.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include"catalog/pg_namespace.h"
2626
#include"catalog/pg_proc.h"
2727
#include"catalog/pg_type.h"
28-
#include"catalog/pg_type_fn.h"
2928
#include"commands/typecmds.h"
3029
#include"miscadmin.h"
3130
#include"parser/scansup.h"

‎src/backend/commands/aggregatecmds.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include"catalog/dependency.h"
2727
#include"catalog/indexing.h"
2828
#include"catalog/pg_aggregate.h"
29-
#include"catalog/pg_aggregate_fn.h"
3029
#include"catalog/pg_proc.h"
3130
#include"catalog/pg_type.h"
3231
#include"commands/alter.h"

‎src/backend/commands/analyze.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include"catalog/index.h"
2828
#include"catalog/indexing.h"
2929
#include"catalog/pg_collation.h"
30-
#include"catalog/pg_inherits_fn.h"
30+
#include"catalog/pg_inherits.h"
3131
#include"catalog/pg_namespace.h"
3232
#include"catalog/pg_statistic_ext.h"
3333
#include"commands/dbcommands.h"

‎src/backend/commands/collationcmds.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include"catalog/namespace.h"
2323
#include"catalog/objectaccess.h"
2424
#include"catalog/pg_collation.h"
25-
#include"catalog/pg_collation_fn.h"
2625
#include"commands/alter.h"
2726
#include"commands/collationcmds.h"
2827
#include"commands/comment.h"

‎src/backend/commands/conversioncmds.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#include"catalog/dependency.h"
1919
#include"catalog/indexing.h"
2020
#include"catalog/pg_conversion.h"
21-
#include"catalog/pg_conversion_fn.h"
2221
#include"catalog/pg_type.h"
2322
#include"commands/alter.h"
2423
#include"commands/conversioncmds.h"

‎src/backend/commands/functioncmds.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,8 @@
4444
#include"catalog/pg_language.h"
4545
#include"catalog/pg_namespace.h"
4646
#include"catalog/pg_proc.h"
47-
#include"catalog/pg_proc_fn.h"
4847
#include"catalog/pg_transform.h"
4948
#include"catalog/pg_type.h"
50-
#include"catalog/pg_type_fn.h"
5149
#include"commands/alter.h"
5250
#include"commands/defrem.h"
5351
#include"commands/proclang.h"

‎src/backend/commands/indexcmds.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@
2525
#include"catalog/indexing.h"
2626
#include"catalog/partition.h"
2727
#include"catalog/pg_am.h"
28-
#include"catalog/pg_constraint_fn.h"
28+
#include"catalog/pg_constraint.h"
2929
#include"catalog/pg_inherits.h"
30-
#include"catalog/pg_inherits_fn.h"
3130
#include"catalog/pg_opclass.h"
3231
#include"catalog/pg_opfamily.h"
3332
#include"catalog/pg_tablespace.h"

‎src/backend/commands/lockcmds.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include"postgres.h"
1616

1717
#include"catalog/namespace.h"
18-
#include"catalog/pg_inherits_fn.h"
18+
#include"catalog/pg_inherits.h"
1919
#include"commands/lockcmds.h"
2020
#include"miscadmin.h"
2121
#include"parser/parse_clause.h"

‎src/backend/commands/operatorcmds.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
#include"catalog/indexing.h"
4141
#include"catalog/objectaccess.h"
4242
#include"catalog/pg_operator.h"
43-
#include"catalog/pg_operator_fn.h"
4443
#include"catalog/pg_type.h"
4544
#include"commands/alter.h"
4645
#include"commands/defrem.h"

‎src/backend/commands/proclang.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include"catalog/pg_namespace.h"
2525
#include"catalog/pg_pltemplate.h"
2626
#include"catalog/pg_proc.h"
27-
#include"catalog/pg_proc_fn.h"
2827
#include"catalog/pg_type.h"
2928
#include"commands/dbcommands.h"
3029
#include"commands/defrem.h"

‎src/backend/commands/publicationcmds.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include"catalog/namespace.h"
2929
#include"catalog/objectaccess.h"
3030
#include"catalog/objectaddress.h"
31-
#include"catalog/pg_inherits_fn.h"
31+
#include"catalog/pg_inherits.h"
3232
#include"catalog/pg_type.h"
3333
#include"catalog/pg_publication.h"
3434
#include"catalog/pg_publication_rel.h"

‎src/backend/commands/tablecmds.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,14 @@
3535
#include"catalog/pg_am.h"
3636
#include"catalog/pg_collation.h"
3737
#include"catalog/pg_constraint.h"
38-
#include"catalog/pg_constraint_fn.h"
3938
#include"catalog/pg_depend.h"
4039
#include"catalog/pg_foreign_table.h"
4140
#include"catalog/pg_inherits.h"
42-
#include"catalog/pg_inherits_fn.h"
4341
#include"catalog/pg_namespace.h"
4442
#include"catalog/pg_opclass.h"
4543
#include"catalog/pg_tablespace.h"
4644
#include"catalog/pg_trigger.h"
4745
#include"catalog/pg_type.h"
48-
#include"catalog/pg_type_fn.h"
4946
#include"catalog/storage.h"
5047
#include"catalog/storage_xlog.h"
5148
#include"catalog/toasting.h"

‎src/backend/commands/trigger.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@
2424
#include"catalog/indexing.h"
2525
#include"catalog/objectaccess.h"
2626
#include"catalog/pg_constraint.h"
27-
#include"catalog/pg_constraint_fn.h"
28-
#include"catalog/pg_inherits_fn.h"
27+
#include"catalog/pg_inherits.h"
2928
#include"catalog/pg_proc.h"
3029
#include"catalog/pg_trigger.h"
3130
#include"catalog/pg_type.h"

‎src/backend/commands/typecmds.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,13 @@
4141
#include"catalog/pg_authid.h"
4242
#include"catalog/pg_collation.h"
4343
#include"catalog/pg_constraint.h"
44-
#include"catalog/pg_constraint_fn.h"
4544
#include"catalog/pg_depend.h"
4645
#include"catalog/pg_enum.h"
4746
#include"catalog/pg_language.h"
4847
#include"catalog/pg_namespace.h"
4948
#include"catalog/pg_proc.h"
50-
#include"catalog/pg_proc_fn.h"
5149
#include"catalog/pg_range.h"
5250
#include"catalog/pg_type.h"
53-
#include"catalog/pg_type_fn.h"
5451
#include"commands/defrem.h"
5552
#include"commands/tablecmds.h"
5653
#include"commands/typecmds.h"

‎src/backend/commands/vacuum.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include"access/xact.h"
3333
#include"catalog/namespace.h"
3434
#include"catalog/pg_database.h"
35-
#include"catalog/pg_inherits_fn.h"
35+
#include"catalog/pg_inherits.h"
3636
#include"catalog/pg_namespace.h"
3737
#include"commands/cluster.h"
3838
#include"commands/vacuum.h"

‎src/backend/executor/execPartition.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#include"postgres.h"
1616

17-
#include"catalog/pg_inherits_fn.h"
17+
#include"catalog/pg_inherits.h"
1818
#include"catalog/pg_type.h"
1919
#include"executor/execPartition.h"
2020
#include"executor/executor.h"

‎src/backend/optimizer/plan/planner.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include"access/parallel.h"
2323
#include"access/sysattr.h"
2424
#include"access/xact.h"
25-
#include"catalog/pg_constraint_fn.h"
25+
#include"catalog/pg_constraint.h"
2626
#include"catalog/pg_proc.h"
2727
#include"catalog/pg_type.h"
2828
#include"executor/executor.h"

‎src/backend/optimizer/prep/prepunion.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include"access/htup_details.h"
3535
#include"access/sysattr.h"
3636
#include"catalog/partition.h"
37-
#include"catalog/pg_inherits_fn.h"
37+
#include"catalog/pg_inherits.h"
3838
#include"catalog/pg_type.h"
3939
#include"miscadmin.h"
4040
#include"nodes/makefuncs.h"

‎src/backend/parser/parse_agg.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include"postgres.h"
1616

1717
#include"catalog/pg_aggregate.h"
18-
#include"catalog/pg_constraint_fn.h"
18+
#include"catalog/pg_constraint.h"
1919
#include"catalog/pg_type.h"
2020
#include"nodes/makefuncs.h"
2121
#include"nodes/nodeFuncs.h"

‎src/backend/parser/parse_clause.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include"catalog/pg_am.h"
2727
#include"catalog/pg_amproc.h"
2828
#include"catalog/pg_collation.h"
29-
#include"catalog/pg_constraint_fn.h"
29+
#include"catalog/pg_constraint.h"
3030
#include"catalog/pg_type.h"
3131
#include"commands/defrem.h"
3232
#include"nodes/makefuncs.h"

‎src/backend/parser/parse_coerce.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include"access/htup_details.h"
1818
#include"catalog/pg_cast.h"
1919
#include"catalog/pg_class.h"
20-
#include"catalog/pg_inherits_fn.h"
20+
#include"catalog/pg_inherits.h"
2121
#include"catalog/pg_proc.h"
2222
#include"catalog/pg_type.h"
2323
#include"nodes/makefuncs.h"

‎src/backend/parser/parse_utilcmd.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
#include"catalog/pg_am.h"
3737
#include"catalog/pg_collation.h"
3838
#include"catalog/pg_constraint.h"
39-
#include"catalog/pg_constraint_fn.h"
4039
#include"catalog/pg_opclass.h"
4140
#include"catalog/pg_operator.h"
4241
#include"catalog/pg_statistic_ext.h"

‎src/backend/rewrite/rowsecurity.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#include"access/htup_details.h"
3939
#include"access/sysattr.h"
4040
#include"catalog/pg_class.h"
41-
#include"catalog/pg_inherits_fn.h"
41+
#include"catalog/pg_inherits.h"
4242
#include"catalog/pg_policy.h"
4343
#include"catalog/pg_type.h"
4444
#include"miscadmin.h"

‎src/backend/tcop/utility.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include"access/xlog.h"
2424
#include"catalog/catalog.h"
2525
#include"catalog/namespace.h"
26-
#include"catalog/pg_inherits_fn.h"
26+
#include"catalog/pg_inherits.h"
2727
#include"catalog/toasting.h"
2828
#include"commands/alter.h"
2929
#include"commands/async.h"

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp