Move basebackup code to new directory src/backend/backup

Reviewed by David Steele and Justin Pryzby

Discussion: http://postgr.es/m/CA+TgmoafqboATDSoXHz8VLrSwK_MDhjthK4hEpYjqf9_1Fmczw%40mail.gmail.com

diff --git a/contrib/basebackup_to_shell/basebackup_to_shell.c b/contrib/basebackup_to_shell/basebackup_to_shell.c
index 34188f2d9d3cbbfb1f278f074bcdb0675eeb93b7..e2b18631e053b97a67f3339c4408bc2e830536c9 100644 (file)
--- a/contrib/basebackup_to_shell/basebackup_to_shell.c
+++ b/contrib/basebackup_to_shell/basebackup_to_shell.c
@@ -11,8 +11,8 @@
 #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"

diff --git a/src/backend/Makefile b/src/backend/Makefile
index 01d5a7448f225c3211e93426eca1f649a3abba59..3f01c655927a05d9d0b3410880bf8c19ddbaad34 100644 (file)
--- a/src/backend/Makefile
+++ b/src/backend/Makefile
@@ -17,7 +17,8 @@ subdir = src/backend
 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 \

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 34f0150d1ee965bb9f6238617f6a759487421b70..9cedd6876f68906001be9cd6095f5b62f19d6261 100644 (file)
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -63,6 +63,7 @@
 #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"
@@ -77,7 +78,6 @@
 #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"

diff --git a/src/backend/access/transam/xlogrecovery.c b/src/backend/access/transam/xlogrecovery.c
index 21088e78f61bd36930deca1579077d8bea1f3fbe..a59a0e826bb970f81e5c01c196c6b7739fcec3dd 100644 (file)
--- a/src/backend/access/transam/xlogrecovery.c
+++ b/src/backend/access/transam/xlogrecovery.c
@@ -40,6 +40,7 @@
 #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"
@@ -47,7 +48,6 @@
 #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"

diff --git a/src/backend/backup/Makefile b/src/backend/backup/Makefile
new file mode 100644 (file)
index 0000000..b21bd8f
--- /dev/null
+++ b/src/backend/backup/Makefile
@@ -0,0 +1,30 @@
+#-------------------------------------------------------------------------
+#
+# 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

diff --git a/src/backend/replication/backup_manifest.c b/src/backend/backup/backup_manifest.c
similarity index 98%
rename from src/backend/replication/backup_manifest.c
rename to src/backend/backup/backup_manifest.c
index d47ab4c41e3596956a6af115a23d8526f230c70e..a54185fdab8c4971415d32e0eff3a9832c2d5135 100644 (file)
--- a/src/backend/replication/backup_manifest.c
+++ b/src/backend/backup/backup_manifest.c
@@ -6,18 +6,18 @@
  * 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"
 

diff --git a/src/backend/replication/basebackup.c b/src/backend/backup/basebackup.c
similarity index 99%
rename from src/backend/replication/basebackup.c
rename to src/backend/backup/basebackup.c
index deeddd09a9c5f4dc743a2a8d76e0a9b2a1d2313a..715428029b35cd1945dab17ed42438a5849c0697 100644 (file)
--- a/src/backend/replication/basebackup.c
+++ b/src/backend/backup/basebackup.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 2010-2022, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *       src/backend/replication/basebackup.c
+ *       src/backend/backup/basebackup.c
  *
  *-------------------------------------------------------------------------
  */
@@ -17,9 +17,13 @@
 #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"
@@ -27,10 +31,6 @@
 #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"

diff --git a/src/backend/replication/basebackup_copy.c b/src/backend/backup/basebackup_copy.c
similarity index 99%
rename from src/backend/replication/basebackup_copy.c
rename to src/backend/backup/basebackup_copy.c
index c384d63a34135ba37fcdc03705f09c4c44f1a530..a5ad7fa392ea291a7f8e45720e49da04cec95a76 100644 (file)
--- a/src/backend/replication/basebackup_copy.c
+++ b/src/backend/backup/basebackup_copy.c
@@ -19,19 +19,19 @@
  * 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"

diff --git a/src/backend/replication/basebackup_gzip.c b/src/backend/backup/basebackup_gzip.c
similarity index 99%
rename from src/backend/replication/basebackup_gzip.c
rename to src/backend/backup/basebackup_gzip.c
index ef2b954946ade7d0cf324e3bbe5021edcf628504..a965866ff2bc82ff9bd16491799eb368229b36f6 100644 (file)
--- a/src/backend/replication/basebackup_gzip.c
+++ b/src/backend/backup/basebackup_gzip.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 2010-2022, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *       src/backend/replication/basebackup_gzip.c
+ *       src/backend/backup/basebackup_gzip.c
  *
  *-------------------------------------------------------------------------
  */
