Commit1aa447a

committed

Grab predicate locks on matching tuples in a lossy bitmap heap scan.

Non-lossy case was already handled correctly.Kevin Grittner

1 parent3ec6e00 commit1aa447aCopy full SHA for 1aa447a

File tree

+11

-1

lines changed

+11

-1

lines changed

Lines changed: 11 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@`
`42`	`42`	`#include"executor/nodeBitmapHeapscan.h"`
`43`	`43`	`#include"pgstat.h"`
`44`	`44`	`#include"storage/bufmgr.h"`
	`45`	`+#include"storage/predicate.h"`
`45`	`46`	`#include"utils/memutils.h"`
`46`	`47`	`#include"utils/snapmgr.h"`
`47`	`48`	`#include"utils/tqual.h"`
`@@ -369,14 +370,23 @@ bitgetpage(HeapScanDesc scan, TBMIterateResult *tbmres)`
`369`	`370`	`{`
`370`	`371`	`ItemIdlp;`
`371`	`372`	`HeapTupleDataloctup;`
	`373`	`+boolvalid;`
`372`	`374`
`373`	`375`	`lp=PageGetItemId(dp,offnum);`
`374`	`376`	`if (!ItemIdIsNormal(lp))`
`375`	`377`	`continue;`
`376`	`378`	`loctup.t_data= (HeapTupleHeader)PageGetItem((Page)dp,lp);`
`377`	`379`	`loctup.t_len=ItemIdGetLength(lp);`
`378`		`-if (HeapTupleSatisfiesVisibility(&loctup,snapshot,buffer))`
	`380`	`+loctup.t_tableOid=scan->rs_rd->rd_id;`
	`381`	`+ItemPointerSet(&loctup.t_self,page,offnum);`
	`382`	`+valid=HeapTupleSatisfiesVisibility(&loctup,snapshot,buffer);`
	`383`	`+if (valid)`
	`384`	`+{`
`379`	`385`	`scan->rs_vistuples[ntup++]=offnum;`
	`386`	`+PredicateLockTuple(scan->rs_rd,&loctup,snapshot);`
	`387`	`+}`
	`388`	`+CheckForSerializableConflictOut(valid,scan->rs_rd,&loctup,`
	`389`	`+buffer,snapshot);`
`380`	`390`	`}`
`381`	`391`	`}`
`382`	`392`

Comments

(0)