Movatterモバイル変換

Skip to content

postgrespro/postgresproPublic

NotificationsYou must be signed in to change notification settings
Fork5
Star26

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>`

`‎src/include/access/xlog_fn.h`

Lines changed: 35 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,35 @@`
	`1`	`+/*`
	`2`	`+ * xlog_fn.h`
	`3`	`+ *`
	`4`	`+ * PostgreSQL transaction log SQL-callable function declarations`
	`5`	`+ *`
	`6`	`+ * Portions Copyright (c) 1996-2012, PostgreSQL Global Development Group`
	`7`	`+ * Portions Copyright (c) 1994, Regents of the University of California`
	`8`	`+ *`
	`9`	`+ * src/include/access/xlog_fn.h`
	`10`	`+ */`
	`11`	`+#ifndefXLOG_FN_H`
	`12`	`+#defineXLOG_FN_H`
	`13`	`+`
	`14`	`+#include"fmgr.h"`
	`15`	`+`
	`16`	`+externDatumpg_start_backup(PG_FUNCTION_ARGS);`
	`17`	`+externDatumpg_stop_backup(PG_FUNCTION_ARGS);`
	`18`	`+externDatumpg_switch_xlog(PG_FUNCTION_ARGS);`
	`19`	`+externDatumpg_create_restore_point(PG_FUNCTION_ARGS);`
	`20`	`+externDatumpg_current_xlog_location(PG_FUNCTION_ARGS);`
	`21`	`+externDatumpg_current_xlog_insert_location(PG_FUNCTION_ARGS);`
	`22`	`+externDatumpg_last_xlog_receive_location(PG_FUNCTION_ARGS);`
	`23`	`+externDatumpg_last_xlog_replay_location(PG_FUNCTION_ARGS);`
	`24`	`+externDatumpg_last_xact_replay_timestamp(PG_FUNCTION_ARGS);`
	`25`	`+externDatumpg_xlogfile_name_offset(PG_FUNCTION_ARGS);`
	`26`	`+externDatumpg_xlogfile_name(PG_FUNCTION_ARGS);`
	`27`	`+externDatumpg_is_in_recovery(PG_FUNCTION_ARGS);`
	`28`	`+externDatumpg_xlog_replay_pause(PG_FUNCTION_ARGS);`
	`29`	`+externDatumpg_xlog_replay_resume(PG_FUNCTION_ARGS);`
	`30`	`+externDatumpg_is_xlog_replay_paused(PG_FUNCTION_ARGS);`
	`31`	`+externDatumpg_xlog_location_diff(PG_FUNCTION_ARGS);`
	`32`	`+externDatumpg_is_in_backup(PG_FUNCTION_ARGS);`
	`33`	`+externDatumpg_backup_start_time(PG_FUNCTION_ARGS);`
	`34`	`+`
	`35`	`+#endif/* XLOG_FN_H */`

`‎src/include/access/xlog_internal.h`

Lines changed: 13 additions & 25 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,9 @@`
`8`	`8`	`* needed by rmgr routines (redo support for individual record types).`
`9`	`9`	`* So the XLogRecord typedef and associated stuff appear in xlog.h.`
`10`	`10`	`*`
	`11`	`+ * Note: This file must be includable in both frontend and backend contexts,`
	`12`	`+ * to allow stand-alone tools like pg_receivexlog to deal with WAL files.`
	`13`	`+ *`
`11`	`14`	`* Portions Copyright (c) 1996-2012, PostgreSQL Global Development Group`
`12`	`15`	`* Portions Copyright (c) 1994, Regents of the University of California`
`13`	`16`	`*`
`@@ -16,8 +19,9 @@`
`16`	`19`	`#ifndefXLOG_INTERNAL_H`
`17`	`20`	`#defineXLOG_INTERNAL_H`
`18`	`21`
`19`		`-#include"access/xlog.h"`
`20`		`-#include"fmgr.h"`
	`22`	`+#include"access/xlogdefs.h"`
	`23`	`+#include"datatype/timestamp.h"`
	`24`	`+#include"lib/stringinfo.h"`
