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

Commitfda0594

Browse files
committed
remove catcache.h from syscache.h
Instead, place a forward struct declaration for struct catclist insyscache.h. This reduces header proliferation somewhat.
1 parent45326c5 commitfda0594

File tree

11 files changed

+14
-1
lines changed

11 files changed

+14
-1
lines changed

‎src/backend/catalog/namespace.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
#include"storage/sinval.h"
4747
#include"utils/acl.h"
4848
#include"utils/builtins.h"
49+
#include"utils/catcache.h"
4950
#include"utils/guc.h"
5051
#include"utils/inval.h"
5152
#include"utils/lsyscache.h"

‎src/backend/catalog/pg_conversion.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include"catalog/pg_proc.h"
2626
#include"mb/pg_wchar.h"
2727
#include"utils/builtins.h"
28+
#include"utils/catcache.h"
2829
#include"utils/fmgroids.h"
2930
#include"utils/rel.h"
3031
#include"utils/syscache.h"

‎src/backend/catalog/pg_enum.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include"storage/lmgr.h"
2424
#include"miscadmin.h"
2525
#include"utils/builtins.h"
26+
#include"utils/catcache.h"
2627
#include"utils/fmgroids.h"
2728
#include"utils/syscache.h"
2829
#include"utils/tqual.h"

‎src/backend/utils/adt/acl.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#include"miscadmin.h"
3030
#include"utils/acl.h"
3131
#include"utils/builtins.h"
32+
#include"utils/catcache.h"
3233
#include"utils/inval.h"
3334
#include"utils/lsyscache.h"
3435
#include"utils/memutils.h"

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

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

1919
#include"access/reloptions.h"
2020
#include"utils/attoptcache.h"
21+
#include"utils/catcache.h"
2122
#include"utils/hsearch.h"
2223
#include"utils/inval.h"
2324
#include"utils/syscache.h"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@
100100
#include"miscadmin.h"
101101
#include"storage/sinval.h"
102102
#include"storage/smgr.h"
103+
#include"utils/catcache.h"
103104
#include"utils/inval.h"
104105
#include"utils/memutils.h"
105106
#include"utils/rel.h"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
#include"nodes/makefuncs.h"
3434
#include"utils/array.h"
3535
#include"utils/builtins.h"
36+
#include"utils/catcache.h"
3637
#include"utils/datum.h"
3738
#include"utils/fmgroids.h"
3839
#include"utils/lsyscache.h"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include"commands/tablespace.h"
2424
#include"miscadmin.h"
2525
#include"optimizer/cost.h"
26+
#include"utils/catcache.h"
2627
#include"utils/hsearch.h"
2728
#include"utils/inval.h"
2829
#include"utils/spccache.h"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
#include"catalog/pg_type.h"
5757
#include"catalog/pg_user_mapping.h"
5858
#include"utils/rel.h"
59+
#include"utils/catcache.h"
5960
#include"utils/syscache.h"
6061

6162

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
#include"commands/defrem.h"
4040
#include"tsearch/ts_cache.h"
4141
#include"utils/builtins.h"
42+
#include"utils/catcache.h"
4243
#include"utils/fmgroids.h"
4344
#include"utils/inval.h"
4445
#include"utils/lsyscache.h"

‎src/include/utils/syscache.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
#ifndefSYSCACHE_H
1717
#defineSYSCACHE_H
1818

19-
#include"utils/catcache.h"
19+
#include"access/attnum.h"
20+
#include"access/htup.h"
21+
/* we purposedly do not include utils/catcache.h here */
2022

2123
/*
2224
*SysCache identifiers.
@@ -119,6 +121,7 @@ extern uint32 GetSysCacheHashValue(int cacheId,
119121
Datumkey1,Datumkey2,Datumkey3,Datumkey4);
120122

121123
/* list-search interface. Users of this must import catcache.h too */
124+
structcatclist;
122125
externstructcatclist*SearchSysCacheList(intcacheId,intnkeys,
123126
Datumkey1,Datumkey2,Datumkey3,Datumkey4);
124127

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp