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

Commit9e72430

Browse files
committed
When using a junkfilter, the output tuple should NOT be stored back into
the same tuple slot that the raw tuple came from, because that slot hasthe wrong tuple descriptor. Store it into its own slot with the correctdescriptor, instead. This repairs problems with SPI functions seeinginappropriate tuple descriptors --- for example, plpgsql code failing tocope with SELECT FOR UPDATE.
1 parenta3855c5 commit9e72430

File tree

4 files changed

+51
-24
lines changed

4 files changed

+51
-24
lines changed

‎src/backend/executor/execJunk.c

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/executor/execJunk.c,v 1.27 2001/03/22 06:16:12 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/executor/execJunk.c,v 1.28 2001/05/27 20:48:51 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -56,10 +56,12 @@
5656
* Initialize the Junk filter.
5757
*
5858
* The initial targetlist and associated tuple descriptor are passed in.
59+
* An optional resultSlot can be passed as well.
5960
*-------------------------------------------------------------------------
6061
*/
6162
JunkFilter*
62-
ExecInitJunkFilter(List*targetList,TupleDesctupType)
63+
ExecInitJunkFilter(List*targetList,TupleDesctupType,
64+
TupleTableSlot*slot)
6365
{
6466
MemoryContextoldContext;
6567
MemoryContextjunkContext;
@@ -245,6 +247,10 @@ ExecInitJunkFilter(List *targetList, TupleDesc tupType)
245247
junkfilter->jf_cleanTupType=cleanTupType;
246248
junkfilter->jf_cleanMap=cleanMap;
247249
junkfilter->jf_junkContext=junkContext;
250+
junkfilter->jf_resultSlot=slot;
251+
252+
if (slot)
253+
ExecSetSlotDescriptor(slot,cleanTupType, false);
248254

249255
MemoryContextSwitchTo(oldContext);
250256

@@ -260,7 +266,6 @@ ExecInitJunkFilter(List *targetList, TupleDesc tupType)
260266
void
261267
ExecFreeJunkFilter(JunkFilter*junkfilter)
262268
{
263-
264269
/*
265270
* Since the junkfilter is inside its own context, we just have to
266271
* delete the context and we're set.
@@ -336,6 +341,10 @@ ExecGetJunkAttribute(JunkFilter *junkfilter,
336341
* ExecRemoveJunk
337342
*
338343
* Construct and return a tuple with all the junk attributes removed.
344+
*
345+
* Note: for historical reasons, this does not store the constructed
346+
* tuple into the junkfilter's resultSlot. The caller should do that
347+
* if it wants to.
339348
*-------------------------------------------------------------------------
340349
*/
341350
HeapTuple

‎src/backend/executor/execMain.c

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
*
2828
*
2929
* IDENTIFICATION
30-
* $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.141 2001/05/2709:59:29 petere Exp $
30+
* $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.142 2001/05/2720:48:51 tgl Exp $
3131
*
3232
*-------------------------------------------------------------------------
3333
*/
@@ -598,12 +598,19 @@ InitPlan(CmdType operation, Query *parseTree, Plan *plan, EState *estate)
598598
}
599599

600600
/*
601-
* initialize the executor "tuple" table.
601+
* initialize the executor "tuple" table. We need slots for all the
602+
* plan nodes, plus possibly output slots for the junkfilter(s).
603+
* At this point we aren't sure if we need junkfilters, so just add
604+
* slots for them unconditionally.
602605
*/
603606
{
604607
intnSlots=ExecCountSlotsNode(plan);
605608

606-
estate->es_tupleTable=ExecCreateTupleTable(nSlots+10);/* why add ten? - jolly */
609+
if (parseTree->resultRelations!=NIL)
610+
nSlots+=length(parseTree->resultRelations);
611+
else
612+
nSlots+=1;
613+
estate->es_tupleTable=ExecCreateTupleTable(nSlots);
607614
}
608615

609616
/* mark EvalPlanQual not active */
@@ -686,7 +693,8 @@ InitPlan(CmdType operation, Query *parseTree, Plan *plan, EState *estate)
686693
JunkFilter*j;
687694

688695
j=ExecInitJunkFilter(subplan->targetlist,
689-
ExecGetTupType(subplan));
696+
ExecGetTupType(subplan),
697+
ExecAllocTableSlot(estate->es_tupleTable));
690698
resultRelInfo->ri_junkFilter=j;
691699
resultRelInfo++;
692700
subplans=lnext(subplans);
@@ -702,9 +710,11 @@ InitPlan(CmdType operation, Query *parseTree, Plan *plan, EState *estate)
702710
else
703711
{
704712
/* Normal case with just one JunkFilter */
705-
JunkFilter*j=ExecInitJunkFilter(plan->targetlist,
706-
tupType);
713+
JunkFilter*j;
707714

715+
j=ExecInitJunkFilter(plan->targetlist,
716+
tupType,
717+
ExecAllocTableSlot(estate->es_tupleTable));
708718
estate->es_junkFilter=j;
709719
if (estate->es_result_relation_info)
710720
estate->es_result_relation_info->ri_junkFilter=j;
@@ -986,7 +996,9 @@ lnext:;
986996
* if we have a junk filter, then project a new tuple with the
987997
* junk removed.
988998
*
989-
* Store this new "clean" tuple in the place of the original tuple.
999+
* Store this new "clean" tuple in the junkfilter's resultSlot.
1000+
* (Formerly, we stored it back over the "dirty" tuple, which is
1001+
* WRONG because that tuple slot has the wrong descriptor.)
9901002
*
9911003
* Also, extract all the junk information we need.
9921004
*/
@@ -1088,7 +1100,7 @@ lnext:;
10881100
newTuple=ExecRemoveJunk(junkfilter,slot);
10891101

10901102
slot=ExecStoreTuple(newTuple,/* tuple to store */
1091-
slot,/*destination slot */
1103+
junkfilter->jf_resultSlot,/*dest slot */
10921104
InvalidBuffer,/* this tuple has no
10931105
* buffer */
10941106
true);/* tuple should be pfreed */
@@ -1467,7 +1479,9 @@ lreplace:;
14671479
{
14681480
*tupleid=ctid;
14691481
tuple=ExecRemoveJunk(estate->es_junkFilter,epqslot);
1470-
slot=ExecStoreTuple(tuple,slot,InvalidBuffer, true);
1482+
slot=ExecStoreTuple(tuple,
1483+
estate->es_junkFilter->jf_resultSlot,
1484+
InvalidBuffer, true);
14711485
gotolreplace;
14721486
}
14731487
}

