[PBCKP-146] review fixes

Author: funny-falcon

src/catalog.c

@@ -1069,7 +1069,7 @@ get_backup_filelist(pgBackup *backup, bool strict)
 		char		linked[MAXPGPATH];
 		char		compress_alg_string[MAXPGPATH];
 		int64		write_size,
-					full_size,
+					uncompressed_size,
 					mode,		/* bit length of mode_t depends on platforms */
 					is_datafile,
 					is_cfs,
@@ -1088,8 +1088,6 @@ get_backup_filelist(pgBackup *backup, bool strict)
 
         get_control_value_str(buf, "path", path, sizeof(path),true);
         get_control_value_int64(buf, "size", &write_size, true);
-		if (!get_control_value_int64(buf, "full_size", &full_size, false))
-			full_size = write_size;
         get_control_value_int64(buf, "mode", &mode, true);
         get_control_value_int64(buf, "is_datafile", &is_datafile, true);
         get_control_value_int64(buf, "is_cfs", &is_cfs, false);
@@ -1100,7 +1098,6 @@ get_backup_filelist(pgBackup *backup, bool strict)
 
 		file = pgFileInit(path);
 		file->write_size = (int64) write_size;
-		file->uncompressed_size = full_size;
 		file->mode = (mode_t) mode;
 		file->is_datafile = is_datafile ? true : false;
 		file->is_cfs = is_cfs ? true : false;
@@ -1136,6 +1133,11 @@ 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 (get_control_value_int64(buf, "full_size", &uncompressed_size, false))
+			file->uncompressed_size = uncompressed_size;
+		else
+			file->uncompressed_size = write_size;
+
 		if (file->external_dir_num == 0)
 			set_forkname(file);
 

src/data.c

@@ -1447,11 +1447,12 @@ backup_non_data_file_internal(const char *from_fullpath,
 			elog(ERROR, "Cannot access remote file \"%s\"", from_fullpath);
 	}
 
-	pg_free(errmsg); /* ????? */
-
 	file->uncompressed_size = file->read_size;
 
 cleanup:
+	if (errmsg != NULL)
+		pg_free(errmsg);
+
 	/* finish CRC calculation and store into pgFile */
 	FIN_FILE_CRC32(true, file->crc);
 

tests/cfs_backup.py

@@ -171,6 +171,8 @@ def test_fullbackup_after_create_table(self):
             "ERROR: File pg_compression not found in {0}".format(
                 os.path.join(self.backup_dir, 'node', backup_id))
         )
+
+        # check cfm size
         cfms = find_by_extensions(
             [os.path.join(self.backup_dir, 'backups', 'node', backup_id)],
             ['.cfm'])

tests/cfs_catchup.py

@@ -56,6 +56,16 @@ def test_full_catchup_with_tablespace(self):
             self.pgdata_content(dst_pg.data_dir)
         )
 
+        # check cfm size
+        cfms = find_by_extensions([os.path.join(dst_pg.data_dir)], ['.cfm'])
+        self.assertTrue(cfms, "ERROR: .cfm files not found in backup dir")
+        for cfm in cfms:
+            size = os.stat(cfm).st_size
+            self.assertLessEqual(size, 4096,
+                                 "ERROR: {0} is not truncated (has size {1} > 4096)".format(
+                                     cfm, size
+                                 ))
+
         # make changes in master tablespace
         src_pg.safe_psql(
             "postgres",
@@ -89,6 +99,16 @@ def test_full_catchup_with_tablespace(self):
             ]
         )
 
+        # check cfm size again
+        cfms = find_by_extensions([os.path.join(dst_pg.data_dir)], ['.cfm'])
+        self.assertTrue(cfms, "ERROR: .cfm files not found in backup dir")
+        for cfm in cfms:
+            size = os.stat(cfm).st_size
+            self.assertLessEqual(size, 4096,
+                                 "ERROR: {0} is not truncated (has size {1} > 4096)".format(
+                                     cfm, size
+                                 ))
+
         # run&recover catchup'ed instance
         dst_options = {}
         dst_options['port'] = str(dst_pg.port)