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

Commit4312192

Browse files
committed
another directory cleaned of extraneous #includes
makefile fixed for fmgr.h
1 parent0cf60fb commit4312192

File tree

9 files changed

+51
-83
lines changed

9 files changed

+51
-83
lines changed

‎src/backend/access/hash/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@
44
# Makefile for access/hash
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/access/hash/Makefile,v 1.2 1996/10/31 08:24:36 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/access/hash/Makefile,v 1.3 1996/11/05 09:40:16 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

1111
SRCDIR = ../../..
1212
include ../../../Makefile.global
1313

14-
INCLUDE_OPT = -I../../port/$(PORTNAME)\
14+
INCLUDE_OPT = -I../..\
15+
-I../../port/$(PORTNAME)\
1516
-I../../../include
1617

1718
CFLAGS+=$(INCLUDE_OPT)

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

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,41 +7,30 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.9 1996/11/03 12:34:33 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.10 1996/11/05 09:40:17 scrappy Exp $
1111
*
1212
* NOTES
1313
* This file contains only the public interface routines.
1414
*
1515
*-------------------------------------------------------------------------
1616
*/
1717

18-
#include"postgres.h"
18+
#include<postgres.h>
1919

20-
#include"access/relscan.h"
21-
#include"access/hash.h"
22-
23-
#include"nodes/execnodes.h"
24-
25-
#include"executor/executor.h"
26-
27-
#include"access/heapam.h"
28-
29-
#include"access/genam.h"
30-
31-
#include"utils/palloc.h"
32-
33-
#include"catalog/index.h"
20+
#include<access/hash.h>
21+
#include<executor/executor.h>
22+
#include<access/heapam.h>
23+
#include<access/genam.h>
24+
#include<catalog/index.h>
25+
#include<storage/bufmgr.h>
26+
#include<miscadmin.h>
3427

3528
#ifndefHAVE_MEMMOVE
36-
# include"regex/utils.h"
29+
# include<regex/utils.h>
3730
#else
3831
# include<string.h>
3932
#endif
4033

41-
#include"storage/bufmgr.h"
42-
43-
#include"miscadmin.h"
44-
4534
boolBuildingHash= false;
4635

4736
/*

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

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,16 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashinsert.c,v 1.6 1996/11/03 12:34:35 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashinsert.c,v 1.7 1996/11/05 09:40:18 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414

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

20-
#include"access/relscan.h"
21-
#include"access/hash.h"
22-
23-
#include"storage/bufmgr.h"
24-
25-
#include"utils/palloc.h"
26-
27-
#include"utils/memutils.h"
17+
#include<access/hash.h>
18+
#include<storage/bufmgr.h>
19+
#include<utils/memutils.h>
2820

2921
staticInsertIndexResult_hash_insertonpg(Relationrel,Bufferbuf,intkeysz,ScanKeyscankey,HashItemhitem,Buffermetabuf);
3022
staticOffsetNumber_hash_pgaddtup(Relationrel,Bufferbuf,intkeysz,ScanKeyitup_scankey,Sizeitemsize,HashItemhitem);

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,21 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.7 1996/11/03 12:34:38 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.8 1996/11/05 09:40:20 scrappy Exp $
1111
*
1212
* NOTES
1313
* Overflow pages look like ordinary relation pages.
1414
*
1515
*-------------------------------------------------------------------------
1616
*/
17-
#include"postgres.h"
17+
#include<postgres.h>
1818

19-
#include"access/relscan.h"
20-
#include"access/hash.h"
21-
#include"storage/bufmgr.h"
22-
#include"utils/memutils.h"
19+
#include<access/hash.h>
20+
#include<storage/bufmgr.h>
21+
#include<utils/memutils.h>
2322

2423
#ifndefHAVE_MEMMOVE
25-
# include"regex/utils.h"
24+
# include<regex/utils.h>
2625
#else
2726
# include<string.h>
2827
#endif

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

