mirror of
https://github.com/postgres/postgres.git
synced 2025-08-19 23:22:23 +03:00
Add ExecCopySlotMinimalTupleExtra().
Allows an "extra" argument that allocates extra memory at the end of the MinimalTuple. This is important for callers that need to store additional data, but do not want to perform an additional allocation. Suggested-by: David Rowley <dgrowleyml@gmail.com> Discussion: https://postgr.es/m/CAApHDvppeqw2pNM-+ahBOJwq2QmC0hOAGsmCpC89QVmEoOvsdg@mail.gmail.com
This commit is contained in:
@@ -298,13 +298,14 @@ tts_virtual_copy_heap_tuple(TupleTableSlot *slot)
|
||||
}
|
||||
|
||||
static MinimalTuple
|
||||
tts_virtual_copy_minimal_tuple(TupleTableSlot *slot)
|
||||
tts_virtual_copy_minimal_tuple(TupleTableSlot *slot, Size extra)
|
||||
{
|
||||
Assert(!TTS_EMPTY(slot));
|
||||
|
||||
return heap_form_minimal_tuple(slot->tts_tupleDescriptor,
|
||||
slot->tts_values,
|
||||
slot->tts_isnull);
|
||||
slot->tts_isnull,
|
||||
extra);
|
||||
}
|
||||
|
||||
|
||||
@@ -472,14 +473,14 @@ tts_heap_copy_heap_tuple(TupleTableSlot *slot)
|
||||
}
|
||||
|
||||
static MinimalTuple
|
||||
tts_heap_copy_minimal_tuple(TupleTableSlot *slot)
|
||||
tts_heap_copy_minimal_tuple(TupleTableSlot *slot, Size extra)
|
||||
{
|
||||
HeapTupleTableSlot *hslot = (HeapTupleTableSlot *) slot;
|
||||
|
||||
if (!hslot->tuple)
|
||||
tts_heap_materialize(slot);
|
||||
|
||||
return minimal_tuple_from_heap_tuple(hslot->tuple);
|
||||
return minimal_tuple_from_heap_tuple(hslot->tuple, extra);
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -607,7 +608,8 @@ tts_minimal_materialize(TupleTableSlot *slot)
|
||||
{
|
||||
mslot->mintuple = heap_form_minimal_tuple(slot->tts_tupleDescriptor,
|
||||
slot->tts_values,
|
||||
slot->tts_isnull);
|
||||
slot->tts_isnull,
|
||||
0);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -617,7 +619,7 @@ tts_minimal_materialize(TupleTableSlot *slot)
|
||||
* TTS_FLAG_SHOULDFREE set). Copy the minimal tuple into the given
|
||||
* slot's memory context.
|
||||
*/
|
||||
mslot->mintuple = heap_copy_minimal_tuple(mslot->mintuple);
|
||||
mslot->mintuple = heap_copy_minimal_tuple(mslot->mintuple, 0);
|
||||
}
|
||||
|
||||
slot->tts_flags |= TTS_FLAG_SHOULDFREE;
|
||||
@@ -666,14 +668,14 @@ tts_minimal_copy_heap_tuple(TupleTableSlot *slot)
|
||||
}
|
||||
|
||||
static MinimalTuple
|
||||
tts_minimal_copy_minimal_tuple(TupleTableSlot *slot)
|
||||
tts_minimal_copy_minimal_tuple(TupleTableSlot *slot, Size extra)
|
||||
{
|
||||
MinimalTupleTableSlot *mslot = (MinimalTupleTableSlot *) slot;
|
||||
|
||||
if (!mslot->mintuple)
|
||||
tts_minimal_materialize(slot);
|
||||
|
||||
return heap_copy_minimal_tuple(mslot->mintuple);
|
||||
return heap_copy_minimal_tuple(mslot->mintuple, extra);
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -926,7 +928,7 @@ tts_buffer_heap_copy_heap_tuple(TupleTableSlot *slot)
|
||||
}
|
||||
|
||||
static MinimalTuple
|
||||
tts_buffer_heap_copy_minimal_tuple(TupleTableSlot *slot)
|
||||
tts_buffer_heap_copy_minimal_tuple(TupleTableSlot *slot, Size extra)
|
||||
{
|
||||
BufferHeapTupleTableSlot *bslot = (BufferHeapTupleTableSlot *) slot;
|
||||
|
||||
@@ -935,7 +937,7 @@ tts_buffer_heap_copy_minimal_tuple(TupleTableSlot *slot)
|
||||
if (!bslot->base.tuple)
|
||||
tts_buffer_heap_materialize(slot);
|
||||
|
||||
return minimal_tuple_from_heap_tuple(bslot->base.tuple);
|
||||
return minimal_tuple_from_heap_tuple(bslot->base.tuple, extra);
|
||||
}
|
||||
|
||||
static inline void
|
||||
@@ -1895,7 +1897,7 @@ ExecFetchSlotMinimalTuple(TupleTableSlot *slot,
|
||||
{
|
||||
if (shouldFree)
|
||||
*shouldFree = true;
|
||||
return slot->tts_ops->copy_minimal_tuple(slot);
|
||||
return slot->tts_ops->copy_minimal_tuple(slot, 0);
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -735,7 +735,7 @@ gm_readnext_tuple(GatherMergeState *gm_state, int nreader, bool nowait,
|
||||
* Since we'll be buffering these across multiple calls, we need to make a
|
||||
* copy.
|
||||
*/
|
||||
return tup ? heap_copy_minimal_tuple(tup) : NULL;
|
||||
return tup ? heap_copy_minimal_tuple(tup, 0) : NULL;
|
||||
}
|
||||
|
||||
/*
|
||||
|
Reference in New Issue
Block a user