CFS fd.c: fix rewrite of uncompressed page detection.

Sokolov Yura · Sokolov Yura · commit e46d274a769c · 2017-10-01T17:06:35.000+03:00
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
@@ -2056,7 +2056,6 @@ FileWrite(File file, char *buffer, int amount)
 			if (CFS_INODE_SIZE(inode) != BLCKSZ)
 			{
 				pos = cfs_alloc_page(map, CFS_INODE_SIZE(inode), BLCKSZ);
-				inode = CFS_INODE(BLCKSZ, pos);
 			}
 			else
 			{
@@ -2066,6 +2065,8 @@ FileWrite(File file, char *buffer, int amount)
 				 */
 				pos = CFS_INODE_OFFS(inode);
 			}
+			/* we need to do it in both cases to clear flag set by gc */
+			inode = CFS_INODE(BLCKSZ, pos);
 		}
 		seekPos = lseek(vfdP->fd, pos, SEEK_SET);
 		Assert(seekPos == (off_t)pos);

Original file line number	Diff line number	Diff line change
`@@ -2056,7 +2056,6 @@ FileWrite(File file, char *buffer, int amount)`
`2056`	`2056`	`if (CFS_INODE_SIZE(inode) != BLCKSZ)`
`2057`	`2057`	`{`
`2058`	`2058`	`pos = cfs_alloc_page(map, CFS_INODE_SIZE(inode), BLCKSZ);`
`2059`		`- inode = CFS_INODE(BLCKSZ, pos);`
`2060`	`2059`	`}`
`2061`	`2060`	`else`
`2062`	`2061`	`{`
`@@ -2066,6 +2065,8 @@ FileWrite(File file, char *buffer, int amount)`
`2066`	`2065`	`*/`
`2067`	`2066`	`pos = CFS_INODE_OFFS(inode);`
`2068`	`2067`	`}`
	`2068`	`+ /* we need to do it in both cases to clear flag set by gc */`
	`2069`	`+ inode = CFS_INODE(BLCKSZ, pos);`
`2069`	`2070`	`}`
`2070`	`2071`	`seekPos = lseek(vfdP->fd, pos, SEEK_SET);`
`2071`	`2072`	`Assert(seekPos == (off_t)pos);`