Commit93d08b2

committed

Correctly return number of proceed segments in cfs_gc_relation

1 parentb485470 commit93d08b2Copy full SHA for 93d08b2

File tree

-5

lines changed

-5

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -928,7 +928,8 @@ static bool cfs_gc_file(char* map_path, bool background)`
`928`	`928`	`if (res!=BLCKSZ)`
`929`	`929`	`{`
`930`	`930`	`pg_atomic_fetch_sub_u32(&map->lock,CFS_GC_LOCK);/* release lock */`
`931`		`-elog(ERROR,"Verification failed for block %d position %d size %d of relation %s: error code %d",`
	`931`	`+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",`
`932`	`933`	`i, (int)CFS_INODE_OFFS(inode),size,file_bck_path, (int)res);`
`933`	`934`	`}`
`934`	`935`	`}`
`@@ -1429,11 +1430,11 @@ Datum cfs_gc_relation(PG_FUNCTION_ARGS)`
`1429`	`1430`	`pfree(map_path);`
`1430`	`1431`	`relation_close(rel,AccessShareLock);`
`1431`	`1432`
`1432`		`-processed_segments-=cfs_gc_processed_segments;`
	`1433`	`+processed_segments=cfs_gc_processed_segments-processed_segments;`
`1433`	`1434`
`1434`	`1435`	`LWLockRelease(CfsGcLock);`
`1435`	`1436`	`}`
`1436`		`-PG_RETURN_INT32(cfs_gc_processed_segments);`
	`1437`	`+PG_RETURN_INT32(processed_segments);`
`1437`	`1438`	`}`
`1438`	`1439`
`1439`	`1440`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1770,7 +1770,7 @@ FileRead(File file, char *buffer, int amount)`
`1770`	`1770`	`INIT_TRADITIONAL_CRC32(crc);`
`1771`	`1771`	`COMP_TRADITIONAL_CRC32(crc,compressedBuffer,amount);`
`1772`	`1772`	`FIN_TRADITIONAL_CRC32(crc);`
`1773`		`-elog(LOG,"Decompress error: %d for file %s block %u position %u compressed size %u crc %x",`
	`1773`	`+elog(LOG,"CFS: decompress error: %d for file %s block %u position %u compressed size %u crc %x",`
`1774`	`1774`	`returnCode,VfdCache[file].fileName, (uint32)(VfdCache[file].seekPos /BLCKSZ), (uint32)seekPos,amount,crc);`
`1775`	`1775`	`VfdCache[file].seekPos=FileUnknownPos;`
`1776`	`1776`	`returnCode=-1;`
`@@ -2015,6 +2015,8 @@ FileWrite(File file, char *buffer, int amount)`
`2015`	`2015`	`*/`
`2016`	`2016`	`if ((int32)pos >=0&& (int32)(pos+amount)<0)`
`2017`	`2017`	`{`
	`2018`	`+elog(LOG,"CFS: backend %d forced to performe GC on file %s block %u because it's size exceed %u bytes",`
	`2019`	`+MyProcPid,VfdCache[file].fileName, (uint32)(VfdCache[file].seekPos /BLCKSZ),pos);`
`2018`	`2020`	`cfs_gc_segment(VfdCache[file].fileName);`
`2019`	`2021`	`}`
`2020`	`2022`	`}`

Lines changed: 1 addition & 1 deletion

Comments

(0)