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

Commit 302b809

Browse files
scrappyscrappy
committed
Changes required so that access/* compiles cleanly...
cleaning up behind myself before *yawn* bed :)
1 parent ff36ebc commit 302b809

19 files changed

+80
-551
lines changed

‎src/backend/access/hash/hash.c

Lines changed: 2 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -7,66 +7,21 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.8 1996/10/31 08:24:37 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.9 1996/11/03 12:34:33 scrappy Exp $
1111
*
1212
* NOTES
1313
* This file contains only the public interface routines.
1414
*
1515
*-------------------------------------------------------------------------
1616
*/
1717

18-
#include <stdio.h>
19-
#include <time.h>
20-
2118
#include "postgres.h"
2219

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-
#include "storage/fd.h"
29-
#include "catalog/pg_am.h"
30-
#include "catalog/pg_class.h"
31-
#include "nodes/nodes.h"
32-
#include "rewrite/prs2lock.h"
33-
#include "access/skey.h"
34-
#include "access/strat.h"
35-
#include "utils/rel.h"
36-
37-
#include "storage/block.h"
38-
#include "storage/off.h"
39-
#include "storage/itemptr.h"
40-
#include "utils/nabstime.h"
41-
#include "access/htup.h"
42-
#include "access/itup.h"
43-
#include "storage/itemid.h"
44-
#include "storage/item.h"
45-
#include "storage/buf.h"
46-
#include "storage/page.h"
47-
#include "storage/bufpage.h"
48-
#include "access/sdir.h"
49-
#include "access/funcindex.h"
50-
#include "utils/tqual.h"
5120
#include "access/relscan.h"
5221
#include "access/hash.h"
53-
54-
#include "nodes/params.h"
55-
#include "storage/ipc.h"
56-
#include "executor/hashjoin.h"
57-
#include "utils/fcache.h"
58-
#include "nodes/primnodes.h"
59-
#include "utils/memutils.h"
60-
#include "lib/fstack.h"
61-
#include "nodes/memnodes.h"
62-
#include "executor/tuptable.h"
22+
6323
#include "nodes/execnodes.h"
6424

65-
#include "nodes/plannodes.h"
66-
#include "nodes/parsenodes.h"
67-
#include "tcop/dest.h"
68-
#include "executor/execdesc.h"
69-
#include "catalog/pg_index.h"
7025
#include "executor/executor.h"
7126

7227
#include "access/heapam.h"
@@ -83,7 +38,6 @@
8338
# include <string.h>
8439
#endif
8540

86-
#include "storage/ipc.h"
8741
#include "storage/bufmgr.h"
8842

8943
#include "miscadmin.h"

‎src/backend/access/hash/hashinsert.c

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashinsert.c,v 1.5 1996/10/31 08:24:38 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashinsert.c,v 1.6 1996/11/03 12:34:35 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -17,39 +17,9 @@
1717

1818
#include "postgres.h"
1919

20-
#include "catalog/pg_attribute.h"
21-
#include "access/attnum.h"
22-
#include "nodes/nodes.h"
23-
#include "nodes/pg_list.h"
24-
#include "access/tupdesc.h"
25-
#include "storage/fd.h"
26-
#include "catalog/pg_am.h"
27-
#include "catalog/pg_class.h"
28-
#include "nodes/nodes.h"
29-
#include "rewrite/prs2lock.h"
30-
#include "access/skey.h"
31-
#include "access/strat.h"
32-
#include "utils/rel.h"
33-
34-
#include "storage/block.h"
35-
#include "storage/off.h"
36-
#include "storage/itemptr.h"
37-
#include "utils/nabstime.h"
38-
#include "access/htup.h"
39-
#include "access/itup.h"
40-
#include "storage/itemid.h"
41-
#include "storage/item.h"
42-
#include "storage/buf.h"
43-
#include "storage/page.h"
44-
#include "storage/bufpage.h"
45-
#include "access/sdir.h"
46-
#include "access/funcindex.h"
47-
#include "utils/tqual.h"
48-
#include "storage/buf.h"
4920
#include "access/relscan.h"
5021
#include "access/hash.h"
5122

