Refactoring of includes and unused code

Makefile

@@ -1,7 +1,7 @@
 PROGRAM = pg_probackup
 OBJS = src/backup.o src/catalog.o src/configure.o src/data.o \
 	src/delete.o src/dir.o src/fetch.o src/help.o src/init.o \
-	src/pg_probackup.o src/restore.o src/show.o src/status.o \
+	src/pg_probackup.o src/restore.o src/show.o \
 	src/util.o src/validate.o src/datapagemap.o src/parsexlog.o \
 	src/xlogreader.o src/streamutil.o src/receivelog.o \
 	src/archive.o src/utils/parray.o src/utils/pgut.o src/utils/logger.o \

gen_probackup_project.pl

@@ -145,7 +145,6 @@ sub build_pgprobackup
 		'pg_probackup.c',
 		'restore.c',
 		'show.c',
-		'status.c',
 		'util.c',
 		'validate.c'
 		);

src/archive.c

@@ -7,10 +7,10 @@
  *
  *-------------------------------------------------------------------------
  */
-#include "pg_probackup.h"
 
 #include <unistd.h>
-#include <sys/stat.h>
+
+#include "pg_probackup.h"
 
 /*
  * pg_probackup specific archive command for archive backups

src/backup.c

@@ -8,27 +8,29 @@
  *-------------------------------------------------------------------------
  */
 
-#include "pg_probackup.h"
+#include "postgres_fe.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <unistd.h>
-#include <dirent.h>
-#include <time.h>
-
-#include "catalog/catalog.h"
 #include "catalog/pg_tablespace.h"
-#include "datapagemap.h"
-#include "libpq/pqsignal.h"
 #include "pgtar.h"
 #include "receivelog.h"
-#include "storage/bufpage.h"
 #include "streamutil.h"
+
+#include <sys/stat.h>
+#include <unistd.h>
+
+#include "pg_probackup.h"
+
 #include "utils/thread.h"
 
+#define PG_STOP_BACKUP_TIMEOUT 300
+
+/*
+ * Macro needed to parse ptrack.
+ * NOTE Keep those values syncronised with definitions in ptrack.h
+ */
+#define PTRACK_BITS_PER_HEAPBLOCK 1
+#define HEAPBLOCKS_PER_BYTE (BITS_PER_BYTE / PTRACK_BITS_PER_HEAPBLOCK)
+
 static int	standby_message_timeout = 10 * 1000;	/* 10 sec = default */
 static XLogRecPtr stop_backup_lsn = InvalidXLogRecPtr;
 static XLogRecPtr stop_stream_lsn = InvalidXLogRecPtr;

src/catalog.c

@@ -8,18 +8,13 @@
  *-------------------------------------------------------------------------
  */
 
-#include "pg_probackup.h"
-
 #include <dirent.h>
-#include <fcntl.h>
 #include <signal.h>
-#include <sys/file.h>
 #include <sys/stat.h>
-#include <sys/types.h>
-#include <stdlib.h>
-#include <time.h>
 #include <unistd.h>
 
+#include "pg_probackup.h"
+
 static const char *backupModes[] = {"", "PAGE", "PTRACK", "DELTA", "FULL"};
 static pgBackup *readBackupControlFile(const char *path);
 

src/configure.c

@@ -8,9 +8,6 @@
  */
 
 #include "pg_probackup.h"
-#include "utils/logger.h"
-
-#include "pqexpbuffer.h"
 
 #include "utils/json.h"
 

src/data.c

@@ -8,23 +8,27 @@
  *-------------------------------------------------------------------------
  */
 
-#include "pg_probackup.h"
+#include "postgres_fe.h"
 
-#include <unistd.h>
-#include <time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include "libpq/pqsignal.h"
-#include "storage/block.h"
-#include "storage/bufpage.h"
+#include "storage/checksum.h"
 #include "storage/checksum_impl.h"
 #include <common/pg_lzcompress.h>
 
+#include <sys/stat.h>
+
+#include "pg_probackup.h"
+
 #ifdef HAVE_LIBZ
 #include <zlib.h>
 #endif
 