`21`	`25`	`#include"pgtime.h"`
`22`	`26`	`#include"storage/block.h"`
`23`	`27`	`#include"storage/relfilenode.h"`
`@@ -225,6 +229,12 @@ typedef struct xl_restore_point`
`225`	`229`	`}xl_restore_point;`
`226`	`230`
`227`	`231`
	`232`	`+/*`
	`233`	`+ * XLogRecord is defined in xlog.h, but we avoid #including that to keep`
	`234`	`+ * this file includable in stand-alone programs.`
	`235`	`+ */`
	`236`	`+structXLogRecord;`
	`237`	`+`
`228`	`238`	`/*`
`229`	`239`	`* Method table for resource managers.`
`230`	`240`	`*`
`@@ -233,7 +243,7 @@ typedef struct xl_restore_point`
`233`	`243`	`typedefstructRmgrData`
`234`	`244`	`{`
`235`	`245`	`constchar*rm_name;`
`236`		`-void(rm_redo) (XLogRecPtrlsn,XLogRecordrptr);`
	`246`	`+void(rm_redo) (XLogRecPtrlsn,structXLogRecordrptr);`
`237`	`247`	`void(rm_desc) (StringInfobuf,uint8xl_info,charrec);`
`238`	`248`	`void(*rm_startup) (void);`
`239`	`249`	`void(*rm_cleanup) (void);`
`@@ -272,26 +282,4 @@ extern bool XLogArchiveCheckDone(const char *xlog);`
`272`	`282`	`externboolXLogArchiveIsBusy(constchar*xlog);`
`273`	`283`	`externvoidXLogArchiveCleanup(constchar*xlog);`
`274`	`284`
`275`		`-/*`
`276`		`- * These aren't in xlog.h because I'd rather not include fmgr.h there.`
`277`		`- */`
`278`		`-externDatumpg_start_backup(PG_FUNCTION_ARGS);`
`279`		`-externDatumpg_stop_backup(PG_FUNCTION_ARGS);`
`280`		`-externDatumpg_switch_xlog(PG_FUNCTION_ARGS);`
`281`		`-externDatumpg_create_restore_point(PG_FUNCTION_ARGS);`
`282`		`-externDatumpg_current_xlog_location(PG_FUNCTION_ARGS);`
`283`		`-externDatumpg_current_xlog_insert_location(PG_FUNCTION_ARGS);`
`284`		`-externDatumpg_last_xlog_receive_location(PG_FUNCTION_ARGS);`
`285`		`-externDatumpg_last_xlog_replay_location(PG_FUNCTION_ARGS);`
`286`		`-externDatumpg_last_xact_replay_timestamp(PG_FUNCTION_ARGS);`
`287`		`-externDatumpg_xlogfile_name_offset(PG_FUNCTION_ARGS);`
`288`		`-externDatumpg_xlogfile_name(PG_FUNCTION_ARGS);`
`289`		`-externDatumpg_is_in_recovery(PG_FUNCTION_ARGS);`
`290`		`-externDatumpg_xlog_replay_pause(PG_FUNCTION_ARGS);`
`291`		`-externDatumpg_xlog_replay_resume(PG_FUNCTION_ARGS);`
`292`		`-externDatumpg_is_xlog_replay_paused(PG_FUNCTION_ARGS);`
`293`		`-externDatumpg_xlog_location_diff(PG_FUNCTION_ARGS);`
`294`		`-externDatumpg_is_in_backup(PG_FUNCTION_ARGS);`
`295`		`-externDatumpg_backup_start_time(PG_FUNCTION_ARGS);`
`296`		`-`
`297`	`285`	`#endif/* XLOG_INTERNAL_H */`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp