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

Commit45326c5

Browse files
committed
Split resowner.h
This lets files that are mere users of ResourceOwner not automaticallyinclude the headers for stuff that is managed by the resowner mechanism.
1 parent0a664ec commit45326c5

File tree

23 files changed

+106
-69
lines changed

23 files changed

+106
-69
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include"parser/parse_type.h"
2525
#include"utils/acl.h"
2626
#include"utils/builtins.h"
27-
#include"utils/resowner.h"
27+
#include"utils/resowner_private.h"
2828
#include"utils/syscache.h"
2929

3030

‎src/backend/access/transam/xact.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,14 @@
3838
#include"pgstat.h"
3939
#include"replication/walsender.h"
4040
#include"replication/syncrep.h"
41+
#include"storage/fd.h"
4142
#include"storage/lmgr.h"
4243
#include"storage/predicate.h"
4344
#include"storage/proc.h"
4445
#include"storage/procarray.h"
4546
#include"storage/sinvaladt.h"
4647
#include"storage/smgr.h"
48+
#include"utils/catcache.h"
4749
#include"utils/combocid.h"
4850
#include"utils/guc.h"
4951
#include"utils/inval.h"

‎src/backend/commands/dbcommands.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
#include"pgstat.h"
4646
#include"postmaster/bgwriter.h"
4747
#include"storage/copydir.h"
48+
#include"storage/fd.h"
4849
#include"storage/lmgr.h"
4950
#include"storage/ipc.h"
5051
#include"storage/procarray.h"

‎src/backend/commands/extension.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
#include"funcapi.h"
4646
#include"mb/pg_wchar.h"
4747
#include"miscadmin.h"
48+
#include"storage/fd.h"
4849
#include"tcop/utility.h"
4950
#include"utils/builtins.h"
5051
#include"utils/fmgroids.h"

‎src/backend/postmaster/autovacuum.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
#include"catalog/pg_database.h"
7777
#include"commands/dbcommands.h"
7878
#include"commands/vacuum.h"
79+
#include"lib/dllist.h"
7980
#include"libpq/pqsignal.h"
8081
#include"miscadmin.h"
8182
#include"pgstat.h"

‎src/backend/postmaster/bgwriter.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
#include"postmaster/bgwriter.h"
4747
#include"storage/bufmgr.h"
4848
#include"storage/buf_internals.h"
49+
#include"storage/fd.h"
4950
#include"storage/ipc.h"
5051
#include"storage/lwlock.h"
5152
#include"storage/proc.h"

‎src/backend/postmaster/checkpointer.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
#include"postmaster/bgwriter.h"
4949
#include"replication/syncrep.h"
5050
#include"storage/bufmgr.h"
51+
#include"storage/fd.h"
5152
#include"storage/ipc.h"
5253
#include"storage/lwlock.h"
5354
#include"storage/proc.h"

‎src/backend/postmaster/walwriter.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
#include"miscadmin.h"
5252
#include"postmaster/walwriter.h"
5353
#include"storage/bufmgr.h"
54+
#include"storage/fd.h"
5455
#include"storage/ipc.h"
5556
#include"storage/lwlock.h"
5657
#include"storage/proc.h"

‎src/backend/storage/buffer/bufmgr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
#include"storage/smgr.h"
4747
#include"storage/standby.h"
4848
#include"utils/rel.h"
49-
#include"utils/resowner.h"
49+
#include"utils/resowner_private.h"
5050
#include"utils/timestamp.h"
5151

5252

‎src/backend/storage/buffer/localbuf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include"storage/bufmgr.h"
2222
#include"utils/guc.h"
2323
#include"utils/memutils.h"
24-
#include"utils/resowner.h"
24+
#include"utils/resowner_private.h"
2525

2626

2727
/*#define LBDEBUG*/

‎src/backend/storage/file/fd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
#include"storage/fd.h"
5858
#include"storage/ipc.h"
5959
#include"utils/guc.h"
60-
#include"utils/resowner.h"
60+
#include"utils/resowner_private.h"
6161

6262

6363
/*

‎src/backend/storage/lmgr/lock.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
#include"storage/standby.h"
4545
#include"utils/memutils.h"
4646
#include"utils/ps_status.h"
47-
#include"utils/resowner.h"
47+
#include"utils/resowner_private.h"
4848

4949

5050
/* This configuration variable is used to set the lock table size */

‎src/backend/utils/cache/catcache.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include"utils/inval.h"
3434
#include"utils/memutils.h"
3535
#include"utils/rel.h"
36-
#include"utils/resowner.h"
36+
#include"utils/resowner_private.h"
3737
#include"utils/syscache.h"
3838
#include"utils/tqual.h"
3939

‎src/backend/utils/cache/evtcache.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include"commands/trigger.h"
2222
#include"utils/array.h"
2323
#include"utils/builtins.h"
24+
#include"utils/catcache.h"
2425
#include"utils/evtcache.h"
2526
#include"utils/inval.h"
2627
#include"utils/memutils.h"

