code cleanup. add more comments

alubennikova · alubennikova · commit e47b02018bdd · 2017-09-28T15:12:12.000+03:00
diff --git a/src/backup.c b/src/backup.c
@@ -222,6 +222,7 @@ do_backup_instance(void)
 	backup_files_list = parray_new();
 
 	/* list files with the logical path. omit $PGDATA */
+	dir_list_file(backup_files_list, pgdata, true, true, false);
 	add_pgdata_files(backup_files_list, pgdata);
 
 	if (current.backup_mode != BACKUP_MODE_FULL)
@@ -251,7 +252,8 @@ do_backup_instance(void)
 						*/
 					   !from_replica);
 	}
-	else if (current.backup_mode == BACKUP_MODE_DIFF_PTRACK)
+
+	if (current.backup_mode == BACKUP_MODE_DIFF_PTRACK)
 	{
 		XLogRecPtr	ptrack_lsn = get_last_ptrack_lsn();
 
@@ -295,6 +297,7 @@ do_backup_instance(void)
 			dir_create_dir(dirpath, DIR_PERMISSION);
 		}
 
+		/* setup threads */
 		__sync_lock_release(&file->lock);
 	}
 
@@ -1601,16 +1604,18 @@ backup_files(void *arg)
 }
 
 /*
- * Append files to the backup list array.
+ * Extract information about files in backup_list parsing their names:
+ * - remove temp tables from the list
+ * - set flags for datafiles
+ * - link ptrack files with main fork files
+ * TODO: rename the function
+ * TODO: review flags
  */
 static void
 add_pgdata_files(parray *files, const char *root)
 {
 	size_t		i;
 
-	/* list files with the logical path. omit $PGDATA */
-	dir_list_file(files, root, true, true, false);
-
 	/* mark files that are possible datafile as 'datafile' */
 	for (i = 0; i < parray_num(files); i++)
 	{

Original file line number	Diff line number	Diff line change
`@@ -222,6 +222,7 @@ do_backup_instance(void)`
`222`	`222`	`backup_files_list = parray_new();`
`223`	`223`
`224`	`224`	`/* list files with the logical path. omit $PGDATA */`
	`225`	`+ dir_list_file(backup_files_list, pgdata, true, true, false);`
`225`	`226`	`add_pgdata_files(backup_files_list, pgdata);`
`226`	`227`
`227`	`228`	`if (current.backup_mode != BACKUP_MODE_FULL)`
`@@ -251,7 +252,8 @@ do_backup_instance(void)`
`251`	`252`	`*/`
`252`	`253`	`!from_replica);`
`253`	`254`	`}`
`254`		`- else if (current.backup_mode == BACKUP_MODE_DIFF_PTRACK)`
	`255`	`+`
	`256`	`+ if (current.backup_mode == BACKUP_MODE_DIFF_PTRACK)`
`255`	`257`	`{`
`256`	`258`	`XLogRecPtr ptrack_lsn = get_last_ptrack_lsn();`
`257`	`259`
`@@ -295,6 +297,7 @@ do_backup_instance(void)`
`295`	`297`	`dir_create_dir(dirpath, DIR_PERMISSION);`
`296`	`298`	`}`
`297`	`299`
	`300`	`+ /* setup threads */`
`298`	`301`	`__sync_lock_release(&file->lock);`
`299`	`302`	`}`
`300`	`303`
`@@ -1601,16 +1604,18 @@ backup_files(void *arg)`
`1601`	`1604`	`}`
`1602`	`1605`
`1603`	`1606`	`/*`
`1604`		`- * Append files to the backup list array.`
	`1607`	`+ * Extract information about files in backup_list parsing their names:`
	`1608`	`+ * - remove temp tables from the list`
	`1609`	`+ * - set flags for datafiles`
	`1610`	`+ * - link ptrack files with main fork files`
	`1611`	`+ * TODO: rename the function`
	`1612`	`+ * TODO: review flags`
`1605`	`1613`	`*/`
`1606`	`1614`	`static void`
`1607`	`1615`	`add_pgdata_files(parray files, const char root)`
`1608`	`1616`	`{`
`1609`	`1617`	`size_t i;`
`1610`	`1618`
`1611`		`- /* list files with the logical path. omit $PGDATA */`
`1612`		`- dir_list_file(files, root, true, true, false);`
`1613`		`-`
`1614`	`1619`	`/* mark files that are possible datafile as 'datafile' */`
`1615`	`1620`	`for (i = 0; i < parray_num(files); i++)`
`1616`	`1621`	`{`