@@ -16,7 +16,7 @@
 #include <zlib.h>
 #endif
 
-#include "replication/basebackup_sink.h"
+#include "backup/basebackup_sink.h"
 
 #ifdef HAVE_LIBZ
 typedef struct bbsink_gzip

diff --git a/src/backend/replication/basebackup_lz4.c b/src/backend/backup/basebackup_lz4.c
similarity index 99%
rename from src/backend/replication/basebackup_lz4.c
rename to src/backend/backup/basebackup_lz4.c
index c9d19b6c448661c25f32c9804f3f7c51077ccec8..d919e3dec7ad4c9f1a7c08f57beef7f19864797f 100644 (file)
--- a/src/backend/replication/basebackup_lz4.c
+++ b/src/backend/backup/basebackup_lz4.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 2010-2022, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *       src/backend/replication/basebackup_lz4.c
+ *       src/backend/backup/basebackup_lz4.c
  *
  *-------------------------------------------------------------------------
  */
@@ -16,7 +16,7 @@
 #include <lz4frame.h>
 #endif
 
-#include "replication/basebackup_sink.h"
+#include "backup/basebackup_sink.h"
 
 #ifdef USE_LZ4
 

diff --git a/src/backend/replication/basebackup_progress.c b/src/backend/backup/basebackup_progress.c
similarity index 98%
rename from src/backend/replication/basebackup_progress.c
rename to src/backend/backup/basebackup_progress.c
index 36671ad3fda378795ea951e705b92a8e25bceece..6d4b5a23d11af9419f634b21a59bb9c85ef2eae5 100644 (file)
--- a/src/backend/replication/basebackup_progress.c
+++ b/src/backend/backup/basebackup_progress.c
@@ -25,16 +25,16 @@
  * 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"

diff --git a/src/backend/replication/basebackup_server.c b/src/backend/backup/basebackup_server.c
similarity index 98%
rename from src/backend/replication/basebackup_server.c
rename to src/backend/backup/basebackup_server.c
index 9b4847d90cc9c5eb249a9e37c0221de3d5fcb7df..d020a92bfab58eb371c61bdd9dbb264a98748a50 100644 (file)
--- a/src/backend/replication/basebackup_server.c
+++ b/src/backend/backup/basebackup_server.c
@@ -4,17 +4,17 @@
  *       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"

diff --git a/src/backend/replication/basebackup_sink.c b/src/backend/backup/basebackup_sink.c
similarity index 97%
rename from src/backend/replication/basebackup_sink.c
rename to src/backend/backup/basebackup_sink.c
index 81353f8f4d125c091e5926841758d4eba837be62..4536029d847b62ed484501a8228d69ee014eab88 100644 (file)
--- a/src/backend/replication/basebackup_sink.c
+++ b/src/backend/backup/basebackup_sink.c
@@ -5,14 +5,14 @@
  *
  * 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.

diff --git a/src/backend/replication/basebackup_target.c b/src/backend/backup/basebackup_target.c
similarity index 98%
rename from src/backend/replication/basebackup_target.c
rename to src/backend/backup/basebackup_target.c
index 9f73457320ed3fd633592392842816fd6fe2b01e..83928e320551ab963303a0520503526ec8920e23 100644 (file)
--- a/src/backend/replication/basebackup_target.c
+++ b/src/backend/backup/basebackup_target.c
@@ -9,13 +9,13 @@
  * 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

diff --git a/src/backend/replication/basebackup_throttle.c b/src/backend/backup/basebackup_throttle.c
similarity index 98%
rename from src/backend/replication/basebackup_throttle.c
rename to src/backend/backup/basebackup_throttle.c
index af0704c3acefe4f450a9c735da96557786d44283..62ba73214cb7d7a2da978263e3ee52f2dbc32952 100644 (file)
--- a/src/backend/replication/basebackup_throttle.c
+++ b/src/backend/backup/basebackup_throttle.c
@@ -8,14 +8,14 @@
  * 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"

