Skip to content

Minor improvements #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ereutt wants to merge 3 commits into
base: patches18
Choose a base branch
from
Open

Minor improvements #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
54e06fe
assert expression misprint
ereutt Aug 7, 2026
46d53ed
Stop check custom wal-record after hook alredy done the checks
ereutt Aug 7, 2026
87341b9
invoke RecoveryInProgress outside SpinLock in GetEffectiveXlogReplayR…
ereutt Aug 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/backend/access/transam/xlogrecovery.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2675,9 +2675,11 @@ recoveryStopsBefore(XLogReaderState *record)
timestamptz_to_str(recoveryStopTime))));
return true;
}
return false;
}

/* Otherwise we only consider stopping before COMMIT or ABORT records. */
else if (XLogRecGetRmid(record) != RM_XACT_ID)
if (XLogRecGetRmid(record) != RM_XACT_ID)
return false;

xact_info = XLogRecGetInfo(record) & XLOG_XACT_OPMASK;
Expand Down Expand Up @@ -4649,9 +4651,10 @@ XLogRecPtr
GetEffectiveXlogReplayRecPtr(void)
{
XLogRecPtr recptr = InvalidXLogRecPtr;
bool useHook = GetReplayXlogPtrHook != NULL && RecoveryInProgress();

SpinLockAcquire(&XLogRecoveryCtl->info_lck);
if (GetReplayXlogPtrHook)
if (useHook)
recptr = GetReplayXlogPtrHook();
if (recptr == InvalidXLogRecPtr)
recptr = XLogRecoveryCtl->lastReplayedEndRecPtr;
Expand Down
2 changes: 1 addition & 1 deletion src/backend/executor/nodeLockRows.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ ExecLockRows(PlanState *pstate)
}
else
{
Assert(erm->refType = ROW_REF_ROWID);
Assert(erm->refType == ROW_REF_ROWID);
datum = datumCopy(datum, false, -1);
}
switch (erm->markType)
Expand Down