@@ -193,9 +193,15 @@ ExecFindPartition(ResultRelInfo *resultRelInfo, PartitionDispatch *pd,
193193Datum values [PARTITION_MAX_KEYS ];
194194bool isnull [PARTITION_MAX_KEYS ];
195195Relation rel ;
196- PartitionDispatch parent ;
196+ PartitionDispatch dispatch ;
197197ExprContext * ecxt = GetPerTupleExprContext (estate );
198198TupleTableSlot * ecxt_scantuple_old = ecxt -> ecxt_scantuple ;
199+ TupleTableSlot * myslot = NULL ;
200+ MemoryContext oldcxt ;
201+ HeapTuple tuple ;
202+
203+ /* use per-tuple context here to avoid leaking memory */
204+ oldcxt = MemoryContextSwitchTo (GetPerTupleMemoryContext (estate ));
199205
200206/*
201207 * First check the root table's partition constraint, if any. No point in
@@ -205,26 +211,24 @@ ExecFindPartition(ResultRelInfo *resultRelInfo, PartitionDispatch *pd,
205211ExecPartitionCheck (resultRelInfo ,slot ,estate , true);
206212
207213/* start with the root partitioned table */
208- parent = pd [0 ];
214+ tuple = ExecFetchSlotTuple (slot );
215+ dispatch = pd [0 ];
209216while (true)
210217{
211218PartitionDesc partdesc ;
212- TupleTableSlot * myslot = parent -> tupslot ;
213- TupleConversionMap * map = parent -> tupmap ;
219+ TupleConversionMap * map = dispatch -> tupmap ;
214220int cur_index = -1 ;
215221
216- rel = parent -> reldesc ;
222+ rel = dispatch -> reldesc ;
217223partdesc = RelationGetPartitionDesc (rel );
218224
219225/*
220- * Convert the tuple to this parent's layout so that we can do certain
221- *things we do below .
226+ * Convert the tuple to this parent's layout, if different from the
227+ *current relation .
222228 */
229+ myslot = dispatch -> tupslot ;
223230if (myslot != NULL && map != NULL )
224231{
225- HeapTuple tuple = ExecFetchSlotTuple (slot );
226-
227- ExecClearTuple (myslot );
228232tuple = do_convert_tuple (tuple ,map );
229233ExecStoreTuple (tuple ,myslot ,InvalidBuffer , true);
230234slot = myslot ;
@@ -239,7 +243,7 @@ ExecFindPartition(ResultRelInfo *resultRelInfo, PartitionDispatch *pd,
239243 * So update ecxt_scantuple accordingly.
240244 */
241245ecxt -> ecxt_scantuple = slot ;
242- FormPartitionKeyDatum (parent ,slot ,estate ,values ,isnull );
246+ FormPartitionKeyDatum (dispatch ,slot ,estate ,values ,isnull );
243247
244248/*
245249 * Nothing for get_partition_for_tuple() to do if there are no
@@ -263,15 +267,33 @@ ExecFindPartition(ResultRelInfo *resultRelInfo, PartitionDispatch *pd,
263267result = -1 ;
264268break ;
265269}
266- else if (parent -> indexes [cur_index ] >=0 )
270+ else if (dispatch -> indexes [cur_index ] >=0 )
267271{
268- result = parent -> indexes [cur_index ];
272+ result = dispatch -> indexes [cur_index ];
273+ /* success! */
269274break ;
270275}
271276else
272- parent = pd [- parent -> indexes [cur_index ]];
277+ {
278+ /* move down one level */
279+ dispatch = pd [- dispatch -> indexes [cur_index ]];
280+
281+ /*
282+ * Release the dedicated slot, if it was used. Create a copy of
283+ * the tuple first, for the next iteration.
284+ */
285+ if (slot == myslot )
286+ {
287+ tuple = ExecCopySlotTuple (myslot );
288+ ExecClearTuple (myslot );
289+ }
290+ }
273291}
274292
293+ /* Release the tuple in the lowest parent's dedicated slot. */
294+ if (slot == myslot )
295+ ExecClearTuple (myslot );
296+
275297/* A partition was not found. */
276298if (result < 0 )
277299{
@@ -287,7 +309,9 @@ ExecFindPartition(ResultRelInfo *resultRelInfo, PartitionDispatch *pd,
287309val_desc ?errdetail ("Partition key of the failing row contains %s." ,val_desc ) :0 ));
288310}
289311
312+ MemoryContextSwitchTo (oldcxt );
290313ecxt -> ecxt_scantuple = ecxt_scantuple_old ;
314+
291315return result ;
292316}
293317
