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

Commit4029fb5

Browse files
committed
first pass at cleaning up include files
1 parentca11203 commit4029fb5

File tree

9 files changed

+31
-70
lines changed

9 files changed

+31
-70
lines changed

‎src/backend/catalog/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for catalog
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.1 1996/10/27 09:47:07 bryanh Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.2 1996/11/03 23:26:58 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -13,7 +13,6 @@ include ../../Makefile.global
1313

1414
INCLUDE_OPT = -I..\
1515
-I../port/$(PORTNAME)\
16-
-I../include\
1716
-I../../include
1817

1918
CFLAGS+=$(INCLUDE_OPT)

‎src/backend/catalog/catalog.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,23 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/catalog/catalog.c,v 1.2 1996/10/18 05:50:04 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/catalog/catalog.c,v 1.3 1996/11/03 23:27:00 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414
#include<string.h>/* XXX */
15+
1516
#include"postgres.h"
1617
#include"miscadmin.h"/* for DataDir */
17-
#include"access/htup.h"
18+
19+
#include"utils/syscache.h"
1820
#include"storage/buf.h"
19-
#include"utils/elog.h"
2021
#include"utils/palloc.h"
2122

22-
#include"utils/syscache.h"
2323
#include"catalog/catname.h"/* NameIs{,Shared}SystemRelationName */
2424
#include"catalog/pg_attribute.h"
2525
#include"catalog/pg_type.h"
2626
#include"catalog/catalog.h"
27-
#include"storage/bufmgr.h"
2827
#include"access/transam.h"
2928

3029
/*

‎src/backend/catalog/heap.c

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.2 1996/10/24 07:54:45 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.3 1996/11/03 23:27:01 scrappy Exp $
1111
*
1212
* INTERFACE ROUTINES
1313
*heap_creatr()- Create an uncataloged heap relation
@@ -30,44 +30,36 @@
3030

3131
#include"postgres.h"
3232

33+
#include"parser/catalog_utils.h"
34+
3335
#include"access/heapam.h"
3436
#include"access/genam.h"
35-
#include"access/htup.h"
3637
#include"access/istrat.h"
37-
#include"access/relscan.h"
38-
#include"access/skey.h"
39-
#include"utils/tqual.h"/* for NowTimeQual */
40-
#include"storage/buf.h"
4138
#include"storage/bufmgr.h"
42-
#include"storage/itemptr.h"
4339
#include"lib/hasht.h"
4440
#include"miscadmin.h"
4541
#include"fmgr.h"
4642
#include"utils/builtins.h"
47-
#include"utils/elog.h"/* XXX */
4843
#include"utils/mcxt.h"
4944
#include"utils/palloc.h"
50-
#include"utils/rel.h"
5145
#include"utils/relcache.h"
5246

5347
#include"catalog/catname.h"
54-
#include"catalog/pg_class.h"
5548
#include"catalog/pg_attribute.h"
5649
#include"catalog/pg_index.h"
5750
#include"catalog/pg_inherits.h"
5851
#include"catalog/pg_ipl.h"
59-
#include"catalog/pg_proc.h"
60-
#include"catalog/pg_type.h"
6152
#include"catalog/index.h"
6253
#include"catalog/indexing.h"
6354

6455
#include"catalog/catalog.h"
65-
#include"parser/catalog_utils.h"
6656

6757
#include"storage/lmgr.h"
6858

6959
#include"rewrite/rewriteRemove.h"
7060

61+
#include"storage/smgr.h"
62+
7163
staticvoidAddNewAttributeTuples(Oidnew_rel_oid,TupleDesctupdesc);
7264
staticvoidCheckAttributeNames(TupleDesctupdesc);
7365

‎src/backend/catalog/index.c

Lines changed: 4 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/catalog/index.c,v 1.4 1996/08/27 22:16:32 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.5 1996/11/03 23:27:02 scrappy Exp $
1111
*
1212
*
1313
* INTERFACE ROUTINES
@@ -25,41 +25,30 @@
2525
*/
2626
#include"postgres.h"
2727

