mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add new snapshot fields to serialize/deserialize functions.

Browse Source 
The "snapshot too old" condition was not being recognized when
using a copied snapshot, since the original timestamp and lsn were
not being passed along.  Noticed when testing the combination of
"snapshot too old" with parallel query execution.
This commit is contained in:
Kevin Grittner 2016-06-03 11:13:28 -05:00
parent 6436a853f1
commit 370a46fc01
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/utils/time/snapmgr.c
View File

@ -239,6 +239,8 @@ typedef struct SerializedSnapshotData
bool suboverflowed; bool suboverflowed;
bool takenDuringRecovery; bool takenDuringRecovery;
CommandId curcid; CommandId curcid;
int64 whenTaken;
XLogRecPtr lsn;
} SerializedSnapshotData; } SerializedSnapshotData;
Size Size
@ -1936,6 +1938,8 @@ SerializeSnapshot(Snapshot snapshot, char *start_address)
serialized_snapshot->suboverflowed = snapshot->suboverflowed; serialized_snapshot->suboverflowed = snapshot->suboverflowed;
serialized_snapshot->takenDuringRecovery = snapshot->takenDuringRecovery; serialized_snapshot->takenDuringRecovery = snapshot->takenDuringRecovery;
serialized_snapshot->curcid = snapshot->curcid; serialized_snapshot->curcid = snapshot->curcid;
serialized_snapshot->whenTaken = snapshot->whenTaken;
serialized_snapshot->lsn = snapshot->lsn;
/* /*
* Ignore the SubXID array if it has overflowed, unless the snapshot was * Ignore the SubXID array if it has overflowed, unless the snapshot was
@ -2002,6 +2006,8 @@ RestoreSnapshot(char *start_address)
snapshot->suboverflowed = serialized_snapshot->suboverflowed; snapshot->suboverflowed = serialized_snapshot->suboverflowed;
snapshot->takenDuringRecovery = serialized_snapshot->takenDuringRecovery; snapshot->takenDuringRecovery = serialized_snapshot->takenDuringRecovery;
snapshot->curcid = serialized_snapshot->curcid; snapshot->curcid = serialized_snapshot->curcid;
snapshot->whenTaken = serialized_snapshot->whenTaken;
snapshot->lsn = serialized_snapshot->lsn;
/* Copy XIDs, if present. */ /* Copy XIDs, if present. */
if (serialized_snapshot->xcnt > 0) if (serialized_snapshot->xcnt > 0)