heap_delete returns int now (for non-functional deletes).

diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index 97d2c950b12d8a4cbdebd7a4dedc15cbec195f36..f199803a711433481a5bac5ecc032cd49ac65481 100644 (file)
--- 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.14 1997/08/19 21:29:17 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.15 1997/08/27 09:00:20 vadim Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -1114,7 +1114,7 @@ heap_insert(Relation relation, HeapTuple tup)
  *     Must decide how to handle errors.
  * ----------------
  */
-void
+int
 heap_delete(Relation relation, ItemPointer tid)
 {
     ItemId             lp;
@@ -1163,7 +1163,7 @@ heap_delete(Relation relation, ItemPointer tid)
        if ( IsSystemRelationName(RelationGetRelationName(relation)->data) )
            RelationUnsetLockForWrite(relation);
        ReleaseBuffer(b);
-       return;
+       return (1);
     }
     /* ----------------
      * check that we're deleteing a valid item
@@ -1203,6 +1203,8 @@ heap_delete(Relation relation, ItemPointer tid)
     WriteBuffer(b);
     if ( IsSystemRelationName(RelationGetRelationName(relation)->data) )
        RelationUnsetLockForWrite(relation);
+    
+    return(0);
 }
 
 /* ----------------
@@ -1302,10 +1304,10 @@ heap_replace(Relation relation, ItemPointer otid, HeapTuple tup)
                              NowTimeQual,
                              0,
                              (ScanKey)NULL))
-       {
-           ReleaseBuffer(buffer);
-           elog(WARN, "heap_replace: (am)invalid otid");
-       }
+    {
+       ReleaseBuffer(buffer);
+       elog(WARN, "heap_replace: (am)invalid otid");
+    }
     
     /* XXX order problems if not atomic assignment ??? */
     tup->t_oid = tp->t_oid;

diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h
index 9fdb9af8e75bf532d82d51d28c601c9ba143a596..1819d72339afabce68357e50fe827eca5d79f71f 100644 (file)
--- a/src/include/access/heapam.h
+++ b/src/include/access/heapam.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: heapam.h,v 1.8 1997/08/26 23:31:53 momjian Exp $
+ * $Id: heapam.h,v 1.9 1997/08/27 09:03:47 vadim Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -124,7 +124,7 @@ extern HeapTuple heap_getnext(HeapScanDesc scandesc, int backw, Buffer *b);
 extern HeapTuple heap_fetch(Relation relation, TimeQual timeQual,
                            ItemPointer tid, Buffer *b);
 extern Oid heap_insert(Relation relation, HeapTuple tup);
-extern void heap_delete(Relation relation, ItemPointer tid);
+extern int heap_delete(Relation relation, ItemPointer tid);
 extern int heap_replace(Relation relation, ItemPointer otid,
                        HeapTuple tup);
 extern void heap_markpos(HeapScanDesc sdesc);