diff --git a/src/backend/replication/basebackup_zstd.c b/src/backend/backup/basebackup_zstd.c
similarity index 99%
rename from src/backend/replication/basebackup_zstd.c
rename to src/backend/backup/basebackup_zstd.c
index b23a37b29ed2052f285a2ce2584bffd62fa6a6c2..865067f8dc990228f331e32eedd90ad60fc5502c 100644 (file)
--- a/src/backend/replication/basebackup_zstd.c
+++ b/src/backend/backup/basebackup_zstd.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 2010-2022, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *       src/backend/replication/basebackup_zstd.c
+ *       src/backend/backup/basebackup_zstd.c
  *
  *-------------------------------------------------------------------------
  */
@@ -16,7 +16,7 @@
 #include <zstd.h>
 #endif
 
-#include "replication/basebackup_sink.h"
+#include "backup/basebackup_sink.h"
 
 #ifdef USE_ZSTD
 

diff --git a/src/backend/replication/Makefile b/src/backend/replication/Makefile
index 3d8fb70c0e336fdf9887368019e7636344a81c6d..2bffac58c0d5891ee29e53e42c3d257cff59167f 100644 (file)
--- a/src/backend/replication/Makefile
+++ b/src/backend/replication/Makefile
@@ -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 \

diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c
index 3a86786cc3a4c037e364823359e51310152eb81d..724010dbd97dbfcae507593a519692ecfe4ccc26 100644 (file)
--- a/src/backend/replication/walsender.c
+++ b/src/backend/replication/walsender.c
@@ -57,6 +57,7 @@
 #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"
@@ -68,7 +69,6 @@
 #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"

diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
index 5f6bc1c28ac53a184be8beb52b78eb911a69ccf4..49fcabbd2c6e6b08e6218900e94b2080f04cb708 100644 (file)
--- a/src/bin/pg_basebackup/pg_basebackup.c
+++ b/src/bin/pg_basebackup/pg_basebackup.c
@@ -28,6 +28,7 @@
 #endif
 
 #include "access/xlog_internal.h"
+#include "backup/basebackup.h"
 #include "bbstreamer.h"
 #include "common/compression.h"
 #include "common/file_perm.h"
@@ -37,7 +38,6 @@
 #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"

diff --git a/src/include/replication/backup_manifest.h b/src/include/backup/backup_manifest.h
similarity index 94%
rename from src/include/replication/backup_manifest.h
rename to src/include/backup/backup_manifest.h
index 062d05024a9295a1d5418d0afd192e82a298df29..b15f0fa2ec63e32ef3aefeab3850764fcfa82786 100644 (file)
--- a/src/include/replication/backup_manifest.h
+++ b/src/include/backup/backup_manifest.h
@@ -5,16 +5,16 @@
  *
  * 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

diff --git a/src/include/replication/basebackup.h b/src/include/backup/basebackup.h
similarity index 96%
rename from src/include/replication/basebackup.h
rename to src/include/backup/basebackup.h
index 1badcd45eb4e0e241733611c12c3072de8f24f87..593479afdcada1ed426b8df115c6172c2f8cf246 100644 (file)
--- a/src/include/replication/basebackup.h
+++ b/src/include/backup/basebackup.h
@@ -5,7 +5,7 @@
  *
  * Portions Copyright (c) 2010-2022, PostgreSQL Global Development Group
  *
- * src/include/replication/basebackup.h
+ * src/include/backup/basebackup.h
  *
  *-------------------------------------------------------------------------
  */

diff --git a/src/include/replication/basebackup_sink.h b/src/include/backup/basebackup_sink.h
similarity index 99%
rename from src/include/replication/basebackup_sink.h
rename to src/include/backup/basebackup_sink.h
index 36278cac146b03ccddf81c212ab6625fc962e82f..a1cd24ce8146221acd024148a3c1e30ea462a13b 100644 (file)
--- a/src/include/replication/basebackup_sink.h
+++ b/src/include/backup/basebackup_sink.h
@@ -19,7 +19,7 @@
  *
  * Portions Copyright (c) 2010-2022, PostgreSQL Global Development Group
  *
- * src/include/replication/basebackup_sink.h
+ * src/include/backup/basebackup_sink.h
  *
  *-------------------------------------------------------------------------
  */

diff --git a/src/include/replication/basebackup_target.h b/src/include/backup/basebackup_target.h
similarity index 96%
rename from src/include/replication/basebackup_target.h
rename to src/include/backup/basebackup_target.h
index 1cf3c0777dc3c294d7cd1d3edad220762b195985..3a359dd4d04d0c52ad4c5fe0d0e6e0c26a197af1 100644 (file)
--- a/src/include/replication/basebackup_target.h
+++ b/src/include/backup/basebackup_target.h
@@ -5,14 +5,14 @@
  *
  * 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;