Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit c219d9b

Browse files
committed
Split tuple struct defs from htup.h to htup_details.h
This reduces unnecessary exposure of other headers through htup.h, which is very widely included by many files. I have chosen to move the function prototypes to the new file as well, because that means htup.h no longer needs to include tupdesc.h. In itself this doesn't have much effect in indirect inclusion of tupdesc.h throughout the tree, because it's also required by execnodes.h; but it's something to explore in the future, and it seemed best to do the htup.h change now while I'm busy with it.
1 parent 381a9ed commit c219d9b

File tree

167 files changed

+830
-639
lines changed

Some content is hidden

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

167 files changed

+830
-639
lines changed

contrib/dblink/dblink.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,14 @@
3535
#include <limits.h>
3636

3737
#include "libpq-fe.h"
38-
#include "funcapi.h"
38+
39+
#include "access/htup_details.h"
3940
#include "catalog/indexing.h"
4041
#include "catalog/namespace.h"
4142
#include "catalog/pg_type.h"
4243
#include "executor/spi.h"
4344
#include "foreign/foreign.h"
45+
#include "funcapi.h"
4446
#include "lib/stringinfo.h"
4547
#include "mb/pg_wchar.h"
4648
#include "miscadmin.h"

contrib/file_fdw/file_fdw.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include <sys/stat.h>
1616
#include <unistd.h>
1717

18+
#include "access/htup_details.h"
1819
#include "access/reloptions.h"
1920
#include "access/sysattr.h"
2021
#include "catalog/pg_foreign_table.h"

contrib/hstore/hstore_io.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
#include <ctype.h>
77

8+
#include "access/htup_details.h"
89
#include "catalog/pg_type.h"
910
#include "funcapi.h"
1011
#include "libpq/pqformat.h"

contrib/hstore/hstore_op.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#include "postgres.h"
55

66
#include "access/hash.h"
7+
#include "access/htup_details.h"
78
#include "catalog/pg_type.h"
89
#include "funcapi.h"
910
#include "utils/builtins.h"

contrib/ltree/ltree_op.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
#include <ctype.h>
99

10+
#include "access/htup_details.h"
1011
#include "catalog/pg_statistic.h"
1112
#include "utils/builtins.h"
1213
#include "utils/lsyscache.h"

contrib/pageinspect/heapfuncs.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
#include "postgres.h"
2727

28+
#include "access/htup_details.h"
2829
#include "funcapi.h"
2930
#include "utils/builtins.h"
3031
#include "miscadmin.h"

contrib/pageinspect/rawpage.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
#include "postgres.h"
1717

18+
#include "access/htup_details.h"
1819
#include "catalog/catalog.h"
1920
#include "catalog/namespace.h"
2021
#include "funcapi.h"

contrib/pg_buffercache/pg_buffercache_pages.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
*/
99
#include "postgres.h"
1010

11+
#include "access/htup_details.h"
1112
#include "catalog/pg_type.h"
1213
#include "funcapi.h"
1314
#include "storage/buf_internals.h"

contrib/tablefunc/tablefunc.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434

3535
#include <math.h>
3636

37+
#include "access/htup_details.h"
3738
#include "catalog/pg_type.h"
3839
#include "executor/spi.h"
3940
#include "funcapi.h"

contrib/tcn/tcn.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
#include "postgres.h"
1717

18+
#include "access/htup_details.h"
1819
#include "executor/spi.h"
1920
#include "commands/async.h"
2021
#include "commands/trigger.h"

contrib/xml2/xpath.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
*/
77
#include "postgres.h"
88

9+
#include "access/htup_details.h"
910
#include "executor/spi.h"
1011
#include "fmgr.h"
1112
#include "funcapi.h"

src/backend/access/common/reloptions.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
#include "access/gist_private.h"
1919
#include "access/hash.h"
20+
#include "access/htup_details.h"
2021
#include "access/nbtree.h"
2122
#include "access/reloptions.h"
2223
#include "access/spgist.h"

src/backend/access/common/tupconvert.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
*/
2121
#include "postgres.h"
2222

23+
#include "access/htup_details.h"
2324
#include "access/tupconvert.h"
2425
#include "utils/builtins.h"
2526

src/backend/access/common/tupdesc.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
#include "postgres.h"
2121

22+
#include "access/htup_details.h"
2223
#include "catalog/pg_type.h"
2324
#include "miscadmin.h"
2425
#include "parser/parse_type.h"

