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

Commit1609797

Browse files
committed
Clean up the #include mess a little.
walsender.h should depend on xlog.h, not vice versa. (Actually, theinclusion was circular until a couple hours ago, which was even sillier;but Bruce broke it in the expedient rather than logically correctdirection.) Because of that poor decision, plus blind application ofpgrminclude, we had a situation where half the system was depending onxlog.h to include such unrelated stuff as array.h and guc.h. Clean upthe header inclusion, and manually revert a lot of what pgrminclude haddone so things build again.This episode reinforces my feeling that pgrminclude should not be runwithout adult supervision. Inclusion changes in header files in particularneed to be reviewed with great care. More generally, it'd be good if wehad a clearer notion of module layering to dictate which headers can sanelyinclude which others ... but that's a big task for another day.
1 parentf116b1f commit1609797

File tree

74 files changed

+102
-10
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+102
-10
lines changed

‎contrib/auto_explain/auto_explain.c

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

1515
#include"commands/explain.h"
1616
#include"executor/instrument.h"
17+
#include"utils/guc.h"
1718

1819
PG_MODULE_MAGIC;
1920

‎contrib/cube/cube.c

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

1414
#include"access/gist.h"
1515
#include"access/skey.h"
16+
#include"utils/array.h"
1617
#include"utils/builtins.h"
1718

1819
#include"cubedata.h"

‎contrib/pg_stat_statements/pg_stat_statements.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include"pgstat.h"
3131
#include"storage/fd.h"
3232
#include"storage/ipc.h"
33+
#include"storage/spin.h"
3334
#include"tcop/utility.h"
3435
#include"utils/builtins.h"
3536

‎contrib/tsearch2/tsearch2.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include"commands/trigger.h"
1919
#include"tsearch/ts_utils.h"
2020
#include"utils/builtins.h"
21+
#include"utils/guc.h"
2122
#include"utils/syscache.h"
2223

2324
PG_MODULE_MAGIC;

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,10 @@
2323
#include"commands/defrem.h"
2424
#include"commands/tablespace.h"
2525
#include"nodes/makefuncs.h"
26+
#include"utils/array.h"
2627
#include"utils/attoptcache.h"
2728
#include"utils/builtins.h"
29+
#include"utils/guc.h"
2830
#include"utils/memutils.h"
2931
#include"utils/rel.h"
3032

‎src/backend/access/gin/ginarrayproc.c

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

1616
#include"access/gin.h"
1717
#include"access/skey.h"
18+
#include"utils/array.h"
1819
#include"utils/builtins.h"
1920
#include"utils/lsyscache.h"
2021

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
#include"access/transam.h"
5656
#include"access/xlog.h"
5757
#include"storage/fd.h"
58+
#include"storage/shmem.h"
5859
#include"miscadmin.h"
5960

6061

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include"access/multixact.h"
1818
#include"access/twophase_rmgr.h"
1919
#include"pgstat.h"
20+
#include"storage/lock.h"
2021
#include"storage/predicate.h"
2122

2223

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include"miscadmin.h"
2222
#include"postmaster/autovacuum.h"
2323
#include"storage/pmsignal.h"
24+
#include"storage/proc.h"
2425
#include"utils/syscache.h"
2526

2627

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,15 @@
3636
#include"libpq/be-fsstubs.h"
3737
#include"miscadmin.h"
3838
#include"pgstat.h"
39+
#include"replication/walsender.h"
40+
#include"replication/syncrep.h"
3941
#include"storage/lmgr.h"
4042
#include"storage/predicate.h"
4143
#include"storage/procarray.h"
4244
#include"storage/sinvaladt.h"
4345
#include"storage/smgr.h"
4446
#include"utils/combocid.h"
47+
#include"utils/guc.h"
4548
#include"utils/inval.h"
4649
#include"utils/memutils.h"
4750
#include"utils/relmapper.h"

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
#include"access/xlogutils.h"
2222
#include"catalog/catalog.h"
2323
#include"storage/smgr.h"
24+
#include"utils/guc.h"
25+
#include"utils/hsearch.h"
2426
#include"utils/rel.h"
2527

2628

‎src/backend/bootstrap/bootstrap.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
#include"replication/walreceiver.h"
3434
#include"storage/bufmgr.h"
3535
#include"storage/ipc.h"
36+
#include"storage/proc.h"
3637
#include"tcop/tcopprot.h"
3738
#include"utils/builtins.h"
3839
#include"utils/fmgroids.h"

‎src/backend/catalog/dependency.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
#include"utils/acl.h"
7272
#include"utils/builtins.h"
7373
#include"utils/fmgroids.h"
74+
#include"utils/guc.h"
7475
#include"utils/lsyscache.h"
7576
#include"utils/syscache.h"
7677
#include"utils/tqual.h"

‎src/backend/catalog/index.c

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

‎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/guc.h"
4950
#include"utils/inval.h"
5051
#include"utils/lsyscache.h"
5152
#include"utils/memutils.h"