‎src/backend/utils/cache/plancache.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
#include"tcop/utility.h"
6262
#include"utils/inval.h"
6363
#include"utils/memutils.h"
64+
#include"utils/resowner_private.h"
6465
#include"utils/snapmgr.h"
6566
#include"utils/syscache.h"
6667

‎src/backend/utils/cache/relcache.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
#include"utils/lsyscache.h"
7070
#include"utils/memutils.h"
7171
#include"utils/relmapper.h"
72-
#include"utils/resowner.h"
72+
#include"utils/resowner_private.h"
7373
#include"utils/syscache.h"
7474
#include"utils/tqual.h"
7575

‎src/backend/utils/cache/typcache.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
#include"catalog/pg_type.h"
5656
#include"commands/defrem.h"
5757
#include"utils/builtins.h"
58+
#include"utils/catcache.h"
5859
#include"utils/fmgroids.h"
5960
#include"utils/inval.h"
6061
#include"utils/lsyscache.h"

‎src/backend/utils/resowner/resowner.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include"storage/proc.h"
2626
#include"utils/memutils.h"
2727
#include"utils/rel.h"
28+
#include"utils/resowner_private.h"
2829
#include"utils/snapmgr.h"
2930

3031
/*

‎src/backend/utils/time/snapmgr.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
#include"storage/procarray.h"
4949
#include"utils/builtins.h"
5050
#include"utils/memutils.h"
51+
#include"utils/resowner_private.h"
5152
#include"utils/snapmgr.h"
5253
#include"utils/tqual.h"
5354

‎src/include/utils/portal.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848

4949
#include"datatype/timestamp.h"
5050
#include"executor/execdesc.h"
51+
#include"utils/plancache.h"
5152
#include"utils/resowner.h"
5253

5354
/*

‎src/include/utils/resowner.h

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,6 @@
1919
#ifndefRESOWNER_H
2020
#defineRESOWNER_H
2121

22-
#include"storage/fd.h"
23-
#include"storage/lock.h"
24-
#include"utils/catcache.h"
25-
#include"utils/plancache.h"
26-
#include"utils/snapshot.h"
27-
2822

2923
/*
3024
* ResourceOwner objects are an opaque data structure known only within
@@ -85,60 +79,4 @@ extern void RegisterResourceReleaseCallback(ResourceReleaseCallback callback,
8579
externvoidUnregisterResourceReleaseCallback(ResourceReleaseCallbackcallback,
8680
void*arg);
8781

88-
/* support for buffer refcount management */
89-
externvoidResourceOwnerEnlargeBuffers(ResourceOwnerowner);
90-
externvoidResourceOwnerRememberBuffer(ResourceOwnerowner,Bufferbuffer);
91-
externvoidResourceOwnerForgetBuffer(ResourceOwnerowner,Bufferbuffer);
92-
93-
/* support for local lock management */
94-
externvoidResourceOwnerRememberLock(ResourceOwnerowner,LOCALLOCK*locallock);
95-
externvoidResourceOwnerForgetLock(ResourceOwnerowner,LOCALLOCK*locallock);
96-
97-
/* support for catcache refcount management */
98-
externvoidResourceOwnerEnlargeCatCacheRefs(ResourceOwnerowner);
99-
externvoidResourceOwnerRememberCatCacheRef(ResourceOwnerowner,
100-
HeapTupletuple);
101-
externvoidResourceOwnerForgetCatCacheRef(ResourceOwnerowner,
102-
HeapTupletuple);
103-
externvoidResourceOwnerEnlargeCatCacheListRefs(ResourceOwnerowner);
104-
externvoidResourceOwnerRememberCatCacheListRef(ResourceOwnerowner,
105-
CatCList*list);
106-
externvoidResourceOwnerForgetCatCacheListRef(ResourceOwnerowner,
107-
CatCList*list);
108-
109-
/* support for relcache refcount management */
110-
externvoidResourceOwnerEnlargeRelationRefs(ResourceOwnerowner);
111-
externvoidResourceOwnerRememberRelationRef(ResourceOwnerowner,
112-
Relationrel);
113-
externvoidResourceOwnerForgetRelationRef(ResourceOwnerowner,
114-
Relationrel);
115-
116-
/* support for plancache refcount management */
117-
externvoidResourceOwnerEnlargePlanCacheRefs(ResourceOwnerowner);
118-
externvoidResourceOwnerRememberPlanCacheRef(ResourceOwnerowner,
119-
CachedPlan*plan);
120-
externvoidResourceOwnerForgetPlanCacheRef(ResourceOwnerowner,
121-
CachedPlan*plan);
122-
123-
/* support for tupledesc refcount management */
124-
externvoidResourceOwnerEnlargeTupleDescs(ResourceOwnerowner);
125-
externvoidResourceOwnerRememberTupleDesc(ResourceOwnerowner,
126-
TupleDesctupdesc);
127-
externvoidResourceOwnerForgetTupleDesc(ResourceOwnerowner,
128-
TupleDesctupdesc);
129-
130-
/* support for snapshot refcount management */
131-
externvoidResourceOwnerEnlargeSnapshots(ResourceOwnerowner);
132-
externvoidResourceOwnerRememberSnapshot(ResourceOwnerowner,
133-
Snapshotsnapshot);
134-
externvoidResourceOwnerForgetSnapshot(ResourceOwnerowner,
135-
Snapshotsnapshot);
136-
137-
/* support for temporary file management */
138-
externvoidResourceOwnerEnlargeFiles(ResourceOwnerowner);
139-
externvoidResourceOwnerRememberFile(ResourceOwnerowner,
140-
Filefile);
141-
externvoidResourceOwnerForgetFile(ResourceOwnerowner,
142-
Filefile);
143-
14482
#endif/* RESOWNER_H */

