Movatterモバイル変換

Skip to content

postgrespro/postgresPublic

forked frompostgres/postgres

NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit5276687

hlinnaka

committed

Make xlog_internal.h includable in frontend context.

This makes unnecessary the ugly hack used to #include postgres.h inpg_basebackup.Based on Alvaro Herrera's patch

1 parent6264cd3 commit5276687Copy full SHA for 5276687

File tree

12 files changed

+58

-56

lines changed

src
- backend
  - access
    - rmgrdesc
      - xlogdesc.c
    - transam
      - xlogarchive.c
      - xlogfuncs.c
  - postmaster
- bin/pg_basebackup
- include/access
  - xlog_fn.h
  - xlog_internal.h

12 files changed

+58

-56

lines changed

`‎src/backend/access/rmgrdesc/xlogdesc.c‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`*/`
`15`	`15`	`#include"postgres.h"`
`16`	`16`
	`17`	`+#include"access/xlog.h"`
`17`	`18`	`#include"access/xlog_internal.h"`
`18`	`19`	`#include"catalog/pg_control.h"`
`19`	`20`	`#include"utils/guc.h"`

`‎src/backend/access/transam/xlogarchive.c‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`#include<signal.h>`
`21`	`21`	`#include<unistd.h>`
`22`	`22`
	`23`	`+#include"access/xlog.h"`
`23`	`24`	`#include"access/xlog_internal.h"`
`24`	`25`	`#include"miscadmin.h"`
`25`	`26`	`#include"postmaster/startup.h"`

`‎src/backend/access/transam/xlogfuncs.c‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`
`19`	`19`	`#include"access/htup_details.h"`
`20`	`20`	`#include"access/xlog.h"`
	`21`	`+#include"access/xlog_fn.h"`
`21`	`22`	`#include"access/xlog_internal.h"`
`22`	`23`	`#include"access/xlogutils.h"`
`23`	`24`	`#include"catalog/catalog.h"`

`‎src/backend/postmaster/bgwriter.c‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@`
`39`	`39`	`#include<time.h>`
`40`	`40`	`#include<unistd.h>`
`41`	`41`
	`42`	`+#include"access/xlog.h"`
`42`	`43`	`#include"access/xlog_internal.h"`
`43`	`44`	`#include"libpq/pqsignal.h"`
`44`	`45`	`#include"miscadmin.h"`

`‎src/backend/postmaster/checkpointer.c‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@`
`41`	`41`	`#include<time.h>`
`42`	`42`	`#include<unistd.h>`
`43`	`43`
	`44`	`+#include"access/xlog.h"`
`44`	`45`	`#include"access/xlog_internal.h"`
`45`	`46`	`#include"libpq/pqsignal.h"`
`46`	`47`	`#include"miscadmin.h"`

`‎src/backend/postmaster/pgarch.c‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@`
`32`	`32`	`#include<sys/wait.h>`
`33`	`33`	`#include<unistd.h>`
`34`	`34`
	`35`	`+#include"access/xlog.h"`
`35`	`36`	`#include"access/xlog_internal.h"`
`36`	`37`	`#include"libpq/pqsignal.h"`
`37`	`38`	`#include"miscadmin.h"`

`‎src/bin/pg_basebackup/pg_basebackup.c‎`

Lines changed: 1 addition & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,13 +11,7 @@`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`13`	`13`
`14`		`-/*`
`15`		`- * We have to use postgres.h not postgres_fe.h here, because there's so much`
`16`		`- * backend-only stuff in the XLOG include files we need. But we need a`
`17`		`- * frontend-ish environment otherwise.Hence this ugly hack.`
`18`		`- */`
`19`		`-#defineFRONTEND 1`
`20`		`-#include"postgres.h"`
	`14`	`+#include"postgres_fe.h"`
`21`	`15`	`#include"libpq-fe.h"`
`22`	`16`
`23`	`17`	`#include<unistd.h>`

`‎src/bin/pg_basebackup/pg_receivexlog.c‎`

Lines changed: 1 addition & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,13 +12,7 @@`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`14`	`14`
`15`		`-/*`
`16`		`- * We have to use postgres.h not postgres_fe.h here, because there's so much`
`17`		`- * backend-only stuff in the XLOG include files we need. But we need a`
`18`		`- * frontend-ish environment otherwise.Hence this ugly hack.`
`19`		`- */`
`20`		`-#defineFRONTEND 1`
`21`		`-#include"postgres.h"`
	`15`	`+#include"postgres_fe.h"`
`22`	`16`	`#include"libpq-fe.h"`
`23`	`17`	`#include"libpq/pqsignal.h"`
`24`	`18`	`#include"access/xlog_internal.h"`

`‎src/bin/pg_basebackup/receivelog.c‎`

Lines changed: 1 addition & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,14 +11,7 @@`
`11`	`11`	`* src/bin/pg_basebackup/receivelog.c`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`14`		`-`
`15`		`-/*`
`16`		`- * We have to use postgres.h not postgres_fe.h here, because there's so much`
`17`		`- * backend-only stuff in the XLOG include files we need. But we need a`
`18`		`- * frontend-ish environment otherwise.Hence this ugly hack.`
`19`		`- */`
`20`		`-#defineFRONTEND 1`
`21`		`-#include"postgres.h"`
	`14`	`+#include"postgres_fe.h"`
`22`	`15`
`23`	`16`	`#include<sys/stat.h>`
`24`	`17`	`#include<sys/time.h>`
`@@ -30,8 +23,6 @@`
`30`	`23`
`31`	`24`	`#include"libpq-fe.h"`
`32`	`25`	`#include"access/xlog_internal.h"`
`33`		`-#include"utils/datetime.h"`
`34`		`-#include"utils/timestamp.h"`
`35`	`26`
`36`	`27`	`#include"receivelog.h"`
`37`	`28`	`#include"streamutil.h"`

`‎src/bin/pg_basebackup/streamutil.c‎`

Lines changed: 1 addition & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,13 +11,7 @@`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`13`	`13`
`14`		`-/*`
`15`		`- * We have to use postgres.h not postgres_fe.h here, because there's so much`
`16`		`- * backend-only stuff in the XLOG include files we need. But we need a`
`17`		`- * frontend-ish environment otherwise.Hence this ugly hack.`
`18`		`- */`
`19`		`-#defineFRONTEND 1`
`20`		`-#include"postgres.h"`
	`14`	`+#include"postgres_fe.h"`
`21`	`15`	`#include"streamutil.h"`
`22`	`16`
`23`	`17`	`#include<stdio.h>`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp