make pg_probackup compatible with ptrack 1.5;

cleanup the code;
fix parallel pg_ptrack_get_block()

Author: alubennikova

src/backup.c

@@ -1070,10 +1070,10 @@ pg_ptrack_support(void)
 		return false;
 	}
 
-	/* Now we support only ptrack version 1.3 */
-	if (strcmp(PQgetvalue(res_db, 0, 0), "1.4") != 0)
+	/* Now we support only ptrack version 1.5 */
+	if (strcmp(PQgetvalue(res_db, 0, 0), "1.5") != 0)
 	{
-		elog(WARNING, "Update your ptrack to the version 1.4. Current version is %s", PQgetvalue(res_db, 0, 0));
+		elog(WARNING, "Update your ptrack to the version 1.5. Current version is %s", PQgetvalue(res_db, 0, 0));
 		PQclear(res_db);
 		return false;
 	}
@@ -2692,51 +2692,51 @@ pg_ptrack_get_block(Oid dbOid,
 					BlockNumber blknum,
 					size_t *result_size)
 {
-	PGresult   *res_db;
 	PGresult   *res;
-	const char *dbname;
 	char	   *params[4];
 	char	   *result;
-	char	   *val;
-	PGconn	   *tmp_conn;
+	PGconn *tmp_conn = NULL;
 
 	params[0] = palloc(64);
 	params[1] = palloc(64);
 	params[2] = palloc(64);
 	params[3] = palloc(64);
 
 	/*
-	 * Use backup_conn, cause we can do it from any database.
+	 * Use tmp_conn, since we may work in parallel threads.
+	 * We can connect to any database.
 	 */
 	sprintf(params[0], "%i", tblsOid);
 	sprintf(params[1], "%i", dbOid);
 	sprintf(params[2], "%i", relOid);
 	sprintf(params[3], "%u", blknum);
 
+	tmp_conn = pgut_connect(pgut_dbname);
+
 	//elog(LOG, "db %i pg_ptrack_get_block(%i, %i, %u)",dbOid, tblsOid, relOid, blknum);
-	res = pgut_execute(backup_conn, "SELECT pg_ptrack_get_block_2($1, $2, $3, $4)",
+	res = pgut_execute(tmp_conn, "SELECT pg_ptrack_get_block_2($1, $2, $3, $4)",
 					4, (const char **)params, true);
 
 	if (PQnfields(res) != 1)
 	{
-		elog(LOG, "cannot get file block for relation oid %u",
+		elog(VERBOSE, "cannot get file block for relation oid %u",
 					   relOid);
 		return NULL;
 	}
 
 	if (PQgetisnull(res, 0, 0))
 	{
-		elog(LOG, "cannot get file block for relation oid %u",
+		elog(VERBOSE, "cannot get file block for relation oid %u",
 				   relOid);
 		return NULL;
 	}
 
-	val = PQgetvalue(res, 0, 0);
-
 	result = (char *) PQunescapeBytea((unsigned char *) PQgetvalue(res, 0, 0),
 									  result_size);
 
 	PQclear(res);
+	pgut_disconnect(tmp_conn);
+
 	pfree(params[0]);
 	pfree(params[1]);
 	pfree(params[2]);

src/data.c

@@ -258,10 +258,9 @@ backup_data_page(pgFile *file, XLogRecPtr prev_backup_start_lsn,
 			{
 				/* This block was truncated.*/
 				header.compressed_size = PageIsTruncated;
-				page_is_valid = true;
 				/* Page is not actually valid, but it is absent
 				 * and we're not going to reread it or validate */
-// 				elog(WARNING, "backup blkno %u. PageIsTruncated", blknum);
+				page_is_valid = true;
 			}
 
 			if (result == 1)
@@ -272,7 +271,6 @@ backup_data_page(pgFile *file, XLogRecPtr prev_backup_start_lsn,
 	if (backup_mode == BACKUP_MODE_DIFF_PTRACK)
 	{
 		size_t page_size = 0;
-		PageHeader phdr = (PageHeader) page;
 
 		free(page);
 		page = NULL;
@@ -283,7 +281,6 @@ backup_data_page(pgFile *file, XLogRecPtr prev_backup_start_lsn,
 		{
 			/* This block was truncated.*/
 			header.compressed_size = PageIsTruncated;
-// 			elog(WARNING, "backup blkno %u. reread PageIsTruncated", blknum);
 		}
 		else if (page_size != BLCKSZ)
 		{
@@ -312,18 +309,18 @@ backup_data_page(pgFile *file, XLogRecPtr prev_backup_start_lsn,
 
 		file->compress_alg = compress_alg;
 
-// 		elog(WARNING, "backup blkno %u. header.compressed_size %d", blknum, header.compressed_size);
 		Assert (header.compressed_size <= BLCKSZ);
 	}
 
 	write_buffer_size = sizeof(header);
 
-	/* The page was truncated. Write only header
-	/* to know that we must truncate restored file */
+	/*
+	 * The page was truncated. Write only header
+	 * to know that we must truncate restored file
+	 */
 	if (header.compressed_size == PageIsTruncated)
 	{
 		memcpy(write_buffer, &header, sizeof(header));
-// 		elog(WARNING, "page was truncated in file %s block %u", file->path, header.block);
 	}
 	/* The page compression failed. Write it as is. */
 	else if (header.compressed_size == -1)
@@ -341,8 +338,8 @@ backup_data_page(pgFile *file, XLogRecPtr prev_backup_start_lsn,
 		write_buffer_size += MAXALIGN(header.compressed_size);
 	}
 
-// 	elog(WARNING, "backup blkno %u, compressed_size %d write_buffer_size %ld",
-// 				  blknum, header.compressed_size, write_buffer_size);
+	/* elog(VERBOSE, "backup blkno %u, compressed_size %d write_buffer_size %ld",
+				  blknum, header.compressed_size, write_buffer_size); */
 
 	/* Update CRC */
 	COMP_CRC32C(*crc, &write_buffer, write_buffer_size);
@@ -590,7 +587,6 @@ restore_data_file(const char *from_root,
 			break;
 		}
 
-		//elog(VERBOSE, "file %s, header compressed size %d", file->path, header.compressed_size);
 		Assert(header.compressed_size <= BLCKSZ);
 
 		read_len = fread(compressed_page.data, 1,