src/backend/access/heap/hio.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
#include "access/heapam.h"
1919
#include "access/hio.h"
20+
#include "access/htup_details.h"
2021
#include "access/visibilitymap.h"
2122
#include "storage/bufmgr.h"
2223
#include "storage/freespace.h"

src/backend/access/heap/pruneheap.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include "access/heapam.h"
1818
#include "access/heapam_xlog.h"
1919
#include "access/transam.h"
20+
#include "access/htup_details.h"
2021
#include "miscadmin.h"
2122
#include "pgstat.h"
2223
#include "storage/bufmgr.h"

src/backend/access/transam/twophase.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
#include <time.h>
4242
#include <unistd.h>
4343

44-
#include "access/htup.h"
44+
#include "access/htup_details.h"
4545
#include "access/subtrans.h"
4646
#include "access/transam.h"
4747
#include "access/twophase.h"

src/backend/access/transam/xlogfuncs.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
*/
1717
#include "postgres.h"
1818

19+
#include "access/htup_details.h"
1920
#include "access/xlog.h"
2021
#include "access/xlog_internal.h"
2122
#include "access/xlogutils.h"

src/backend/bootstrap/bootstrap.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include <getopt.h>
2222
#endif
2323

24+
#include "access/htup_details.h"
2425
#include "bootstrap/bootstrap.h"
2526
#include "catalog/index.h"
2627
#include "catalog/pg_collation.h"

src/backend/catalog/aclchk.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
#include "access/genam.h"
2121
#include "access/heapam.h"
22+
#include "access/htup_details.h"
2223
#include "access/sysattr.h"
2324
#include "access/xact.h"
2425
#include "catalog/catalog.h"

src/backend/catalog/dependency.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
*/
1515
#include "postgres.h"
1616

17+
#include "access/htup_details.h"
1718
#include "access/sysattr.h"
1819
#include "access/xact.h"
1920
#include "catalog/dependency.h"

src/backend/catalog/heap.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
*/
3030
#include "postgres.h"
3131

32+
#include "access/htup_details.h"
3233
#include "access/sysattr.h"
3334
#include "access/transam.h"
3435
#include "access/xact.h"

src/backend/catalog/indexing.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
#include "postgres.h"
1717

18+
#include "access/htup_details.h"
1819
#include "catalog/index.h"
1920
#include "catalog/indexing.h"
2021
#include "executor/executor.h"

src/backend/catalog/namespace.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
*/
2020
#include "postgres.h"
2121

22+
#include "access/htup_details.h"
2223
#include "access/xact.h"
2324
#include "catalog/dependency.h"
2425
#include "catalog/pg_authid.h"

src/backend/catalog/objectaddress.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
#include "postgres.h"
1717

18+
#include "access/htup_details.h"
1819
#include "access/sysattr.h"
1920
#include "catalog/catalog.h"
2021
#include "catalog/indexing.h"

src/backend/catalog/pg_aggregate.c

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

1717
#include "access/heapam.h"
18+
#include "access/htup_details.h"
1819
#include "catalog/dependency.h"
1920
#include "catalog/indexing.h"
2021
#include "catalog/pg_aggregate.h"

src/backend/catalog/pg_collation.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
#include "access/genam.h"
1818
#include "access/heapam.h"
19+
#include "access/htup_details.h"
1920
#include "access/sysattr.h"
2021
#include "catalog/dependency.h"
2122
#include "catalog/indexing.h"

src/backend/catalog/pg_constraint.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
#include "access/genam.h"
1818
#include "access/heapam.h"
19+
#include "access/htup_details.h"
1920
#include "catalog/dependency.h"
2021
#include "catalog/indexing.h"
2122
#include "catalog/objectaccess.h"

src/backend/catalog/pg_conversion.c

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

1717
#include "access/heapam.h"
18+
#include "access/htup_details.h"
1819
#include "access/sysattr.h"
1920
#include "catalog/dependency.h"
2021
#include "catalog/indexing.h"

src/backend/catalog/pg_db_role_setting.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
#include "access/genam.h"
1414
#include "access/heapam.h"
15+
#include "access/htup_details.h"
1516
#include "catalog/indexing.h"
1617
#include "catalog/pg_db_role_setting.h"
1718
#include "utils/fmgroids.h"

src/backend/catalog/pg_depend.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
#include "access/genam.h"
1818
#include "access/heapam.h"
19+
#include "access/htup_details.h"
1920
#include "catalog/dependency.h"
2021
#include "catalog/indexing.h"
2122
#include "catalog/pg_constraint.h"

