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

Commit0d54d6a

Browse files
committed
Clean up handling of tuple descriptors so that result-tuple descriptors
allocated by plan nodes are not leaked at end of query. This doesn'treally matter for normal queries, but it sure does for queries invokedrepetitively inside SQL functions. Clean up some other grotty codeassociated with tupdescs, and fix a few other memory leaks exposed bytests with simple SQL functions.
1 parent51cd037 commit0d54d6a

File tree

25 files changed

+423
-748
lines changed

25 files changed

+423
-748
lines changed

‎src/backend/access/gist/gist.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
*
88
* IDENTIFICATION
9-
* $Header: /cvsroot/pgsql/src/backend/access/gist/gist.c,v 1.68 2001/01/12 00:12:58 scrappy Exp $
9+
* $Header: /cvsroot/pgsql/src/backend/access/gist/gist.c,v 1.69 2001/01/29 00:39:12 tgl Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -154,7 +154,7 @@ gistbuild(PG_FUNCTION_ARGS)
154154
{
155155
tupleTable=ExecCreateTupleTable(1);
156156
slot=ExecAllocTableSlot(tupleTable);
157-
ExecSetSlotDescriptor(slot,htupdesc);
157+
ExecSetSlotDescriptor(slot,htupdesc, false);
158158
}
159159
else
160160
{

‎src/backend/access/hash/hash.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.47 2001/01/24 19:42:47 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.48 2001/01/29 00:39:13 tgl Exp $
1212
*
1313
* NOTES
1414
* This file contains only the public interface routines.
@@ -92,7 +92,7 @@ hashbuild(PG_FUNCTION_ARGS)
9292
{
9393
tupleTable=ExecCreateTupleTable(1);
9494
slot=ExecAllocTableSlot(tupleTable);
95-
ExecSetSlotDescriptor(slot,htupdesc);
95+
ExecSetSlotDescriptor(slot,htupdesc, false);
9696
}
9797
else
9898
{

‎src/backend/access/nbtree/nbtree.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* Portions Copyright (c) 1994, Regents of the University of California
1313
*
1414
* IDENTIFICATION
15-
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.76 2001/01/26 01:24:31 vadim Exp $
15+
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.77 2001/01/29 00:39:14 tgl Exp $
1616
*
1717
*-------------------------------------------------------------------------
1818
*/
@@ -128,7 +128,7 @@ btbuild(PG_FUNCTION_ARGS)
128128
{
129129
tupleTable=ExecCreateTupleTable(1);
130130
slot=ExecAllocTableSlot(tupleTable);
131-
ExecSetSlotDescriptor(slot,htupdesc);
131+
ExecSetSlotDescriptor(slot,htupdesc, false);
132132

133133
/*
134134
* we never want to use sort/build if we are extending an existing

‎src/backend/access/rtree/rtree.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.58 2001/01/24 19:42:50 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.59 2001/01/29 00:39:15 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -125,7 +125,7 @@ rtbuild(PG_FUNCTION_ARGS)
125125
{
126126
tupleTable=ExecCreateTupleTable(1);
127127
slot=ExecAllocTableSlot(tupleTable);
128-
ExecSetSlotDescriptor(slot,htupdesc);
128+
ExecSetSlotDescriptor(slot,htupdesc, false);
129129
}
130130
else
131131
{

‎src/backend/catalog/index.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.139 2001/01/24 19:42:51 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.140 2001/01/29 00:39:16 tgl Exp $
1212
*
1313
*
1414
* INTERFACE ROUTINES
@@ -1817,7 +1817,7 @@ DefaultBuild(Relation heapRelation,
18171817
{
18181818
tupleTable=ExecCreateTupleTable(1);
18191819
slot=ExecAllocTableSlot(tupleTable);
1820-
ExecSetSlotDescriptor(slot,heapDescriptor);
1820+
ExecSetSlotDescriptor(slot,heapDescriptor, false);
18211821
}
18221822
else
18231823
{

‎src/backend/commands/command.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.119 2001/01/24 19:42:52 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.120 2001/01/29 00:39:20 tgl Exp $
1212
*
1313
* NOTES
1414
* The PerformAddAttribute() code, like most of the relation
@@ -1102,7 +1102,7 @@ AlterTableAddConstraint(char *relationName,
11021102
boolsuccessful= true;
11031103
HeapScanDescscan;
11041104
ExprContext*econtext;
1105-
TupleTableSlot*slot=makeNode(TupleTableSlot);
1105+
TupleTableSlot*slot;
11061106
HeapTupletuple;
11071107
RangeTblEntry*rte;
11081108
List*qual;
@@ -1169,28 +1169,28 @@ AlterTableAddConstraint(char *relationName,
11691169

11701170
qual=makeList1(expr);
11711171

1172+
/* Make tuple slot to hold tuples */
1173+
slot=MakeTupleTableSlot();
1174+
ExecSetSlotDescriptor(slot,RelationGetDescr(rel), false);
1175+
/* Make an expression context for ExecQual */
1176+
econtext=MakeExprContext(slot,CurrentMemoryContext);
1177+
11721178
/*
1173-
* Scan through the rows now, making the necessary things
1174-
* for ExecQual, and then call it to evaluate the
1175-
* expression.
1179+
* Scan through the rows now, checking the expression
1180+
* at each row.
11761181
*/
11771182
while (HeapTupleIsValid(tuple=heap_getnext(scan,0)))
11781183
{
1179-
slot->val=tuple;
1180-
slot->ttc_shouldFree= false;
1181-
slot->ttc_descIsNew= true;
1182-
slot->ttc_tupleDescriptor=rel->rd_att;
1183-
slot->ttc_buffer=InvalidBuffer;
1184-
1185-
econtext=MakeExprContext(slot,CurrentMemoryContext);
1184+
ExecStoreTuple(tuple,slot,InvalidBuffer, false);
11861185
if (!ExecQual(qual,econtext, true))
11871186
{
11881187
successful=false;
11891188
break;
11901189
}
1191-
FreeExprContext(econtext);
1190+
ResetExprContext(econtext);
11921191
}
11931192

1193+
FreeExprContext(econtext);
11941194
pfree(slot);
11951195

11961196
heap_endscan(scan);

‎src/backend/commands/copy.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.132 2001/01/24 19:42:52 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.133 2001/01/29 00:39:20 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -638,7 +638,7 @@ CopyFrom(Relation rel, bool binary, bool oids, FILE *fp,
638638
/* Set up a dummy tuple table too */
639639
tupleTable=ExecCreateTupleTable(1);
640640
slot=ExecAllocTableSlot(tupleTable);
641-
ExecSetSlotDescriptor(slot,tupDesc);
641+
ExecSetSlotDescriptor(slot,tupDesc, false);
642642

643643
if (!binary)
644644
{

‎src/backend/executor/execJunk.c

Lines changed: 44 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,10 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/executor/execJunk.c,v 1.24 2001/01/24 19:42:53 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/executor/execJunk.c,v 1.25 2001/01/29 00:39:17 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
15-
16-
1715
#include"postgres.h"
1816

1917
#include"access/heapam.h"
@@ -37,7 +35,7 @@
3735
* called 'resjunk'. If the value of this attribute is true then the
3836
* corresponding attribute is a "junk" attribute.
3937
*
40-
* When we initialize a planwe call 'ExecInitJunkFilter' to create
38+
* When we initialize a plan we call 'ExecInitJunkFilter' to create
4139
* and store the appropriate information in the 'es_junkFilter' attribute of
4240
* EState.
4341
*
@@ -63,6 +61,8 @@
6361
JunkFilter*
6462
ExecInitJunkFilter(List*targetList,TupleDesctupType)
6563
{
64+
MemoryContextoldContext;
65+
MemoryContextjunkContext;
6666
JunkFilter*junkfilter;
6767
List*cleanTargetList;
6868
intlen,
@@ -75,9 +75,21 @@ ExecInitJunkFilter(List *targetList, TupleDesc tupType)
7575
boolresjunk;
7676
AttrNumbercleanResno;
7777
AttrNumber*cleanMap;
78-
Sizesize;
7978
Node*expr;
8079

80+
/*
81+
* Make a memory context that will hold the JunkFilter as well as all
82+
* the subsidiary structures we are about to create. We use smaller-
83+
* than-default sizing parameters since we don't expect a very large
84+
* volume of stuff here.
85+
*/
86+
junkContext=AllocSetContextCreate(CurrentMemoryContext,
87+
"JunkFilterContext",
88+
1024,
89+
1024,
90+
ALLOCSET_DEFAULT_MAXSIZE);
91+
oldContext=MemoryContextSwitchTo(junkContext);
92+
8193
/* ---------------------
8294
* First find the "clean" target list, i.e. all the entries
8395
* in the original target list which have a false 'resjunk'
@@ -166,7 +178,7 @@ ExecInitJunkFilter(List *targetList, TupleDesc tupType)
166178
cleanLength=ExecTargetListLength(cleanTargetList);
167179

168180
/* ---------------------
169-
* Now calculate the "map" between the originaltuples attributes
181+
* Now calculate the "map" between the originaltuple's attributes
170182
* and the "clean" tuple's attributes.
171183
*
172184
* The "map" is an array of "cleanLength" attribute numbers, i.e.
@@ -177,8 +189,7 @@ ExecInitJunkFilter(List *targetList, TupleDesc tupType)
177189
*/
178190
if (cleanLength>0)
179191
{
180-
size=cleanLength*sizeof(AttrNumber);
181-
cleanMap= (AttrNumber*)palloc(size);
192+
cleanMap= (AttrNumber*)palloc(cleanLength*sizeof(AttrNumber));
182193
cleanResno=1;
183194
foreach(t,targetList)
184195
{
@@ -226,7 +237,7 @@ ExecInitJunkFilter(List *targetList, TupleDesc tupType)
226237
cleanMap=NULL;
227238

228239
/* ---------------------
229-
* Finally create and initialize the JunkFilter.
240+
* Finally create and initialize the JunkFilter struct.
230241
* ---------------------
231242
*/
232243
junkfilter=makeNode(JunkFilter);
@@ -238,20 +249,36 @@ ExecInitJunkFilter(List *targetList, TupleDesc tupType)
238249
junkfilter->jf_cleanLength=cleanLength;
239250
junkfilter->jf_cleanTupType=cleanTupType;
240251
junkfilter->jf_cleanMap=cleanMap;
252+
junkfilter->jf_junkContext=junkContext;
253+
254+
MemoryContextSwitchTo(oldContext);
241255

242256
returnjunkfilter;
257+
}
243258

259+
/*-------------------------------------------------------------------------
260+
* ExecFreeJunkFilter
261+
*
262+
* Release the data structures created by ExecInitJunkFilter.
263+
*-------------------------------------------------------------------------
264+
*/
265+
void
266+
ExecFreeJunkFilter(JunkFilter*junkfilter)
267+
{
268+
/*
269+
* Since the junkfilter is inside its own context, we just have to
270+
* delete the context and we're set.
271+
*/
272+
MemoryContextDelete(junkfilter->jf_junkContext);
244273
}
245274

246275
/*-------------------------------------------------------------------------
247276
* ExecGetJunkAttribute
248277
*
249278
* Given a tuple (slot), the junk filter and a junk attribute's name,
250-
* extract & return the value of this attribute.
279+
* extract & return the valueand isNull flagof this attribute.
251280
*
252281
* It returns false iff no junk attribute with such name was found.
253-
*
254-
* NOTE: isNull might be NULL !
255282
*-------------------------------------------------------------------------
256283
*/
257284
bool
@@ -304,7 +331,7 @@ ExecGetJunkAttribute(JunkFilter *junkfilter,
304331
* ---------------------
305332
*/
306333
tuple=slot->val;
307-
tupType=(TupleDesc)junkfilter->jf_tupType;
334+
tupType=junkfilter->jf_tupType;
308335

309336
*value=heap_getattr(tuple,resno,tupType,isNull);
310337

@@ -328,7 +355,6 @@ ExecRemoveJunk(JunkFilter *junkfilter, TupleTableSlot *slot)
328355
intcleanLength;
329356
boolisNull;
330357
inti;
331-
Sizesize;
332358
Datum*values;
333359
char*nulls;
334360
Datumvalues_array[64];
@@ -340,8 +366,8 @@ ExecRemoveJunk(JunkFilter *junkfilter, TupleTableSlot *slot)
340366
*/
341367
tuple=slot->val;
342368

343-
tupType=(TupleDesc)junkfilter->jf_tupType;
344-
cleanTupType=(TupleDesc)junkfilter->jf_cleanTupType;
369+
tupType=junkfilter->jf_tupType;
370+
cleanTupType=junkfilter->jf_cleanTupType;
345371
cleanLength=junkfilter->jf_cleanLength;
346372
cleanMap=junkfilter->jf_cleanMap;
347373

@@ -363,11 +389,8 @@ ExecRemoveJunk(JunkFilter *junkfilter, TupleTableSlot *slot)
363389
*/
364390
if (cleanLength>64)
365391
{
366-
size=cleanLength*sizeof(Datum);
367-
values= (Datum*)palloc(size);
368-
369-
size=cleanLength*sizeof(char);
370-
nulls= (char*)palloc(size);
392+
values= (Datum*)palloc(cleanLength*sizeof(Datum));
393+
nulls= (char*)palloc(cleanLength*sizeof(char));
371394
}
372395
else
373396
{

0 commit comments

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