Skip to content

Free temporary rowid Datums after index and trigger use #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GremSnoort wants to merge 1 commit into
base: patches17
Choose a base branch
from
Open

Free temporary rowid Datums after index and trigger use #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/backend/commands/trigger.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6671,6 +6671,16 @@ AfterTriggerSaveEvent(EState *estate, ResultRelInfo *relinfo,
&new_event, &new_shared, rowId1, rowId2);
}

/*
* slot_getsysattr(RowIdAttributeNumber) returns an owning palloc'd copy.
* afterTriggerAddEvent() copies rowids into its event chunk, so these
* temporary copies don't need to live until PortalContext reset.
*/
if (rowId1)
pfree(rowId1);
if (rowId2 && rowId2 != rowId1)
pfree(rowId2);

/*
* Finally, spool any foreign tuple(s). The tuplestore squashes them to
* minimal tuples, so this loses any system columns. The executor lost
Expand Down
36 changes: 32 additions & 4 deletions src/backend/executor/execIndexing.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,25 @@
#include "storage/lmgr.h"
#include "utils/snapmgr.h"

static inline bool
ExecIndexTupleIdNeedsFree(Relation heapRelation)

@pashkinelfe pashkinelfe Jun 23, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any reason not to inline one-line function?

{
/*
* ROW_REF_ROWID table AMs are expected to return a caller-owned palloc'd
* Datum from slot_getsysattr(RowIdAttributeNumber). Freeing it here
* relies on that ownership contract; a future ROW_REF_ROWID AM that
* returns a borrowed pointer must not use this path unchanged.
*/
return table_get_row_ref_type(heapRelation) == ROW_REF_ROWID;
}

static inline void
ExecIndexFreeTupleId(Relation heapRelation, Datum tupleid)
{
if (ExecIndexTupleIdNeedsFree(heapRelation))
pfree(DatumGetPointer(tupleid));
}

static bool index_recheck_constraint(Relation index, const Oid *constr_procs,
const Datum *existing_values, const bool *existing_isnull,
const Datum *new_values);
Expand Down Expand Up @@ -298,7 +317,7 @@ ExecInsertIndexTuples(ResultRelInfo *resultRelInfo,
bool isnull[INDEX_MAX_KEYS];
Datum tupleidDatum;

if (table_get_row_ref_type(resultRelInfo->ri_RelationDesc) == ROW_REF_ROWID)
if (ExecIndexTupleIdNeedsFree(resultRelInfo->ri_RelationDesc))
{
bool isnull;
tupleidDatum = slot_getsysattr(slot, RowIdAttributeNumber, &isnull);
Expand Down Expand Up @@ -496,6 +515,8 @@ ExecInsertIndexTuples(ResultRelInfo *resultRelInfo,
}
}

ExecIndexFreeTupleId(heapRelation, tupleidDatum);

return result;
}

Expand All @@ -520,7 +541,7 @@ ExecUpdateIndexTuples(ResultRelInfo *resultRelInfo,
bool isnull[INDEX_MAX_KEYS];
Datum tupleidDatum;

if (table_get_row_ref_type(resultRelInfo->ri_RelationDesc) == ROW_REF_ROWID)
if (ExecIndexTupleIdNeedsFree(resultRelInfo->ri_RelationDesc))
{
bool isnull;
tupleidDatum = slot_getsysattr(slot, RowIdAttributeNumber, &isnull);
Expand Down Expand Up @@ -661,9 +682,10 @@ ExecUpdateIndexTuples(ResultRelInfo *resultRelInfo,
Datum oldTupleidDatum;
bool old_valid = true;

if (table_get_row_ref_type(resultRelInfo->ri_RelationDesc) == ROW_REF_ROWID)
if (ExecIndexTupleIdNeedsFree(resultRelInfo->ri_RelationDesc))
{
bool isnull;

oldTupleidDatum = slot_getsysattr(oldSlot, RowIdAttributeNumber, &isnull);
Assert(!isnull);
}
Expand Down Expand Up @@ -718,6 +740,8 @@ ExecUpdateIndexTuples(ResultRelInfo *resultRelInfo,
indexUnchanged, /* UPDATE without logical change? */
indexInfo); /* index AM may need this */

ExecIndexFreeTupleId(heapRelation, oldTupleidDatum);

}
else
{
Expand Down Expand Up @@ -791,6 +815,8 @@ ExecUpdateIndexTuples(ResultRelInfo *resultRelInfo,
}
}

ExecIndexFreeTupleId(heapRelation, tupleidDatum);

return result;
}

Expand All @@ -808,7 +834,7 @@ ExecDeleteIndexTuples(ResultRelInfo *resultRelInfo, TupleTableSlot *slot,
bool isnull[INDEX_MAX_KEYS];
Datum tupleid;

if (table_get_row_ref_type(resultRelInfo->ri_RelationDesc) == ROW_REF_ROWID)
if (ExecIndexTupleIdNeedsFree(resultRelInfo->ri_RelationDesc))
{
bool isnull;
tupleid = slot_getsysattr(slot, RowIdAttributeNumber, &isnull);
Expand Down Expand Up @@ -898,6 +924,8 @@ ExecDeleteIndexTuples(ResultRelInfo *resultRelInfo, TupleTableSlot *slot,
heapRelation, /* heap relation */
indexInfo); /* index AM may need this */
}

ExecIndexFreeTupleId(heapRelation, tupleid);
}

/* ----------------------------------------------------------------
Expand Down