db/pg_probackup
db/pg_probackup
1
0
Fork 0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2024-12-05 11:00:22 +02:00
Code Issues Releases Activity

PGPRO-427: A little optimization in process_block_change()

Browse Source
This commit is contained in:
Arthur Zakirov 2018-05-25 18:56:35 +03:00
parent dac3958eec
commit 6a95d7cf75
2 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/backup.c
View File

@ -130,6 +130,11 @@ static void check_system_identifiers(void);
static void confirm_block_size(const char *name, int blcksz); static void confirm_block_size(const char *name, int blcksz);
static void set_cfs_datafiles(parray *files, const char *root, char *relative, size_t i); static void set_cfs_datafiles(parray *files, const char *root, char *relative, size_t i);
/*
* A little optimization used in process_block_change().
*/
static pgFile *last_used_file = NULL;
#define disconnect_and_exit(code) \ #define disconnect_and_exit(code) \
{ \ { \
@ -500,6 +505,7 @@ do_backup_instance(void)
} }
else else
current.tli = get_current_timeline(false); current.tli = get_current_timeline(false);
/* /*
* In incremental backup mode ensure that already-validated * In incremental backup mode ensure that already-validated
* backup on current timeline exists and get its filelist. * backup on current timeline exists and get its filelist.
@ -509,6 +515,7 @@ do_backup_instance(void)
current.backup_mode == BACKUP_MODE_DIFF_DELTA) current.backup_mode == BACKUP_MODE_DIFF_DELTA)
{ {
parray *backup_list; parray *backup_list;
/* get list of backups already taken */ /* get list of backups already taken */
backup_list = catalog_get_backup_list(INVALID_BACKUP_ID); backup_list = catalog_get_backup_list(INVALID_BACKUP_ID);
if (backup_list == NULL) if (backup_list == NULL)
@ -628,6 +635,9 @@ do_backup_instance(void)
*/ */
if (current.backup_mode == BACKUP_MODE_DIFF_PAGE) if (current.backup_mode == BACKUP_MODE_DIFF_PAGE)
{ {
/* Just in case initialize it to NULL */
last_used_file = NULL;
/* /*
* Build the page map. Obtain information about changed pages * Build the page map. Obtain information about changed pages
* reading WAL segments present in archives up to the point * reading WAL segments present in archives up to the point
@ -2318,11 +2328,11 @@ datasegpath(RelFileNode rnode, ForkNumber forknum, BlockNumber segno)
void void
process_block_change(ForkNumber forknum, RelFileNode rnode, BlockNumber blkno) process_block_change(ForkNumber forknum, RelFileNode rnode, BlockNumber blkno)
{ {
char *path; char *path;
char *rel_path; char *rel_path;
BlockNumber blkno_inseg; BlockNumber blkno_inseg;
int segno; int segno;
pgFile *file_item = NULL; pgFile *file_item = NULL;
int j; int j;
segno = blkno / RELSEG_SIZE; segno = blkno / RELSEG_SIZE;
@ -2332,14 +2342,24 @@ process_block_change(ForkNumber forknum, RelFileNode rnode, BlockNumber blkno)
path = pg_malloc(strlen(rel_path) + strlen(pgdata) + 2); path = pg_malloc(strlen(rel_path) + strlen(pgdata) + 2);
sprintf(path, "%s/%s", pgdata, rel_path); sprintf(path, "%s/%s", pgdata, rel_path);
for (j = 0; j < parray_num(backup_files_list); j++) /*
* Little optimization in case if we need the same file as in the previoius
* call.
*/
if (last_used_file && strcmp(last_used_file->path, path) == 0)
file_item = last_used_file;
else
{ {
pgFile *p = (pgFile *) parray_get(backup_files_list, j); for (j = 0; j < parray_num(backup_files_list); j++)
if (strcmp(p->path, path) == 0)
{ {
file_item = p; pgFile *p = (pgFile *) parray_get(backup_files_list, j);
break;
if (strcmp(p->path, path) == 0)
{
file_item = p;
last_used_file = p;
break;
}
} }
} }
@ -2443,7 +2463,7 @@ make_pagemap_from_ptrack(parray *files)
} }
else else
{ {
file->pagemap.bitmapsize = RELSEG_SIZE/HEAPBLOCKS_PER_BYTE; file->pagemap.bitmapsize = RELSEG_SIZE/HEAPBLOCKS_PER_BYTE;
elog(VERBOSE, "pagemap size: %i", file->pagemap.bitmapsize); elog(VERBOSE, "pagemap size: %i", file->pagemap.bitmapsize);
} }

1
src/parsexlog.c
View File

@ -193,6 +193,7 @@ extractPageMap(const char *archivedir, XLogRecPtr startpoint, TimeLineID tli,
for (i = 0; i < parray_num(files); i++) for (i = 0; i < parray_num(files); i++)
{ {
pgFile *file = (pgFile *) parray_get(files, i); pgFile *file = (pgFile *) parray_get(files, i);
if (file->is_datafile && file->pagemap.bitmap == NULL) if (file->is_datafile && file->pagemap.bitmap == NULL)
file->pagemap.bitmapsize = PageBitmapIsEmpty; file->pagemap.bitmapsize = PageBitmapIsEmpty;
} }