Merge branch 'ptrack' into streamrepl

stalkerg · stalkerg · commit 36682408266a · 2016-04-26T23:00:49.000+03:00
diff --git a/data.c b/data.c
@@ -245,6 +245,13 @@ backup_data_file(const char *from_root, const char *to_root,
 			file->write_size += sizeof(header) + read_len - header.hole_length;
 		}
 		pg_free(iter);
+		/*
+		 * If we have pagemap then file can't be a zero size.
+		 * Otherwise, we will clear the last file.
+		 * Increase read_size to delete after.
+		 */
+		if (file->read_size == 0)
+			file->read_size++;
 	}
 
 	/*

Original file line number	Diff line number	Diff line change
`@@ -245,6 +245,13 @@ backup_data_file(const char from_root, const char to_root,`
`245`	`245`	`file->write_size += sizeof(header) + read_len - header.hole_length;`
`246`	`246`	`}`
`247`	`247`	`pg_free(iter);`
	`248`	`+ /*`
	`249`	`+ * If we have pagemap then file can't be a zero size.`
	`250`	`+ * Otherwise, we will clear the last file.`
	`251`	`+ * Increase read_size to delete after.`
	`252`	`+ */`
	`253`	`+ if (file->read_size == 0)`
	`254`	`+ file->read_size++;`
`248`	`255`	`}`
`249`	`256`
`250`	`257`	`/*`