Commit549928d

committed

Fix for breakage of C-coded SRFs, from Joe Conway.

1 parente2d156f commit549928dCopy full SHA for 549928d

File tree

+31

-5

lines changed

+31

-5

lines changed

Lines changed: 11 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Copyright (c) 2002, PostgreSQL Global Development Group`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/funcapi.c,v 1.4 2002/08/29 17:14:33 tgl Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/funcapi.c,v 1.5 2002/08/30 19:56:49 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -83,8 +83,16 @@ per_MultiFuncCall(PG_FUNCTION_ARGS)`
`83`	`83`	`{`
`84`	`84`	`FuncCallContextretval= (FuncCallContext)fcinfo->flinfo->fn_extra;`
`85`	`85`
`86`		`-/* make sure we start with a fresh slot */`
`87`		`-if(retval->slot!=NULL)`
	`86`	`+/*`
	`87`	`+ * Clear the TupleTableSlot, if present. This is for safety's sake:`
	`88`	`+ * the Slot will be in a long-lived context (it better be, if the`
	`89`	`+ * FuncCallContext is pointing to it), but in most usage patterns the`
	`90`	`+ * tuples stored in it will be in the function's per-tuple context.`
	`91`	`+ * So at the beginning of each call, the Slot will hold a dangling`
	`92`	`+ * pointer to an already-recycled tuple. We clear it out here. (See`
	`93`	`+ * also the definition of TupleGetDatum() in funcapi.h!)`
	`94`	`+ */`
	`95`	`+if (retval->slot!=NULL)`
`88`	`96`	`ExecClearTuple(retval->slot);`
`89`	`97`
`90`	`98`	`returnretval;`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*`
`10`	`10`	`* Copyright (c) 2002, PostgreSQL Global Development Group`
`11`	`11`	`*`
`12`		`- * $Id: funcapi.h,v 1.6 2002/08/29 17:14:33 tgl Exp $`
	`12`	`+ * $Id: funcapi.h,v 1.7 2002/08/30 19:56:49 tgl Exp $`
`13`	`13`	`*`
`14`	`14`	`*-------------------------------------------------------------------------`
`15`	`15`	`*/`
`@@ -147,8 +147,12 @@ extern TupleTableSlot *TupleDescGetSlot(TupleDesc tupdesc);`
`147`	`147`	`externAttInMetadata*TupleDescGetAttInMetadata(TupleDesctupdesc);`
`148`	`148`	`externHeapTupleBuildTupleFromCStrings(AttInMetadataattinmeta,char*values);`
`149`	`149`
	`150`	`+/*`
	`151`	`+ * Note we pass shouldFree = false; this is needed because the tuple will`
	`152`	`+ * typically be in a shorter-lived memory context than the TupleTableSlot.`
	`153`	`+ */`
`150`	`154`	`#defineTupleGetDatum(_slot,_tuple) \`
`151`		`-PointerGetDatum(ExecStoreTuple(_tuple, _slot, InvalidBuffer,true))`
	`155`	`+PointerGetDatum(ExecStoreTuple(_tuple, _slot, InvalidBuffer,false))`
`152`	`156`
`153`	`157`
`154`	`158`	`/*----------`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,15 @@`
	`1`	`+SELECT * FROM pg_settings WHERE name LIKE 'enable%';`
	`2`	`+ name \| setting`
	`3`	`+------------------+---------`
	`4`	`+ enable_hashjoin \| on`
	`5`	`+ enable_indexscan \| on`
	`6`	`+ enable_mergejoin \| on`
	`7`	`+ enable_nestloop \| on`
	`8`	`+ enable_seqscan \| on`
	`9`	`+ enable_sort \| on`
	`10`	`+ enable_tidscan \| on`
	`11`	`+(7 rows)`
	`12`	`+`
`1`	`13`	`CREATE TABLE foo2(fooid int, f2 int);`
`2`	`14`	`INSERT INTO foo2 VALUES(1, 11);`
`3`	`15`	`INSERT INTO foo2 VALUES(2, 22);`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+SELECT*FROM pg_settingsWHERE nameLIKE'enable%';`
	`2`	`+`
`1`	`3`	`CREATETABLEfoo2(fooidint, f2int);`
`2`	`4`	`INSERT INTO foo2VALUES(1,11);`
`3`	`5`	`INSERT INTO foo2VALUES(2,22);`

Comments

(0)