mirror of
https://github.com/postgres/postgres.git
synced 2025-09-02 04:21:28 +03:00
Avoid copying index tuples when building an index.
The previous code, perhaps out of concern for avoid memory leaks, formed the tuple in one memory context and then copied it to another memory context. However, this doesn't appear to be necessary, since index_form_tuple and the functions it calls take precautions against leaking memory. In my testing, building the tuple directly inside the sort context shaves several percent off the index build time. Rearrange things so we do that. Patch by me. Review by Amit Kapila, Tom Lane, Andres Freund.
This commit is contained in:
@@ -171,28 +171,21 @@ btbuildCallback(Relation index,
|
||||
void *state)
|
||||
{
|
||||
BTBuildState *buildstate = (BTBuildState *) state;
|
||||
IndexTuple itup;
|
||||
|
||||
/* form an index tuple and point it at the heap tuple */
|
||||
itup = index_form_tuple(RelationGetDescr(index), values, isnull);
|
||||
itup->t_tid = htup->t_self;
|
||||
|
||||
/*
|
||||
* insert the index tuple into the appropriate spool file for subsequent
|
||||
* processing
|
||||
*/
|
||||
if (tupleIsAlive || buildstate->spool2 == NULL)
|
||||
_bt_spool(itup, buildstate->spool);
|
||||
_bt_spool(buildstate->spool, &htup->t_self, values, isnull);
|
||||
else
|
||||
{
|
||||
/* dead tuples are put into spool2 */
|
||||
buildstate->haveDead = true;
|
||||
_bt_spool(itup, buildstate->spool2);
|
||||
_bt_spool(buildstate->spool2, &htup->t_self, values, isnull);
|
||||
}
|
||||
|
||||
buildstate->indtuples += 1;
|
||||
|
||||
pfree(itup);
|
||||
}
|
||||
|
||||
/*
|
||||
|
@@ -185,9 +185,10 @@ _bt_spooldestroy(BTSpool *btspool)
|
||||
* spool an index entry into the sort file.
|
||||
*/
|
||||
void
|
||||
_bt_spool(IndexTuple itup, BTSpool *btspool)
|
||||
_bt_spool(BTSpool *btspool, ItemPointer self, Datum *values, bool *isnull)
|
||||
{
|
||||
tuplesort_putindextuple(btspool->sortstate, itup);
|
||||
tuplesort_putindextuplevalues(btspool->sortstate, btspool->index,
|
||||
self, values, isnull);
|
||||
}
|
||||
|
||||
/*
|
||||
|
Reference in New Issue
Block a user