+/* Union to ease operations on relation pages */
+typedef union DataPage
+{
+	PageHeaderData page_data;
+	char		data[BLCKSZ];
+} DataPage;
+
 #ifdef HAVE_LIBZ
 /* Implementation of zlib compression method */
 static int32

src/delete.c

@@ -8,17 +8,17 @@
  *-------------------------------------------------------------------------
  */
 
-#include "pg_probackup.h"
-
 #include <dirent.h>
 #include <time.h>
 #include <unistd.h>
 
-static int pgBackupDeleteFiles(pgBackup *backup);
+#include "pg_probackup.h"
+
+static int delete_backup_files(pgBackup *backup);
 static void delete_walfiles(XLogRecPtr oldest_lsn, TimeLineID oldest_tli,
 							uint32 xlog_seg_size);
 
-int
+void
 do_delete(time_t backup_id)
 {
 	int			i;
@@ -85,7 +85,7 @@ do_delete(time_t backup_id)
 			if (interrupted)
 				elog(ERROR, "interrupted during delete backup");
 
-			pgBackupDeleteFiles(backup);
+			delete_backup_files(backup);
 		}
 
 		parray_free(delete_list);
@@ -115,8 +115,6 @@ do_delete(time_t backup_id)
 	/* cleanup */
 	parray_walk(backup_list, pgBackupFree);
 	parray_free(backup_list);
-
-	return 0;
 }
 
 /*
@@ -205,7 +203,7 @@ do_retention_purge(void)
 			}
 
 			/* Delete backup and update status to DELETED */
-			pgBackupDeleteFiles(backup);
+			delete_backup_files(backup);
 			backup_deleted = true;
 		}
 	}
@@ -248,7 +246,7 @@ do_retention_purge(void)
  * BACKUP_STATUS_DELETED.
  */
 static int
