Fix copy bitmap.

stalkerg · stalkerg · commit 6d51bb10d9bf · 2016-02-28T02:10:27.000+03:00
diff --git a/backup.c b/backup.c
@@ -987,7 +987,6 @@ void make_pagemap_from_ptrack(parray *files)
 		if (p->ptrack_path != NULL)
 		{
 			DataPage page;
-			int i;
 			struct stat st;
 			FILE *ptrack_file = fopen(p->ptrack_path, "r");
 			if (ptrack_file == NULL)
@@ -996,23 +995,17 @@ void make_pagemap_from_ptrack(parray *files)
 					strerror(errno));
 			}
 
-			elog(LOG, "Start copy bitmap from ptrack:%s", p->ptrack_path);
 			fstat(fileno(ptrack_file), &st);
 			p->pagemap.bitmapsize = st.st_size-(st.st_size/BLCKSZ)*MAXALIGN(SizeOfPageHeaderData);
 			p->pagemap.bitmap = pg_malloc(p->pagemap.bitmapsize);
-			while(fread(page.data, BLCKSZ, 1, ptrack_file) == BLCKSZ)
+
+			elog(LOG, "Start copy bitmap from ptrack:%s size:%i", p->ptrack_path, p->pagemap.bitmapsize);
+			while(fread(page.data, BLCKSZ, 1, ptrack_file) == 1)
 			{
 				char *map = PageGetContents(page.data);
-				memcpy(p->pagemap.bitmap, map, BLCKSZ-MAXALIGN(SizeOfPageHeaderData)); 
+				memcpy(p->pagemap.bitmap, map, BLCKSZ - MAXALIGN(SizeOfPageHeaderData));
 			}
 			fclose(ptrack_file);
-			for(i = 0; i < p->pagemap.bitmapsize; i++)
-				if (p->pagemap.bitmap[i] != 0)
-					goto end_loop;
-
-			pg_free(p->pagemap.bitmap);
-			p->pagemap.bitmapsize = 0;
 		}
-		end_loop:;
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -987,7 +987,6 @@ void make_pagemap_from_ptrack(parray *files)`
`987`	`987`	`if (p->ptrack_path != NULL)`
`988`	`988`	`{`
`989`	`989`	`DataPage page;`
`990`		`- int i;`
`991`	`990`	`struct stat st;`
`992`	`991`	`FILE *ptrack_file = fopen(p->ptrack_path, "r");`
`993`	`992`	`if (ptrack_file == NULL)`
`@@ -996,23 +995,17 @@ void make_pagemap_from_ptrack(parray *files)`
`996`	`995`	`strerror(errno));`
`997`	`996`	`}`
`998`	`997`
`999`		`- elog(LOG, "Start copy bitmap from ptrack:%s", p->ptrack_path);`
`1000`	`998`	`fstat(fileno(ptrack_file), &st);`
`1001`	`999`	`p->pagemap.bitmapsize = st.st_size-(st.st_size/BLCKSZ)*MAXALIGN(SizeOfPageHeaderData);`
`1002`	`1000`	`p->pagemap.bitmap = pg_malloc(p->pagemap.bitmapsize);`
`1003`		`- while(fread(page.data, BLCKSZ, 1, ptrack_file) == BLCKSZ)`
	`1001`	`+`
	`1002`	`+ elog(LOG, "Start copy bitmap from ptrack:%s size:%i", p->ptrack_path, p->pagemap.bitmapsize);`
	`1003`	`+ while(fread(page.data, BLCKSZ, 1, ptrack_file) == 1)`
`1004`	`1004`	`{`
`1005`	`1005`	`char *map = PageGetContents(page.data);`
`1006`		`- memcpy(p->pagemap.bitmap, map, BLCKSZ-MAXALIGN(SizeOfPageHeaderData));`
	`1006`	`+ memcpy(p->pagemap.bitmap, map, BLCKSZ - MAXALIGN(SizeOfPageHeaderData));`
`1007`	`1007`	`}`
`1008`	`1008`	`fclose(ptrack_file);`
`1009`		`- for(i = 0; i < p->pagemap.bitmapsize; i++)`
`1010`		`- if (p->pagemap.bitmap[i] != 0)`
`1011`		`- goto end_loop;`
`1012`		`-`
`1013`		`- pg_free(p->pagemap.bitmap);`
`1014`		`- p->pagemap.bitmapsize = 0;`
`1015`	`1009`	`}`
`1016`		`- end_loop:;`
`1017`	`1010`	`}`
`1018`	`1011`	`}`