‎src/include/utils/resowner_private.h

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
/*-------------------------------------------------------------------------
2+
*
3+
* resowner_private.h
4+
* POSTGRES resource owner private definitions.
5+
*
6+
* See utils/resowner/README for more info.
7+
*
8+
*
9+
* Portions Copyright (c) 1996-2012, PostgreSQL Global Development Group
10+
* Portions Copyright (c) 1994, Regents of the University of California
11+
*
12+
* src/include/utils/resowner_private.h
13+
*
14+
*-------------------------------------------------------------------------
15+
*/
16+
#ifndefRESOWNER_PRIVATE_H
17+
#defineRESOWNER_PRIVATE_H
18+
19+
#include"storage/fd.h"
20+
#include"storage/lock.h"
21+
#include"utils/catcache.h"
22+
#include"utils/plancache.h"
23+
#include"utils/resowner.h"
24+
#include"utils/snapshot.h"
25+
26+
27+
/* support for buffer refcount management */
28+
externvoidResourceOwnerEnlargeBuffers(ResourceOwnerowner);
29+
externvoidResourceOwnerRememberBuffer(ResourceOwnerowner,Bufferbuffer);
30+
externvoidResourceOwnerForgetBuffer(ResourceOwnerowner,Bufferbuffer);
31+
32+
/* support for local lock management */
33+
externvoidResourceOwnerRememberLock(ResourceOwnerowner,LOCALLOCK*locallock);
34+
externvoidResourceOwnerForgetLock(ResourceOwnerowner,LOCALLOCK*locallock);
35+
36+
/* support for catcache refcount management */
37+
externvoidResourceOwnerEnlargeCatCacheRefs(ResourceOwnerowner);
38+
externvoidResourceOwnerRememberCatCacheRef(ResourceOwnerowner,
39+
HeapTupletuple);
40+
externvoidResourceOwnerForgetCatCacheRef(ResourceOwnerowner,
41+
HeapTupletuple);
42+
externvoidResourceOwnerEnlargeCatCacheListRefs(ResourceOwnerowner);
43+
externvoidResourceOwnerRememberCatCacheListRef(ResourceOwnerowner,
44+
CatCList*list);
45+
externvoidResourceOwnerForgetCatCacheListRef(ResourceOwnerowner,
46+
CatCList*list);
47+
48+
/* support for relcache refcount management */
49+
externvoidResourceOwnerEnlargeRelationRefs(ResourceOwnerowner);
50+
externvoidResourceOwnerRememberRelationRef(ResourceOwnerowner,
51+
Relationrel);
52+
externvoidResourceOwnerForgetRelationRef(ResourceOwnerowner,
53+
Relationrel);
54+
55+
/* support for plancache refcount management */
56+
externvoidResourceOwnerEnlargePlanCacheRefs(ResourceOwnerowner);
57+
externvoidResourceOwnerRememberPlanCacheRef(ResourceOwnerowner,
58+
CachedPlan*plan);
59+
externvoidResourceOwnerForgetPlanCacheRef(ResourceOwnerowner,
60+
CachedPlan*plan);
61+
62+
/* support for tupledesc refcount management */
63+
externvoidResourceOwnerEnlargeTupleDescs(ResourceOwnerowner);
64+
externvoidResourceOwnerRememberTupleDesc(ResourceOwnerowner,
65+
TupleDesctupdesc);
66+
externvoidResourceOwnerForgetTupleDesc(ResourceOwnerowner,
67+
TupleDesctupdesc);
68+
69+
/* support for snapshot refcount management */
70+
externvoidResourceOwnerEnlargeSnapshots(ResourceOwnerowner);
71+
externvoidResourceOwnerRememberSnapshot(ResourceOwnerowner,
72+
Snapshotsnapshot);
73+
externvoidResourceOwnerForgetSnapshot(ResourceOwnerowner,
74+
Snapshotsnapshot);
75+
76+
/* support for temporary file management */
77+
externvoidResourceOwnerEnlargeFiles(ResourceOwnerowner);
78+
externvoidResourceOwnerRememberFile(ResourceOwnerowner,
79+
Filefile);
80+
externvoidResourceOwnerForgetFile(ResourceOwnerowner,
81+
Filefile);
82+
83+
#endif/* RESOWNER_PRIVATE_H */

‎src/include/utils/snapmgr.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
#ifndefSNAPMGR_H
1414
#defineSNAPMGR_H
1515

16+
#include"fmgr.h"
1617
#include"utils/resowner.h"
18+
#include"utils/snapshot.h"
1719

1820

1921
externboolFirstSnapshotSet;

0 commit comments

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