Fix a few more redundant calls of GetLatestSnapshot()

hlinnaka · hlinnaka · commit f7c566a1a276 · 2025-03-10T18:58:10.000+02:00
Commit 2367503 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
diff --git a/src/backend/executor/execReplication.c b/src/backend/executor/execReplication.c
@@ -411,7 +411,7 @@ RelationFindReplTupleSeq(Relation rel, LockTupleMode lockmode,
 
 		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 @@ FindConflictTuple(ResultRelInfo *resultRelInfo, EState *estate,
 
 	PushActiveSnapshot(GetLatestSnapshot());
 
-	res = table_tuple_lock(rel, &conflictTid, GetLatestSnapshot(),
+	res = table_tuple_lock(rel, &conflictTid, GetActiveSnapshot(),
 						   *conflictslot,
 						   GetCurrentCommandId(false),
 						   LockTupleShare,
