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

Commitf88798c

Browse files
committed
Move basebackup code to new directory src/backend/backup
Reviewed by David Steele and Justin PryzbyDiscussion:http://postgr.es/m/CA+TgmoafqboATDSoXHz8VLrSwK_MDhjthK4hEpYjqf9_1Fmczw%40mail.gmail.com
1 parentad3e07c commitf88798c

23 files changed

+73
-53
lines changed

‎contrib/basebackup_to_shell/basebackup_to_shell.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
#include"postgres.h"
1212

1313
#include"access/xact.h"
14+
#include"backup/basebackup_target.h"
1415
#include"miscadmin.h"
15-
#include"replication/basebackup_target.h"
1616
#include"storage/fd.h"
1717
#include"utils/acl.h"
1818
#include"utils/guc.h"

‎src/backend/Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ subdir = src/backend
1717
top_builddir = ../..
1818
include$(top_builddir)/src/Makefile.global
1919

20-
SUBDIRS = access bootstrap catalog parser commands executor foreign lib libpq\
20+
SUBDIRS = access backup bootstrap catalog parser commands executor\
21+
foreign lib libpq\
2122
main nodes optimizer partitioning port postmaster\
2223
regex replication rewrite\
2324
statistics storage tcop tsearch utils$(top_builddir)/src/timezone\

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
#include"access/xlogreader.h"
6464
#include"access/xlogrecovery.h"
6565
#include"access/xlogutils.h"
66+
#include"backup/basebackup.h"
6667
#include"catalog/catversion.h"
6768
#include"catalog/pg_control.h"
6869
#include"catalog/pg_database.h"
@@ -77,7 +78,6 @@
7778
#include"postmaster/bgwriter.h"
7879
#include"postmaster/startup.h"
7980
#include"postmaster/walwriter.h"
80-
#include"replication/basebackup.h"
8181
#include"replication/logical.h"
8282
#include"replication/origin.h"
8383
#include"replication/slot.h"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@
4040
#include"access/xlogreader.h"
4141
#include"access/xlogrecovery.h"
4242
#include"access/xlogutils.h"
43+
#include"backup/basebackup.h"
4344
#include"catalog/pg_control.h"
4445
#include"commands/tablespace.h"
4546
#include"common/file_utils.h"
4647
#include"miscadmin.h"
4748
#include"pgstat.h"
4849
#include"postmaster/bgwriter.h"
4950
#include"postmaster/startup.h"
50-
#include"replication/basebackup.h"
5151
#include"replication/walreceiver.h"
5252
#include"storage/fd.h"
5353
#include"storage/ipc.h"

‎src/backend/backup/Makefile‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
#-------------------------------------------------------------------------
2+
#
3+
# Makefile--
4+
# Makefile for src/backend/backup
5+
#
6+
# IDENTIFICATION
7+
# src/backend/backup/Makefile
8+
#
9+
#-------------------------------------------------------------------------
10+
11+
subdir = src/backend/backup
12+
top_builddir = ../../..
13+
include$(top_builddir)/src/Makefile.global
14+
15+
overrideCPPFLAGS := -I. -I$(srcdir)$(CPPFLAGS)
16+
17+
OBJS =\
18+
backup_manifest.o\
19+
basebackup.o\
20+
basebackup_copy.o\
21+
basebackup_gzip.o\
22+
basebackup_lz4.o\
23+
basebackup_zstd.o\
24+
basebackup_progress.o\
25+
basebackup_server.o\
26+
basebackup_sink.o\
27+
basebackup_target.o\
28+
basebackup_throttle.o
29+
30+
include$(top_srcdir)/src/backend/common.mk

‎src/backend/replication/backup_manifest.c‎renamed to ‎src/backend/backup/backup_manifest.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
* Portions Copyright (c) 2010-2022, PostgreSQL Global Development Group
77
*
88
* IDENTIFICATION
9-
* src/backend/replication/backup_manifest.c
9+
* src/backend/backup/backup_manifest.c
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
1313
#include"postgres.h"
1414

