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

Commit616ae3d

Browse files
committed
Move routine definitions of xlogarchive.c to a new header file
The definitions of the routines defined in xlogarchive.c have been partof xlog_internal.h which is included by several frontend tools, but allthose routines are only called by the backend. More cleanup could bedone within xlog_internal.h, but that's already a nice cut.This will help a follow-up patch for pg_rewind where handling ofrestore_command is added for frontends.Author: Alexey Kondratov, Michael PaquierReviewed-by: Álvaro Herrera, Alexander KorotkovDiscussion:https://postgr.es/m/a3acff50-5a0d-9a2c-b3b2-ee36168955c1@postgrespro.ru
1 parentfc8c3bd commit616ae3d

File tree

6 files changed

+39
-18
lines changed

6 files changed

+39
-18
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
#include"access/timeline.h"
3838
#include"access/xlog.h"
3939
#include"access/xlog_internal.h"
40+
#include"access/xlogarchive.h"
4041
#include"access/xlogdefs.h"
4142
#include"pgstat.h"
4243
#include"storage/fd.h"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
#include"access/twophase.h"
3434
#include"access/xact.h"
3535
#include"access/xlog_internal.h"
36+
#include"access/xlogarchive.h"
3637
#include"access/xloginsert.h"
3738
#include"access/xlogreader.h"
3839
#include"access/xlogutils.h"

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

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

2222
#include"access/xlog.h"
2323
#include"access/xlog_internal.h"
24+
#include"access/xlogarchive.h"
2425
#include"common/archive.h"
2526
#include"miscadmin.h"
2627
#include"postmaster/startup.h"

‎src/backend/replication/walreceiver.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
#include"access/timeline.h"
5656
#include"access/transam.h"
5757
#include"access/xlog_internal.h"
58+
#include"access/xlogarchive.h"
5859
#include"catalog/pg_authid.h"
5960
#include"catalog/pg_type.h"
6061
#include"common/ip.h"

‎src/include/access/xlog_internal.h

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -320,22 +320,4 @@ extern bool InArchiveRecovery;
320320
externboolStandbyMode;
321321
externchar*recoveryRestoreCommand;
322322

323-
/*
324-
* Prototypes for functions in xlogarchive.c
325-
*/
326-
externboolRestoreArchivedFile(char*path,constchar*xlogfname,
327-
constchar*recovername,off_texpectedSize,
328-
boolcleanupEnabled);
329-
externvoidExecuteRecoveryCommand(constchar*command,constchar*commandName,
330-
boolfailOnSignal);
331-
externvoidKeepFileRestoredFromArchive(constchar*path,constchar*xlogfname);
332-
externvoidXLogArchiveNotify(constchar*xlog);
333-
externvoidXLogArchiveNotifySeg(XLogSegNosegno);
334-
externvoidXLogArchiveForceDone(constchar*xlog);
335-
externboolXLogArchiveCheckDone(constchar*xlog);
336-
externboolXLogArchiveIsBusy(constchar*xlog);
337-
externboolXLogArchiveIsReady(constchar*xlog);
338-
externboolXLogArchiveIsReadyOrDone(constchar*xlog);
339-
externvoidXLogArchiveCleanup(constchar*xlog);
340-
341323
#endif/* XLOG_INTERNAL_H */

‎src/include/access/xlogarchive.h

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
/*------------------------------------------------------------------------
2+
*
3+
* xlogarchive.h
4+
*Prototypes for WAL archives in the backend
5+
*
6+
* Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
7+
* Portions Copyright (c) 1994, Regents of the University of California
8+
*
9+
* IDENTIFICATION
10+
*src/include/access/xlogarchive.h
11+
*
12+
*------------------------------------------------------------------------
13+
*/
14+
15+
#ifndefXLOG_ARCHIVE_H
16+
#defineXLOG_ARCHIVE_H
17+
18+
#include"access/xlogdefs.h"
19+
20+
externboolRestoreArchivedFile(char*path,constchar*xlogfname,
21+
constchar*recovername,off_texpectedSize,
22+
boolcleanupEnabled);
23+
externvoidExecuteRecoveryCommand(constchar*command,constchar*commandName,
24+
boolfailOnSignal);
25+
externvoidKeepFileRestoredFromArchive(constchar*path,constchar*xlogfname);
26+
externvoidXLogArchiveNotify(constchar*xlog);
27+
externvoidXLogArchiveNotifySeg(XLogSegNosegno);
28+
externvoidXLogArchiveForceDone(constchar*xlog);
29+
externboolXLogArchiveCheckDone(constchar*xlog);
30+
externboolXLogArchiveIsBusy(constchar*xlog);
31+
externboolXLogArchiveIsReady(constchar*xlog);
32+
externboolXLogArchiveIsReadyOrDone(constchar*xlog);
33+
externvoidXLogArchiveCleanup(constchar*xlog);
34+
35+
#endif/* XLOG_ARCHIVE_H */

0 commit comments

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