Skip to content

Commit e77f64a

Browse files
committed
There...that pretty much cleans up redundant/unused #includes in
access/common...how many more directories to go? :)
1 parent f4ba64a commit e77f64a

File tree

7 files changed

+14
-109
lines changed

7 files changed

+14
-109
lines changed

src/backend/access/common/heaptuple.c

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.5 1996/10/18 19:01:16 scrappy Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.6 1996/10/19 04:51:32 scrappy Exp $
1212
*
1313
* NOTES
1414
* The old interface functions have been converted to macros
@@ -19,30 +19,9 @@
1919

2020
#include "postgres.h"
2121

22-
#include "catalog/pg_attribute.h"
23-
#include "access/attnum.h"
24-
#include "nodes/nodes.h" /* required for nodes/pg_list.h */
25-
#include "nodes/pg_list.h"
26-
#include "access/tupdesc.h"
27-
28-
#include "storage/block.h" /* required for storage/itemptr.h */
29-
#include "storage/off.h" /* required for storage/itemptr.h */
30-
#include "storage/itemptr.h"
31-
#include "utils/nabstime.h"
3222
#include "access/htup.h"
33-
3423
#include "storage/buf.h"
35-
36-
#include "storage/itemid.h"
37-
#include "storage/item.h"
3824
#include "storage/bufpage.h"
39-
40-
#include "storage/fd.h"
41-
#include "catalog/pg_am.h"
42-
#include "catalog/pg_class.h"
43-
#include "rewrite/prs2lock.h"
44-
#include "access/skey.h" /* required for access/strat.h */
45-
#include "access/strat.h"
4625
#include "utils/rel.h"
4726

4827
/* this is so the sparcstation debugger works */

src/backend/access/common/heapvalid.c

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,41 +7,19 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/common/Attic/heapvalid.c,v 1.2 1996/10/19 03:12:50 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/common/Attic/heapvalid.c,v 1.3 1996/10/19 04:51:34 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414

1515
#include "postgres.h"
1616

17-
#include "storage/block.h"
18-
#include "storage/off.h"
19-
#include "storage/itemptr.h"
20-
#include "utils/nabstime.h"
2117
#include "access/htup.h"
22-
23-
#include "catalog/pg_attribute.h"
24-
#include "access/attnum.h"
25-
#include "nodes/nodes.h"
26-
#include "nodes/pg_list.h"
27-
#include "access/tupdesc.h"
28-
2918
#include "access/skey.h"
30-
3119
#include "storage/buf.h"
32-
3320
#include "storage/itemid.h"
34-
35-
#include "storage/fd.h"
36-
#include "catalog/pg_am.h"
37-
#include "catalog/pg_class.h"
38-
#include "rewrite/prs2lock.h"
39-
#include "access/strat.h"
4021
#include "utils/rel.h"
41-
42-
#include "storage/item.h"
4322
#include "storage/bufpage.h"
44-
4523
#include "utils/tqual.h"
4624

4725
/* ----------------

src/backend/access/common/indextuple.c

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,14 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.2 1996/10/19 03:28:20 scrappy Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.3 1996/10/19 04:51:36 scrappy Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
1515

1616
#include "postgres.h"
1717

18-
#include "storage/block.h"
19-
#include "storage/off.h"
20-
#include "storage/itemptr.h"
21-
#include "nodes/nodes.h"
22-
#include "access/attnum.h"
23-
#include "nodes/pg_list.h"
24-
#include "catalog/pg_attribute.h"
25-
#include "access/tupdesc.h"
2618
#include "access/itup.h"
27-
28-
#include "utils/memutils.h"
2919
#include "access/ibit.h"
3020

3121
static Size IndexInfoFindDataOffset(unsigned short t_info);

src/backend/access/common/indexvalid.c

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,15 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.2 1996/10/19 03:39:04 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.3 1996/10/19 04:51:39 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414

1515
#include "postgres.h"
1616

17-
#include "storage/block.h"
18-
#include "storage/off.h"
19-
#include "storage/itemptr.h"
20-
#include "nodes/nodes.h"
21-
#include "catalog/pg_attribute.h"
22-
#include "access/attnum.h"
23-
#include "nodes/pg_list.h"
24-
#include "access/tupdesc.h"
2517
#include "access/itup.h"
26-
2718
#include "access/skey.h"
28-
29-
#include "storage/block.h"
30-
#include "storage/off.h"
31-
#include "utils/nabstime.h"
32-
#include "storage/itemptr.h"
3319
#include "access/htup.h"
3420

3521
/* ----------------------------------------------------------------

src/backend/access/common/printtup.c

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,18 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.2 1996/10/18 04:54:47 scrappy Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.3 1996/10/19 04:51:40 scrappy Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
15-
#include <sys/file.h>
16-
#include <stdio.h>
17-
#include <string.h>
1815

1916
#include "postgres.h"
2017

21-
#include "access/heapam.h"
2218
#include "access/htup.h"
23-
#include "access/skey.h"
24-
#include "access/printtup.h"
25-
#include "access/tupdesc.h"
26-
#include "storage/buf.h"
27-
#include "utils/memutils.h"
28-
#include "utils/palloc.h"
29-
#include "fmgr.h"
30-
#include "utils/elog.h"
31-
3219
#include "utils/syscache.h"
3320
#include "catalog/pg_type.h"
21+
#include "storage/buf.h"
3422

35-
#include "libpq/libpq.h"
3623

3724
/* ----------------------------------------------------------------
3825
* printtup / debugtup support

src/backend/access/common/scankey.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,15 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/common/scankey.c,v 1.1.1.1 1996/07/09 06:21:10 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/common/scankey.c,v 1.2 1996/10/19 04:51:42 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
14-
#include "c.h"
15-
#include "access/sdir.h"
16-
#include "access/attnum.h"
14+
15+
#include "postgres.h"
16+
1717
#include "access/skey.h"
1818

19-
#include "fmgr.h"
2019

2120
/*
2221
* ScanKeyEntryIsLegal --

src/backend/access/common/tupdesc.c

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,37 +7,23 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.1.1.1 1996/07/09 06:21:10 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.2 1996/10/19 04:51:44 scrappy Exp $
1111
*
1212
* NOTES
1313
* some of the executor utility code such as "ExecTypeFromTL" should be
1414
* moved here.
1515
*
1616
*-------------------------------------------------------------------------
1717
*/
18-
#include <stdio.h> /* for sprintf() */
19-
#include <ctype.h>
20-
#include <string.h>
2118

2219
#include "postgres.h"
2320

24-
#include "nodes/pg_list.h"
25-
#include "nodes/parsenodes.h"
26-
27-
#include "access/attnum.h"
28-
#include "access/htup.h"
2921
#include "access/tupdesc.h"
30-
31-
#include "utils/builtins.h"
32-
#include "utils/elog.h" /* XXX generate exceptions instead */
33-
#include "utils/palloc.h"
34-
35-
#include "utils/syscache.h"
22+
#include "access/htup.h"
3623
#include "catalog/pg_type.h"
37-
38-
#include "nodes/primnodes.h"
39-
24+
#include "utils/syscache.h"
4025
#include "parser/catalog_utils.h"
26+
#include "nodes/parsenodes.h"
4127

4228
/* ----------------------------------------------------------------
4329
* CreateTemplateTupleDesc

0 commit comments

Comments
 (0)