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

git projects / postgresql.git / commitdiff

test_decoding: Protect against rare spurious test failures.

author Andres Freund <andres@anarazel.de>

2015年9月22日 13:33:30 +0000 (15:33 +0200)

committer Andres Freund <andres@anarazel.de>

2015年9月22日 13:39:46 +0000 (15:39 +0200)

A bunch of tests missed specifying that empty transactions shouldn't be
displayed. That causes problems when e.g. autovacuum runs in an
unfortunate moment. The tests in question only run for a very short
time, making this quite unlikely.

Reported-By: Buildfarm member axolotl
Backpatch: 9.4, where logical decoding was introduced

contrib/test_decoding/expected/binary.out patch | blob | blame | history

contrib/test_decoding/sql/binary.sql patch | blob | blame | history

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

index 6d307491f06df7714ab5f7d6e788c4edae732dfd..d0949201003d6ab191ac4d2bd201994a53f95521 100644 (file)

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

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

@@ -7,22 +7,22 @@ SELECT 'init' FROM pg_create_logical_replication_slot('regression_slot', 'test_d

(1 row)

-- succeeds, textual plugin, textual consumer

-SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'force-binary', '0');

+SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'force-binary', '0', 'skip-empty-xacts', '1');

data

------

(0 rows)

-- fails, binary plugin, textual consumer

-SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'force-binary', '1');

+SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'force-binary', '1', 'skip-empty-xacts', '1');

ERROR: logical decoding output plugin "test_decoding" produces binary output, but "pg_logical_slot_get_changes(name,pg_lsn,integer,text[])" expects textual data

-- succeeds, textual plugin, binary consumer

-SELECT data FROM pg_logical_slot_get_binary_changes('regression_slot', NULL, NULL, 'force-binary', '0');

+SELECT data FROM pg_logical_slot_get_binary_changes('regression_slot', NULL, NULL, 'force-binary', '0', 'skip-empty-xacts', '1');

data

------

(0 rows)

-- succeeds, binary plugin, binary consumer

-SELECT data FROM pg_logical_slot_get_binary_changes('regression_slot', NULL, NULL, 'force-binary', '1');

+SELECT data FROM pg_logical_slot_get_binary_changes('regression_slot', NULL, NULL, 'force-binary', '1', 'skip-empty-xacts', '1');

data

------

(0 rows)

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

index 619f00b3bc8c964c09c7d3c11c05f0dcf585f4ea..df1c5fbd4226313af6fb0284bc7320d4d56a6010 100644 (file)

--- a/contrib/test_decoding/sql/binary.sql

+++ b/contrib/test_decoding/sql/binary.sql

@@ -3,12 +3,12 @@ SET synchronous_commit = on;

SELECT 'init' FROM pg_create_logical_replication_slot('regression_slot', 'test_decoding');

-- succeeds, textual plugin, textual consumer

-SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'force-binary', '0');

+SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'force-binary', '0', 'skip-empty-xacts', '1');

-- fails, binary plugin, textual consumer

-SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'force-binary', '1');

+SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'force-binary', '1', 'skip-empty-xacts', '1');

-- succeeds, textual plugin, binary consumer

-SELECT data FROM pg_logical_slot_get_binary_changes('regression_slot', NULL, NULL, 'force-binary', '0');

+SELECT data FROM pg_logical_slot_get_binary_changes('regression_slot', NULL, NULL, 'force-binary', '0', 'skip-empty-xacts', '1');

-- succeeds, binary plugin, binary consumer

-SELECT data FROM pg_logical_slot_get_binary_changes('regression_slot', NULL, NULL, 'force-binary', '1');

+SELECT data FROM pg_logical_slot_get_binary_changes('regression_slot', NULL, NULL, 'force-binary', '1', 'skip-empty-xacts', '1');

SELECT 'init' FROM pg_drop_replication_slot('regression_slot');

This is the main PostgreSQL git repository.

RSS Atom