OSDN Git Service

Move the PredicateLockRelation() call from nodeSeqscan.c to heapam.c. It's
authorHeikki Linnakangas <heikki.linnakangas@iki.fi>
Wed, 29 Jun 2011 18:43:53 +0000 (21:43 +0300)
committerHeikki Linnakangas <heikki.linnakangas@iki.fi>
Wed, 29 Jun 2011 18:57:43 +0000 (21:57 +0300)
commitcd70dd6bef515a573a5af1756ce6a8b8406bb5d4
tree1e3a459fcd8b444e47fae63d2b5f55a2ed7f6e70
parentd9fe63acb033141be695815a8a663de8dae4f8af
Move the PredicateLockRelation() call from nodeSeqscan.c to heapam.c. It's
more consistent that way, since all the other PredicateLock* calls are
made in various heapam.c and index AM functions. The call in nodeSeqscan.c
was unnecessarily aggressive anyway, there's no need to try to lock the
relation every time a tuple is fetched, it's enough to do it once.

This has the user-visible effect that if a seq scan is initialized in the
executor, but never executed, we now acquire the predicate lock on the heap
relation anyway. We could avoid that by taking the lock on the first
heap_getnext() call instead, but it doesn't seem worth the trouble given
that it feels more natural to do it in heap_beginscan().

Also, remove the retail PredicateLockTuple() calls from heap_getnext(). In
a seqscan, started with heap_begin(), we're holding a whole-relation
predicate lock on the heap so there's no need to lock the tuples
individually.

Kevin Grittner and me
src/backend/access/heap/heapam.c
src/backend/executor/nodeSeqscan.c
src/include/access/relscan.h