Lines changed: 9 additions & 15 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.6 1996/11/03 12:34:40 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.7 1996/11/05 09:40:21 scrappy Exp $
1111
*
1212
* NOTES
1313
* Postgres hash pages look like ordinary relation pages. The opaque
@@ -23,23 +23,17 @@
2323
*-------------------------------------------------------------------------
2424
*/
2525

26-
#include"postgres.h"
26+
#include<postgres.h>
2727

28-
#include"access/relscan.h"
29-
#include"access/hash.h"
30-
31-
#include"storage/bufmgr.h"
32-
33-
#include"miscadmin.h"
34-
35-
#include"utils/memutils.h"
36-
37-
#include"storage/lmgr.h"
38-
39-
#include"access/genam.h"
28+
#include<access/hash.h>
29+
#include<storage/bufmgr.h>
30+
#include<miscadmin.h>
31+
#include<utils/memutils.h>
32+
#include<storage/lmgr.h>
33+
#include<access/genam.h>
4034

4135
#ifndefHAVE_MEMMOVE
42-
# include"regex/utils.h"
36+
# include<regex/utils.h>
4337
#else
4438
# include<string.h>
4539
#endif

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

Lines changed: 3 additions & 5 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.6 1996/11/03 12:34:41 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashscan.c,v 1.7 1996/11/05 09:40:22 scrappy Exp $
1111
*
1212
* NOTES
1313
* Because we can be doing an index scan on a relation while we
@@ -27,11 +27,9 @@
2727
*-------------------------------------------------------------------------
2828
*/
2929

30-
#include"postgres.h"
30+
#include<postgres.h>
3131

32-
#include"access/relscan.h"
33-
#include"access/hash.h"
34-
#include"utils/palloc.h"
32+
#include<access/hash.h>
3533

3634
staticvoid_hash_scandel(IndexScanDescscan,BlockNumberblkno,OffsetNumberoffno);
3735
staticbool_hash_scantouched(IndexScanDescscan,BlockNumberblkno,OffsetNumberoffno);

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,15 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.6 1996/11/03 12:34:42 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.7 1996/11/05 09:40:23 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414

15-
#include"postgres.h"
15+
#include<postgres.h>
1616

17-
#include"access/relscan.h"
18-
#include"access/hash.h"
19-
#include"utils/palloc.h"
20-
#include"storage/bufmgr.h"
17+
#include<access/hash.h>
18+
#include<storage/bufmgr.h>
2119

2220
#ifndefHAVE_MEMMOVE
2321
# include"regex/utils.h"

‎src/backend/access/hash/hashstrat.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/hash/Attic/hashstrat.c,v 1.6 1996/11/03 12:34:44 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/hash/Attic/hashstrat.c,v 1.7 1996/11/05 09:40:24 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414

15-
#include"postgres.h"
15+
#include<postgres.h>
1616

17-
#include"access/relscan.h"
18-
#include"access/hash.h"
19-
#include"access/istrat.h"
17+
#include<access/hash.h>
18+
#include<access/istrat.h>
2019

2120
/*
2221
* only one valid strategy for hash tables: equality.

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

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,20 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.6 1996/11/03 12:34:45 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.7 1996/11/05 09:40:25 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414

15-
#include"postgres.h"
15+
#include<postgres.h>
1616

17-
#include"access/relscan.h"
18-
#include"access/hash.h"
19-
#include"utils/palloc.h"
20-
#include"fmgr.h"
21-
#include"utils/memutils.h"
22-
#include"access/iqual.h"
17+
#include<access/hash.h>
18+
#include<fmgr.h>
19+
#include<utils/memutils.h>
20+
#include<access/iqual.h>
2321

2422
#ifndefHAVE_MEMMOVE
25-
# include"regex/utils.h"
23+
# include<regex/utils.h>
2624
#else
2725
# include<string.h>
2826
#endif

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp