git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/contrib/test_decoding/expected/twophase.out b/contrib/test_decoding/expected/twophase.out

index f9f6bedd1cffbed605b81cf0b11f11fa77f6054f..afa35669795c70600d99c8e5a5fda72a65c7f050 100644 (file)

--- a/contrib/test_decoding/expected/twophase.out

+++ b/contrib/test_decoding/expected/twophase.out

test_prepared1 | relation | AccessExclusiveLock

(3 rows)

--- The above CLUSTER command shouldn't cause a timeout on 2pc decoding. The

--- call should return within a second.

-SET statement_timeout = '1s';

+-- The above CLUSTER command shouldn't cause a timeout on 2pc decoding.

+SET statement_timeout = '180s';

SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'two-phase-commit', '1', 'include-xids', '0', 'skip-empty-xacts', '1');

data

---------------------------------------------------------------------------

diff --git a/contrib/test_decoding/sql/twophase.sql b/contrib/test_decoding/sql/twophase.sql

index 894e4f5baf15e74c677a20d4528642fd58c0821f..dacedfe1814e4df6a3d87f114e2bf5254b03cf5c 100644 (file)

--- a/contrib/test_decoding/sql/twophase.sql

+++ b/contrib/test_decoding/sql/twophase.sql

FROM pg_locks

WHERE locktype = 'relation'

AND relation = 'test_prepared1'::regclass;

--- The above CLUSTER command shouldn't cause a timeout on 2pc decoding. The

--- call should return within a second.

-SET statement_timeout = '1s';

+-- The above CLUSTER command shouldn't cause a timeout on 2pc decoding.

+SET statement_timeout = '180s';

SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'two-phase-commit', '1', 'include-xids', '0', 'skip-empty-xacts', '1');

RESET statement_timeout;

COMMIT PREPARED 'test_prepared_lock';