Fix detect tablespace oid.

stalkerg · stalkerg · commit 6ea5df1ca012 · 2016-10-25T17:22:11.000+03:00
diff --git a/backup.c b/backup.c
@@ -1371,7 +1371,6 @@ void make_pagemap_from_ptrack(parray *files)
 			size_t start_addr;
 			Oid db_oid, rel_oid, tablespace_oid = 0;
 			int sep_iter, sep_count = 0;
-			tablespace = palloc0(64);
 
 			/* Find target path*/
 			for(sep_iter = (int)path_length; sep_iter >= 0; sep_iter--)
@@ -1380,16 +1379,17 @@ void make_pagemap_from_ptrack(parray *files)
 				{
 					sep_count++;
 				}
-				if (sep_count == 3)
+				if (sep_count == 2)
 				{
 					tmp_path += sep_iter + 1;
 					break;
 				}
 			}
 			/* For unix only now */
-			sscanf(tmp_path, "%[^/]/%u/%u_ptrack", tablespace, &db_oid, &rel_oid);
-			if (strcmp(tablespace, "base") != 0 && strcmp(tablespace, "global") != 0)
-				sscanf(tablespace, "%i", &tablespace_oid);
+			sscanf(tmp_path, "%u/%u_ptrack", &db_oid, &rel_oid);
+			tablespace = strstr(p->ptrack_path, "pg_tblspc");
+			if (tablespace != NULL)
+				sscanf(tablespace+10, "%i/", &tablespace_oid);
 
 			flat_memory = pg_ptrack_get_and_clear(tablespace_oid,
 												  db_oid,
@@ -1401,7 +1401,6 @@ void make_pagemap_from_ptrack(parray *files)
 			p->pagemap.bitmap = pg_malloc(p->pagemap.bitmapsize);
 			memcpy(p->pagemap.bitmap, flat_memory+start_addr, p->pagemap.bitmapsize);
 			pg_free(flat_memory);
-			pg_free(tablespace);
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -1371,7 +1371,6 @@ void make_pagemap_from_ptrack(parray *files)`
`1371`	`1371`	`size_t start_addr;`
`1372`	`1372`	`Oid db_oid, rel_oid, tablespace_oid = 0;`
`1373`	`1373`	`int sep_iter, sep_count = 0;`
`1374`		`- tablespace = palloc0(64);`
`1375`	`1374`
`1376`	`1375`	`/* Find target path*/`
`1377`	`1376`	`for(sep_iter = (int)path_length; sep_iter >= 0; sep_iter--)`
`@@ -1380,16 +1379,17 @@ void make_pagemap_from_ptrack(parray *files)`
`1380`	`1379`	`{`
`1381`	`1380`	`sep_count++;`
`1382`	`1381`	`}`
`1383`		`- if (sep_count == 3)`
	`1382`	`+ if (sep_count == 2)`
`1384`	`1383`	`{`
`1385`	`1384`	`tmp_path += sep_iter + 1;`
`1386`	`1385`	`break;`
`1387`	`1386`	`}`
`1388`	`1387`	`}`
`1389`	`1388`	`/* For unix only now */`
`1390`		`- sscanf(tmp_path, "%[^/]/%u/%u_ptrack", tablespace, &db_oid, &rel_oid);`
`1391`		`- if (strcmp(tablespace, "base") != 0 && strcmp(tablespace, "global") != 0)`
`1392`		`- sscanf(tablespace, "%i", &tablespace_oid);`
	`1389`	`+ sscanf(tmp_path, "%u/%u_ptrack", &db_oid, &rel_oid);`
	`1390`	`+ tablespace = strstr(p->ptrack_path, "pg_tblspc");`
	`1391`	`+ if (tablespace != NULL)`
	`1392`	`+ sscanf(tablespace+10, "%i/", &tablespace_oid);`
`1393`	`1393`
`1394`	`1394`	`flat_memory = pg_ptrack_get_and_clear(tablespace_oid,`
`1395`	`1395`	`db_oid,`
`@@ -1401,7 +1401,6 @@ void make_pagemap_from_ptrack(parray *files)`
`1401`	`1401`	`p->pagemap.bitmap = pg_malloc(p->pagemap.bitmapsize);`
`1402`	`1402`	`memcpy(p->pagemap.bitmap, flat_memory+start_addr, p->pagemap.bitmapsize);`
`1403`	`1403`	`pg_free(flat_memory);`
`1404`		`- pg_free(tablespace);`
`1405`	`1404`	`}`
`1406`	`1405`	`}`
`1407`	`1406`	`}`