database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-10 17:42:29 +03:00
Code Activity

Change the return value of HeapTupleSatisfiesUpdate() to be an enum,

Browse Source 
rather than an integer, and fix the associated fallout. From Alvaro
Herrera.
This commit is contained in:
Neil Conway
2005-03-20 23:40:34 +00:00
parent 9e0dd84596
commit fe7015f5e8
7 changed files with 33 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/access/heap/heapam.c,v 1.183 2005/02/20 21:46:47 tgl Exp $
* $PostgreSQL: pgsql/src/backend/access/heap/heapam.c,v 1.184 2005/03/20 23:40:23 neilc Exp $
*
*
* INTERFACE ROUTINES
@@ -1265,7 +1265,7 @@ simple_heap_insert(Relation relation, HeapTuple tup)
* *ctid is set to the ctid link of the target tuple (possibly a later
* version of the row).
*/
int
HTSU_Result
heap_delete(Relation relation, ItemPointer tid,
ItemPointer ctid, CommandId cid,
Snapshot crosscheck, bool wait)
@@ -1275,7 +1275,7 @@ heap_delete(Relation relation, ItemPointer tid,
HeapTupleData tp;
PageHeader dp;
Buffer buffer;
int result;
HTSU_Result result;
Assert(ItemPointerIsValid(tid));
@@ -1430,7 +1430,7 @@ void
simple_heap_delete(Relation relation, ItemPointer tid)
{
ItemPointerData ctid;
int result;
HTSU_Result result;
result = heap_delete(relation, tid,
&ctid,
@@ -1480,7 +1480,7 @@ simple_heap_delete(Relation relation, ItemPointer tid)
* On success, newtup->t_self is set to the TID where the new tuple
* was inserted.
*/
int
HTSU_Result
heap_update(Relation relation, ItemPointer otid, HeapTuple newtup,
ItemPointer ctid, CommandId cid,
Snapshot crosscheck, bool wait)
@@ -1495,7 +1495,7 @@ heap_update(Relation relation, ItemPointer otid, HeapTuple newtup,
already_marked;
Size newtupsize,
pagefree;
int result;
HTSU_Result result;
Assert(ItemPointerIsValid(otid));
@@ -1792,7 +1792,7 @@ void
simple_heap_update(Relation relation, ItemPointer otid, HeapTuple tup)
{
ItemPointerData ctid;
int result;
HTSU_Result result;
result = heap_update(relation, otid, tup,
&ctid,
@@ -1822,7 +1822,7 @@ simple_heap_update(Relation relation, ItemPointer otid, HeapTuple tup)
/*
* heap_mark4update - mark a tuple for update
*/
int
HTSU_Result
heap_mark4update(Relation relation, HeapTuple tuple, Buffer *buffer,
CommandId cid)
{
@@ -1830,7 +1830,7 @@ heap_mark4update(Relation relation, HeapTuple tuple, Buffer *buffer,
ItemPointer tid = &(tuple->t_self);
ItemId lp;
PageHeader dp;
int result;
HTSU_Result result;
*buffer = ReadBuffer(relation, ItemPointerGetBlockNumber(tid));
LockBuffer(*buffer, BUFFER_LOCK_EXCLUSIVE);

4
src/backend/commands/async.c
View File

@@ -7,7 +7,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/commands/async.c,v 1.119 2005/01/27 23:23:54 neilc Exp $
* $PostgreSQL: pgsql/src/backend/commands/async.c,v 1.120 2005/03/20 23:40:24 neilc Exp $
*
*-------------------------------------------------------------------------
*/
@@ -521,7 +521,7 @@ AtCommit_Notify(void)
else if (listener->notification == 0)
{
ItemPointerData ctid;
int result;
HTSU_Result result;
rTuple = heap_modifytuple(lTuple, tdesc,
value, nulls, repl);

4
src/backend/commands/trigger.c
View File

@@ -7,7 +7,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/commands/trigger.c,v 1.177 2004/12/31 21:59:41 pgsql Exp $
* $PostgreSQL: pgsql/src/backend/commands/trigger.c,v 1.178 2005/03/20 23:40:24 neilc Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1566,7 +1566,7 @@ GetTupleForTrigger(EState *estate, ResultRelInfo *relinfo,
if (newSlot != NULL)
{
int test;
HTSU_Result test;
/*
* mark tuple for update

8
src/backend/executor/execMain.c
View File

@@ -26,7 +26,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/executor/execMain.c,v 1.242 2005/03/16 21:38:06 tgl Exp $
* $PostgreSQL: pgsql/src/backend/executor/execMain.c,v 1.243 2005/03/20 23:40:25 neilc Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1116,7 +1116,7 @@ lnext: ;
Buffer buffer;
HeapTupleData tuple;
TupleTableSlot *newSlot;
int test;
HTSU_Result test;
if (!ExecGetJunkAttribute(junkfilter,
slot,
@@ -1396,7 +1396,7 @@ ExecDelete(TupleTableSlot *slot,
ResultRelInfo *resultRelInfo;
Relation resultRelationDesc;
ItemPointerData ctid;
int result;
HTSU_Result result;
/*
* get information on the (current) result relation
@@ -1500,7 +1500,7 @@ ExecUpdate(TupleTableSlot *slot,
ResultRelInfo *resultRelInfo;
Relation resultRelationDesc;
ItemPointerData ctid;
int result;
HTSU_Result result;
int numIndices;
/*

4
src/backend/utils/time/tqual.c
View File

@@ -16,7 +16,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/time/tqual.c,v 1.85 2005/02/20 15:01:42 momjian Exp $
* $PostgreSQL: pgsql/src/backend/utils/time/tqual.c,v 1.86 2005/03/20 23:40:27 neilc Exp $
*
*-------------------------------------------------------------------------
*/
@@ -455,7 +455,7 @@ HeapTupleSatisfiesToast(HeapTupleHeader tuple, Buffer buffer)
* tuples of my own xact are tested against the passed CommandId not
* CurrentCommandId.
*/
int
HTSU_Result
HeapTupleSatisfiesUpdate(HeapTupleHeader tuple, CommandId curcid,
Buffer buffer)
{