From b1e48bbe64a411666bb1928b9741e112e267836d Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Sun, 12 Jul 2020 20:47:15 +0900 Subject: Include replication origins in SQL functions for commit timestamp This includes two changes: - Addition of a new function pg_xact_commit_timestamp_origin() able, for a given transaction ID, to return the commit timestamp and replication origin of this transaction. An equivalent function existed in pglogical. - Addition of the replication origin to pg_last_committed_xact(). The commit timestamp manager includes already APIs able to return the replication origin of a transaction on top of its commit timestamp, but the code paths for replication origins were never stressed as those functions have never looked for a replication origin, and the SQL functions available have never included this information since their introduction in 73c986a. While on it, refactor a test of modules/commit_ts/ to use tstzrange() to check that a transaction timestamp is within the wanted range, making the test a bit easier to read. Bump catalog version. Author: Movead Li Reviewed-by: Madan Kumar, Michael Paquier Discussion: https://postgr.es/m/2020051116430836450630@highgo.ca --- .../modules/commit_ts/sql/commit_timestamp.sql | 35 +++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) (limited to 'src/test/modules/commit_ts/sql/commit_timestamp.sql') diff --git a/src/test/modules/commit_ts/sql/commit_timestamp.sql b/src/test/modules/commit_ts/sql/commit_timestamp.sql index 4e041a53473..4a8a6aa56ef 100644 --- a/src/test/modules/commit_ts/sql/commit_timestamp.sql +++ b/src/test/modules/commit_ts/sql/commit_timestamp.sql @@ -21,4 +21,37 @@ SELECT pg_xact_commit_timestamp('0'::xid); SELECT pg_xact_commit_timestamp('1'::xid); SELECT pg_xact_commit_timestamp('2'::xid); -SELECT x.xid::text::bigint > 0, x.timestamp > '-infinity'::timestamptz, x.timestamp <= now() FROM pg_last_committed_xact() x; +SELECT x.xid::text::bigint > 0 as xid_valid, + x.timestamp <@ tstzrange('-infinity'::timestamptz, now()) AS ts_in_range, + roident != 0 AS valid_roident + FROM pg_last_committed_xact() x; + +-- Test non-normal transaction ids. +SELECT * FROM pg_xact_commit_timestamp_origin(NULL); -- ok, NULL +SELECT * FROM pg_xact_commit_timestamp_origin('0'::xid); -- error +SELECT * FROM pg_xact_commit_timestamp_origin('1'::xid); -- ok, NULL +SELECT * FROM pg_xact_commit_timestamp_origin('2'::xid); -- ok, NULL + +-- Test transaction without replication origin +SELECT txid_current() as txid_no_origin \gset +SELECT x.timestamp <@ tstzrange('-infinity'::timestamptz, now()) AS ts_in_range, + roident != 0 AS valid_roident + FROM pg_last_committed_xact() x; +SELECT x.timestamp <@ tstzrange('-infinity'::timestamptz, now()) AS ts_in_range, + roident != 0 AS valid_roident + FROM pg_xact_commit_timestamp_origin(:'txid_no_origin') x; + +-- Test transaction with replication origin +SELECT pg_replication_origin_create('test_commit_ts: get_origin') != 0 + AS valid_roident; +SELECT pg_replication_origin_session_setup('test_commit_ts: get_origin'); +SELECT txid_current() as txid_with_origin \gset +SELECT x.timestamp <@ tstzrange('-infinity'::timestamptz, now()) AS ts_in_range, r.roname + FROM pg_last_committed_xact() x, pg_replication_origin r + WHERE r.roident = x.roident; +SELECT x.timestamp <@ tstzrange('-infinity'::timestamptz, now()) AS ts_in_range, r.roname + FROM pg_xact_commit_timestamp_origin(:'txid_with_origin') x, pg_replication_origin r + WHERE r.roident = x.roident; + +SELECT pg_replication_origin_session_reset(); +SELECT pg_replication_origin_drop('test_commit_ts: get_origin'); -- cgit v1.2.3