52-
#include "storage/ipc.h"
5323
#include "storage/bufmgr.h"
5424

5525
#include "utils/palloc.h"

‎src/backend/access/hash/hashovfl.c

Lines changed: 7 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -7,57 +7,26 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.6 1996/10/31 08:24:39 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.7 1996/11/03 12:34:38 scrappy Exp $
1111
*
1212
* NOTES
1313
* Overflow pages look like ordinary relation pages.
1414
*
1515
*-------------------------------------------------------------------------
1616
*/
17-
18-
#include <stdio.h>
19-
#include <time.h>
20-
#include <string.h>
21-
2217
#include "postgres.h"
2318

24-
#include "catalog/pg_attribute.h"
25-
#include "access/attnum.h"
26-
#include "nodes/nodes.h"
27-
#include "nodes/pg_list.h"
28-
#include "access/tupdesc.h"
29-
#include "storage/fd.h"
30-
#include "catalog/pg_am.h"
31-
#include "catalog/pg_class.h"
32-
#include "nodes/nodes.h"
33-
#include "rewrite/prs2lock.h"
34-
#include "access/skey.h"
35-
#include "access/strat.h"
36-
#include "utils/rel.h"
37-
38-
#include "storage/block.h"
39-
#include "storage/off.h"
40-
#include "storage/itemptr.h"
41-
#include "utils/nabstime.h"
42-
#include "access/htup.h"
43-
#include "access/itup.h"
44-
#include "storage/itemid.h"
45-
#include "storage/item.h"
46-
#include "storage/buf.h"
47-
#include "storage/page.h"
48-
#include "storage/bufpage.h"
49-
#include "access/sdir.h"
50-
#include "access/funcindex.h"
51-
#include "utils/tqual.h"
5219
#include "access/relscan.h"
5320
#include "access/hash.h"
54-
55-
#include "storage/ipc.h"
5621
#include "storage/bufmgr.h"
57-
58-
5922
#include "utils/memutils.h"
6023

24+
#ifndef HAVE_MEMMOVE
25+
# include "regex/utils.h"
26+
#else
27+
# include <string.h>
28+
#endif
29+
6130
static OverflowPageAddress _hash_getovfladdr(Relation rel, Buffer *metabufp);
6231
static uint32 _hash_firstfreebit(uint32 map);
6332

‎src/backend/access/hash/hashpage.c

Lines changed: 7 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.5 1996/10/31 08:24:41 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.6 1996/11/03 12:34:40 scrappy Exp $
1111
*
1212
* NOTES
1313
* Postgres hash pages look like ordinary relation pages. The opaque
@@ -23,58 +23,27 @@
2323
*-------------------------------------------------------------------------
2424
*/
2525

26-
#include <stdio.h>
27-
#include <time.h>
28-
#include <string.h>
29-
3026
#include "postgres.h"
3127

32-
#include "catalog/pg_attribute.h"
33-
#include "access/attnum.h"
34-
#include "nodes/nodes.h"
35-
#include "nodes/pg_list.h"
36-
#include "access/tupdesc.h"
37-
#include "storage/fd.h"
38-
#include "catalog/pg_am.h"
39-
#include "catalog/pg_class.h"
40-
#include "nodes/nodes.h"
41-
#include "rewrite/prs2lock.h"
42-
#include "access/skey.h"
43-
#include "access/strat.h"
44-
#include "utils/rel.h"
45-
46-
#include "storage/block.h"
47-
#include "storage/off.h"
48-
#include "storage/itemptr.h"
49-
#include "utils/nabstime.h"
50-
#include "access/htup.h"
51-
#include "access/itup.h"
52-
#include "storage/itemid.h"
53-
#include "storage/item.h"
54-
#include "storage/buf.h"
55-
#include "storage/page.h"
56-
#include "storage/bufpage.h"
57-
#include "access/sdir.h"
58-
#include "access/funcindex.h"
59-
#include "utils/tqual.h"
6028
#include "access/relscan.h"
6129
#include "access/hash.h"
6230

63-
#include "storage/ipc.h"
6431
#include "storage/bufmgr.h"
6532

6633
#include "miscadmin.h"
6734

6835
#include "utils/memutils.h"
6936