src/backend/catalog/pg_enum.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
#include "access/genam.h"
1717
#include "access/heapam.h"
18+
#include "access/htup_details.h"
1819
#include "access/xact.h"
1920
#include "catalog/catalog.h"
2021
#include "catalog/indexing.h"

src/backend/catalog/pg_inherits.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
#include "access/genam.h"
2323
#include "access/heapam.h"
24+
#include "access/htup_details.h"
2425
#include "catalog/indexing.h"
2526
#include "catalog/pg_inherits.h"
2627
#include "catalog/pg_inherits_fn.h"

src/backend/catalog/pg_largeobject.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
#include "access/genam.h"
1818
#include "access/heapam.h"
19+
#include "access/htup_details.h"
1920
#include "access/sysattr.h"
2021
#include "catalog/dependency.h"
2122
#include "catalog/indexing.h"

src/backend/catalog/pg_namespace.c

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

1717
#include "access/heapam.h"
18+
#include "access/htup_details.h"
1819
#include "catalog/dependency.h"
1920
#include "catalog/indexing.h"
2021
#include "catalog/objectaccess.h"

src/backend/catalog/pg_operator.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include "postgres.h"
1919

2020
#include "access/heapam.h"
21+
#include "access/htup_details.h"
2122
#include "access/xact.h"
2223
#include "catalog/dependency.h"
2324
#include "catalog/indexing.h"

src/backend/catalog/pg_proc.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
*/
1515
#include "postgres.h"
1616

17+
#include "access/htup_details.h"
1718
#include "access/xact.h"
1819
#include "catalog/dependency.h"
1920
#include "catalog/indexing.h"

src/backend/catalog/pg_range.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
#include "access/genam.h"
1818
#include "access/heapam.h"
19+
#include "access/htup_details.h"
1920
#include "catalog/dependency.h"
2021
#include "catalog/indexing.h"
2122
#include "catalog/pg_collation.h"

src/backend/catalog/pg_shdepend.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
#include "access/genam.h"
1818
#include "access/heapam.h"
19+
#include "access/htup_details.h"
1920
#include "access/xact.h"
2021
#include "catalog/catalog.h"
2122
#include "catalog/dependency.h"

src/backend/catalog/pg_type.c

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

1717
#include "access/heapam.h"
18+
#include "access/htup_details.h"
1819
#include "access/xact.h"
1920
#include "catalog/dependency.h"
2021
#include "catalog/indexing.h"

src/backend/commands/aggregatecmds.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include "postgres.h"
2424

2525
#include "access/heapam.h"
26+
#include "access/htup_details.h"
2627
#include "catalog/dependency.h"
2728
#include "catalog/indexing.h"
2829
#include "catalog/pg_aggregate.h"

src/backend/commands/alter.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
*/
1515
#include "postgres.h"
1616

17+
#include "access/htup_details.h"
1718
#include "catalog/dependency.h"
1819
#include "catalog/indexing.h"
1920
#include "catalog/namespace.h"

src/backend/commands/collationcmds.c

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

1717
#include "access/heapam.h"
18+
#include "access/htup_details.h"
1819
#include "access/xact.h"
1920
#include "catalog/dependency.h"
2021
#include "catalog/indexing.h"

src/backend/commands/comment.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
#include "access/genam.h"
1818
#include "access/heapam.h"
19+
#include "access/htup_details.h"
1920
#include "catalog/indexing.h"
2021
#include "catalog/objectaddress.h"
2122
#include "catalog/pg_description.h"

src/backend/commands/conversioncmds.c

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

1717
#include "access/heapam.h"
18+
#include "access/htup_details.h"
1819
#include "catalog/dependency.h"
1920
#include "catalog/indexing.h"
2021
#include "catalog/pg_conversion.h"

src/backend/commands/copy.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include <arpa/inet.h>
2222

2323
#include "access/heapam.h"
24+
#include "access/htup_details.h"
2425
#include "access/sysattr.h"
2526
#include "access/xact.h"
2627
#include "catalog/namespace.h"

src/backend/commands/createas.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include "postgres.h"
2323

2424
#include "access/reloptions.h"
25+
#include "access/htup_details.h"
2526
#include "access/sysattr.h"
2627
#include "access/xact.h"
2728
#include "catalog/toasting.h"

src/backend/commands/dbcommands.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
#include "access/genam.h"
2828
#include "access/heapam.h"
29+
#include "access/htup_details.h"
2930
#include "access/xact.h"
3031
#include "access/xlogutils.h"
3132
#include "catalog/catalog.h"

0 commit comments

Comments
 (0)