From 0916eba131530b296f86137759a32f66ffedff7b Mon Sep 17 00:00:00 2001 From: Noah Misch Date: Mon, 15 Dec 2014 20:56:09 -0500 Subject: Fix commit_ts test suite for systems with coarse timestamp granularity. Noticed on a couple of Windows configurations. Petr Jelinek, reviewed by Michael Paquier. --- src/test/modules/commit_ts/expected/commit_timestamp.out | 4 ++-- src/test/modules/commit_ts/expected/commit_timestamp_1.out | 4 ++-- src/test/modules/commit_ts/sql/commit_timestamp.sql | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/test/modules/commit_ts') diff --git a/src/test/modules/commit_ts/expected/commit_timestamp.out b/src/test/modules/commit_ts/expected/commit_timestamp.out index e40e28cdfb8..99f3322c421 100644 --- a/src/test/modules/commit_ts/expected/commit_timestamp.out +++ b/src/test/modules/commit_ts/expected/commit_timestamp.out @@ -13,7 +13,7 @@ INSERT INTO committs_test DEFAULT VALUES; INSERT INTO committs_test DEFAULT VALUES; SELECT id, pg_xact_commit_timestamp(xmin) >= ts, - pg_xact_commit_timestamp(xmin) < now(), + pg_xact_commit_timestamp(xmin) <= now(), pg_xact_commit_timestamp(xmin) - ts < '60s' -- 60s should give a lot of reserve FROM committs_test ORDER BY id; @@ -31,7 +31,7 @@ SELECT pg_xact_commit_timestamp('1'::xid); ERROR: cannot retrieve commit timestamp for transaction 1 SELECT pg_xact_commit_timestamp('2'::xid); ERROR: cannot retrieve commit timestamp for transaction 2 -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, x.timestamp > '-infinity'::timestamptz, x.timestamp <= now() FROM pg_last_committed_xact() x; ?column? | ?column? | ?column? ----------+----------+---------- t | t | t diff --git a/src/test/modules/commit_ts/expected/commit_timestamp_1.out b/src/test/modules/commit_ts/expected/commit_timestamp_1.out index 51f89c20bd0..a4253faa7b7 100644 --- a/src/test/modules/commit_ts/expected/commit_timestamp_1.out +++ b/src/test/modules/commit_ts/expected/commit_timestamp_1.out @@ -13,7 +13,7 @@ INSERT INTO committs_test DEFAULT VALUES; INSERT INTO committs_test DEFAULT VALUES; SELECT id, pg_xact_commit_timestamp(xmin) >= ts, - pg_xact_commit_timestamp(xmin) < now(), + pg_xact_commit_timestamp(xmin) <= now(), pg_xact_commit_timestamp(xmin) - ts < '60s' -- 60s should give a lot of reserve FROM committs_test ORDER BY id; @@ -29,6 +29,6 @@ HINT: Make sure the configuration parameter "track_commit_timestamp" is set. SELECT pg_xact_commit_timestamp('2'::xid); ERROR: could not get commit timestamp data HINT: Make sure the configuration parameter "track_commit_timestamp" is set. -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, x.timestamp > '-infinity'::timestamptz, x.timestamp <= now() FROM pg_last_committed_xact() x; ERROR: could not get commit timestamp data HINT: Make sure the configuration parameter "track_commit_timestamp" is set. diff --git a/src/test/modules/commit_ts/sql/commit_timestamp.sql b/src/test/modules/commit_ts/sql/commit_timestamp.sql index 9beb78a91d2..4e041a53473 100644 --- a/src/test/modules/commit_ts/sql/commit_timestamp.sql +++ b/src/test/modules/commit_ts/sql/commit_timestamp.sql @@ -10,7 +10,7 @@ INSERT INTO committs_test DEFAULT VALUES; SELECT id, pg_xact_commit_timestamp(xmin) >= ts, - pg_xact_commit_timestamp(xmin) < now(), + pg_xact_commit_timestamp(xmin) <= now(), pg_xact_commit_timestamp(xmin) - ts < '60s' -- 60s should give a lot of reserve FROM committs_test ORDER BY id; @@ -21,4 +21,4 @@ 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, x.timestamp > '-infinity'::timestamptz, x.timestamp <= now() FROM pg_last_committed_xact() x; -- cgit v1.2.3