70-
#include "storage/spin.h"
71-
#include "utils/hsearch.h"
72-
#include "storage/shmem.h"
73-
#include "storage/lock.h"
7437
#include "storage/lmgr.h"
7538

7639
#include "access/genam.h"
7740

41+
#ifndef HAVE_MEMMOVE
42+
# include "regex/utils.h"
43+
#else
44+
# include <string.h>
45+
#endif
46+
7847
static void _hash_setpagelock(Relation rel, BlockNumber blkno, int access);
7948
static void _hash_unsetpagelock(Relation rel, BlockNumber blkno, int access);
8049
static void _hash_splitpage(Relation rel, Buffer metabuf, Bucket obucket, Bucket nbucket);

‎src/backend/access/hash/hashscan.c

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashscan.c,v 1.5 1996/10/31 08:24:42 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashscan.c,v 1.6 1996/11/03 12:34:41 scrappy Exp $
1111
*
1212
* NOTES
1313
* Because we can be doing an index scan on a relation while we
@@ -27,41 +27,10 @@
2727
*-------------------------------------------------------------------------
2828
*/
2929

30-
#include <time.h>
31-
3230
#include "postgres.h"
3331

34-
#include "catalog/pg_attribute.h"
35-
#include "access/attnum.h"
36-
#include "nodes/nodes.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"
46-
#include "utils/rel.h"
47-
48-
#include "storage/block.h"
49-
#include "storage/off.h"
50-
#include "storage/itemptr.h"
51-
#include "utils/nabstime.h"
52-
#include "access/htup.h"
53-
#include "access/itup.h"
54-
#include "storage/itemid.h"
55-
#include "storage/item.h"
56-
#include "storage/buf.h"
57-
#include "storage/page.h"
58-
#include "storage/bufpage.h"
59-
#include "access/sdir.h"
60-
#include "access/funcindex.h"
61-
#include "utils/tqual.h"
6232
#include "access/relscan.h"
6333
#include "access/hash.h"
64-
6534
#include "utils/palloc.h"
6635

6736
static void _hash_scandel(IndexScanDesc scan, BlockNumber blkno, OffsetNumber offno);

‎src/backend/access/hash/hashsearch.c

Lines changed: 2 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -7,58 +7,24 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.5 1996/10/31 08:24:43 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.6 1996/11/03 12:34:42 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414

15-
#include <stdio.h>
16-
#include <time.h>
17-
1815
#include "postgres.h"
1916

20-
#include "catalog/pg_attribute.h"
21-
#include "access/attnum.h"
22-
#include "nodes/nodes.h"
23-
#include "nodes/pg_list.h"
24-
#include "access/tupdesc.h"
25-
#include "storage/fd.h"
26-
#include "catalog/pg_am.h"
27-
#include "catalog/pg_class.h"
28-
#include "nodes/nodes.h"
29-
#include "rewrite/prs2lock.h"
30-
#include "access/skey.h"
31-
#include "access/strat.h"
32-
#include "utils/rel.h"
33-
34-
#include "storage/block.h"
35-
#include "storage/off.h"
36-
#include "storage/itemptr.h"
37-
#include "utils/nabstime.h"
38-
#include "access/htup.h"
39-
#include "access/itup.h"
40-
#include "storage/itemid.h"
41-
#include "storage/item.h"
42-
#include "storage/buf.h"
43-
#include "storage/page.h"
44-
#include "storage/bufpage.h"
45-
#include "access/sdir.h"
46-
#include "access/funcindex.h"
47-
#include "utils/tqual.h"
4817
#include "access/relscan.h"
4918
#include "access/hash.h"
50-
5119
#include "utils/palloc.h"
20+
#include "storage/bufmgr.h"
5221

5322
#ifndef HAVE_MEMMOVE
5423
# include "regex/utils.h"
5524
#else
5625
# include <string.h>
5726
#endif
5827

59-
#include "storage/ipc.h"
60-
#include "storage/bufmgr.h"
61-
6228
/*
6329
* _hash_search() -- Finds the page/bucket that the contains the
6430
* scankey and loads it into *bufP. the buffer has a read lock.

0 commit comments

Comments
 (0)