Fix error message for CFS

knizhnik · knizhnik · commit 020258a5e424 · 2017-05-15T20:16:21.000+03:00
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
@@ -1749,8 +1749,12 @@ FileRead(File file, char *buffer, int amount)
 				{
 					if (errno != EINTR)
 					{
-						elog(LOG, "Failed to read block %u position %u size %u from compressed file %s: %m", 
-							 (uint32)(VfdCache[file].seekPos / BLCKSZ), (uint32)seekPos, size, VfdCache[file].fileName);
+						if (returnCode == 0)
+							elog(LOG, "Block %u position %u size %u is beyond end of compressed file %s", 
+								 (uint32)(VfdCache[file].seekPos / BLCKSZ), (uint32)seekPos, size, VfdCache[file].fileName);
+						else
+							elog(LOG, "Failed to read block %u position %u size %u from compressed file %s: %m", 
+								 (uint32)(VfdCache[file].seekPos / BLCKSZ), (uint32)seekPos, size, VfdCache[file].fileName);
 						cfs_unlock_file(map);
 						return returnCode;
 					}

Original file line number	Diff line number	Diff line change
`@@ -1749,8 +1749,12 @@ FileRead(File file, char *buffer, int amount)`
`1749`	`1749`	`{`
`1750`	`1750`	`if (errno != EINTR)`
`1751`	`1751`	`{`
`1752`		`- elog(LOG, "Failed to read block %u position %u size %u from compressed file %s: %m",`
`1753`		`- (uint32)(VfdCache[file].seekPos / BLCKSZ), (uint32)seekPos, size, VfdCache[file].fileName);`
	`1752`	`+ if (returnCode == 0)`
	`1753`	`+ elog(LOG, "Block %u position %u size %u is beyond end of compressed file %s",`
	`1754`	`+ (uint32)(VfdCache[file].seekPos / BLCKSZ), (uint32)seekPos, size, VfdCache[file].fileName);`
	`1755`	`+ else`
	`1756`	`+ elog(LOG, "Failed to read block %u position %u size %u from compressed file %s: %m",`
	`1757`	`+ (uint32)(VfdCache[file].seekPos / BLCKSZ), (uint32)seekPos, size, VfdCache[file].fileName);`
`1754`	`1758`	`cfs_unlock_file(map);`
`1755`	`1759`	`return returnCode;`
`1756`	`1760`	`}`