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/access/table/tableam.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/access/table/tableam.c')
| -rw-r--r-- | src/backend/access/table/tableam.c | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/src/backend/access/table/tableam.c b/src/backend/access/table/tableam.c index 8d3675be959..e57a0b7ea31 100644 --- a/src/backend/access/table/tableam.c +++ b/src/backend/access/table/tableam.c @@ -287,23 +287,16 @@ simple_table_tuple_insert(Relation rel, TupleTableSlot *slot) * via ereport(). */ void -simple_table_tuple_delete(Relation rel, ItemPointer tid, Snapshot snapshot, - TupleTableSlot *oldSlot) +simple_table_tuple_delete(Relation rel, ItemPointer tid, Snapshot snapshot) { TM_Result result; TM_FailureData tmfd; - int options = TABLE_MODIFY_WAIT; /* wait for commit */ - - /* Fetch old tuple if the relevant slot is provided */ - if (oldSlot) - options |= TABLE_MODIFY_FETCH_OLD_TUPLE; result = table_tuple_delete(rel, tid, GetCurrentCommandId(true), snapshot, InvalidSnapshot, - options, - &tmfd, false /* changingPart */ , - oldSlot); + true /* wait for commit */ , + &tmfd, false /* changingPart */ ); switch (result) { @@ -342,24 +335,17 @@ void simple_table_tuple_update(Relation rel, ItemPointer otid, TupleTableSlot *slot, Snapshot snapshot, - TU_UpdateIndexes *update_indexes, - TupleTableSlot *oldSlot) + TU_UpdateIndexes *update_indexes) { TM_Result result; TM_FailureData tmfd; LockTupleMode lockmode; - int options = TABLE_MODIFY_WAIT; /* wait for commit */ - - /* Fetch old tuple if the relevant slot is provided */ - if (oldSlot) - options |= TABLE_MODIFY_FETCH_OLD_TUPLE; result = table_tuple_update(rel, otid, slot, GetCurrentCommandId(true), snapshot, InvalidSnapshot, - options, - &tmfd, &lockmode, update_indexes, - oldSlot); + true /* wait for commit */ , + &tmfd, &lockmode, update_indexes); switch (result) { |