Commitc678325

committed

Add backup_label to file_database.txt for all checks.

1 parente829899 commitc678325Copy full SHA for c678325

File tree

+19

-5

lines changed

+19

-5

lines changed

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -888,6 +888,7 @@ get_lsn(PGconn conn, PGresult res, XLogRecPtr *lsn, bool stop_backup)`
`888`	`888`	`charpath_backup_label[MAXPGPATH];`
`889`	`889`	`charpath_tablespace_map[MAXPGPATH];`
`890`	`890`	`FILE*fp;`
	`891`	`+pgFile*file;`
`891`	`892`
`892`	`893`	`pgBackupGetPath(&current,path,lengthof(path),DATABASE_DIR);`
`893`	`894`	`snprintf(path_backup_label,lengthof(path_backup_label),"%s/backup_label",path);`
`@@ -900,6 +901,11 @@ get_lsn(PGconn conn, PGresult res, XLogRecPtr *lsn, bool stop_backup)`
`900`	`901`
`901`	`902`	`fwrite(PQgetvalue(res,0,1),1,strlen(PQgetvalue(res,0,1)),fp);`
`902`	`903`	`fclose(fp);`
	`904`	`+file=pgFileNew(path_backup_label, true);`
	`905`	`+calc_file(file);`
	`906`	`+free(file->path);`
	`907`	`+file->path=strdup("backup_label");`
	`908`	`+parray_append(backup_files_list,file);`
`903`	`909`	`if (strlen(PQgetvalue(res,0,2))==0)`
`904`	`910`	`return;`
`905`	`911`
`@@ -910,6 +916,11 @@ get_lsn(PGconn conn, PGresult res, XLogRecPtr *lsn, bool stop_backup)`
`910`	`916`
`911`	`917`	`fwrite(PQgetvalue(res,0,2),1,strlen(PQgetvalue(res,0,2)),fp);`
`912`	`918`	`fclose(fp);`
	`919`	`+file=pgFileNew(path_tablespace_map, true);`
	`920`	`+calc_file(file);`
	`921`	`+free(file->path);`
	`922`	`+file->path=strdup("tablespace_map");`
	`923`	`+parray_append(backup_files_list,file);`
`913`	`924`	`}`
`914`	`925`	`}`
`915`	`926`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -722,14 +722,16 @@ calc_file(pgFile *file)`
`722`	`722`
`723`	`723`	`for (;;)`
`724`	`724`	`{`
`725`		`-if ((read_len=fread(buf,1,sizeof(buf),in))!=sizeof(buf))`
	`725`	`+read_len=fread(buf,1,sizeof(buf),in);`
	`726`	`+`
	`727`	`+if(read_len==0)`
`726`	`728`	`break;`
`727`	`729`
`728`	`730`	`/* update CRC */`
`729`	`731`	`COMP_CRC32C(crc,buf,read_len);`
`730`	`732`
`731`		`-file->write_size+=sizeof(buf);`
`732`		`-file->read_size+=sizeof(buf);`
	`733`	`+file->write_size+=read_len;`
	`734`	`+file->read_size+=read_len;`
`733`	`735`	`}`
`734`	`736`
`735`	`737`	`errno_tmp=errno;`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ const char *pgdata_exclude[] =`
`31`	`31`	`NULL`
`32`	`32`	`};`
`33`	`33`
`34`		`-staticpgFilepgFileNew(constcharpath,boolomit_symlink);`
	`34`	`+pgFilepgFileNew(constcharpath,boolomit_symlink);`
`35`	`35`	`staticintBlackListCompare(constvoidstr1,constvoidstr2);`
`36`	`36`
`37`	`37`	`/* create directory, also create parent directories if necessary */`
`@@ -60,7 +60,7 @@ dir_create_dir(const char *dir, mode_t mode)`
`60`	`60`	`return0;`
`61`	`61`	`}`
`62`	`62`
`63`		`-staticpgFile*`
	`63`	`+pgFile*`
`64`	`64`	`pgFileNew(constchar*path,boolomit_symlink)`
`65`	`65`	`{`
`66`	`66`	`structstatst;`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -283,6 +283,7 @@ extern parray dir_read_file_list(const char root, const char *file_txt);`
`283`	`283`	`externintdir_create_dir(constchar*path,mode_tmode);`
`284`	`284`	`externvoiddir_copy_files(constcharfrom_root,constcharto_root);`
`285`	`285`
	`286`	`+externpgFilepgFileNew(constcharpath,boolomit_symlink);`
`286`	`287`	`externvoidpgFileDelete(pgFile*file);`
`287`	`288`	`externvoidpgFileFree(void*file);`
`288`	`289`	`externpg_crc32pgFileGetCRC(pgFile*file);`

Comments

(0)