Fix a few more redundant calls of GetLatestSnapshot()
authorHeikki Linnakangas <heikki.linnakangas@iki.fi>
Mon, 10 Mar 2025 16:54:58 +0000 (18:54 +0200)
committerHeikki Linnakangas <heikki.linnakangas@iki.fi>
Mon, 10 Mar 2025 16:58:10 +0000 (18:58 +0200)
Commit 2367503177 fixed this in RelationFindReplTupleByIndex(), but I
missed two other similar cases.

Per report from Ranier Vilela.

Discussion: https://www.postgresql.org/message-id/CAEudQArUT1dE45WN87F-Gb7XMy_hW6x1DFd3sqdhhxP-RMDa0Q@mail.gmail.com
Backpatch-through: 13

src/backend/executor/execReplication.c

index 69109a7572679ca04a5a4579c18c1965cb631383..f59cb9098ffd1418ad28ab86c58e090de0922ed2 100644 (file)
@@ -411,7 +411,7 @@ retry:
 
        PushActiveSnapshot(GetLatestSnapshot());
 
-       res = table_tuple_lock(rel, &(outslot->tts_tid), GetLatestSnapshot(),
+       res = table_tuple_lock(rel, &(outslot->tts_tid), GetActiveSnapshot(),
                               outslot,
                               GetCurrentCommandId(false),
                               lockmode,
@@ -468,7 +468,7 @@ retry:
 
    PushActiveSnapshot(GetLatestSnapshot());
 
-   res = table_tuple_lock(rel, &conflictTid, GetLatestSnapshot(),
+   res = table_tuple_lock(rel, &conflictTid, GetActiveSnapshot(),
                           *conflictslot,
                           GetCurrentCommandId(false),
                           LockTupleShare,