Commit8d42b6b

authored

Merge pull request#10 from funny-falcon/patch-1

Remove erroneous cast to size_t in BID_HASH_FUNC

2 parents68e0644 +7d3b7f6 commit8d42b6bCopy full SHA for 8d42b6b

File tree

-7

lines changed

-7

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -654,7 +654,7 @@ ptrack_mark_block(RelFileNodeBackend smgr_rnode,`
`654`	`654`	`ForkNumberforknum,BlockNumberblocknum)`
`655`	`655`	`{`
`656`	`656`	`PtBlockIdbid;`
`657`		`-size_thash;`
	`657`	`+uint64hash;`
`658`	`658`	`size_tslot1;`
`659`	`659`	`size_tslot2;`
`660`	`660`	`XLogRecPtrnew_lsn;`
`@@ -676,8 +676,8 @@ ptrack_mark_block(RelFileNodeBackend smgr_rnode,`
`676`	`676`	`bid.blocknum=blocknum;`
`677`	`677`
`678`	`678`	`hash=BID_HASH_FUNC(bid);`
`679`		`-slot1=hash %PtrackContentNblocks;`
`680`		`-slot2= ((hash <<32) \| (hash >>32)) %PtrackContentNblocks;`
	`679`	`+slot1=(size_t)(hash %PtrackContentNblocks);`
	`680`	`+slot2= (size_t)(((hash <<32) \| (hash >>32)) %PtrackContentNblocks);`
`681`	`681`
`682`	`682`	`if (RecoveryInProgress())`
`683`	`683`	`new_lsn=GetXLogReplayRecPtr(NULL);`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ typedef PtrackMapHdr * PtrackMap;`
`86`	`86`	`/* Block address 'bid' to hash. To get slot position in map should be divided`
`87`	`87`	`* with '% PtrackContentNblocks' */`
`88`	`88`	`#defineBID_HASH_FUNC(bid) \`
`89`		`-(size_t)(DatumGetUInt64(hash_any_extended((unsigned char *)&bid, sizeof(bid), 0)))`
	`89`	`+(DatumGetUInt64(hash_any_extended((unsigned char *)&bid, sizeof(bid), 0)))`
`90`	`90`
`91`	`91`	`/*`
`92`	`92`	`* Per process pointer to shared ptrack_map`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -487,7 +487,7 @@ ptrack_get_pagemapset(PG_FUNCTION_ARGS)`
`487`	`487`
`488`	`488`	`while (true)`
`489`	`489`	`{`
`490`		`-size_thash;`
	`490`	`+uint64hash;`
`491`	`491`	`size_tslot1;`
`492`	`492`	`size_tslot2;`
`493`	`493`	`XLogRecPtrupdate_lsn1;`
`@@ -535,7 +535,7 @@ ptrack_get_pagemapset(PG_FUNCTION_ARGS)`
`535`	`535`	`}`
`536`	`536`
`537`	`537`	`hash=BID_HASH_FUNC(ctx->bid);`
`538`		`-slot1=hash %PtrackContentNblocks;`
	`538`	`+slot1=(size_t)(hash %PtrackContentNblocks);`
`539`	`539`
`540`	`540`	`update_lsn1=pg_atomic_read_u64(&ptrack_map->entries[slot1]);`
`541`	`541`
`@@ -547,7 +547,7 @@ ptrack_get_pagemapset(PG_FUNCTION_ARGS)`
`547`	`547`	`/* Only probe the second slot if the first one is marked */`
`548`	`548`	`if (update_lsn1 >=ctx->lsn)`
`549`	`549`	`{`
`550`		`-slot2= ((hash <<32) \| (hash >>32)) %PtrackContentNblocks;`
	`550`	`+slot2= (size_t)(((hash <<32) \| (hash >>32)) %PtrackContentNblocks);`
`551`	`551`	`update_lsn2=pg_atomic_read_u64(&ptrack_map->entries[slot2]);`
`552`	`552`
`553`	`553`	`if (update_lsn2!=InvalidXLogRecPtr)`

Comments

(0)