diff options
| author | Michael Paquier <michael@paquier.xyz> | 2019-02-20 12:31:07 +0900 |
|---|---|---|
| committer | Michael Paquier <michael@paquier.xyz> | 2019-02-20 12:31:07 +0900 |
| commit | 56fadbedbd2f697400b89e7b767cfa4ec67932d6 (patch) | |
| tree | 7e7bfe305e2bef3e64b411291440084ae690d11d | |
| parent | 90cfa49003831dbea109a9f0a7924dc95c1bf1c5 (diff) | |
| download | postgresql-56fadbedbd2f697400b89e7b767cfa4ec67932d6.tar.gz postgresql-56fadbedbd2f697400b89e7b767cfa4ec67932d6.zip | |
Mark correctly initial slot snapshots with MVCC type when built
When building an initial slot snapshot, snapshots are marked with
historic MVCC snapshots as type with the marker field being set in
SnapBuildBuildSnapshot() but not overriden in SnapBuildInitialSnapshot().
Existing callers of SnapBuildBuildSnapshot() do not care about the type
of snapshot used, but extensions calling it actually may, as reported.
While on it, mark correctly the snapshot type when importing one. This
is cosmetic as the field is enforced to 0.
Author: Antonin Houska
Reviewed-by: Álvaro Herrera, Michael Paquier
Discussion: https://postgr.es/m/23215.1527665193@localhost
Backpatch-through: 9.4
| -rw-r--r-- | src/backend/replication/logical/snapbuild.c | 2 | ||||
| -rw-r--r-- | src/backend/utils/time/snapmgr.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/backend/replication/logical/snapbuild.c b/src/backend/replication/logical/snapbuild.c index ad44b2bf43c..a59896f0825 100644 --- a/src/backend/replication/logical/snapbuild.c +++ b/src/backend/replication/logical/snapbuild.c @@ -616,6 +616,8 @@ SnapBuildInitialSnapshot(SnapBuild *builder) TransactionIdAdvance(xid); } + /* adjust remaining snapshot fields as needed */ + snap->snapshot_type = SNAPSHOT_MVCC; snap->xcnt = newxcnt; snap->xip = newxip; diff --git a/src/backend/utils/time/snapmgr.c b/src/backend/utils/time/snapmgr.c index 6e02585e10e..3b442935bb6 100644 --- a/src/backend/utils/time/snapmgr.c +++ b/src/backend/utils/time/snapmgr.c @@ -1509,6 +1509,8 @@ ImportSnapshot(const char *idstr) src_isolevel = parseIntFromText("iso:", &filebuf, path); src_readonly = parseIntFromText("ro:", &filebuf, path); + snapshot.snapshot_type = SNAPSHOT_MVCC; + snapshot.xmin = parseXidFromText("xmin:", &filebuf, path); snapshot.xmax = parseXidFromText("xmax:", &filebuf, path); |