opensourcemirror
/
postgresql
mirror of git://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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

This commit is contained in:
Vadim B. Mikheev 1997-08-27 09:03:47 +00:00
parent ceac1d5a4e
commit 40ac5a692b
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/backend/access/heap/heapam.c
View File

@ -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;

4
src/include/access/heapam.h
View File

@ -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);