Skip to content

Commit caf1f67

Browse files
committed
Don't set ThisTimeLineID when there's no reason to do so.
In slotfuncs.c, pg_replication_slot_advance() needs to determine the LSN up to which the slot should be advanced, but that doesn't require us to update ThisTimeLineID, because none of the code called from here depends on it. If the replication slot is logical, pg_logical_replication_slot_advance will call read_local_xlog_page, which does use ThisTimeLineID, but also takes care of making sure it's up to date. If the replication slot is physical, the timeline isn't used for anything at all. In logicalfuncs.c, pg_logical_slot_get_changes_guts() has the same issue: the only code we're going to run that cares about timelines is in or downstream of read_local_xlog_page, which already makes sure that the correct value gets set. Hence, don't do it here. Patch by me, reviewed and tested by Michael Paquier, Amul Sul, and Álvaro Herrera. Discussion: https://postgr.es/m/CA+TgmobfAAqhfWa1kaFBBFvX+5CjM=7TE=n4r4Q1o2bjbGYBpA@mail.gmail.com
1 parent d74b54b commit caf1f67

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

src/backend/replication/logical/logicalfuncs.c

+2-3
Original file line numberDiff line numberDiff line change
@@ -208,13 +208,12 @@ pg_logical_slot_get_changes_guts(FunctionCallInfo fcinfo, bool confirm, bool bin
208208
rsinfo->setDesc = p->tupdesc;
209209

210210
/*
211-
* Compute the current end-of-wal and maintain ThisTimeLineID.
212-
* RecoveryInProgress() will update ThisTimeLineID on promotion.
211+
* Compute the current end-of-wal.
213212
*/
214213
if (!RecoveryInProgress())
215214
end_of_wal = GetFlushRecPtr();
216215
else
217-
end_of_wal = GetXLogReplayRecPtr(&ThisTimeLineID);
216+
end_of_wal = GetXLogReplayRecPtr(NULL);
218217

219218
ReplicationSlotAcquire(NameStr(*name), true);
220219

src/backend/replication/slotfuncs.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,7 @@ pg_replication_slot_advance(PG_FUNCTION_ARGS)
627627
if (!RecoveryInProgress())
628628
moveto = Min(moveto, GetFlushRecPtr());
629629
else
630-
moveto = Min(moveto, GetXLogReplayRecPtr(&ThisTimeLineID));
630+
moveto = Min(moveto, GetXLogReplayRecPtr(NULL));
631631

632632
/* Acquire the slot so we "own" it */
633633
ReplicationSlotAcquire(NameStr(*slotname), true);

0 commit comments

Comments
 (0)