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

Commit 5a0b450

Browse files
scrappyscrappy
committed
First pass at fixing my own mistakes
Mainly...fix up the includes I removed, as well as prototypes Pointed out by D'Arcy
1 parent dd007d4 commit 5a0b450

22 files changed

+583
-19
lines changed

‎src/backend/access/common/heaptuple.c

Lines changed: 22 additions & 1 deletion
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.6 1996/10/19 04:51:32 scrappy Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.7 1996/10/20 08:31:26 scrappy Exp $
1212
*
1313
* NOTES
1414
* The old interface functions have been converted to macros
@@ -19,9 +19,30 @@
1919

2020
#include "postgres.h"
2121

22+
#include "storage/block.h"
23+
#include "storage/off.h"
24+
#include "storage/itemptr.h"
25+
#include <time.h>
26+
#include "utils/nabstime.h"
2227
#include "access/htup.h"
28+
2329
#include "storage/buf.h"
30+
31+
#include "storage/itemid.h"
32+
#include "storage/item.h"
2433
#include "storage/bufpage.h"
34+
35+
#include "catalog/pg_attribute.h"
36+
#include "access/attnum.h"
37+
#include "nodes/pg_list.h"
38+
#include "access/tupdesc.h"
39+
#include "storage/fd.h"
40+
#include "catalog/pg_am.h"
41+
#include "catalog/pg_class.h"
42+
#include "nodes/nodes.h"
43+
#include "rewrite/prs2lock.h"
44+
#include "access/skey.h"
45+
#include "access/strat.h"
2546
#include "utils/rel.h"
2647

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

‎src/backend/access/common/heapvalid.c

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,42 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/common/Attic/heapvalid.c,v 1.3 1996/10/19 04:51:34 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/common/Attic/heapvalid.c,v 1.4 1996/10/20 08:31:28 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 <time.h>
21+
#include "utils/nabstime.h"
1722
#include "access/htup.h"
23+
24+
#include "access/attnum.h"
1825
#include "access/skey.h"
26+
1927
#include "storage/buf.h"
28+
2029
#include "storage/itemid.h"
30+
31+
#include "catalog/pg_attribute.h"
32+
#include "access/attnum.h"
33+
#include "nodes/pg_list.h"
34+
#include "access/tupdesc.h"
35+
#include "storage/fd.h"
36+
#include "catalog/pg_am.h"
37+
#include "catalog/pg_class.h"
38+
#include "nodes/nodes.h"
39+
#include "rewrite/prs2lock.h"
40+
#include "access/strat.h"
2141
#include "utils/rel.h"
42+
43+
#include "storage/item.h"
2244
#include "storage/bufpage.h"
45+
2346
#include "utils/tqual.h"
2447

2548
/* ----------------

‎src/backend/access/common/indextuple.c

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,27 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.3 1996/10/19 04:51:36 scrappy Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.4 1996/10/20 08:31:29 scrappy Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
1515

1616
#include "postgres.h"
1717

18+
#include "storage/block.h"
19+
#include "storage/off.h"
20+
#include "catalog/pg_attribute.h"
21+
#include "access/attnum.h"
22+
#include "nodes/pg_list.h"
23+
#include "storage/itemptr.h"
24+
#include "access/tupdesc.h"
1825
#include "access/itup.h"
26+
27+
#include "utils/memutils.h"
1928
#include "access/ibit.h"
2029

30+
#include "access/tupmacs.h"
31+
2132
static Size IndexInfoFindDataOffset(unsigned short t_info);
2233

2334
/* ----------------------------------------------------------------

‎src/backend/access/common/indexvalid.c

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,26 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.3 1996/10/19 04:51:39 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.4 1996/10/20 08:31:31 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 "catalog/pg_attribute.h"
21+
#include "access/attnum.h"
22+
#include "nodes/pg_list.h"
23+
#include "access/tupdesc.h"
1724
#include "access/itup.h"
25+
1826
#include "access/skey.h"
27+
28+
#include <time.h>
29+
#include "utils/nabstime.h"
1930
#include "access/htup.h"
2031

2132
/* ----------------------------------------------------------------

‎src/backend/access/common/printtup.c

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,40 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.3 1996/10/19 04:51:40 scrappy Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.4 1996/10/20 08:31:32 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 <time.h>
22+
#include "utils/nabstime.h"
1823
#include "access/htup.h"
24+
25+
#include "access/attnum.h"
1926
#include "utils/syscache.h"
27+
28+
#include "catalog/pg_attribute.h"
29+
#include "nodes/pg_list.h"
30+
#include "access/tupdesc.h"
31+
#include "storage/fd.h"
32+
#include "catalog/pg_am.h"
33+
#include "catalog/pg_class.h"
34+
#include "nodes/nodes.h"
35+
#include "rewrite/prs2lock.h"
36+
#include "access/skey.h"
37+
#include "access/strat.h"
38+
#include "utils/rel.h"
2039
#include "catalog/pg_type.h"
40+
2141
#include "storage/buf.h"
2242

43+
#include "access/heaptuple.h" /* Prototypes */
44+
#include "fmgr.h" /* Prototypes */
2345

