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

Commitff36ebc

Browse files
committed
More cleans of the inter-dependencies in the #include files
1 parent71cd646 commitff36ebc

File tree

17 files changed

+47
-110
lines changed

17 files changed

+47
-110
lines changed

‎src/include/access/genam.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,15 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: genam.h,v 1.2 1996/10/31 09:46:37 scrappy Exp $
9+
* $Id: genam.h,v 1.3 1996/11/03 12:12:22 scrappy Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
1313
#ifndefGENAM_H
1414
#defineGENAM_H
1515

16-
17-
#include"access/attnum.h"
18-
#include"access/htup.h"
19-
#include"access/istrat.h"
2016
#include"access/itup.h"
2117
#include"access/relscan.h"
22-
#include"access/skey.h"
2318
#include"access/sdir.h"
2419
#include"access/funcindex.h"
2520

‎src/include/access/gist.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@
1212
#ifndefGIST_H
1313
#defineGIST_H
1414

15-
#include"utils/rel.h"
1615
#include"storage/off.h"
16+
#include"utils/rel.h"
1717
#include"storage/block.h"
18-
#include"storage/bufpage.h"
19-
#include"access/skey.h"
18+
#include"storage/page.h"
2019

2120
/*
2221
** You can have as many strategies as you please in GiSTs, as

‎src/include/access/gistscan.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
*/
1212
#ifndefGISTSCAN_H
1313

14+
#include"utils/rel.h"
15+
#include"storage/block.h"
16+
#include"storage/off.h"
17+
1418
voidgistadjscans(Relationr,intop,BlockNumberblkno,OffsetNumberoffnum);
1519

1620
#endif/* GISTSCAN_H */

‎src/include/catalog/index.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: index.h,v 1.1 1996/08/28 01:56:27 scrappy Exp $
9+
* $Id: index.h,v 1.2 1996/11/03 12:12:28 scrappy Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
1313
#ifndefINDEX_H
1414
#defineINDEX_H
1515

16-
#include"access/funcindex.h"
17-
#include"access/itup.h"
1816
#include"nodes/execnodes.h"
17+
#include"access/htup.h"
18+
#include"access/itup.h"
1919
#include"nodes/parsenodes.h"
20-
20+
#include"storage/buf.h"
2121

2222
externForm_pg_am
2323
AccessMethodObjectIdGetAccessMethodTupleForm(OidaccessMethodObjectId);