‎src/include/executor/executor.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $Id: executor.h,v 1.57 2001/03/22 04:00:44 momjian Exp $
10+
* $Id: executor.h,v 1.58 2001/05/27 20:48:51 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -43,7 +43,8 @@ extern void ExecRestrPos(Plan *node);
4343
/*
4444
* prototypes from functions in execJunk.c
4545
*/
46-
externJunkFilter*ExecInitJunkFilter(List*targetList,TupleDesctupType);
46+
externJunkFilter*ExecInitJunkFilter(List*targetList,TupleDesctupType,
47+
TupleTableSlot*slot);
4748
externvoidExecFreeJunkFilter(JunkFilter*junkfilter);
4849
externboolExecGetJunkAttribute(JunkFilter*junkfilter,TupleTableSlot*slot,
4950
char*attrName,Datum*value,bool*isNull);

‎src/include/nodes/execnodes.h

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $Id: execnodes.h,v 1.59 2001/05/15 00:33:36 tgl Exp $
10+
* $Id: execnodes.h,v 1.60 2001/05/27 20:48:51 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -166,17 +166,19 @@ typedef struct ProjectionInfo
166166
* cleanLength:the length of 'cleanTargetList'
167167
* cleanTupType:the tuple descriptor of the "clean" tuple (with
168168
*junk attributes removed).
169-
* cleanMap:A map with thecorrespondance between the non-junk
170-
*attributes of the "original" tuple and the
171-
*attributes of the "clean" tuple.
169+
* cleanMap:A map with thecorrespondence between the non-junk
170+
*attribute numbers of the "original" tuple and the
171+
*attribute numbers of the "clean" tuple.
172172
* junkContext:memory context holding the JunkFilter node and all
173173
*its subsidiary data structures.
174-
*
175-
* NOTE: the original targetList and tupType are passed to ExecInitJunkFilter
176-
* and do not belong to the JunkFilter. All the other subsidiary structures
177-
* are created during ExecInitJunkFilter, and all of them can be freed by
178-
* deleting the memory context junkContext. This would not be needed if we
179-
* had a cleaner approach to managing query-lifetime data structures...
174+
* resultSlot:tuple slot that can be used to hold cleaned tuple.
175+
*
176+
* NOTE: the original targetList and tupType are passed to ExecInitJunkFilter,
177+
* as is the resultSlot. These items do not belong to the JunkFilter. All
178+
* the other subsidiary structures are created during ExecInitJunkFilter,
179+
* and all of them can be freed by deleting the memory context junkContext.
180+
* This would not be needed if we had a cleaner approach to managing
181+
* query-lifetime data structures...
180182
* ----------------
181183
*/
182184
typedefstructJunkFilter
@@ -190,6 +192,7 @@ typedef struct JunkFilter
190192
TupleDescjf_cleanTupType;
191193
AttrNumber*jf_cleanMap;
192194
MemoryContextjf_junkContext;
195+
TupleTableSlot*jf_resultSlot;
193196
}JunkFilter;
194197

195198
/* ----------------

0 commit comments

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