‎src/backend/catalog/pg_constraint.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include"catalog/pg_operator.h"
2424
#include"catalog/pg_type.h"
2525
#include"commands/defrem.h"
26+
#include"utils/array.h"
2627
#include"utils/builtins.h"
2728
#include"utils/fmgroids.h"
2829
#include"utils/lsyscache.h"

‎src/backend/commands/analyze.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,12 @@
3737
#include"postmaster/autovacuum.h"
3838
#include"storage/bufmgr.h"
3939
#include"storage/lmgr.h"
40+
#include"storage/proc.h"
4041
#include"storage/procarray.h"
4142
#include"utils/acl.h"
4243
#include"utils/attoptcache.h"
4344
#include"utils/datum.h"
45+
#include"utils/guc.h"
4446
#include"utils/lsyscache.h"
4547
#include"utils/memutils.h"
4648
#include"utils/pg_rusage.h"

‎src/backend/commands/discard.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include"commands/async.h"
1919
#include"commands/discard.h"
2020
#include"commands/prepare.h"
21+
#include"utils/guc.h"
2122
#include"utils/portal.h"
2223

2324
staticvoidDiscardAll(boolisTopLevel);

‎src/backend/commands/functioncmds.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
#include"utils/acl.h"
5959
#include"utils/builtins.h"
6060
#include"utils/fmgroids.h"
61+
#include"utils/guc.h"
6162
#include"utils/lsyscache.h"
6263
#include"utils/rel.h"
6364
#include"utils/syscache.h"

‎src/backend/commands/indexcmds.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
#include"parser/parse_func.h"
3636
#include"parser/parse_oper.h"
3737
#include"storage/lmgr.h"
38+
#include"storage/proc.h"
3839
#include"storage/procarray.h"
3940
#include"utils/acl.h"
4041
#include"utils/builtins.h"

‎src/backend/commands/sequence.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include"miscadmin.h"
2727
#include"nodes/makefuncs.h"
2828
#include"storage/lmgr.h"
29+
#include"storage/proc.h"
2930
#include"storage/smgr.h"
3031
#include"utils/acl.h"
3132
#include"utils/builtins.h"

‎src/backend/commands/tablespace.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
#include"utils/acl.h"
7171
#include"utils/builtins.h"
7272
#include"utils/fmgroids.h"
73+
#include"utils/guc.h"
7374
#include"utils/memutils.h"
7475
#include"utils/rel.h"
7576
#include"utils/tqual.h"

‎src/backend/commands/vacuum.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,11 @@
3737
#include"postmaster/autovacuum.h"
3838
#include"storage/bufmgr.h"
3939
#include"storage/lmgr.h"
40+
#include"storage/proc.h"
4041
#include"storage/procarray.h"
4142
#include"utils/acl.h"
4243
#include"utils/fmgroids.h"
44+
#include"utils/guc.h"
4345
#include"utils/memutils.h"
4446
#include"utils/snapmgr.h"
4547
#include"utils/syscache.h"

‎src/backend/executor/nodeIndexscan.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#include"executor/execdebug.h"
3030
#include"executor/nodeIndexscan.h"
3131
#include"optimizer/clauses.h"
32+
#include"utils/array.h"
3233
#include"utils/lsyscache.h"
3334
#include"utils/memutils.h"
3435
#include"utils/rel.h"

‎src/backend/executor/nodeSubplan.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include"executor/nodeSubplan.h"
2525
#include"nodes/makefuncs.h"
2626
#include"optimizer/clauses.h"
27+
#include"utils/array.h"
2728
#include"utils/lsyscache.h"
2829
#include"utils/memutils.h"
2930

‎src/backend/executor/nodeTidscan.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include"executor/nodeTidscan.h"
3131
#include"optimizer/clauses.h"
3232
#include"storage/bufmgr.h"
33+
#include"utils/array.h"
3334
#include"utils/rel.h"
3435

3536

‎src/backend/optimizer/util/predtest.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include"optimizer/clauses.h"
2323
#include"optimizer/planmain.h"
2424
#include"optimizer/predtest.h"
25+
#include"utils/array.h"
2526
#include"utils/inval.h"
2627
#include"utils/lsyscache.h"
2728
#include"utils/syscache.h"

‎src/backend/parser/parse_clause.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
#include"parser/parse_relation.h"
3434
#include"parser/parse_target.h"
3535
#include"rewrite/rewriteManip.h"
36+
#include"utils/guc.h"
3637
#include"utils/lsyscache.h"
3738
#include"utils/rel.h"
3839

‎src/backend/postmaster/bgwriter.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,15 @@
5454
#include"miscadmin.h"
5555
#include"pgstat.h"
5656
#include"postmaster/bgwriter.h"
57+
#include"replication/syncrep.h"
5758
#include"storage/bufmgr.h"
5859
#include"storage/ipc.h"
60+
#include"storage/lwlock.h"
5961
#include"storage/pmsignal.h"
62+
#include"storage/shmem.h"
6063
#include"storage/smgr.h"
64+
#include"storage/spin.h"
65+
#include"utils/guc.h"
6166
#include"utils/memutils.h"
6267
#include"utils/resowner.h"
6368

