Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitedc7f14

Browse files
committed
Use a shutdown callback to ensure proper clean up when rescanning
partially-evaluated SRFs. Per report found here:http://archives.postgresql.org/pgsql-general/2003-12/msg00851.php
1 parente0cd175 commitedc7f14

File tree

1 file changed

+37
-4
lines changed

1 file changed

+37
-4
lines changed

‎src/backend/utils/fmgr/funcapi.c

Lines changed: 37 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Copyright (c) 2002-2003, PostgreSQL Global Development Group
88
*
99
* IDENTIFICATION
10-
* $PostgreSQL: pgsql/src/backend/utils/fmgr/funcapi.c,v 1.12 2003/11/29 19:52:01 pgsql Exp $
10+
* $PostgreSQL: pgsql/src/backend/utils/fmgr/funcapi.c,v 1.13 2003/12/19 00:02:11 joe Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -17,6 +17,7 @@
1717
#include"catalog/pg_type.h"
1818
#include"utils/syscache.h"
1919

20+
staticvoidshutdown_MultiFuncCall(Datumarg);
2021

2122
/*
2223
* init_MultiFuncCall
@@ -41,7 +42,10 @@ init_MultiFuncCall(PG_FUNCTION_ARGS)
4142
{
4243
/*
4344
* First call
44-
*
45+
*/
46+
ReturnSetInfo*rsi= (ReturnSetInfo*)fcinfo->resultinfo;
47+
48+
/*
4549
* Allocate suitably long-lived space and zero it
4650
*/
4751
retval= (FuncCallContext*)
@@ -63,6 +67,14 @@ init_MultiFuncCall(PG_FUNCTION_ARGS)
6367
* save the pointer for cross-call use
6468
*/
6569
fcinfo->flinfo->fn_extra=retval;
70+
71+
/*
72+
* Ensure we will get shut down cleanly if the exprcontext is not
73+
* run to completion.
74+
*/
75+
RegisterExprContextCallback(rsi->econtext,
76+
shutdown_MultiFuncCall,
77+
PointerGetDatum(fcinfo->flinfo));
6678
}
6779
else
6880
{
@@ -108,8 +120,29 @@ per_MultiFuncCall(PG_FUNCTION_ARGS)
108120
void
109121
end_MultiFuncCall(PG_FUNCTION_ARGS,FuncCallContext*funcctx)
110122
{
111-
/* unbind from fcinfo */
112-
fcinfo->flinfo->fn_extra=NULL;
123+
ReturnSetInfo*rsi= (ReturnSetInfo*)fcinfo->resultinfo;
124+
125+
/* Deregister the shutdown callback */
126+
UnregisterExprContextCallback(rsi->econtext,
127+
shutdown_MultiFuncCall,
128+
PointerGetDatum(fcinfo->flinfo));
129+
130+
/* But use it to do the real work */
131+
shutdown_MultiFuncCall(PointerGetDatum(fcinfo->flinfo));
132+
}
133+
134+
/*
135+
* shutdown_MultiFuncCall
136+
* Shutdown function to clean up after init_MultiFuncCall
137+
*/
138+
staticvoid
139+
shutdown_MultiFuncCall(Datumarg)
140+
{
141+
FmgrInfo*flinfo= (FmgrInfo*)DatumGetPointer(arg);
142+
FuncCallContext*funcctx= (FuncCallContext*)flinfo->fn_extra;
143+
144+
/* unbind from flinfo */
145+
flinfo->fn_extra=NULL;
113146

114147
/*
115148
* Caller is responsible to free up memory for individual struct

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp