Merge branch 'REL_2_6-PBCKP-245-mingw' into REL_2_6_tmp

Author: funny-falcon

Makefile

@@ -50,14 +50,14 @@ BORROWED_C_SRC := \
 	src/bin/pg_basebackup/streamutil.c \
 	src/bin/pg_basebackup/walmethods.c
 
-OBJS += src/fu_util/impl/ft_impl.o src/fu_util/impl/fo_impl.o
-
 BORROW_DIR := src/borrowed
 BORROWED_H := $(addprefix $(BORROW_DIR)/, $(notdir $(BORROWED_H_SRC)))
 BORROWED_C := $(addprefix $(BORROW_DIR)/, $(notdir $(BORROWED_C_SRC)))
 OBJS += $(patsubst %.c, %.o, $(BORROWED_C))
 EXTRA_CLEAN := $(BORROWED_H) $(BORROWED_C) $(BORROW_DIR) borrowed.mk
 
+OBJS += src/fu_util/impl/ft_impl.o src/fu_util/impl/fo_impl.o
+
 # off-source build support
 ifneq ($(abspath $(CURDIR))/, $(top_pbk_srcdir))
 VPATH := $(top_pbk_srcdir)
@@ -95,7 +95,7 @@ borrowed.mk: $(firstword $(MAKEFILE_LIST))
 	$(file >$@,# This file is autogenerated. Do not edit!)
 	$(foreach borrowed_file, $(BORROWED_H_SRC) $(BORROWED_C_SRC), \
 		$(file >>$@,$(addprefix $(BORROW_DIR)/, $(notdir $(borrowed_file))): | $(CURDIR)/$(BORROW_DIR)/ $(realpath $(top_srcdir)/$(borrowed_file))) \
-		$(file >>$@,$(shell echo "\t"'$$(LN_S) $(realpath $(top_srcdir)/$(borrowed_file)) $$@')) \
+		$(file >>$@,$(shell echo "	"'$$(LN_S) $(realpath $(top_srcdir)/$(borrowed_file)) $$@')) \
 	)
 include borrowed.mk
 

src/archive.c

@@ -148,7 +148,7 @@ do_archive_push(InstanceState *instanceState, InstanceConfig *instance, char *pg
 		n_threads = parray_num(batch_files);
 
 	elog(INFO, "pg_probackup archive-push WAL file: %s, "
-					"threads: %i/%i, batch: %lu/%i, compression: %s",
+					"threads: %i/%i, batch: %zu/%i, compression: %s",
 						wal_file_name, n_threads, num_threads,
 						parray_num(batch_files), batch_size,
 						is_compress ? "zlib" : "none");
@@ -279,7 +279,7 @@ push_files(void *arg)
 	int		rc;
 	archive_push_arg *args = (archive_push_arg *) arg;
 
-	my_thread_num = args->thread_num;
+	set_my_thread_num(args->thread_num);
 
 	for (i = 0; i < parray_num(args->files); i++)
 	{
@@ -553,17 +553,17 @@ push_file_internal(const char *wal_file_name, const char *pg_xlog_dir,
 
     /* enable streaming compression */
     if (is_compress)
-#ifdef HAVE_LIBZ
     {
+#ifdef HAVE_LIBZ
         pioFilter_i flt = pioGZCompressFilter(compress_level);
         err = pioCopy($reduce(pioWriteFlush, out),
                       $reduce(pioRead, in),
                       flt);
-    }
-    else
 #else
-    elog(ERROR, "Compression is requested, but not compiled it");
+        elog(ERROR, "Compression is requested, but not compiled it");
 #endif
+    }
+    else
     {
         err = pioCopy($reduce(pioWriteFlush, out),
                       $reduce(pioRead, in));
@@ -1012,7 +1012,7 @@ get_files(void *arg)
 	char    from_fullpath[MAXPGPATH];
 	archive_get_arg *args = (archive_get_arg *) arg;
 
-	my_thread_num = args->thread_num;
+	set_my_thread_num(args->thread_num);
 
 	for (i = 0; i < parray_num(args->files); i++)
 	{

src/backup.c

@@ -17,7 +17,6 @@
 #include "pgtar.h"
 #include "streamutil.h"
 
-#include <sys/stat.h>
 #include <time.h>
 #include <unistd.h>
 
@@ -2229,6 +2228,7 @@ check_external_for_tablespaces(parray *external_list, PGconn *backup_conn)
 	PGresult   *res;
 	int			i = 0;
 	int			j = 0;
+	int 		ntups;
 	char	   *tablespace_path = NULL;
 	char	   *query = "SELECT pg_catalog.pg_tablespace_location(oid) "
 						"FROM pg_catalog.pg_tablespace "
@@ -2240,7 +2240,8 @@ check_external_for_tablespaces(parray *external_list, PGconn *backup_conn)
 	if (!res)
 		elog(ERROR, "Failed to get list of tablespaces");
 
-	for (i = 0; i < res->ntups; i++)
+	ntups = PQntuples(res);
+	for (i = 0; i < ntups; i++)
 	{
 		tablespace_path = PQgetvalue(res, i, 0);
 		Assert (strlen(tablespace_path) > 0);

src/catalog.c

@@ -13,7 +13,6 @@
 
 #include <dirent.h>
 #include <signal.h>
-#include <sys/stat.h>
 #include <unistd.h>
 
 #include "utils/file.h"
@@ -423,8 +422,8 @@ grab_excl_lock_file(const char *root_dir, const char *backup_id, bool strict)
 			/* complain every fifth interval */
 			if ((ntries % LOG_FREQ) == 0)
 			{
-				elog(WARNING, "Process %d is using backup %s, and is still running",
-					 encoded_pid, backup_id);
+				elog(WARNING, "Process %lld is using backup %s, and is still running",
+					 (long long)encoded_pid, backup_id);
 
 				elog(WARNING, "Waiting %u seconds on exclusive lock for backup %s",
 					 ntries, backup_id);
@@ -438,8 +437,8 @@ grab_excl_lock_file(const char *root_dir, const char *backup_id, bool strict)
 		else
 		{
 			if (errno == ESRCH)
-				elog(WARNING, "Process %d which used backup %s no longer exists",
-					 encoded_pid, backup_id);
+				elog(WARNING, "Process %lld which used backup %s no longer exists",
+					 (long long)encoded_pid, backup_id);
 			else
 				elog(ERROR, "Failed to send signal 0 to a process %d: %s",
 					encoded_pid, strerror(errno));
@@ -468,7 +467,7 @@ grab_excl_lock_file(const char *root_dir, const char *backup_id, bool strict)
 	/*
 	 * Successfully created the file, now fill it.
 	 */
-	snprintf(buffer, sizeof(buffer), "%d\n", my_pid);
+	snprintf(buffer, sizeof(buffer), "%lld\n", (long long)my_pid);
 
 	errno = 0;
 	if (fio_write(fd, buffer, strlen(buffer)) != strlen(buffer))
@@ -575,8 +574,8 @@ wait_shared_owners(pgBackup *backup)
                 /* complain from time to time */
                 if ((ntries % LOG_FREQ) == 0)
                 {
-                    elog(WARNING, "Process %d is using backup %s in shared mode, and is still running",
-                            encoded_pid, base36enc(backup->start_time));
+                    elog(WARNING, "Process %lld is using backup %s in shared mode, and is still running",
+                            (long long)encoded_pid, base36enc(backup->start_time));
 
                     elog(WARNING, "Waiting %u seconds on lock for backup %s", ntries,
                             base36enc(backup->start_time));
@@ -588,8 +587,8 @@ wait_shared_owners(pgBackup *backup)
                 continue;
             }
             else if (errno != ESRCH)
-                elog(ERROR, "Failed to send signal 0 to a process %d: %s",
-                        encoded_pid, strerror(errno));
+                elog(ERROR, "Failed to send signal 0 to a process %lld: %s",
+                        (long long)encoded_pid, strerror(errno));
 
             /* locker is dead */
             break;
@@ -606,8 +605,8 @@ wait_shared_owners(pgBackup *backup)
     /* some shared owners are still alive */
     if (ntries <= 0)
     {
-        elog(WARNING, "Cannot to lock backup %s in exclusive mode, because process %u owns shared lock",
-                base36enc(backup->start_time), encoded_pid);
+        elog(WARNING, "Cannot to lock backup %s in exclusive mode, because process %llu owns shared lock",
+                base36enc(backup->start_time), (long long)encoded_pid);
         return 1;
     }
 
@@ -662,11 +661,11 @@ grab_shared_lock_file(pgBackup *backup)
 			 * Somebody is still using this backup in shared mode,
 			 * copy this pid into a new file.
 			 */
-			buffer_len += snprintf(buffer+buffer_len, 4096, "%u\n", encoded_pid);
+			buffer_len += snprintf(buffer+buffer_len, 4096, "%llu\n", (long long)encoded_pid);
 		}
 		else if (errno != ESRCH)
-			elog(ERROR, "Failed to send signal 0 to a process %d: %s",
-					encoded_pid, strerror(errno));
+			elog(ERROR, "Failed to send signal 0 to a process %lld: %s",
+					(long long)encoded_pid, strerror(errno));
 	}
 
 	if (fp_in)
@@ -686,7 +685,7 @@ grab_shared_lock_file(pgBackup *backup)
 	}
 
 	/* add my own pid */
-	buffer_len += snprintf(buffer+buffer_len, sizeof(buffer), "%u\n", my_pid);
+	buffer_len += snprintf(buffer+buffer_len, sizeof(buffer), "%llu\n", (long long)my_pid);
 
 	/* write out the collected PIDs to temp lock file */
 	fwrite(buffer, 1, buffer_len, fp_out);
@@ -784,11 +783,11 @@ release_shared_lock_file(const char *backup_dir)
 			 * Somebody is still using this backup in shared mode,
 			 * copy this pid into a new file.
 			 */
-			buffer_len += snprintf(buffer+buffer_len, 4096, "%u\n", encoded_pid);
+			buffer_len += snprintf(buffer+buffer_len, 4096, "%llu\n", (long long)encoded_pid);
 		}
 		else if (errno != ESRCH)
-			elog(ERROR, "Failed to send signal 0 to a process %d: %s",
-					encoded_pid, strerror(errno));
+			elog(ERROR, "Failed to send signal 0 to a process %lld: %s",
+					(long long)encoded_pid, strerror(errno));
     }
 
 	if (ferror(fp_in))

src/catchup.c

@@ -17,7 +17,6 @@
 #include "pgtar.h"
 #include "streamutil.h"
 
-#include <sys/stat.h>
 #include <time.h>
 #include <unistd.h>
 
@@ -138,8 +137,8 @@ catchup_preflight_checks(PGNodeInfo *source_node_info, PGconn *source_conn,
 		}
 		else if (pid > 1) /* postmaster is up */
 		{
-			elog(ERROR, "Postmaster with pid %u is running in destination directory \"%s\"",
-				pid, dest_pgdata);
+			elog(ERROR, "Postmaster with pid %lld is running in destination directory \"%s\"",
+				(long long)pid, dest_pgdata);
 		}
 	}
 
@@ -161,15 +160,15 @@ catchup_preflight_checks(PGNodeInfo *source_node_info, PGconn *source_conn,
 		source_id = get_system_identifier(FIO_DB_HOST, source_pgdata, false); /* same as instance_config.system_identifier */
 
 		if (source_conn_id != source_id)
-			elog(ERROR, "Database identifiers mismatch: we connected to DB id %lu, but in \"%s\" we found id %lu",
-				source_conn_id, source_pgdata, source_id);
+			elog(ERROR, "Database identifiers mismatch: we connected to DB id %llu, but in \"%s\" we found id %llu",
+				(long long)source_conn_id, source_pgdata, (long long)source_id);
 
 		if (current.backup_mode != BACKUP_MODE_FULL)
 		{
 			dest_id = get_system_identifier(FIO_LOCAL_HOST, dest_pgdata, false);
 			if (source_conn_id != dest_id)
-			elog(ERROR, "Database identifiers mismatch: we connected to DB id %lu, but in \"%s\" we found id %lu",
-				source_conn_id, dest_pgdata, dest_id);
+			elog(ERROR, "Database identifiers mismatch: we connected to DB id %llu, but in \"%s\" we found id %llu",
+				(long long)source_conn_id, dest_pgdata, (long long)dest_id);
 		}
 	}
 
@@ -230,6 +229,7 @@ catchup_check_tablespaces_existance_in_tbsmapping(PGconn *conn)
 {
 	PGresult	*res;
 	int		i;
+	int 	ntups;
 	char		*tablespace_path = NULL;
 	const char	*linked_path = NULL;
 	char		*query = "SELECT pg_catalog.pg_tablespace_location(oid) "
@@ -241,7 +241,8 @@ catchup_check_tablespaces_existance_in_tbsmapping(PGconn *conn)
 	if (!res)
 		elog(ERROR, "Failed to get list of tablespaces");
 
-	for (i = 0; i < res->ntups; i++)
+	ntups = PQntuples(res);
+	for (i = 0; i < ntups; i++)
 	{
 		tablespace_path = PQgetvalue(res, i, 0);
 		Assert (strlen(tablespace_path) > 0);
@@ -438,7 +439,7 @@ catchup_thread_runner(void *arg)
 
 		if (file->write_size == BYTES_INVALID)
 		{
-			elog(LOG, "Skipping the unchanged file: \"%s\", read %li bytes", from_fullpath, file->read_size);
+			elog(LOG, "Skipping the unchanged file: \"%s\", read %zu bytes", from_fullpath, file->read_size);
 			continue;
 		}
 

src/checkdb.c

@@ -16,7 +16,6 @@
 
 #include "pg_probackup.h"
 
-#include <sys/stat.h>
 #include <time.h>
 #include <unistd.h>
 
@@ -293,7 +292,8 @@ check_indexes(void *arg)
 	int			i;
 	check_indexes_arg *arguments = (check_indexes_arg *) arg;
 	int			n_indexes = 0;
-	my_thread_num = arguments->thread_num;
+
+	set_my_thread_num(arguments->thread_num);
 
 	if (arguments->index_list)
 		n_indexes = parray_num(arguments->index_list);

src/data.c

@@ -16,7 +16,6 @@
 #include "utils/file.h"
 
 #include <unistd.h>
-#include <sys/stat.h>
 
 #ifdef HAVE_LIBZ
 #include <zlib.h>
@@ -208,12 +207,12 @@ get_header_errormsg(Page page, char **errormsg)
 
 	if (PageGetPageSize(phdr) != BLCKSZ)
 		snprintf(*errormsg, ERRMSG_MAX_LEN, "page header invalid, "
-				"page size %lu is not equal to block size %u",
+				"page size %zu is not equal to block size %u",
 				PageGetPageSize(phdr), BLCKSZ);
 
 	else if (phdr->pd_lower < SizeOfPageHeaderData)
 		snprintf(*errormsg, ERRMSG_MAX_LEN, "page header invalid, "
-				"pd_lower %i is less than page header size %lu",
+				"pd_lower %i is less than page header size %zu",
 				phdr->pd_lower, SizeOfPageHeaderData);
 
 	else if (phdr->pd_lower > phdr->pd_upper)
@@ -233,7 +232,7 @@ get_header_errormsg(Page page, char **errormsg)
 
 	else if (phdr->pd_special != MAXALIGN(phdr->pd_special))
 		snprintf(*errormsg, ERRMSG_MAX_LEN, "page header invalid, "
-				"pd_special %i is misaligned, expected %lu",
+				"pd_special %i is misaligned, expected %zu",
 				phdr->pd_special, MAXALIGN(phdr->pd_special));
 
 	else if (phdr->pd_flags & ~PD_VALID_FLAG_BITS)
@@ -1203,7 +1202,7 @@ restore_data_file_internal(FILE *in, FILE *out, pgFile *file, uint32 backup_vers
 			datapagemap_add(map, blknum);
 	}
 
-	elog(LOG, "Copied file \"%s\": %lu bytes", from_fullpath, write_len);
+	elog(LOG, "Copied file \"%s\": %zu bytes", from_fullpath, write_len);
 	return write_len;
 }
 
@@ -1247,7 +1246,7 @@ restore_non_data_file_internal(FILE *in, FILE *out, pgFile *file,
 
 	pg_free(buf);
 
-	elog(LOG, "Copied file \"%s\": %lu bytes", from_fullpath, file->write_size);
+	elog(LOG, "Copied file \"%s\": %llu bytes", from_fullpath, (long long)file->write_size);
 }
 
 size_t
@@ -1324,9 +1323,9 @@ restore_non_data_file(parray *parent_chain, pgBackup *dest_backup,
 		elog(ERROR, "Failed to locate a full copy of non-data file \"%s\"", to_fullpath);
 
 	if (tmp_file->write_size <= 0)
-		elog(ERROR, "Full copy of non-data file has invalid size: %li. "
+		elog(ERROR, "Full copy of non-data file has invalid size: %lli. "
 				"Metadata corruption in backup %s in file: \"%s\"",
-				tmp_file->write_size, base36enc(tmp_backup->start_time),
+				(long long)tmp_file->write_size, base36enc(tmp_backup->start_time),
 				to_fullpath);
 
 	/* incremental restore */
@@ -2038,11 +2037,11 @@ get_page_header(FILE *in, const char *fullpath, BackupPageHeader* bph,
 			return false;		/* EOF found */
 		else if (read_len != 0 && feof(in))
 			elog(ERROR,
-				 "Odd size page found at offset %ld of \"%s\"",
-				 ftello(in), fullpath);
+				 "Odd size page found at offset %lld of \"%s\"",
+				 (long long)ftello(in), fullpath);
 		else
-			elog(ERROR, "Cannot read header at offset %ld of \"%s\": %s",
-				 ftello(in), fullpath, strerror(errno));
+			elog(ERROR, "Cannot read header at offset %lld of \"%s\": %s",
+				 (long long)ftello(in), fullpath, strerror(errno));
 	}
 
 	/* In older versions < 2.4.0, when crc for file was calculated, header was
@@ -2342,8 +2341,8 @@ copy_pages(const char *to_fullpath, const char *from_fullpath,
 					 to_fullpath, strerror(errno));
 
 			if (ftruncate(fileno(out), file->size) == -1)
-				elog(ERROR, "Cannot ftruncate file \"%s\" to size %lu: %s",
-					 to_fullpath, file->size, strerror(errno));
+				elog(ERROR, "Cannot ftruncate file \"%s\" to size %llu: %s",
+					 to_fullpath, (long long)file->size, strerror(errno));
 		}
 	}
 
@@ -2452,7 +2451,7 @@ get_data_file_headers(HeaderMap *hdr_map, pgFile *file, uint32 backup_version, b
 	if (hdr_crc != file->hdr_crc)
 	{
 		elog(strict ? ERROR : WARNING, "Header map for file \"%s\" crc mismatch \"%s\" "
-				"offset: %llu, len: %lu, current: %u, expected: %u",
+				"offset: %llu, len: %zu, current: %u, expected: %u",
 			file->rel_path, hdr_map->path, file->hdr_off, read_len, hdr_crc, file->hdr_crc);
 		goto cleanup;
 	}