index 34188f2d9d3cbbfb1f278f074bcdb0675eeb93b7..e2b18631e053b97a67f3339c4408bc2e830536c9 100644 (file)
#include "postgres.h"
#include "access/xact.h"
+#include "backup/basebackup_target.h"
#include "miscadmin.h"
-#include "replication/basebackup_target.h"
#include "storage/fd.h"
#include "utils/acl.h"
#include "utils/guc.h"
index 01d5a7448f225c3211e93426eca1f649a3abba59..3f01c655927a05d9d0b3410880bf8c19ddbaad34 100644 (file)
top_builddir = ../..
include $(top_builddir)/src/Makefile.global
-SUBDIRS = access bootstrap catalog parser commands executor foreign lib libpq \
+SUBDIRS = access backup bootstrap catalog parser commands executor \
+ foreign lib libpq \
main nodes optimizer partitioning port postmaster \
regex replication rewrite \
statistics storage tcop tsearch utils $(top_builddir)/src/timezone \
index 34f0150d1ee965bb9f6238617f6a759487421b70..9cedd6876f68906001be9cd6095f5b62f19d6261 100644 (file)
#include "access/xlogreader.h"
#include "access/xlogrecovery.h"
#include "access/xlogutils.h"
+#include "backup/basebackup.h"
#include "catalog/catversion.h"
#include "catalog/pg_control.h"
#include "catalog/pg_database.h"
#include "postmaster/bgwriter.h"
#include "postmaster/startup.h"
#include "postmaster/walwriter.h"
-#include "replication/basebackup.h"
#include "replication/logical.h"
#include "replication/origin.h"
#include "replication/slot.h"
index 21088e78f61bd36930deca1579077d8bea1f3fbe..a59a0e826bb970f81e5c01c196c6b7739fcec3dd 100644 (file)
#include "access/xlogreader.h"
#include "access/xlogrecovery.h"
#include "access/xlogutils.h"
+#include "backup/basebackup.h"
#include "catalog/pg_control.h"
#include "commands/tablespace.h"
#include "common/file_utils.h"
#include "pgstat.h"
#include "postmaster/bgwriter.h"
#include "postmaster/startup.h"
-#include "replication/basebackup.h"
#include "replication/walreceiver.h"
#include "storage/fd.h"
#include "storage/ipc.h"
new file mode 100644
(file)
index 0000000..
b21bd8f
--- /dev/null
+#-------------------------------------------------------------------------
+#
+# Makefile--
+# Makefile for src/backend/backup
+#
+# IDENTIFICATION
+# src/backend/backup/Makefile
+#
+#-------------------------------------------------------------------------
+
+subdir = src/backend/backup
+top_builddir = ../../..
+include $(top_builddir)/src/Makefile.global
+
+override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
+
+OBJS = \
+ backup_manifest.o \
+ basebackup.o \
+ basebackup_copy.o \
+ basebackup_gzip.o \
+ basebackup_lz4.o \
+ basebackup_zstd.o \
+ basebackup_progress.o \
+ basebackup_server.o \
+ basebackup_sink.o \
+ basebackup_target.o \
+ basebackup_throttle.o
+
+include $(top_srcdir)/src/backend/common.mk
* Portions Copyright (c) 2010-2022, PostgreSQL Global Development Group
*
* IDENTIFICATION
- * src/backend/replication/backup_manifest.c
+ * src/backend/backup/backup_manifest.c
*
*-------------------------------------------------------------------------
*/
#include "postgres.h"
#include "access/timeline.h"
+#include "backup/backup_manifest.h"
+#include "backup/basebackup_sink.h"
#include "libpq/libpq.h"
#include "libpq/pqformat.h"
#include "mb/pg_wchar.h"
-#include "replication/backup_manifest.h"
-#include "replication/basebackup_sink.h"
#include "utils/builtins.h"
#include "utils/json.h"
* Portions Copyright (c) 2010-2022, PostgreSQL Global Development Group
*
* IDENTIFICATION
- * src/backend/replication/basebackup.c
+ * src/backend/backup/basebackup.c
*
*-------------------------------------------------------------------------
*/
#include <time.h>
#include "access/xlog_internal.h" /* for pg_backup_start/stop */
+#include "backup/backup_manifest.h"
+#include "backup/basebackup.h"
+#include "backup/basebackup_sink.h"
+#include "backup/basebackup_target.h"
+#include "commands/defrem.h"
#include "common/compression.h"
#include "common/file_perm.h"
-#include "commands/defrem.h"
#include "lib/stringinfo.h"
#include "miscadmin.h"
#include "nodes/pg_list.h"
#include "pgtar.h"
#include "port.h"
#include "postmaster/syslogger.h"
-#include "replication/basebackup.h"
-#include "replication/basebackup_sink.h"
-#include "replication/basebackup_target.h"
-#include "replication/backup_manifest.h"
#include "replication/walsender.h"
#include "replication/walsender_private.h"
#include "storage/bufpage.h"
* Portions Copyright (c) 2010-2022, PostgreSQL Global Development Group
*
* IDENTIFICATION
- * src/backend/replication/basebackup_copy.c
+ * src/backend/backup/basebackup_copy.c
*
*-------------------------------------------------------------------------
*/
#include "postgres.h"
#include "access/tupdesc.h"
+#include "backup/basebackup.h"
+#include "backup/basebackup_sink.h"
#include "catalog/pg_type_d.h"
#include "executor/executor.h"
#include "libpq/libpq.h"
#include "libpq/pqformat.h"
-#include "replication/basebackup.h"
-#include "replication/basebackup_sink.h"
#include "tcop/dest.h"
#include "utils/builtins.h"
#include "utils/timestamp.h"
* Portions Copyright (c) 2010-2022, PostgreSQL Global Development Group
*
* IDENTIFICATION
- * src/backend/replication/basebackup_gzip.c
+ * src/backend/backup/basebackup_gzip.c
*
*-------------------------------------------------------------------------
*/
#include <zlib.h>
#endif
-#include "replication/basebackup_sink.h"
+#include "backup/basebackup_sink.h"
#ifdef HAVE_LIBZ
typedef struct bbsink_gzip
* Portions Copyright (c) 2010-2022, PostgreSQL Global Development Group
*
* IDENTIFICATION
- * src/backend/replication/basebackup_lz4.c
+ * src/backend/backup/basebackup_lz4.c
*
*-------------------------------------------------------------------------
*/
#include <lz4frame.h>
#endif
-#include "replication/basebackup_sink.h"
+#include "backup/basebackup_sink.h"
#ifdef USE_LZ4
* Portions Copyright (c) 2010-2022, PostgreSQL Global Development Group
*
* IDENTIFICATION
- * src/backend/replication/basebackup_progress.c
+ * src/backend/backup/basebackup_progress.c
*
*-------------------------------------------------------------------------
*/
#include "postgres.h"
+#include "backup/basebackup.h"
+#include "backup/basebackup_sink.h"
#include "commands/progress.h"
#include "miscadmin.h"
-#include "replication/basebackup.h"
-#include "replication/basebackup_sink.h"
#include "pgstat.h"
#include "storage/latch.h"
#include "utils/timestamp.h"
* store basebackup archives on the server
*
* IDENTIFICATION
- * src/backend/replication/basebackup_server.c
+ * src/backend/backup/basebackup_server.c
*
*-------------------------------------------------------------------------
*/
#include "postgres.h"
#include "access/xact.h"
+#include "backup/basebackup.h"
+#include "backup/basebackup_sink.h"
#include "catalog/pg_authid.h"
#include "miscadmin.h"
-#include "replication/basebackup.h"
-#include "replication/basebackup_sink.h"
#include "storage/fd.h"
#include "utils/acl.h"
#include "utils/timestamp.h"
*
* Portions Copyright (c) 2010-2022, PostgreSQL Global Development Group
*
- * src/backend/replication/basebackup_sink.c
+ * src/backend/backup/basebackup_sink.c
*
*-------------------------------------------------------------------------
*/
#include "postgres.h"
-#include "replication/basebackup_sink.h"
+#include "backup/basebackup_sink.h"
/*
* Forward begin_backup callback.
* Portions Copyright (c) 2010-2022, PostgreSQL Global Development Group
*
* IDENTIFICATION
- * src/backend/replication/basebackup_target.c
+ * src/backend/backup/basebackup_target.c
*
*-------------------------------------------------------------------------
*/
#include "postgres.h"
-#include "replication/basebackup_target.h"
+#include "backup/basebackup_target.h"
#include "utils/memutils.h"
typedef struct BaseBackupTargetType
* Portions Copyright (c) 2010-2022, PostgreSQL Global Development Group
*
* IDENTIFICATION
- * src/backend/replication/basebackup_throttle.c
+ * src/backend/backup/basebackup_throttle.c
*
*-------------------------------------------------------------------------
*/
#include "postgres.h"
+#include "backup/basebackup_sink.h"
#include "miscadmin.h"
-#include "replication/basebackup_sink.h"
#include "pgstat.h"
#include "storage/latch.h"
#include "utils/timestamp.h"
* Portions Copyright (c) 2010-2022, PostgreSQL Global Development Group
*
* IDENTIFICATION
- * src/backend/replication/basebackup_zstd.c
+ * src/backend/backup/basebackup_zstd.c
*
*-------------------------------------------------------------------------
*/
#include <zstd.h>
#endif
-#include "replication/basebackup_sink.h"
+#include "backup/basebackup_sink.h"
#ifdef USE_ZSTD
index 3d8fb70c0e336fdf9887368019e7636344a81c6d..2bffac58c0d5891ee29e53e42c3d257cff59167f 100644 (file)
@@ -15,17 +15,6 @@ include $(top_builddir)/src/Makefile.global
override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
OBJS = \
- backup_manifest.o \
- basebackup.o \
- basebackup_copy.o \
- basebackup_gzip.o \
- basebackup_lz4.o \
- basebackup_zstd.o \
- basebackup_progress.o \
- basebackup_server.o \
- basebackup_sink.o \
- basebackup_target.o \
- basebackup_throttle.o \
repl_gram.o \
slot.o \
slotfuncs.o \
index 3a86786cc3a4c037e364823359e51310152eb81d..724010dbd97dbfcae507593a519692ecfe4ccc26 100644 (file)
#include "access/xlogreader.h"
#include "access/xlogrecovery.h"
#include "access/xlogutils.h"
+#include "backup/basebackup.h"
#include "catalog/pg_authid.h"
#include "catalog/pg_type.h"
#include "commands/dbcommands.h"
#include "nodes/replnodes.h"
#include "pgstat.h"
#include "postmaster/interrupt.h"
-#include "replication/basebackup.h"
#include "replication/decode.h"
#include "replication/logical.h"
#include "replication/slot.h"
index 5f6bc1c28ac53a184be8beb52b78eb911a69ccf4..49fcabbd2c6e6b08e6218900e94b2080f04cb708 100644 (file)
#endif
#include "access/xlog_internal.h"
+#include "backup/basebackup.h"
#include "bbstreamer.h"
#include "common/compression.h"
#include "common/file_perm.h"
#include "fe_utils/recovery_gen.h"
#include "getopt_long.h"
#include "receivelog.h"
-#include "replication/basebackup.h"
#include "streamutil.h"
#define ERRCODE_DATA_CORRUPTED "XX001"
*
* Portions Copyright (c) 2010-2022, PostgreSQL Global Development Group
*
- * src/include/replication/backup_manifest.h
+ * src/include/backup/backup_manifest.h
*
*-------------------------------------------------------------------------
*/
#ifndef BACKUP_MANIFEST_H
#define BACKUP_MANIFEST_H
+#include "backup/basebackup_sink.h"
#include "common/checksum_helper.h"
#include "pgtime.h"
-#include "replication/basebackup_sink.h"
#include "storage/buffile.h"
typedef enum manifest_option
*
* Portions Copyright (c) 2010-2022, PostgreSQL Global Development Group
*
- * src/include/replication/basebackup.h
+ * src/include/backup/basebackup.h
*
*-------------------------------------------------------------------------
*/
*
* Portions Copyright (c) 2010-2022, PostgreSQL Global Development Group
*
- * src/include/replication/basebackup_sink.h
+ * src/include/backup/basebackup_sink.h
*
*-------------------------------------------------------------------------
*/
*
* Portions Copyright (c) 2010-2022, PostgreSQL Global Development Group
*
- * src/include/replication/basebackup_target.h
+ * src/include/backup/basebackup_target.h
*
*-------------------------------------------------------------------------
*/
#ifndef BASEBACKUP_TARGET_H
#define BASEBACKUP_TARGET_H
-#include "replication/basebackup_sink.h"
+#include "backup/basebackup_sink.h"
struct BaseBackupTargetHandle;
typedef struct BaseBackupTargetHandle BaseBackupTargetHandle;