‎src/include/catalog/pg_proc.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: pg_proc.h,v 1.2 1996/10/31 09:47:52 scrappy Exp $
9+
* $Id: pg_proc.h,v 1.3 1996/11/03 12:12:32 scrappy Exp $
1010
*
1111
* NOTES
1212
* The script catalog/genbki.sh reads this file and generates .bki
@@ -754,9 +754,6 @@ DATA(insert OID = 1239 ( texticregexne PGUID 11 f t f 2 f 16 "25 25" 100
754754
DATA(insertOID=1240 (nameicregexeqPGUID11ftf2f16"19 25"10000100foobar ));
755755
DATA(insertOID=1241 (nameicregexnePGUID11ftf2f16"19 25"10000100foobar ));
756756

757-
758-
#include"nodes/pg_list.h"
759-
760757
/*
761758
* prototypes for functions pg_proc.c
762759
*/

‎src/include/executor/executor.h

Lines changed: 10 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: executor.h,v 1.2 1996/10/31 09:48:30 scrappy Exp $
9+
* $Id: executor.h,v 1.3 1996/11/03 12:12:39 scrappy Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -17,57 +17,22 @@
1717
* #includes
1818
* ----------------------------------------------------------------
1919
*/
20-
#include<stdio.h>
21-
#include<string.h>
22-
23-
#include"nodes/pg_list.h"
2420

25-
/* ----------------
26-
* executor debugging definitions are kept in a separate file
27-
* so people can customize what debugging they want to see and not
28-
* have this information clobbered every time a new version of
29-
* executor.h is checked in -cim 10/26/89
30-
* ----------------
31-
*/
32-
#include"executor/execdebug.h"
21+
#include<stdio.h>
3322

34-
#include"access/heapam.h"
35-
#include"access/htup.h"
36-
#include"access/istrat.h"
3723
#include"access/itup.h"
24+
#include"access/relscan.h"
3825
#include"access/skey.h"
39-
#include"utils/tqual.h"
40-
#include"catalog/catname.h"
41-
#include"utils/syscache.h"
42-
#include"executor/execdefs.h"
43-
#include"executor/tuptable.h"
44-
45-
#include"nodes/parsenodes.h"
46-
47-
#include"storage/buf.h"
48-
#include"miscadmin.h"
49-
#include"fmgr.h"
50-
#include"utils/elog.h"
51-
#include"utils/mcxt.h"
52-
#include"utils/memutils.h"
53-
#include"utils/rel.h"
54-
26+
#include"access/sdir.h"
5527
#include"catalog/pg_index.h"
56-
#include"catalog/pg_proc.h"
57-
#include"catalog/pg_type.h"
58-
#include"catalog/pg_aggregate.h"
59-
60-
#include"access/printtup.h"
61-
#include"nodes/primnodes.h"
62-
#include"nodes/plannodes.h"
63-
#include"nodes/execnodes.h"
64-
65-
#include"tcop/dest.h"
66-
#include"storage/smgr.h"
67-
68-
#include"access/genam.h"
6928
#include"executor/execdesc.h"
7029

30+
#ifndefHAVE_MEMMOVE
31+
# include"regex/utils.h"
32+
#else
33+
# include<string.h>
34+
#endif
35+
7136
/*
7237
* prototypes from functions in execAmi.c
7338
*/

‎src/include/executor/tuptable.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: tuptable.h,v 1.2 1996/10/23 07:41:36 scrappy Exp $
9+
* $Id: tuptable.h,v 1.3 1996/11/03 12:12:42 scrappy Exp $
1010
*
1111
* NOTES
1212
* The tuple table interface is getting pretty ugly.
@@ -18,7 +18,7 @@
1818
#defineTUPTABLE_H
1919

2020
#include"access/htup.h"
21-
#include"access/relscan.h"
21+
#include"storage/buf.h"
2222

2323
/* ----------------
2424
*Note: the executor tuple table is managed and manipulated by special

‎src/include/nodes/execnodes.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,21 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: execnodes.h,v 1.4 1996/10/23 07:41:56 scrappy Exp $
9+
* $Id: execnodes.h,v 1.5 1996/11/03 12:12:50 scrappy Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
1313
#ifndefEXECNODES_H
1414
#defineEXECNODES_H
1515

16-
#include"nodes/params.h"
17-
#include"access/sdir.h"
18-
#include"access/funcindex.h"
1916
#include"executor/hashjoin.h"
2017
#include"nodes/primnodes.h"
21-
#include"nodes/memnodes.h"
18+
#include"access/funcindex.h"
19+
#include"access/relscan.h"
2220
#include"executor/tuptable.h"
21+
#include"nodes/params.h"
22+
#include"access/sdir.h"
23+
#include"nodes/memnodes.h"
2324

2425
/* ----------------
2526
* IndexInfo information

‎src/include/nodes/nodes.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: nodes.h,v 1.2 1996/10/31 09:49:10 scrappy Exp $
9+
* $Id: nodes.h,v 1.3 1996/11/03 12:12:52 scrappy Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
1313
#ifndefNODES_H
1414
#defineNODES_H
1515

16-
1716
/*
1817
* The first field of every node is NodeTag. Each node created (with makeNode)
1918
* will have one of the following tags as the value of its first field.

‎src/include/nodes/parsenodes.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: parsenodes.h,v 1.4 1996/10/30 02:02:08 momjian Exp $
9+
* $Id: parsenodes.h,v 1.5 1996/11/03 12:12:55 scrappy Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
1313
#ifndefPARSENODES_H
1414
#definePARSENODES_H
1515

16-
#include"nodes/primnodes.h"
17-
#include"utils/tqual.h"
16+
#include"utils/tqual.h"
17+
#include"nodes/primnodes.h"
1818

1919
/*****************************************************************************
2020
* Query Tree

‎src/include/nodes/plannodes.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,13 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: plannodes.h,v 1.2 1996/10/31 09:49:16 scrappy Exp $
9+
* $Id: plannodes.h,v 1.3 1996/11/03 12:12:57 scrappy Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
1313
#ifndefPLANNODES_H
1414
#definePLANNODES_H
1515

16-
17-
#include"nodes/nodes.h"
18-
#include"nodes/pg_list.h"
1916
#include"nodes/primnodes.h"
2017

2118
/* ----------------------------------------------------------------

‎src/include/nodes/primnodes.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,15 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: primnodes.h,v 1.4 1996/10/23 07:42:02 scrappy Exp $
9+
* $Id: primnodes.h,v 1.5 1996/11/03 12:12:58 scrappy Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
1313
#ifndefPRIMNODES_H
1414
#definePRIMNODES_H
1515

1616
#include"nodes/pg_list.h"
17-
#include"nodes/nodes.h"
1817
#include"access/attnum.h"
19-
2018
#include"utils/fcache.h"
2119

2220
/* ----------------------------------------------------------------

‎src/include/parser/catalog_utils.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,13 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: catalog_utils.h,v 1.2 1996/10/31 09:49:33 scrappy Exp $
9+
* $Id: catalog_utils.h,v 1.3 1996/11/03 12:13:03 scrappy Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
1313
#ifndefCATALOG_UTILS_H
1414
#defineCATALOG_UTILS_H
1515

16-
17-
18-
#include"access/htup.h"
19-
#include"utils/rel.h"
2016
#include"catalog/pg_proc.h"
2117
#include"catalog/pg_type.h"
2218
#include"utils/syscache.h"

‎src/include/storage/bufmgr.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,18 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: bufmgr.h,v 1.5 1996/11/01 09:31:05 scrappy Exp $
9+
* $Id: bufmgr.h,v 1.6 1996/11/03 12:13:10 scrappy Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
1313
#ifndefBUFMGR_H
1414
#defineBUFMGR_H
1515

1616
#include<stdio.h>
17-
18-
#include"storage/ipc.h"
17+
#include"storage/block.h"
1918
#include"storage/buf.h"
19+
#include"storage/ipc.h"
2020
#include"utils/rel.h"
21-
#include"storage/block.h"
2221

2322
/*
2423
* the maximum size of a disk block for any possible installation.

‎src/include/tcop/dest.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,14 @@
2626
*
2727
* Copyright (c) 1994, Regents of the University of California
2828
*
29-
* $Id: dest.h,v 1.1 1996/08/28 07:27:49 scrappy Exp $
29+
* $Id: dest.h,v 1.2 1996/11/03 12:13:19 scrappy Exp $
3030
*
3131
*-------------------------------------------------------------------------
3232
*/
3333
#ifndefDEST_H
3434
#defineDEST_H
3535

36-
#include"catalog/pg_attribute.h"
37-
#include"access/tupdesc.h"
36+
#include"access/tupdesc.h"
3837

3938
/* ----------------
4039
*CommandDest is used to allow the results of calling

‎src/include/utils/builtins.h

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: builtins.h,v 1.2 1996/10/31 09:51:07 scrappy Exp $
9+
* $Id: builtins.h,v 1.3 1996/11/03 12:13:34 scrappy Exp $
1010
*
1111
* NOTES
1212
* This should normally only be included by fmgr.h.
@@ -18,12 +18,10 @@
1818
#ifndefBUILTINS_H
1919
#defineBUILTINS_H
2020

21-
2221
#include"storage/itemptr.h"
23-
24-
#include"storage/large_object.h"
25-
26-
#include"utils/geo-decls.h"
22+
#include"utils/nabstime.h"
23+
#include"utils/geo-decls.h"
24+
#include"utils/rel.h"
2725

2826
/*
2927
*Defined in adt/

0 commit comments

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