Change format to unsigned fort printing CFS messages

knizhnik · knizhnik · commit ceecae46a10c · 2017-06-19T19:33:48.000+03:00
diff --git a/src/backend/storage/file/cfs.c b/src/backend/storage/file/cfs.c
@@ -605,7 +605,6 @@ void cfs_lock_file(FileMap* map, char const* file_path)
 				pfree(map_bck_path);
 			}
 			LWLockRelease(CfsGcLock);
-			break;
 		}
 		/* Wait until GC of segment is completed */
 		pg_atomic_fetch_sub_u32(&map->lock, 1);
@@ -831,7 +830,7 @@ static bool cfs_gc_file(char* map_path, bool background)
 
 				if (!cfs_read_file(fd, block, size))
 				{
-					elog(WARNING, "CFS GC failed to read block %d of file %s at position %d size %d: %m",
+					elog(WARNING, "CFS GC failed to read block %u of file %s at position %u size %u: %m",
 							   i, file_path, offs, size);
 					goto Cleanup;
 				}
@@ -929,7 +928,7 @@ static bool cfs_gc_file(char* map_path, bool background)
 					{
 						pg_atomic_fetch_sub_u32(&map->lock, CFS_GC_LOCK); /* release lock */
 						pg_atomic_fetch_sub_u32(&cfs_state->n_active_gc, 1);
-						elog(ERROR, "CFS: verification failed for block %d position %d size %d of relation %s: error code %d",
+						elog(ERROR, "CFS: verification failed for block %u position %u size %u of relation %s: error code %d",
 							 i, (int)CFS_INODE_OFFS(inode), size, file_bck_path, (int)res);
 					}
 				}
@@ -1001,7 +1000,7 @@ static bool cfs_gc_file(char* map_path, bool background)
 
 		if (succeed)
 		{
-			elog(LOG, "CFS GC worker %d: defragment file %s: old size %d, new size %d, logical size %d, used %d, compression ratio %f, time %ld usec",
+			elog(LOG, "CFS GC worker %d: defragment file %s: old size %u, new size %u, logical size %u, used %u, compression ratio %f, time %ld usec",
 				 MyProcPid, file_path, physSize, newSize, virtSize, usedSize, (double)virtSize/newSize,
 				 secs*USECS_PER_SEC + usecs);
 		}
@@ -1022,7 +1021,7 @@ static bool cfs_gc_file(char* map_path, bool background)
 		}
 	}
 	else if (cfs_state->max_iterations == 1)
-		elog(LOG, "CFS GC worker %d: file %.*s: physical size %d, logical size %d, used %d, compression ratio %f",
+		elog(LOG, "CFS GC worker %d: file %.*s: physical size %u, logical size %u, used %u, compression ratio %f",
 			 MyProcPid, suf, map_path, physSize, virtSize, usedSize, (double)virtSize/physSize);
 
 	if (cfs_munmap(map) < 0)

Original file line number	Diff line number	Diff line change
`@@ -605,7 +605,6 @@ void cfs_lock_file(FileMap* map, char const* file_path)`
`605`	`605`	`pfree(map_bck_path);`
`606`	`606`	`}`
`607`	`607`	`LWLockRelease(CfsGcLock);`
`608`		`- break;`
`609`	`608`	`}`
`610`	`609`	`/* Wait until GC of segment is completed */`
`611`	`610`	`pg_atomic_fetch_sub_u32(&map->lock, 1);`
`@@ -831,7 +830,7 @@ static bool cfs_gc_file(char* map_path, bool background)`
`831`	`830`
`832`	`831`	`if (!cfs_read_file(fd, block, size))`
`833`	`832`	`{`
`834`		`- elog(WARNING, "CFS GC failed to read block %d of file %s at position %d size %d: %m",`
	`833`	`+ elog(WARNING, "CFS GC failed to read block %u of file %s at position %u size %u: %m",`
`835`	`834`	`i, file_path, offs, size);`
`836`	`835`	`goto Cleanup;`
`837`	`836`	`}`
`@@ -929,7 +928,7 @@ static bool cfs_gc_file(char* map_path, bool background)`
`929`	`928`	`{`
`930`	`929`	`pg_atomic_fetch_sub_u32(&map->lock, CFS_GC_LOCK); /* release lock */`
`931`	`930`	`pg_atomic_fetch_sub_u32(&cfs_state->n_active_gc, 1);`
`932`		`- elog(ERROR, "CFS: verification failed for block %d position %d size %d of relation %s: error code %d",`
	`931`	`+ elog(ERROR, "CFS: verification failed for block %u position %u size %u of relation %s: error code %d",`
`933`	`932`	`i, (int)CFS_INODE_OFFS(inode), size, file_bck_path, (int)res);`
`934`	`933`	`}`
`935`	`934`	`}`
`@@ -1001,7 +1000,7 @@ static bool cfs_gc_file(char* map_path, bool background)`
`1001`	`1000`
`1002`	`1001`	`if (succeed)`
`1003`	`1002`	`{`
`1004`		`- elog(LOG, "CFS GC worker %d: defragment file %s: old size %d, new size %d, logical size %d, used %d, compression ratio %f, time %ld usec",`
	`1003`	`+ elog(LOG, "CFS GC worker %d: defragment file %s: old size %u, new size %u, logical size %u, used %u, compression ratio %f, time %ld usec",`
`1005`	`1004`	`MyProcPid, file_path, physSize, newSize, virtSize, usedSize, (double)virtSize/newSize,`
`1006`	`1005`	`secs*USECS_PER_SEC + usecs);`
`1007`	`1006`	`}`
`@@ -1022,7 +1021,7 @@ static bool cfs_gc_file(char* map_path, bool background)`
`1022`	`1021`	`}`
`1023`	`1022`	`}`
`1024`	`1023`	`else if (cfs_state->max_iterations == 1)`
`1025`		`- elog(LOG, "CFS GC worker %d: file %.*s: physical size %d, logical size %d, used %d, compression ratio %f",`
	`1024`	`+ elog(LOG, "CFS GC worker %d: file %.*s: physical size %u, logical size %u, used %u, compression ratio %f",`
`1026`	`1025`	`MyProcPid, suf, map_path, physSize, virtSize, usedSize, (double)virtSize/physSize);`
`1027`	`1026`
`1028`	`1027`	`if (cfs_munmap(map) < 0)`