diff options
| author | Alexander Korotkov <akorotkov@postgresql.org> | 2024-04-11 15:51:35 +0300 |
|---|---|---|
| committer | Alexander Korotkov <akorotkov@postgresql.org> | 2024-04-11 16:01:34 +0300 |
| commit | 193e6d18e553a104d315ff81892d509d89a30fd8 (patch) | |
| tree | e6e98a5ed7eb252aae83d112d853aadbba6c58a9 /src/backend/executor/execReplication.c | |
| parent | da841aa4dc279bb0053de56121c927ec943edff3 (diff) | |
| download | postgresql-193e6d18e553a104d315ff81892d509d89a30fd8.tar.gz postgresql-193e6d18e553a104d315ff81892d509d89a30fd8.zip | |
Revert: Allow locking updated tuples in tuple_update() and tuple_delete()
This commit reverts 87985cc925 and 818861eb57 per review by Andres Freund.
Discussion: https://postgr.es/m/20240410165236.rwyrny7ihi4ddxw4%40awork3.anarazel.de
Diffstat (limited to 'src/backend/executor/execReplication.c')
| -rw-r--r-- | src/backend/executor/execReplication.c | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/src/backend/executor/execReplication.c b/src/backend/executor/execReplication.c index 0cad843fb69..d0a89cd5778 100644 --- a/src/backend/executor/execReplication.c +++ b/src/backend/executor/execReplication.c @@ -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); } } |