db/pg_probackup
db/pg_probackup
1
0
Fork 0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2024-11-24 08:52:38 +02:00
Code Issues Releases Activity

Fix recalc checksums during restore for segno > 0.

Browse Source
This commit is contained in:
stalkerg 2016-09-13 19:50:59 +03:00
parent 8957aadae6
commit fb4ae4a235
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data.c
View File

@ -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:

26
dir.c
View File

@ -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);