NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit2050832

Amit Kapila

committed

Fix the unstable output of tests added by commit8fccf75.

The test cases added by that commit were trying to test the exact number oftimes a particular transaction has spilled. However, that number can vary ifany background transaction (say by autovacuum) happens in parallel to the maintransaction. So let's not try to verify the exact count.Author: Amit KapilaReviewed-by: Sawada MasahikoDiscussion:https://postgr.es/m/CA+fd4k5_pPAYRTDrO2PbtTOe0eHQpBvuqmCr8ic39uTNmR49Eg@mail.gmail.com

1 parent323ae00 commit2050832Copy full SHA for 2050832

File tree

2 files changed

+18

-14

lines changed

contrib/test_decoding
- expected
  - stats.out
- sql
  - stats.sql

2 files changed

+18

-14

lines changed

`‎contrib/test_decoding/expected/stats.out`

Lines changed: 11 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,23 +42,25 @@ $$ LANGUAGE plpgsql;`
`42`	`42`	`BEGIN;`
`43`	`43`	`INSERT INTO stats_test SELECT 'serialize-topbig--1:'\|\|g.i FROM generate_series(1, 5000) g(i);`
`44`	`44`	`COMMIT;`
`45`		`-SELECT count(*) FROM pg_logical_slot_peek_changes('regression_slot', NULL,NULL);`
	`45`	`+SELECT count(*) FROM pg_logical_slot_peek_changes('regression_slot', NULL,NULL, 'skip-empty-xacts', '1');`
`46`	`46`	`count`
`47`	`47`	`-------`
`48`		`-5006`
	`48`	`+5002`
`49`	`49`	`(1 row)`
`50`	`50`
`51`		`--- check stats, wait for stats collector to update.`
	`51`	`+-- Check stats, wait for the stats collector to update. We can't test the`
	`52`	`+-- exact stats count as that can vary if any background transaction (say by`
	`53`	`+-- autovacuum) happens in parallel to the main transaction.`
`52`	`54`	`SELECT wait_for_decode_stats(false);`
`53`	`55`	`wait_for_decode_stats`
`54`	`56`	`-----------------------`
`55`	`57`
`56`	`58`	`(1 row)`
`57`	`59`
`58`		`-SELECT name, spill_txns, spill_count FROM pg_stat_replication_slots;`
	`60`	`+SELECT name, spill_txns > 0 AS spill_txns, spill_count > 0 AS spill_count FROM pg_stat_replication_slots;`
`59`	`61`	`name \| spill_txns \| spill_count`
`60`	`62`	`-----------------+------------+-------------`
`61`		`- regression_slot \|1 \| 12`
	`63`	`+ regression_slot \|t \|t`
`62`	`64`	`(1 row)`
`63`	`65`
`64`	`66`	`-- reset the slot stats, and wait for stats collector to reset`
`@@ -81,10 +83,10 @@ SELECT name, spill_txns, spill_count FROM pg_stat_replication_slots;`
`81`	`83`	`(1 row)`
`82`	`84`
`83`	`85`	`-- decode and check stats again.`
`84`		`-SELECT count(*) FROM pg_logical_slot_peek_changes('regression_slot', NULL,NULL);`
	`86`	`+SELECT count(*) FROM pg_logical_slot_peek_changes('regression_slot', NULL,NULL, 'skip-empty-xacts', '1');`
`85`	`87`	`count`
`86`	`88`	`-------`
`87`		`-5006`
	`89`	`+5002`
`88`	`90`	`(1 row)`
`89`	`91`
`90`	`92`	`SELECT wait_for_decode_stats(false);`
`@@ -93,10 +95,10 @@ SELECT wait_for_decode_stats(false);`
`93`	`95`
`94`	`96`	`(1 row)`
`95`	`97`
`96`		`-SELECT name, spill_txns, spill_count FROM pg_stat_replication_slots;`
	`98`	`+SELECT name, spill_txns > 0 AS spill_txns, spill_count > 0 AS spill_count FROM pg_stat_replication_slots;`
`97`	`99`	`name \| spill_txns \| spill_count`
`98`	`100`	`-----------------+------------+-------------`
`99`		`- regression_slot \|1 \| 12`
	`101`	`+ regression_slot \|t \|t`
`100`	`102`	`(1 row)`
`101`	`103`
`102`	`104`	`DROP FUNCTION wait_for_decode_stats(bool);`

`‎contrib/test_decoding/sql/stats.sql`

Lines changed: 7 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -41,21 +41,23 @@ $$ LANGUAGE plpgsql;`
`41`	`41`	`BEGIN;`
`42`	`42`	`INSERT INTO stats_testSELECT'serialize-topbig--1:'\|\|g.iFROM generate_series(1,5000) g(i);`
`43`	`43`	`COMMIT;`
`44`		`-SELECTcount(*)FROM pg_logical_slot_peek_changes('regression_slot',NULL,NULL);`
	`44`	`+SELECTcount(*)FROM pg_logical_slot_peek_changes('regression_slot',NULL,NULL,'skip-empty-xacts','1');`
`45`	`45`
`46`		`--- check stats, wait for stats collector to update.`
	`46`	`+-- Check stats, wait for the stats collector to update. We can't test the`
	`47`	`+-- exact stats count as that can vary if any background transaction (say by`
	`48`	`+-- autovacuum) happens in parallel to the main transaction.`
`47`	`49`	`SELECT wait_for_decode_stats(false);`
`48`		`-SELECT name, spill_txns, spill_countFROM pg_stat_replication_slots;`
	`50`	`+SELECT name, spill_txns>0AS spill_txns, spill_count>0AS spill_countFROM pg_stat_replication_slots;`
`49`	`51`
`50`	`52`	`-- reset the slot stats, and wait for stats collector to reset`
`51`	`53`	`SELECT pg_stat_reset_replication_slot('regression_slot');`
`52`	`54`	`SELECT wait_for_decode_stats(true);`
`53`	`55`	`SELECT name, spill_txns, spill_countFROM pg_stat_replication_slots;`
`54`	`56`
`55`	`57`	`-- decode and check stats again.`
`56`		`-SELECTcount(*)FROM pg_logical_slot_peek_changes('regression_slot',NULL,NULL);`
	`58`	`+SELECTcount(*)FROM pg_logical_slot_peek_changes('regression_slot',NULL,NULL,'skip-empty-xacts','1');`
`57`	`59`	`SELECT wait_for_decode_stats(false);`
`58`		`-SELECT name, spill_txns, spill_countFROM pg_stat_replication_slots;`
	`60`	`+SELECT name, spill_txns>0AS spill_txns, spill_count>0AS spill_countFROM pg_stat_replication_slots;`
`59`	`61`
`60`	`62`	`DROPFUNCTION wait_for_decode_stats(bool);`
`61`	`63`	`DROPTABLE stats_test;`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit2050832

File tree

2 files changed

2 files changed

`‎contrib/test_decoding/expected/stats.out`

`‎contrib/test_decoding/sql/stats.sql`

0 commit comments