1515
#include"access/timeline.h"
16+
#include"backup/backup_manifest.h"
17+
#include"backup/basebackup_sink.h"
1618
#include"libpq/libpq.h"
1719
#include"libpq/pqformat.h"
1820
#include"mb/pg_wchar.h"
19-
#include"replication/backup_manifest.h"
20-
#include"replication/basebackup_sink.h"
2121
#include"utils/builtins.h"
2222
#include"utils/json.h"
2323

‎src/backend/replication/basebackup.c‎renamed to ‎src/backend/backup/basebackup.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright (c) 2010-2022, PostgreSQL Global Development Group
77
*
88
* IDENTIFICATION
9-
* src/backend/replication/basebackup.c
9+
* src/backend/backup/basebackup.c
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -17,20 +17,20 @@
1717
#include<time.h>
1818

1919
#include"access/xlog_internal.h"/* for pg_start/stop_backup */
20+
#include"backup/backup_manifest.h"
21+
#include"backup/basebackup.h"
22+
#include"backup/basebackup_sink.h"
23+
#include"backup/basebackup_target.h"
24+
#include"commands/defrem.h"
2025
#include"common/compression.h"
2126
#include"common/file_perm.h"
22-
#include"commands/defrem.h"
2327
#include"lib/stringinfo.h"
2428
#include"miscadmin.h"
2529
#include"nodes/pg_list.h"
2630
#include"pgstat.h"
2731
#include"pgtar.h"
2832
#include"port.h"
2933
#include"postmaster/syslogger.h"
30-
#include"replication/basebackup.h"
31-
#include"replication/basebackup_sink.h"
32-
#include"replication/basebackup_target.h"
33-
#include"replication/backup_manifest.h"
3434
#include"replication/walsender.h"
3535
#include"replication/walsender_private.h"
3636
#include"storage/bufpage.h"

‎src/backend/replication/basebackup_copy.c‎renamed to ‎src/backend/backup/basebackup_copy.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@
1919
* Portions Copyright (c) 2010-2022, PostgreSQL Global Development Group
2020
*
2121
* IDENTIFICATION
22-
* src/backend/replication/basebackup_copy.c
22+
* src/backend/backup/basebackup_copy.c
2323
*
2424
*-------------------------------------------------------------------------
2525
*/
2626
#include"postgres.h"
2727

28+
#include"backup/basebackup.h"
29+
#include"backup/basebackup_sink.h"
2830
#include"catalog/pg_type_d.h"
2931
#include"libpq/libpq.h"
3032
#include"libpq/pqformat.h"
31-
#include"replication/basebackup.h"
32-
#include"replication/basebackup_sink.h"
3333
#include"utils/timestamp.h"
3434

3535
typedefstructbbsink_copystream

‎src/backend/replication/basebackup_gzip.c‎renamed to ‎src/backend/backup/basebackup_gzip.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright (c) 2010-2022, PostgreSQL Global Development Group
77
*
88
* IDENTIFICATION
9-
* src/backend/replication/basebackup_gzip.c
9+
* src/backend/backup/basebackup_gzip.c
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -16,7 +16,7 @@
1616
#include<zlib.h>
1717
#endif
1818

19-
#include"replication/basebackup_sink.h"
19+
#include"backup/basebackup_sink.h"
2020

2121
#ifdefHAVE_LIBZ
2222
typedefstructbbsink_gzip

‎src/backend/replication/basebackup_lz4.c‎renamed to ‎src/backend/backup/basebackup_lz4.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright (c) 2010-2022, PostgreSQL Global Development Group
77
*
88
* IDENTIFICATION
9-
* src/backend/replication/basebackup_lz4.c
9+
* src/backend/backup/basebackup_lz4.c
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -16,7 +16,7 @@
1616
#include<lz4frame.h>
1717
#endif
1818

19-
#include"replication/basebackup_sink.h"
19+
#include"backup/basebackup_sink.h"
2020

2121
#ifdefUSE_LZ4
2222

0 commit comments

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