mirror of
https://github.com/postgres/postgres.git
synced 2025-08-19 23:22:23 +03:00
Revert: Allow locking updated tuples in tuple_update() and tuple_delete()
This commit reverts87985cc925
and818861eb57
per review by Andres Freund. Discussion: https://postgr.es/m/20240410165236.rwyrny7ihi4ddxw4%40awork3.anarazel.de
This commit is contained in:
@@ -577,7 +577,6 @@ ExecSimpleRelationUpdate(ResultRelInfo *resultRelInfo,
|
||||
{
|
||||
List *recheckIndexes = NIL;
|
||||
TU_UpdateIndexes update_indexes;
|
||||
TupleTableSlot *oldSlot = NULL;
|
||||
|
||||
/* Compute stored generated columns */
|
||||
if (rel->rd_att->constr &&
|
||||
@@ -591,12 +590,8 @@ ExecSimpleRelationUpdate(ResultRelInfo *resultRelInfo,
|
||||
if (rel->rd_rel->relispartition)
|
||||
ExecPartitionCheck(resultRelInfo, slot, estate, true);
|
||||
|
||||
if (resultRelInfo->ri_TrigDesc &&
|
||||
resultRelInfo->ri_TrigDesc->trig_update_after_row)
|
||||
oldSlot = ExecGetTriggerOldSlot(estate, resultRelInfo);
|
||||
|
||||
simple_table_tuple_update(rel, tid, slot, estate->es_snapshot,
|
||||
&update_indexes, oldSlot);
|
||||
&update_indexes);
|
||||
|
||||
if (resultRelInfo->ri_NumIndices > 0 && (update_indexes != TU_None))
|
||||
recheckIndexes = ExecInsertIndexTuples(resultRelInfo,
|
||||
@@ -607,7 +602,7 @@ ExecSimpleRelationUpdate(ResultRelInfo *resultRelInfo,
|
||||
/* AFTER ROW UPDATE Triggers */
|
||||
ExecARUpdateTriggers(estate, resultRelInfo,
|
||||
NULL, NULL,
|
||||
NULL, oldSlot, slot,
|
||||
tid, NULL, slot,
|
||||
recheckIndexes, NULL, false);
|
||||
|
||||
list_free(recheckIndexes);
|
||||
@@ -641,18 +636,12 @@ ExecSimpleRelationDelete(ResultRelInfo *resultRelInfo,
|
||||
|
||||
if (!skip_tuple)
|
||||
{
|
||||
TupleTableSlot *oldSlot = NULL;
|
||||
|
||||
if (resultRelInfo->ri_TrigDesc &&
|
||||
resultRelInfo->ri_TrigDesc->trig_delete_after_row)
|
||||
oldSlot = ExecGetTriggerOldSlot(estate, resultRelInfo);
|
||||
|
||||
/* OK, delete the tuple */
|
||||
simple_table_tuple_delete(rel, tid, estate->es_snapshot, oldSlot);
|
||||
simple_table_tuple_delete(rel, tid, estate->es_snapshot);
|
||||
|
||||
/* AFTER ROW DELETE Triggers */
|
||||
ExecARDeleteTriggers(estate, resultRelInfo,
|
||||
NULL, oldSlot, NULL, false);
|
||||
tid, NULL, NULL, false);
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user