28-
#include"access/attnum.h"
2928
#include"access/genam.h"
3029
#include"access/heapam.h"
31-
#include"access/itup.h"
32-
#include"access/relscan.h"
33-
#include"access/skey.h"
3430
#include"utils/builtins.h"
35-
#include"utils/tqual.h"
36-
#include"access/tupdesc.h"
37-
#include"access/funcindex.h"
3831
#include"access/xact.h"
32+
#include"parser/catalog_utils.h"
3933

4034
#include"storage/smgr.h"
35+
#include"storage/lmgr.h"
4136
#include"miscadmin.h"
4237
#include"utils/mcxt.h"
4338
#include"utils/palloc.h"
44-
#include"utils/rel.h"
4539
#include"utils/relcache.h"
46-
#include"utils/elog.h"
4740

4841
#include"bootstrap/bootstrap.h"
4942

5043
#include"catalog/catname.h"
5144
#include"catalog/catalog.h"
5245
#include"utils/syscache.h"
5346
#include"catalog/pg_attribute.h"
54-
#include"catalog/pg_index.h"
55-
#include"catalog/pg_proc.h"
5647
#include"catalog/pg_class.h"
57-
#include"catalog/pg_type.h"
5848
#include"catalog/indexing.h"
5949

6050
#include"catalog/heap.h"
6151

62-
#include"nodes/execnodes.h"
6352
#include"nodes/plannodes.h"
6453

6554
#include"catalog/index.h"
@@ -70,7 +59,7 @@
7059
#include"optimizer/clauses.h"
7160
#include"optimizer/prep.h"
7261

73-
#include"parser/catalog_utils.h"
62+
#include"access/istrat.h"
7463

