[PBCKP-146] prettify forkname handling.

Author: funny-falcon

src/catalog.c

@@ -1138,6 +1138,9 @@ get_backup_filelist(pgBackup *backup, bool strict)
 		if (get_control_value_int64(buf, "hdr_size", &hdr_size, false))
 			file->hdr_size = (int) hdr_size;
 
+		if (file->external_dir_num == 0)
+			set_forkname(file);
+
 		parray_append(files, file);
 	}
 
@@ -2516,7 +2519,7 @@ write_backup_filelist(pgBackup *backup, parray *files, const char *root,
 	char		control_path[MAXPGPATH];
 	char		control_path_temp[MAXPGPATH];
 	size_t		i = 0;
-	#define BUFFERSZ 1024*1024
+	#define BUFFERSZ (1024*1024)
 	char		*buf;
 	int64 		backup_size_on_disk = 0;
 	int64 		uncompressed_size_on_disk = 0;

src/dir.c

@@ -680,57 +680,22 @@ dir_check_file(pgFile *file, bool backup_logs)
 			return CHECK_FALSE;
 		else if (isdigit(file->name[0]))
 		{
-			char	   *fork_name;
-			int			len;
-			char		suffix[MAXPGPATH];
+			set_forkname(file);
 
-			fork_name = strstr(file->name, "_");
-			if (fork_name)
-			{
-				/* Auxiliary fork of the relfile */
-				if (strcmp(fork_name, "_vm") == 0)
-					file->forkName = vm;
-
-				else if (strcmp(fork_name, "_fsm") == 0)
-					file->forkName = fsm;
-
-				else if (strcmp(fork_name, "_cfm") == 0)
-					file->forkName = cfm;
-
-				else if (strcmp(fork_name, "_ptrack") == 0)
-					file->forkName = ptrack;
-
-				else if (strcmp(fork_name, "_init") == 0)
-					file->forkName = init;
-
-				// extract relOid for certain forks
-				if (file->forkName == vm ||
-					file->forkName == fsm ||
-					file->forkName == init ||
-					file->forkName == cfm)
-				{
-					// sanity
-					if (sscanf(file->name, "%u_*", &(file->relOid)) != 1)
-						file->relOid = 0;
-				}
+			if (file->forkName == ptrack) /* Compatibility with left-overs from ptrack1 */
+				return CHECK_FALSE;
+			else if (file->forkName != none)
+				return CHECK_TRUE;
 
-				/* Do not backup ptrack files */
-				if (file->forkName == ptrack)
-					return CHECK_FALSE;
-			}
-			else
+			/* Set is_datafile flag */
 			{
+				char suffix[MAXFNAMELEN];
 
-				len = strlen(file->name);
-				/* reloid.cfm */
-				if (len > 3 && strcmp(file->name + len - 3, "cfm") == 0)
-					return CHECK_TRUE;
-
+				/* check if file is datafile */
 				sscanf_res = sscanf(file->name, "%u.%d.%s", &(file->relOid),
 									&(file->segno), suffix);
-				if (sscanf_res == 0)
-					elog(ERROR, "Cannot parse file name \"%s\"", file->name);
-				else if (sscanf_res == 1 || sscanf_res == 2)
+				Assert(sscanf_res > 0); /* since first char is digit */
+				if (sscanf_res == 1 || sscanf_res == 2)
 					file->is_datafile = true;
 			}
 		}
@@ -1869,3 +1834,35 @@ pfilearray_clear_locks(parray *file_list)
 		pg_atomic_clear_flag(&file->lock);
 	}
 }
+
+/* Set forkName if possible */
+void
+set_forkname(pgFile *file)
+{
+	int name_len = strlen(file->name);
+
+	/* Auxiliary fork of the relfile */
+	if (name_len > 3 && strcmp(file->name + name_len - 3, "_vm") == 0)
+		file->forkName = vm;
+
+	else if (name_len > 4 && strcmp(file->name + name_len - 4, "_fsm") == 0)
+		file->forkName = fsm;
+
+	else if (name_len > 4 && strcmp(file->name + name_len - 4, ".cfm") == 0)
+		file->forkName = cfm;
+
+	else if (name_len > 5 && strcmp(file->name + name_len - 5, "_init") == 0)
+		file->forkName = init;
+
+	else if (name_len > 7 && strcmp(file->name + name_len - 7, "_ptrack") == 0)
+		file->forkName = ptrack;
+
+	// extract relOid for certain forks
+
+	if ((file->forkName == vm ||
+		 file->forkName == fsm ||
+		 file->forkName == init ||
+		 file->forkName == cfm) &&
+		(sscanf(file->name, "%u*", &(file->relOid)) != 1))
+		file->relOid = 0;
+}

src/pg_probackup.h

@@ -200,6 +200,7 @@ typedef enum CompressAlg
 
 typedef enum ForkName
 {
+	none,
 	vm,
 	fsm,
 	cfm,
@@ -1061,6 +1062,7 @@ extern int pgCompareString(const void *str1, const void *str2);
 extern int pgPrefixCompareString(const void *str1, const void *str2);
 extern int pgCompareOid(const void *f1, const void *f2);
 extern void pfilearray_clear_locks(parray *file_list);
+extern void set_forkname(pgFile *file);
 
 /* in data.c */
 extern bool check_data_file(ConnectionArgs *arguments, pgFile *file,