2446
/* ----------------------------------------------------------------
2547
* printtup / debugtup support

‎src/backend/access/common/scankey.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/common/scankey.c,v 1.2 1996/10/19 04:51:42 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/common/scankey.c,v 1.3 1996/10/20 08:31:34 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414

1515
#include "postgres.h"
1616

17+
#include "access/attnum.h"
1718
#include "access/skey.h"
1819

19-
2020
/*
2121
* ScanKeyEntryIsLegal --
2222
* True iff the scan key entry is legal.

‎src/backend/access/common/tupdesc.c

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.2 1996/10/19 04:51:44 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.3 1996/10/20 08:31:35 scrappy Exp $
1111
*
1212
* NOTES
1313
* some of the executor utility code such as "ExecTypeFromTL" should be
@@ -18,13 +18,38 @@
1818

1919
#include "postgres.h"
2020

21+
#include "catalog/pg_attribute.h"
22+
#include "access/attnum.h"
23+
#include "nodes/pg_list.h"
2124
#include "access/tupdesc.h"
25+
26+
#include "storage/block.h"
27+
#include "storage/off.h"
28+
#include "storage/itemptr.h"
29+
#include <time.h>
30+
#include "utils/nabstime.h"
2231
#include "access/htup.h"
32+
33+
#include "storage/fd.h"
34+
#include "catalog/pg_am.h"
35+
#include "catalog/pg_class.h"
36+
#include "nodes/nodes.h"
37+
#include "rewrite/prs2lock.h"
38+
#include "access/skey.h"
39+
#include "access/strat.h"
40+
#include "utils/rel.h"
2341
#include "catalog/pg_type.h"
42+
2443
#include "utils/syscache.h"
44+
2545
#include "parser/catalog_utils.h"
46+
47+
#include "nodes/primnodes.h"
48+
#include "utils/tqual.h"
2649
#include "nodes/parsenodes.h"
2750

51+
#include "utils/palloc.h"
52+
2853
/* ----------------------------------------------------------------
2954
* CreateTemplateTupleDesc
3055
*

‎src/backend/access/gist/gist.c

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,63 @@
1313

1414
#include "postgres.h"
1515

16+
17+
#include "catalog/pg_attribute.h"
18+
#include "access/attnum.h"
19+
#include "nodes/pg_list.h"
20+
#include "access/tupdesc.h"
21+
#include "storage/fd.h"
22+
#include "catalog/pg_am.h"
23+
#include "catalog/pg_class.h"
24+
#include "nodes/nodes.h"
25+
#include "rewrite/prs2lock.h"
26+
#include "access/skey.h"
27+
#include "access/strat.h"
1628
#include "utils/rel.h"
29+
30+
#include "storage/block.h"
31+
#include "storage/off.h"
32+
#include "storage/itemptr.h"
1733
#include "access/itup.h"
34+
35+
#include "storage/itemid.h"
36+
#include "storage/item.h"
37+
#include "storage/buf.h"
38+
#include "storage/bufpage.h"
1839
#include "access/gist.h"
40+
1941
#include "access/funcindex.h"
42+
43+
#include <time.h>
44+
#include "utils/nabstime.h"
2045
#include "access/htup.h"
46+
2147
#include "executor/tuptable.h"
48+
49+
#include "utils/tqual.h"
2250
#include "access/relscan.h"
51+
52+
#include "nodes/params.h"
53+
#include "access/sdir.h"
54+
#include "executor/hashjoin.h"
55+
#include "nodes/primnodes.h"
56+
#include "nodes/memnodes.h"
2357
#include "nodes/execnodes.h"
58+
2459
#include "storage/bufmgr.h"
60+
2561
#include "catalog/pg_index.h"
62+
2663
#include "utils/syscache.h"
2764

65+
#include "nodes/plannodes.h"
66+
#include "nodes/parsenodes.h"
67+
#include "tcop/dest.h"
68+
#include "executor/execdesc.h"
69+
#include <stdio.h>
70+
#include "executor/executor.h"
71+
72+
#include "access/heapam.h"
2873

2974
/* non-export function prototypes */
3075
static InsertIndexResult gistdoinsert(Relation r, IndexTuple itup,

‎src/backend/access/gist/gistget.c

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,38 @@
1313

1414
#include "postgres.h"
1515

16+
#include "catalog/pg_attribute.h"
17+
#include "access/attnum.h"
18+
#include "nodes/pg_list.h"
19+
#include "access/tupdesc.h"
20+
#include "storage/fd.h"
21+
#include "catalog/pg_am.h"
22+
#include "catalog/pg_class.h"
23+
#include "nodes/nodes.h"
24+
#include "rewrite/prs2lock.h"
25+
#include "access/skey.h"
26+
#include "access/strat.h"
1627
#include "utils/rel.h"
28+
29+
#include "storage/block.h"
30+
#include "storage/off.h"
31+
#include "storage/itemptr.h"
32+
#include <time.h>
33+
#include "utils/nabstime.h"
1734
#include "access/htup.h"
35+
36+
#include "utils/tqual.h"
37+
#include "storage/buf.h"
1838
#include "access/relscan.h"
39+
40+
#include "storage/itemid.h"
41+
#include "storage/item.h"
1942
#include "storage/bufpage.h"
43+
2044
#include "access/sdir.h"
45+
2146
#include "access/itup.h"
47+
2248
#include "access/gist.h"
2349

2450
static OffsetNumber gistfindnext(IndexScanDesc s, Page p, OffsetNumber n,

‎src/backend/access/gist/gistscan.c

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,40 @@
1212

1313
#include "postgres.h"
1414

15+
#include "catalog/pg_attribute.h"
16+
#include "access/attnum.h"
17+
#include "nodes/pg_list.h"
18+
#include "access/tupdesc.h"
19+
#include "storage/fd.h"
20+
#include "catalog/pg_am.h"
21+
#include "catalog/pg_class.h"
22+
#include "nodes/nodes.h"
23+
#include "rewrite/prs2lock.h"
24+
#include "access/skey.h"
25+
#include "access/strat.h"
1526
#include "utils/rel.h"
27+
28+
#include "storage/block.h"
29+
#include "storage/off.h"
30+
#include "storage/itemptr.h"
31+
#include <time.h>
32+
#include "utils/nabstime.h"
1633
#include "access/htup.h"
34+
35+
#include "utils/tqual.h"
36+
#include "storage/buf.h"
1737
#include "access/relscan.h"
38+
39+
#include "storage/itemid.h"
40+
#include "storage/item.h"
41+
#include "storage/bufpage.h"
1842
#include "access/gist.h"
1943

44+
#include "access/itup.h"
45+
#include "access/funcindex.h"
46+
#include "access/sdir.h"
47+
#include "access/genam.h"
48+
2049
/* routines defined and used here */
2150
static void gistregscan(IndexScanDesc s);
2251
static void gistdropscan(IndexScanDesc s);

0 commit comments

Comments
 (0)