Commitfc5ec42

Hiroshi Inoue

committed

Apply 7.1.3 changes to the current tree also.

1 parentc0d4d54 commitfc5ec42Copy full SHA for fc5ec42

File tree

+15

-3

lines changed

+15

-3

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`*`
`28`	`28`	`*`
`29`	`29`	`* IDENTIFICATION`
`30`		`- * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.145 2001/08/10 18:57:35 tgl Exp $`
	`30`	`+ * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.146 2001/09/08 16:15:28 inoue Exp $`
`31`	`31`	`*`
`32`	`32`	`*-------------------------------------------------------------------------`
`33`	`33`	`*/`
`@@ -1268,6 +1268,7 @@ ExecAppend(TupleTableSlot *slot,`
`1268`	`1268`	`* insert the tuple`
`1269`	`1269`	`*/`
`1270`	`1270`	`newId=heap_insert(resultRelationDesc,tuple);`
	`1271`	`+setLastTid(&(tuple->t_self));`
`1271`	`1272`
`1272`	`1273`	`IncrAppended();`
`1273`	`1274`	`(estate->es_processed)++;`

Lines changed: 11 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/utils/adt/tid.c,v 1.25 2001/07/06 09:41:36 inoue Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/tid.c,v 1.26 2001/09/08 16:15:28 inoue Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* input routine largely stolen from boxin().`
`@@ -124,6 +124,11 @@ tidne(PG_FUNCTION_ARGS)`
`124`	`124`	`*`
`125`	`125`	`*Maybe these implementations should be moved to another place`
`126`	`126`	`*/`
	`127`	`+staticItemPointerDataCurrent_last_tid= { {0,0},0};`
	`128`	`+voidsetLastTid(constItemPointertid)`
	`129`	`+{`
	`130`	`+Current_last_tid=*tid;`
	`131`	`+}`
`127`	`132`	`Datum`
`128`	`133`	`currtid_byreloid(PG_FUNCTION_ARGS)`
`129`	`134`	`{`
`@@ -133,6 +138,11 @@ currtid_byreloid(PG_FUNCTION_ARGS)`
`133`	`138`	`Relationrel;`
`134`	`139`
`135`	`140`	`result= (ItemPointer)palloc(sizeof(ItemPointerData));`
	`141`	`+if (!reloid)`
	`142`	`+{`
	`143`	`+*result=Current_last_tid;`
	`144`	`+PG_RETURN_ITEMPOINTER(result);`
	`145`	`+}`
`136`	`146`	`ItemPointerCopy(tid,result);`
`137`	`147`	`if ((rel=heap_open(reloid,AccessShareLock))!=NULL)`
`138`	`148`	`{`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`		`- * $Id: heapam.h,v 1.66 2001/07/12 04:11:13 tgl Exp $`
	`10`	`+ * $Id: heapam.h,v 1.67 2001/09/08 16:15:28 inoue Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -205,6 +205,7 @@ extern void heap_endscan(HeapScanDesc scan);`
`205`	`205`	`externHeapTupleheap_getnext(HeapScanDescscandesc,intbackw);`
`206`	`206`	`externvoidheap_fetch(Relationrelation,Snapshotsnapshot,HeapTupletup,Buffer*userbuf,IndexScanDesciscan);`
`207`	`207`	`externItemPointerheap_get_latest_tid(Relationrelation,Snapshotsnapshot,ItemPointertid);`
	`208`	`+externvoidsetLastid(constItemPointertid);`
`208`	`209`	`externOidheap_insert(Relationrelation,HeapTupletup);`
`209`	`210`	`externintheap_delete(Relationrelation,ItemPointertid,ItemPointerctid);`
`210`	`211`	`externintheap_update(Relationrelation,ItemPointerotid,HeapTupletup,`

Comments

(0)