-pgBackupDeleteFiles(pgBackup *backup)
+delete_backup_files(pgBackup *backup)
 {
 	size_t		i;
 	char		path[MAXPGPATH];
@@ -433,7 +431,7 @@ do_delete_instance(void)
 	for (i = 0; i < parray_num(backup_list); i++)
 	{
 		pgBackup   *backup = (pgBackup *) parray_get(backup_list, i);
-		pgBackupDeleteFiles(backup);
+		delete_backup_files(backup);
 	}
 
 	/* Cleanup */

src/dir.c

@@ -8,17 +8,15 @@
  *-------------------------------------------------------------------------
  */
 
-#include "pg_probackup.h"
+#include "postgres_fe.h"
+
+#include "catalog/pg_tablespace.h"
 
 #include <unistd.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <dirent.h>
-#include <time.h>
 
-#include "catalog/catalog.h"
-#include "catalog/pg_tablespace.h"
-#include "datapagemap.h"
+#include "pg_probackup.h"
 
 /*
  * The contents of these directories are removed or recreated during server
@@ -1364,8 +1362,7 @@ dir_read_file_list(const char *root, const char *file_txt)
 
 	fp = fopen(file_txt, "rt");
 	if (fp == NULL)
-		elog(errno == ENOENT ? ERROR : ERROR,
-			"cannot open \"%s\": %s", file_txt, strerror(errno));
+		elog(ERROR, "cannot open \"%s\": %s", file_txt, strerror(errno));
 
 	files = parray_new();
 

src/fetch.c

@@ -8,16 +8,8 @@
  *-------------------------------------------------------------------------
  */
 
-#include "postgres_fe.h"
-
-#include "catalog/catalog.h"
-
-#include <sys/types.h>
 #include <sys/stat.h>
-#include <dirent.h>
-#include <fcntl.h>
 #include <unistd.h>
-#include <string.h>
 
 #include "pg_probackup.h"
 

src/help.c

@@ -6,6 +6,7 @@
  *
  *-------------------------------------------------------------------------
  */
+
 #include "pg_probackup.h"
 
 static void help_init(void);

src/init.c

@@ -8,12 +8,11 @@
  *-------------------------------------------------------------------------
  */
 
-#include "pg_probackup.h"
-
 #include <unistd.h>
-#include <dirent.h>
 #include <sys/stat.h>
 
+#include "pg_probackup.h"
+
 /*
  * Initialize backup catalog.
  */

src/merge.c

@@ -7,11 +7,11 @@
  *-------------------------------------------------------------------------
  */
 
-#include "pg_probackup.h"
-
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include "pg_probackup.h"
+
 #include "utils/thread.h"
 
 typedef struct
@@ -75,7 +75,9 @@ do_merge(time_t backup_id)
 			continue;
 		else if (backup->start_time == backup_id && !dest_backup)
 		{
-			if (backup->status != BACKUP_STATUS_OK)
+			if (backup->status != BACKUP_STATUS_OK &&
+				/* It is possible that previous merging was interrupted */
+				backup->status != BACKUP_STATUS_MERGING)
 				elog(ERROR, "Backup %s has status: %s",
 					 base36enc(backup->start_time), status2str(backup->status));
 
@@ -93,19 +95,15 @@ do_merge(time_t backup_id)
 			if (backup->start_time != prev_parent)
 				continue;
 
-			if (backup->status != BACKUP_STATUS_OK)
-				elog(ERROR, "Skipping backup %s, because it has non-valid status: %s",
+			if (backup->status != BACKUP_STATUS_OK &&
+				/* It is possible that previous merging was interrupted */
+				backup->status != BACKUP_STATUS_MERGING)
+				elog(ERROR, "Backup %s has status: %s",
 					 base36enc(backup->start_time), status2str(backup->status));
 
 			/* If we already found dest_backup, look for full backup */
 			if (dest_backup && backup->backup_mode == BACKUP_MODE_FULL)
 			{
-				if (backup->status != BACKUP_STATUS_OK)
-					elog(ERROR, "Parent full backup %s for the given backup %s has status: %s",
-						 base36enc_dup(backup->start_time),
-						 base36enc_dup(dest_backup->start_time),
-						 status2str(backup->status));
-
 				full_backup = backup;
 				full_backup_idx = i;
 

src/parsexlog.c

@@ -10,17 +10,19 @@
  *-------------------------------------------------------------------------
  */
 
-#include "pg_probackup.h"
+#include "postgres_fe.h"
+
+#include "access/transam.h"
+#include "catalog/pg_control.h"
+#include "commands/dbcommands_xlog.h"
+#include "catalog/storage_xlog.h"
 
-#include <time.h>
-#include <unistd.h>
 #ifdef HAVE_LIBZ
 #include <zlib.h>
 #endif
 
-#include "commands/dbcommands_xlog.h"
-#include "catalog/storage_xlog.h"
-#include "access/transam.h"
+#include "pg_probackup.h"
+
 #include "utils/thread.h"
 
 /*
@@ -136,6 +138,22 @@ static void PrintXLogCorruptionMsg(XLogPageReadPrivate *private_data,
 static XLogSegNo nextSegNoToRead = 0;
 static pthread_mutex_t wal_segment_mutex = PTHREAD_MUTEX_INITIALIZER;
 
+/* copied from timestamp.c */
+static pg_time_t
+timestamptz_to_time_t(TimestampTz t)
+{
+	pg_time_t	result;
+
+#ifdef HAVE_INT64_TIMESTAMP
+	result = (pg_time_t) (t / USECS_PER_SEC +
+				 ((POSTGRES_EPOCH_JDATE - UNIX_EPOCH_JDATE) * SECS_PER_DAY));
+#else
+	result = (pg_time_t) (t +
+				 ((POSTGRES_EPOCH_JDATE - UNIX_EPOCH_JDATE) * SECS_PER_DAY));
+#endif
+	return result;
+}
+
 /*
  * Do manual switch to the next WAL segment.
  *

src/pg_probackup.c

@@ -8,21 +8,39 @@
  *-------------------------------------------------------------------------
  */
 
-#include "pg_probackup.h"
-#include "streamutil.h"
-#include "utils/thread.h"
+#include "postgres_fe.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <sys/stat.h>
-#include <unistd.h>
 #include "pg_getopt.h"
+#include "streamutil.h"
+
+#include <sys/stat.h>
+
+#include "pg_probackup.h"
+
+#include "utils/thread.h"
 
 const char *PROGRAM_VERSION	= "2.0.21";
 const char *PROGRAM_URL		= "https://github.com/postgrespro/pg_probackup";
 const char *PROGRAM_EMAIL	= "https://github.com/postgrespro/pg_probackup/issues";
 
+typedef enum ProbackupSubcmd
+{
+	NO_CMD = 0,
+	INIT_CMD,
+	ADD_INSTANCE_CMD,
+	DELETE_INSTANCE_CMD,
+	ARCHIVE_PUSH_CMD,
+	ARCHIVE_GET_CMD,
+	BACKUP_CMD,
+	RESTORE_CMD,
+	VALIDATE_CMD,
+	DELETE_CMD,
+	MERGE_CMD,
+	SHOW_CMD,
+	SET_CONFIG_CMD,
+	SHOW_CONFIG_CMD
+} ProbackupSubcmd;
+
 /* directory options */
 char	   *backup_path = NULL;
 char	   *pgdata = NULL;
@@ -113,7 +131,7 @@ ShowFormat show_format = SHOW_PLAIN;
 
 /* current settings */
 pgBackup	current;
-ProbackupSubcmd backup_subcmd = NO_CMD;
+static ProbackupSubcmd backup_subcmd = NO_CMD;
 
 static bool help_opt = false;
 
@@ -534,7 +552,8 @@ main(int argc, char *argv[])
 			if (delete_expired)
 				return do_retention_purge();
 			else
-				return do_delete(current.backup_id);
+				do_delete(current.backup_id);
+			break;
 		case MERGE_CMD:
 			do_merge(current.backup_id);
 			break;

src/pg_probackup.h

@@ -11,40 +11,25 @@
 #define PG_PROBACKUP_H
 
 #include "postgres_fe.h"
+#include "libpq-fe.h"
 
-#include <limits.h>
-#include <libpq-fe.h>
-
-#include "access/timeline.h"
-#include "access/xlogdefs.h"
 #include "access/xlog_internal.h"
-#include "catalog/pg_control.h"
-#include "storage/block.h"
-#include "storage/bufpage.h"
-#include "storage/checksum.h"
 #include "utils/pg_crc.h"
-#include "common/relpath.h"
-#include "port.h"
 
 #ifdef FRONTEND
 #undef FRONTEND
-	#include "port/atomics.h"
+#include "port/atomics.h"
 #define FRONTEND
+#else
+#include "port/atomics.h"
 #endif
 
+#include "utils/logger.h"
 #include "utils/parray.h"
 #include "utils/pgut.h"
 
 #include "datapagemap.h"
 
-# define PG_STOP_BACKUP_TIMEOUT 300
-/*
- * Macro needed to parse ptrack.
- * NOTE Keep those values syncronised with definitions in ptrack.h
- */
-#define PTRACK_BITS_PER_HEAPBLOCK 1
-#define HEAPBLOCKS_PER_BYTE (BITS_PER_BYTE / PTRACK_BITS_PER_HEAPBLOCK)
-
 /* Directory/File names */
 #define DATABASE_DIR			"database"
 #define BACKUPS_DIR				"backups"
@@ -139,24 +124,6 @@ typedef enum BackupMode
 	BACKUP_MODE_FULL			/* full backup */
 } BackupMode;
 
-typedef enum ProbackupSubcmd
-{
-	NO_CMD = 0,
-	INIT_CMD,
-	ADD_INSTANCE_CMD,
-	DELETE_INSTANCE_CMD,
-	ARCHIVE_PUSH_CMD,
-	ARCHIVE_GET_CMD,
-	BACKUP_CMD,
-	RESTORE_CMD,
-	VALIDATE_CMD,
-	DELETE_CMD,
-	MERGE_CMD,
-	SHOW_CMD,
-	SET_CONFIG_CMD,
-	SHOW_CONFIG_CMD
-} ProbackupSubcmd;
-
 typedef enum ShowFormat
 {
 	SHOW_PLAIN,
@@ -281,13 +248,6 @@ typedef struct pgRecoveryTarget
 	bool			restore_no_validate;
 } pgRecoveryTarget;
 
-/* Union to ease operations on relation pages */
-typedef union DataPage
-{
-	PageHeaderData page_data;
-	char		data[BLCKSZ];
-} DataPage;
-
 typedef struct
 {
 	const char *from_root;
@@ -398,11 +358,6 @@ extern CompressAlg compress_alg;
 extern int		compress_level;
 extern bool		compress_shortcut;
 
-#define COMPRESS_ALG_DEFAULT NOT_DEFINED_COMPRESS
-#define COMPRESS_LEVEL_DEFAULT 1
-
-extern CompressAlg parse_compress_alg(const char *arg);
-extern const char* deparse_compress_alg(int alg);
 /* other options */
 extern char *instance_name;
 extern uint64 system_identifier;
@@ -413,7 +368,6 @@ extern ShowFormat show_format;
 
 /* current settings */
 extern pgBackup current;
-extern ProbackupSubcmd backup_subcmd;
 
 /* in dir.c */
 /* exclude directory list for $PGDATA file listing */
@@ -470,7 +424,7 @@ extern uint32 get_config_xlog_seg_size(void);
 extern int do_show(time_t requested_backup_id);
 
 /* in delete.c */
-extern int do_delete(time_t backup_id);
+extern void do_delete(time_t backup_id);
 extern int do_retention_purge(void);
 extern int do_delete_instance(void);
 
@@ -517,6 +471,12 @@ extern int scan_parent_chain(pgBackup *current_backup, pgBackup **result_backup)
 extern bool is_parent(time_t parent_backup_time, pgBackup *child_backup, bool inclusive);
 extern int get_backup_index_number(parray *backup_list, pgBackup *backup);
 
+#define COMPRESS_ALG_DEFAULT NOT_DEFINED_COMPRESS
+#define COMPRESS_LEVEL_DEFAULT 1
+
+extern CompressAlg parse_compress_alg(const char *arg);
+extern const char* deparse_compress_alg(int alg);
+
 /* in dir.c */
 extern void dir_list_file(parray *files, const char *root, bool exclude,
 						  bool omit_symlink, bool add_root);
@@ -602,12 +562,8 @@ extern void remove_not_digit(char *buf, size_t len, const char *str);
 extern const char *base36enc(long unsigned int value);
 extern char *base36enc_dup(long unsigned int value);
 extern long unsigned int base36dec(const char *text);
-extern pg_time_t timestamptz_to_time_t(TimestampTz t);
 extern int parse_server_version(char *server_version_str);
 
-/* in status.c */
-extern bool is_pg_running(void);
-
 #ifdef WIN32
 #ifdef _DEBUG
 #define lseek _lseek

src/restore.c

@@ -8,15 +8,15 @@
  *-------------------------------------------------------------------------
  */
 
-#include "pg_probackup.h"
+#include "postgres_fe.h"
+
+#include "access/timeline.h"
 
-#include <fcntl.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
 
-#include "catalog/pg_control.h"
-#include "utils/logger.h"
+#include "pg_probackup.h"
+
 #include "utils/thread.h"
 
 typedef struct

src/show.c

@@ -8,14 +8,11 @@
  *-------------------------------------------------------------------------
  */
 
-#include "pg_probackup.h"
-
 #include <time.h>
-#include <unistd.h>
 #include <dirent.h>
 #include <sys/stat.h>
 
-#include "pqexpbuffer.h"
+#include "pg_probackup.h"
 
 #include "utils/json.h"
 

src/status.c

@@ -1,118 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * status.c
- *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
- *
- * Monitor status of a PostgreSQL server.
- *
- *-------------------------------------------------------------------------
- */
-
-
-#include "postgres_fe.h"
-
-#include <signal.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include "pg_probackup.h"
-
-/* PID can be negative for standalone backend */
-typedef long pgpid_t;
-
-static pgpid_t get_pgpid(void);
-static bool postmaster_is_alive(pid_t pid);
-
-/*
- * get_pgpid
- *
- * Get PID of postmaster, by scanning postmaster.pid.
- */
-static pgpid_t
-get_pgpid(void)
-{
-	FILE	   *pidf;
-	long		pid;
-	char		pid_file[MAXPGPATH];
-
-	snprintf(pid_file, lengthof(pid_file), "%s/postmaster.pid", pgdata);
-
-	pidf = fopen(pid_file, PG_BINARY_R);
-	if (pidf == NULL)
-	{
-		/* No pid file, not an error on startup */
-		if (errno == ENOENT)
-			return 0;
-		else
-		{
-			elog(ERROR, "could not open PID file \"%s\": %s",
-				 pid_file, strerror(errno));
-		}
-	}
-	if (fscanf(pidf, "%ld", &pid) != 1)
-	{
-		/* Is the file empty? */
-		if (ftell(pidf) == 0 && feof(pidf))
-			elog(ERROR, "the PID file \"%s\" is empty",
-				 pid_file);
-		else
-			elog(ERROR, "invalid data in PID file \"%s\"\n",
-				 pid_file);
-	}
-	fclose(pidf);
-	return (pgpid_t) pid;
-}
-
-/*
- * postmaster_is_alive
- *
- * Check whether postmaster is alive or not.
- */
-static bool
-postmaster_is_alive(pid_t pid)
-{
-	/*
-	 * Test to see if the process is still there.  Note that we do not
-	 * consider an EPERM failure to mean that the process is still there;
-	 * EPERM must mean that the given PID belongs to some other userid, and
-	 * considering the permissions on $PGDATA, that means it's not the
-	 * postmaster we are after.
-	 *
-	 * Don't believe that our own PID or parent shell's PID is the postmaster,
-	 * either.	(Windows hasn't got getppid(), though.)
-	 */
-	if (pid == getpid())
-		return false;
-#ifndef WIN32
-	if (pid == getppid())
-		return false;
-#endif
-	if (kill(pid, 0) == 0)
-		return true;
-	return false;
-}
-
-/*
- * is_pg_running
- *
- *
- */
-bool
-is_pg_running(void)
-{
-	pgpid_t		pid;
-
-	pid = get_pgpid();
-
-	/* 0 means no pid file */
-	if (pid == 0)
-		return false;
-
-	/* Case of a standalone backend */
-	if (pid < 0)
-		pid = -pid;
-
-	/* Check if postmaster is alive */
-	return postmaster_is_alive((pid_t) pid);
-}

src/util.c

@@ -8,14 +8,13 @@
  *-------------------------------------------------------------------------
  */
 
-#include "pg_probackup.h"
+#include "postgres_fe.h"
+
+#include "catalog/pg_control.h"
 
 #include <time.h>
 
-#include "storage/bufpage.h"
-#if PG_VERSION_NUM >= 110000
-#include "streamutil.h"
-#endif
+#include "pg_probackup.h"
 
 const char *
 base36enc(long unsigned int value)
@@ -283,22 +282,6 @@ time2iso(char *buf, size_t len, time_t time)
 	}
 }
 
-/* copied from timestamp.c */
-pg_time_t
-timestamptz_to_time_t(TimestampTz t)
-{
-	pg_time_t	result;
-
-#ifdef HAVE_INT64_TIMESTAMP
-	result = (pg_time_t) (t / USECS_PER_SEC +
-				 ((POSTGRES_EPOCH_JDATE - UNIX_EPOCH_JDATE) * SECS_PER_DAY));
-#else
-	result = (pg_time_t) (t +
-				 ((POSTGRES_EPOCH_JDATE - UNIX_EPOCH_JDATE) * SECS_PER_DAY));
-#endif
-	return result;
-}
-
 /* Parse string representation of the server version */
 int
 parse_server_version(char *server_version_str)

src/utils/logger.c

@@ -7,11 +7,9 @@
  *-------------------------------------------------------------------------
  */
 
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
+#include "postgres_fe.h"
+
 #include <sys/stat.h>
-#include <time.h>
 
 #include "logger.h"
 #include "pgut.h"

src/utils/logger.h

@@ -10,8 +10,6 @@
 #ifndef LOGGER_H
 #define LOGGER_H
 
-#include "postgres_fe.h"
-
 #define LOG_NONE	(-10)
 
 /* Log level */

src/utils/parray.c

@@ -7,6 +7,8 @@
  *-------------------------------------------------------------------------
  */
 
+#include "postgres_fe.h"
+
 #include "parray.h"
 #include "pgut.h"
 

src/utils/parray.h

@@ -10,10 +10,6 @@
 #ifndef PARRAY_H
 #define PARRAY_H
 
-#include "postgres_fe.h"
-
-#include <stdlib.h>
-
 /*
  * "parray" hold pointers to objects in a linear memory area.
  * Client use "parray *" to access parray object.

src/utils/pgut.c

@@ -9,15 +9,16 @@
  */
 
 #include "postgres_fe.h"
-#include "libpq/pqsignal.h"
 
 #include "getopt_long.h"
-#include <limits.h>
-#include <time.h>
-#include <unistd.h>
+#include "libpq-fe.h"
+#include "libpq/pqsignal.h"
+#include "pqexpbuffer.h"
+
+#include <time.h>
 
-#include "logger.h"
 #include "pgut.h"
+#include "logger.h"
 
 #define MAX_TZDISP_HOUR		15	/* maximum allowed hour part */
 #define SECS_PER_MINUTE		60
@@ -1652,31 +1653,6 @@ pgut_disconnect(PGconn *conn)
 		PQfinish(conn);
 }
 
-/*  set/get host and port for connecting standby server */
-const char *
-pgut_get_host()
-{
-	return host;
-}
-
-const char *
-pgut_get_port()
-{
-	return port;
-}
-
-void
-pgut_set_host(const char *new_host)
-{
-	host = new_host;
-}
-
-void
-pgut_set_port(const char *new_port)
-{
-	port = new_port;
-}
-
 
 PGresult *
 pgut_execute_parallel(PGconn* conn, 
@@ -2151,60 +2127,6 @@ get_username(void)
 	return ret;
 }
 
-int
-appendStringInfoFile(StringInfo str, FILE *fp)
-{
-	AssertArg(str != NULL);
-	AssertArg(fp != NULL);
-
-	for (;;)
-	{
-		int		rc;
-
-		if (str->maxlen - str->len < 2 && enlargeStringInfo(str, 1024) == 0)
-			return errno = ENOMEM;
-
-		rc = fread(str->data + str->len, 1, str->maxlen - str->len - 1, fp);
-		if (rc == 0)
-			break;
-		else if (rc > 0)
-		{
-			str->len += rc;
-			str->data[str->len] = '\0';
-		}
-		else if (ferror(fp) && errno != EINTR)
-			return errno;
-	}
-	return 0;
-}
-
-int
-appendStringInfoFd(StringInfo str, int fd)
-{
-	AssertArg(str != NULL);
-	AssertArg(fd != -1);
-
-	for (;;)
-	{
-		int		rc;
-
-		if (str->maxlen - str->len < 2 && enlargeStringInfo(str, 1024) == 0)
-			return errno = ENOMEM;
-
-		rc = read(fd, str->data + str->len, str->maxlen - str->len - 1);
-		if (rc == 0)
-			break;
-		else if (rc > 0)
-		{
-			str->len += rc;
-			str->data[str->len] = '\0';
-		}
-		else if (errno != EINTR)
-			return errno;
-	}
-	return 0;
-}
-
 void *
 pgut_malloc(size_t size)
 {
@@ -2241,36 +2163,6 @@ pgut_strdup(const char *str)
 	return ret;
 }
 
-char *
-strdup_with_len(const char *str, size_t len)
-{
-	char *r;
-
-	if (str == NULL)
-		return NULL;
-
-	r = pgut_malloc(len + 1);
-	memcpy(r, str, len);
-	r[len] = '\0';
-	return r;
-}
-
-/* strdup but trim whitespaces at head and tail */
-char *
-strdup_trim(const char *str)
-{
-	size_t	len;
-
-	if (str == NULL)
-		return NULL;
-
-	while (IsSpace(str[0])) { str++; }
-	len = strlen(str);
-	while (len > 0 && IsSpace(str[len - 1])) { len--; }
-
-	return strdup_with_len(str, len);
-}
-
 FILE *
 pgut_fopen(const char *path, const char *mode, bool missing_ok)
 {

src/utils/pgut.h

@@ -11,26 +11,9 @@
 #ifndef PGUT_H
 #define PGUT_H
 
-#include "libpq-fe.h"
-#include "pqexpbuffer.h"
-
-#include <assert.h>
-#include <sys/time.h>
-
+#include "postgres_fe.h"
 #include "access/xlogdefs.h"
-#include "logger.h"
-
-#if !defined(C_H) && !defined(__cplusplus)
-#ifndef bool
-typedef char bool;
-#endif
-#ifndef true
-#define true	((bool) 1)
-#endif
-#ifndef false
-#define false	((bool) 0)
-#endif
-#endif
+#include "libpq-fe.h"
 
 #define INFINITE_STR		"INFINITE"
 
@@ -139,19 +122,12 @@ extern bool pgut_send(PGconn* conn, const char *query, int nParams, const char *
 extern void pgut_cancel(PGconn* conn);
 extern int pgut_wait(int num, PGconn *connections[], struct timeval *timeout);
 
-extern const char *pgut_get_host(void);
-extern const char *pgut_get_port(void);
-extern void pgut_set_host(const char *new_host);
-extern void pgut_set_port(const char *new_port);
-
 /*
  * memory allocators
  */
 extern void *pgut_malloc(size_t size);
 extern void *pgut_realloc(void *p, size_t size);
 extern char *pgut_strdup(const char *str);
-extern char *strdup_with_len(const char *str, size_t len);
-extern char *strdup_trim(const char *str);
 
 #define pgut_new(type)			((type *) pgut_malloc(sizeof(type)))
 #define pgut_newarray(type, n)	((type *) pgut_malloc(sizeof(type) * (n)))
@@ -178,28 +154,6 @@ extern FILE *pgut_fopen(const char *path, const char *mode, bool missing_ok);
 #define AssertMacro(x)	((void) 0)
 #endif
 
-/*
- * StringInfo and string operations
- */
-#define STRINGINFO_H
-
-#define StringInfoData			PQExpBufferData
-#define StringInfo				PQExpBuffer
-#define makeStringInfo			createPQExpBuffer
-#define initStringInfo			initPQExpBuffer
-#define freeStringInfo			destroyPQExpBuffer
-#define termStringInfo			termPQExpBuffer
-#define resetStringInfo			resetPQExpBuffer
-#define enlargeStringInfo		enlargePQExpBuffer
-#define printfStringInfo		printfPQExpBuffer	/* reset + append */
-#define appendStringInfo		appendPQExpBuffer
-#define appendStringInfoString	appendPQExpBufferStr
-#define appendStringInfoChar	appendPQExpBufferChar
-#define appendBinaryStringInfo	appendBinaryPQExpBuffer
-
-extern int appendStringInfoFile(StringInfo str, FILE *fp);
-extern int appendStringInfoFd(StringInfo str, int fd);
-
 extern bool parse_bool(const char *value, bool *result);
 extern bool parse_bool_with_len(const char *value, size_t len, bool *result);
 extern bool parse_int32(const char *value, int32 *result, int flags);
@@ -219,8 +173,6 @@ extern void convert_from_base_unit_u(uint64 base_value, int base_unit,
 #define IsSpace(c)		(isspace((unsigned char)(c)))
 #define IsAlpha(c)		(isalpha((unsigned char)(c)))
 #define IsAlnum(c)		(isalnum((unsigned char)(c)))
-#define IsIdentHead(c)	(IsAlpha(c) || (c) == '_')
-#define IsIdentBody(c)	(IsAlnum(c) || (c) == '_')
 #define ToLower(c)		(tolower((unsigned char)(c)))
 #define ToUpper(c)		(toupper((unsigned char)(c)))
 

src/validate.c

@@ -8,11 +8,13 @@
  *-------------------------------------------------------------------------
  */
 
-#include "pg_probackup.h"
+#include "postgres_fe.h"
 
 #include <sys/stat.h>
 #include <dirent.h>
 
+#include "pg_probackup.h"
+
 #include "utils/thread.h"
 
 static void *pgBackupValidateFiles(void *arg);