summaryrefslogtreecommitdiff
path: root/src/backend/access/heap/heapam.c
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>1997-09-18 14:21:02 +0000
committerBruce Momjian <bruce@momjian.us>1997-09-18 14:21:02 +0000
commit8cb415449202d7804c6a557352a91d0401ab1c19 (patch)
tree44acc47d6a50fa83667fdb4e9ad4e1bb81d61a0a /src/backend/access/heap/heapam.c
parentbbe2c10c140803881125c516bcc172363eb698d8 (diff)
downloadpostgresql-8cb415449202d7804c6a557352a91d0401ab1c19.tar.gz
Inline frequently called functions.
Diffstat (limited to 'src/backend/access/heap/heapam.c')
-rw-r--r--src/backend/access/heap/heapam.c35
1 files changed, 20 insertions, 15 deletions
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index 19bdf5b34c..2537e7e777 100644
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.19 1997/09/08 21:40:57 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.20 1997/09/18 14:19:30 momjian Exp $
*
*
* INTERFACE ROUTINES
@@ -429,8 +429,9 @@ heapgettup(Relation relation,
* if current tuple qualifies, return it.
* ----------------
*/
- if ((rtup = heap_tuple_satisfies(lpp, relation, *b, (PageHeader) dp,
- timeQual, nkeys, key)) != NULL)
+ HeapTupleSatisfies(lpp, relation, *b, (PageHeader) dp,
+ timeQual, nkeys, key, rtup);
+ if (rtup != NULL)
{
ItemPointer iptr = &(rtup->t_ctid);
@@ -1092,8 +1093,8 @@ heap_fetch(Relation relation,
* ----------------
*/
- tuple = heap_tuple_satisfies(lp, relation, buffer, dp,
- timeQual, 0, (ScanKey) NULL);
+ HeapTupleSatisfies(lp, relation, buffer, dp,
+ timeQual, 0, (ScanKey) NULL, tuple);
if (tuple == NULL)
{
@@ -1257,8 +1258,9 @@ heap_delete(Relation relation, ItemPointer tid)
* check that we're deleteing a valid item
* ----------------
*/
- if (!(tp = heap_tuple_satisfies(lp, relation, b, dp,
- NowTimeQual, 0, (ScanKey) NULL)))
+ HeapTupleSatisfies(lp, relation, b, dp,
+ NowTimeQual, 0, (ScanKey) NULL, tp);
+ if (!tp)
{
/* XXX call something else */
@@ -1317,7 +1319,8 @@ heap_replace(Relation relation, ItemPointer otid, HeapTuple tup)
HeapTuple tp;
Page dp;
Buffer buffer;
-
+ HeapTuple tuple;
+
/* ----------------
* increment access statistics
* ----------------
@@ -1388,13 +1391,15 @@ heap_replace(Relation relation, ItemPointer otid, HeapTuple tup)
* xact, we only want to flag the 'non-functional' NOTICE. -mer
* ----------------
*/
- if (!heap_tuple_satisfies(lp,
- relation,
- buffer,
- (PageHeader) dp,
- NowTimeQual,
- 0,
- (ScanKey) NULL))
+ HeapTupleSatisfies(lp,
+ relation,
+ buffer,
+ (PageHeader) dp,
+ NowTimeQual,
+ 0,
+ (ScanKey) NULL,
+ tuple);
+ if (!tuple)
{
ReleaseBuffer(buffer);
elog(WARN, "heap_replace: (am)invalid otid");