Merge commit 'fb4ae4a2356804d64e51213c43632bd78629d922' into PGPRO9_5

dmpgpro · dmpgpro · commit 7680c9f473ce · 2016-09-14T18:57:56.000+03:00
diff --git a/contrib/pg_arman/data.c b/contrib/pg_arman/data.c
@@ -519,7 +519,7 @@ restore_data_file(const char *from_root,
 				if (i == BLCKSZ)
 					goto skip_checksum;
 			}
-			((PageHeader) page.data)->pd_checksum = pg_checksum_page(page.data, header.block);
+			((PageHeader) page.data)->pd_checksum = pg_checksum_page(page.data, file->segno * RELSEG_SIZE + header.block);
 		}
 
 		skip_checksum:
diff --git a/contrib/pg_arman/dir.c b/contrib/pg_arman/dir.c
@@ -547,7 +547,7 @@ dir_read_file_list(const char *root, const char *file_txt)
 		pg_crc32		crc;
 		unsigned int	mode;	/* bit length of mode_t depends on platforms */
 		struct tm		tm;
-		pgFile		   *file;
+		pgFile			*file;
 
 		memset(&tm, 0, sizeof(tm));
 		if (sscanf(buf, "%s %c %lu %u %o %d-%d-%d %d:%d:%d",
@@ -590,6 +590,30 @@ dir_read_file_list(const char *root, const char *file_txt)
 			strcpy(file->path, path);
 
 		parray_append(files, file);
+
+		if(file->is_datafile)
+		{
+			int find_dot;
+			int check_digit;
+			char *text_segno;
+			size_t path_len = strlen(file->path);
+			for(find_dot = path_len-1; file->path[find_dot] != '.' && find_dot >= 0; find_dot--);
+			if (find_dot <= 0)
+				continue;
+
+			text_segno = file->path + find_dot + 1;
+			for(check_digit=0; text_segno[check_digit] != '\0'; check_digit++)
+				if (!isdigit(text_segno[check_digit]))
+				{
+					check_digit = -1;
+					break;
+				}
+
+			if (check_digit == -1)
+				continue;
+
+			file->segno = (int) strtol(text_segno, NULL, 10);
+		}
 	}
 
 	fclose(fp);

Original file line number	Diff line number	Diff line change
`@@ -519,7 +519,7 @@ restore_data_file(const char *from_root,`
`519`	`519`	`if (i == BLCKSZ)`
`520`	`520`	`goto skip_checksum;`
`521`	`521`	`}`
`522`		`- ((PageHeader) page.data)->pd_checksum = pg_checksum_page(page.data, header.block);`
	`522`	`+ ((PageHeader) page.data)->pd_checksum = pg_checksum_page(page.data, file->segno * RELSEG_SIZE + header.block);`
`523`	`523`	`}`
`524`	`524`
`525`	`525`	`skip_checksum:`