7564
/*
7665
* macros used in guessing how many tuples are on a page.

‎src/backend/catalog/indexing.c

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,36 +8,31 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.2 1996/08/26 06:29:38 scrappy Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.3 1996/11/03 23:27:04 scrappy Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
1515
#include"postgres.h"
1616
#include"utils/builtins.h"
17-
#include"utils/rel.h"
18-
#include"utils/elog.h"
1917
#include"utils/oidcompos.h"
2018
#include"utils/palloc.h"
21-
#include"access/htup.h"
2219
#include"access/heapam.h"
2320
#include"access/genam.h"
24-
#include"access/attnum.h"
25-
#include"access/funcindex.h"
2621
#include"access/skey.h"
27-
#include"storage/buf.h"
2822
#include"storage/bufmgr.h"
2923
#include"nodes/execnodes.h"
3024
#include"catalog/catalog.h"
3125
#include"catalog/catname.h"
3226
#include"catalog/pg_index.h"
3327
#include"catalog/pg_proc.h"
34-
#include"catalog/pg_type.h"
3528
#include"catalog/pg_class.h"
3629
#include"catalog/pg_attribute.h"
3730
#include"utils/syscache.h"
3831
#include"catalog/indexing.h"
3932
#include"catalog/index.h"
4033

34+
#include"miscadmin.h"
35+
4136
/*
4237
* Names of indices on the following system catalogs:
4338
*
@@ -141,7 +136,6 @@ CatalogIndexInsert(Relation *idescs,
141136
HeapTuplepgIndexTup;
142137
TupleDescheapDescriptor;
143138
IndexTupleFormpgIndexP;
144-
IndexTuplenewIndxTup;
145139
Datumdatum;
146140
intnatts;
147141
AttrNumber*attnumP;

‎src/backend/catalog/pg_aggregate.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_aggregate.c,v 1.1.1.1 1996/07/09 06:21:16 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_aggregate.c,v 1.2 1996/11/03 23:27:05 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -17,10 +17,7 @@
1717
#include"access/heapam.h"
1818
#include"access/relscan.h"
1919
#include"access/skey.h"
20-
#include"access/htup.h"
2120
#include"access/tupdesc.h"
22-
#include"utils/rel.h"
23-
#include"utils/elog.h"
2421
#include"utils/palloc.h"
2522
#include"utils/builtins.h"
2623
#include"fmgr.h"
@@ -32,6 +29,8 @@
3229
#include"catalog/pg_type.h"
3330
#include"catalog/pg_aggregate.h"
3431

32+
#include"miscadmin.h"
33+
3534
/* ----------------
3635
* AggregateCreate
3736
*

‎src/backend/catalog/pg_operator.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.2 1996/10/07 03:27:48 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.3 1996/11/03 23:27:06 scrappy Exp $
1111
*
1212
* NOTES
1313
* these routines moved here from commands/define.c and somewhat cleaned up.
@@ -18,22 +18,19 @@
1818
#include"postgres.h"
1919

2020
#include"access/heapam.h"
21-
#include"access/relscan.h"
2221
#include"access/skey.h"
2322
#include"access/htup.h"
24-
#include"utils/rel.h"
25-
#include"utils/elog.h"
2623
#include"utils/palloc.h"
2724
#include"parser/catalog_utils.h"
2825

2926
#include"catalog/catname.h"
30-
#include"utils/syscache.h"
3127
#include"catalog/pg_operator.h"
32-
#include"catalog/pg_proc.h"
3328
#include"storage/bufmgr.h"
3429

3530
#include"fmgr.h"
3631

32+
#include"miscadmin.h"
33+
3734
staticOidOperatorGetWithOpenRelation(Relationpg_operator_desc,
3835
constchar*operatorName,
3936
OidleftObjectId,

‎src/backend/catalog/pg_proc.c

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.1.1.1 1996/07/09 06:21:17 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.2 1996/11/03 23:27:07 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -17,27 +17,22 @@
1717
#include"access/heapam.h"
1818
#include"access/relscan.h"
1919
#include"access/skey.h"
20-
#include"utils/rel.h"
2120
#include"fmgr.h"
22-
#include"utils/elog.h"
2321
#include"utils/builtins.h"
2422
#include"utils/sets.h"
2523

26-
#include"nodes/pg_list.h"
27-
2824
#include"catalog/catname.h"
29-
#include"utils/syscache.h"
30-
#include"catalog/pg_proc.h"
3125
#include"catalog/indexing.h"
32-
#include"tcop/dest.h"
3326
#include"parser/parse_query.h"
3427
#include"tcop/tcopprot.h"
35-
#include"catalog/pg_type.h"
3628
#include"parser/catalog_utils.h"
37-
#include"utils/lsyscache.h"
3829
#include"optimizer/internal.h"
3930
#include"optimizer/planner.h"
4031

32+
#include"utils/lsyscache.h"
33+
34+
#include"miscadmin.h"
35+
4136
/* ----------------------------------------------------------------
4237
*ProcedureDefine
4338
* ----------------------------------------------------------------

‎src/backend/catalog/pg_type.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.1.1.1 1996/07/09 06:21:18 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.2 1996/11/03 23:27:08 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -19,19 +19,16 @@
1919
#include"access/skey.h"
2020
#include"access/tupdesc.h"
2121
#include"utils/builtins.h"
22-
#include"utils/rel.h"
2322
#include"utils/palloc.h"
2423
#include"fmgr.h"
25-
#include"utils/elog.h"
2624
#include"parser/catalog_utils.h"
2725

2826
#include"catalog/catname.h"
29-
#include"utils/syscache.h"
30-
#include"catalog/pg_proc.h"
31-
#include"catalog/pg_type.h"
3227
#include"catalog/indexing.h"
3328
#include"storage/lmgr.h"
3429

30+
#include"miscadmin.h"
31+
3532
/* ----------------------------------------------------------------
3633
* TypeGetWithOpenRelation
3734
*

0 commit comments

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