‎src/backend/postmaster/walwriter.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,11 @@
5151
#include"postmaster/walwriter.h"
5252
#include"storage/bufmgr.h"
5353
#include"storage/ipc.h"
54+
#include"storage/lwlock.h"
5455
#include"storage/pmsignal.h"
5556
#include"storage/smgr.h"
57+
#include"utils/guc.h"
58+
#include"utils/hsearch.h"
5659
#include"utils/memutils.h"
5760
#include"utils/resowner.h"
5861

‎src/backend/replication/syncrep.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,10 @@
4747

4848
#include"access/xact.h"
4949
#include"miscadmin.h"
50+
#include"replication/syncrep.h"
51+
#include"replication/walsender.h"
5052
#include"storage/pmsignal.h"
53+
#include"storage/proc.h"
5154
#include"tcop/tcopprot.h"
5255
#include"utils/builtins.h"
5356
#include"utils/ps_status.h"
@@ -58,6 +61,9 @@ char *SyncRepStandbyNames;
5861
#defineSyncStandbysDefined() \
5962
(SyncRepStandbyNames != NULL && SyncRepStandbyNames[0] != '\0')
6063

64+
#defineSyncRepRequested() \
65+
(max_wal_senders > 0 && synchronous_commit > SYNCHRONOUS_COMMIT_LOCAL_FLUSH)
66+
6167
staticboolannounce_next_takeover= true;
6268

6369
staticvoidSyncRepQueueInsert(void);

‎src/backend/replication/walreceiver.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,11 @@
4343
#include"miscadmin.h"
4444
#include"replication/walprotocol.h"
4545
#include"replication/walreceiver.h"
46+
#include"replication/walsender.h"
4647
#include"storage/ipc.h"
4748
#include"storage/pmsignal.h"
4849
#include"storage/procarray.h"
50+
#include"utils/guc.h"
4951
#include"utils/ps_status.h"
5052
#include"utils/resowner.h"
5153

‎src/backend/replication/walreceiverfuncs.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include"access/xlog_internal.h"
2727
#include"replication/walreceiver.h"
2828
#include"storage/pmsignal.h"
29+
#include"storage/shmem.h"
2930

3031
WalRcvData*WalRcv=NULL;
3132

‎src/backend/replication/walsender.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
#include"miscadmin.h"
4848
#include"nodes/replnodes.h"
4949
#include"replication/basebackup.h"
50+
#include"replication/syncrep.h"
5051
#include"replication/walprotocol.h"
5152
#include"replication/walreceiver.h"
5253
#include"replication/walsender.h"

‎src/backend/storage/ipc/procarray.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
#include"access/twophase.h"
5353
#include"miscadmin.h"
5454
#include"storage/procarray.h"
55+
#include"storage/spin.h"
5556
#include"utils/builtins.h"
5657
#include"utils/snapmgr.h"
5758

‎src/backend/storage/ipc/procsignal.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include"bootstrap/bootstrap.h"
2121
#include"commands/async.h"
2222
#include"miscadmin.h"
23+
#include"storage/latch.h"
2324
#include"storage/ipc.h"
2425
#include"storage/sinval.h"
2526
#include"tcop/tcopprot.h"

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
#include"pg_trace.h"
3030
#include"storage/ipc.h"
3131
#include"storage/predicate.h"
32+
#include"storage/proc.h"
33+
#include"storage/spin.h"
3234

3335

3436
/* We use the ShmemLock spinlock to protect LWLockAssign */

‎src/backend/storage/smgr/smgr.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include"storage/bufmgr.h"
2222
#include"storage/ipc.h"
2323
#include"storage/smgr.h"
24+
#include"utils/hsearch.h"
2425
#include"utils/inval.h"
2526

2627

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

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

1919
#include"funcapi.h"
2020
#include"libpq/pqformat.h"
21+
#include"utils/array.h"
2122
#include"utils/builtins.h"
2223
#include"utils/datum.h"
2324
#include"utils/lsyscache.h"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include"catalog/indexing.h"
1919
#include"catalog/pg_enum.h"
2020
#include"libpq/pqformat.h"
21+
#include"utils/array.h"
2122
#include"utils/builtins.h"
2223
#include"utils/fmgroids.h"
2324
#include"utils/snapmgr.h"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
#include"catalog/pg_type.h"
3535
#include"funcapi.h"
3636
#include"libpq/pqformat.h"
37+
#include"utils/array.h"
3738
#include"utils/builtins.h"
3839

3940

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
#include"catalog/pg_type.h"
3333
#include"funcapi.h"
3434
#include"regex/regex.h"
35+
#include"utils/array.h"
3536
#include"utils/builtins.h"
3637

3738
#definePG_GETARG_TEXT_PP_IF_EXISTS(_n) \

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
#include"miscadmin.h"
4545
#include"utils/builtins.h"
4646
#include"utils/fmgroids.h"
47+
#include"utils/guc.h"
4748
#include"utils/lsyscache.h"
4849
#include"utils/memutils.h"
4950
#include"utils/rel.h"

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp