NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitb1aa0f2

committed

Improve display of query results in isolation tests.

Previously, isolationtester displayed SQL query results using somead-hoc code that clearly hadn't had much effort expended on it.Field values longer than 14 characters weren't separated fromthe next field, and usually caused misalignment of the columnstoo. Also there was no visual separation of a query's resultfrom subsequent isolationtester output. This made test resultfiles confusing and hard to read.To improve matters, let's use libpq's PQprint() function. Althoughthat's long since unused by psql, it's still plenty good enoughfor the purpose here.Like741d7f1, back-patch to all supported branches, so that thisisn't a stumbling block for back-patching isolation test changes.Discussion:https://postgr.es/m/582362.1623798221@sss.pgh.pa.us

1 parenta1417e4 commitb1aa0f2Copy full SHA for b1aa0f2

File tree

89 files changed

+31889

-13059

lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+31889

-13059

lines changed

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

Lines changed: 418 additions & 258 deletions

Large diffs are not rendered by default.

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

Lines changed: 26 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,33 +6,45 @@ step s1w: INSERT INTO do_write DEFAULT VALUES;`
`6`	`6`	`step s2init: SELECT 'init' FROM pg_create_logical_replication_slot('isolation_slot', 'test_decoding'); <waiting ...>`
`7`	`7`	`step s1c: COMMIT;`
`8`	`8`	`step s2init: <... completed>`
`9`		`-?column?`
	`9`	`+?column?`
	`10`	`+--------`
	`11`	`+init`
	`12`	`+(1 row)`
`10`	`13`
`11`		`-init`
`12`	`14`	`step s2start: SELECT data FROM pg_logical_slot_get_changes('isolation_slot', NULL, NULL, 'include-xids', 'false');`
`13`		`-data`
	`15`	`+data`
	`16`	`+----`
	`17`	`+(0 rows)`
`14`	`18`
`15`	`19`	`step s1b: BEGIN ISOLATION LEVEL SERIALIZABLE;`
`16`	`20`	`step s1w: INSERT INTO do_write DEFAULT VALUES;`
`17`	`21`	`step s1c: COMMIT;`
`18`	`22`	`step s2start: SELECT data FROM pg_logical_slot_get_changes('isolation_slot', NULL, NULL, 'include-xids', 'false');`
`19`		`-data`
`20`		`-`
`21`		`-BEGIN`
	`23`	`+data`
	`24`	`+--------------------------------------------`
	`25`	`+BEGIN`
`22`	`26`	`table public.do_write: INSERT: id[integer]:2`
`23`		`-COMMIT`
	`27`	`+COMMIT`
	`28`	`+(3 rows)`
	`29`	`+`
`24`	`30`	`step s1b: BEGIN ISOLATION LEVEL SERIALIZABLE;`
`25`	`31`	`step s1w: INSERT INTO do_write DEFAULT VALUES;`
`26`	`32`	`step s2start: SELECT data FROM pg_logical_slot_get_changes('isolation_slot', NULL, NULL, 'include-xids', 'false');`
`27`		`-data`
	`33`	`+data`
	`34`	`+----`
	`35`	`+(0 rows)`
`28`	`36`
`29`	`37`	`step s1c: COMMIT;`
`30`	`38`	`step s2start: SELECT data FROM pg_logical_slot_get_changes('isolation_slot', NULL, NULL, 'include-xids', 'false');`
`31`		`-data`
`32`		`-`
`33`		`-BEGIN`
	`39`	`+data`
	`40`	`+--------------------------------------------`
	`41`	`+BEGIN`
`34`	`42`	`table public.do_write: INSERT: id[integer]:3`
`35`		`-COMMIT`
`36`		`-?column?`
	`43`	`+COMMIT`
	`44`	`+(3 rows)`
	`45`	`+`
	`46`	`+?column?`
	`47`	`+--------`
	`48`	`+stop`
	`49`	`+(1 row)`
`37`	`50`
`38`		`-stop`

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

Lines changed: 52 additions & 28 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,65 +2,89 @@ Parsed test spec with 3 sessions`
`2`	`2`
`3`	`3`	`starting permutation: s0init s0start s1begin s1sharepgclass s2begin s2sharepgclass s0w s0start s2commit s1commit`
`4`	`4`	`step s0init: SELECT 'init' FROM pg_create_logical_replication_slot('isolation_slot', 'test_decoding');`
`5`		`-?column?`
	`5`	`+?column?`
	`6`	`+--------`
	`7`	`+init`
	`8`	`+(1 row)`
`6`	`9`
`7`		`-init`
`8`	`10`	`step s0start: SELECT data FROM pg_logical_slot_get_changes('isolation_slot', NULL, NULL, 'include-xids', 'false');`
`9`		`-data`
	`11`	`+data`
	`12`	`+----`
	`13`	`+(0 rows)`
`10`	`14`
`11`	`15`	`step s1begin: BEGIN;`
`12`	`16`	`step s1sharepgclass: SELECT count() > 1 FROM (SELECT FROM pg_class FOR SHARE) s;`
`13`		`-?column?`
	`17`	`+?column?`
	`18`	`+--------`
	`19`	`+t`
	`20`	`+(1 row)`
`14`	`21`
`15`		`-t`
`16`	`22`	`step s2begin: BEGIN;`
`17`	`23`	`step s2sharepgclass: SELECT count() > 1 FROM (SELECT FROM pg_class FOR SHARE) s;`
`18`		`-?column?`
	`24`	`+?column?`
	`25`	`+--------`
	`26`	`+t`
	`27`	`+(1 row)`
`19`	`28`
`20`		`-t`
`21`	`29`	`step s0w: INSERT INTO do_write DEFAULT VALUES;`
`22`	`30`	`step s0start: SELECT data FROM pg_logical_slot_get_changes('isolation_slot', NULL, NULL, 'include-xids', 'false');`
`23`		`-data`
`24`		`-`
`25`		`-BEGIN`
	`31`	`+data`
	`32`	`+--------------------------------------------`
	`33`	`+BEGIN`
`26`	`34`	`table public.do_write: INSERT: id[integer]:1`
`27`		`-COMMIT`
	`35`	`+COMMIT`
	`36`	`+(3 rows)`
	`37`	`+`
`28`	`38`	`step s2commit: COMMIT;`
`29`	`39`	`step s1commit: COMMIT;`
`30`		`-?column?`
	`40`	`+?column?`
	`41`	`+--------`
	`42`	`+stop`
	`43`	`+(1 row)`
`31`	`44`
`32`		`-stop`
`33`	`45`
`34`	`46`	`starting permutation: s0init s0start s1begin s1keysharepgclass s2begin s2keysharepgclass s0alter s0w s0start s2commit s1commit`
`35`	`47`	`step s0init: SELECT 'init' FROM pg_create_logical_replication_slot('isolation_slot', 'test_decoding');`
`36`		`-?column?`
	`48`	`+?column?`
	`49`	`+--------`
	`50`	`+init`
	`51`	`+(1 row)`
`37`	`52`
`38`		`-init`
`39`	`53`	`step s0start: SELECT data FROM pg_logical_slot_get_changes('isolation_slot', NULL, NULL, 'include-xids', 'false');`
`40`		`-data`
	`54`	`+data`
	`55`	`+----`
	`56`	`+(0 rows)`
`41`	`57`
`42`	`58`	`step s1begin: BEGIN;`
`43`	`59`	`step s1keysharepgclass: SELECT count() > 1 FROM (SELECT FROM pg_class FOR KEY SHARE) s;`
`44`		`-?column?`
	`60`	`+?column?`
	`61`	`+--------`
	`62`	`+t`
	`63`	`+(1 row)`
`45`	`64`
`46`		`-t`
`47`	`65`	`step s2begin: BEGIN;`
`48`	`66`	`step s2keysharepgclass: SELECT count() > 1 FROM (SELECT FROM pg_class FOR KEY SHARE) s;`
`49`		`-?column?`
	`67`	`+?column?`
	`68`	`+--------`
	`69`	`+t`
	`70`	`+(1 row)`
`50`	`71`
`51`		`-t`
`52`	`72`	`step s0alter: ALTER TABLE do_write ADD column ts timestamptz;`
`53`	`73`	`step s0w: INSERT INTO do_write DEFAULT VALUES;`
`54`	`74`	`step s0start: SELECT data FROM pg_logical_slot_get_changes('isolation_slot', NULL, NULL, 'include-xids', 'false');`
`55`		`-data`
`56`		`-`
`57`		`-BEGIN`
`58`		`-COMMIT`
`59`		`-BEGIN`
	`75`	`+data`
	`76`	`+------------------------------------------------------------------------------`
	`77`	`+BEGIN`
	`78`	`+COMMIT`
	`79`	`+BEGIN`
`60`	`80`	`table public.do_write: INSERT: id[integer]:1 ts[timestamp with time zone]:null`
`61`		`-COMMIT`
	`81`	`+COMMIT`
	`82`	`+(5 rows)`
	`83`	`+`
`62`	`84`	`step s2commit: COMMIT;`
`63`	`85`	`step s1commit: COMMIT;`
`64`		`-?column?`
	`86`	`+?column?`
	`87`	`+--------`
	`88`	`+stop`
	`89`	`+(1 row)`
`65`	`90`
`66`		`-stop`

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

Lines changed: 20 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,28 +3,38 @@ Parsed test spec with 2 sessions`
`3`	`3`	`starting permutation: s0_begin s0_getxid s1_begin s1_insert s0_alter s0_commit s0_checkpoint s0_get_changes s0_get_changes s1_commit s0_vacuum s0_get_changes`
`4`	`4`	`step s0_begin: BEGIN;`
`5`	`5`	`step s0_getxid: SELECT txid_current() IS NULL;`
`6`		`-?column?`
	`6`	`+?column?`
	`7`	`+--------`
	`8`	`+f`
	`9`	`+(1 row)`
`7`	`10`
`8`		`-f`
`9`	`11`	`step s1_begin: BEGIN;`
`10`	`12`	`step s1_insert: INSERT INTO harvest VALUES ((1, 2, 3));`
`11`	`13`	`step s0_alter: ALTER TYPE basket DROP ATTRIBUTE mangos;`
`12`	`14`	`step s0_commit: COMMIT;`
`13`	`15`	`step s0_checkpoint: CHECKPOINT;`
`14`	`16`	`step s0_get_changes: SELECT data FROM pg_logical_slot_get_changes('isolation_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1');`
`15`		`-data`
	`17`	`+data`
	`18`	`+----`
	`19`	`+(0 rows)`
`16`	`20`
`17`	`21`	`step s0_get_changes: SELECT data FROM pg_logical_slot_get_changes('isolation_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1');`
`18`		`-data`
	`22`	`+data`
	`23`	`+----`
	`24`	`+(0 rows)`
`19`	`25`
`20`	`26`	`step s1_commit: COMMIT;`
`21`	`27`	`step s0_vacuum: VACUUM pg_attribute;`
`22`	`28`	`step s0_get_changes: SELECT data FROM pg_logical_slot_get_changes('isolation_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1');`
`23`		`-data`
`24`		`-`
`25`		`-BEGIN`
	`29`	`+data`
	`30`	`+------------------------------------------------------`
	`31`	`+BEGIN`
`26`	`32`	`table public.harvest: INSERT: fruits[basket]:'(1,2,3)'`
`27`		`-COMMIT`
`28`		`-?column?`
	`33`	`+COMMIT`
	`34`	`+(3 rows)`
	`35`	`+`
	`36`	`+?column?`
	`37`	`+--------`
	`38`	`+stop`
	`39`	`+(1 row)`
`29`	`40`
`30`		`-stop`

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

Lines changed: 37 additions & 23 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,50 +3,64 @@ Parsed test spec with 3 sessions`
`3`	`3`	`starting permutation: s2b s2txid s1init s3b s3txid s2alter s2c s2b s2txid s3c s2c s1insert s1checkpoint s1start s1insert s1alter s1insert s1start`
`4`	`4`	`step s2b: BEGIN;`
`5`	`5`	`step s2txid: SELECT txid_current() IS NULL;`
`6`		`-?column?`
	`6`	`+?column?`
	`7`	`+--------`
	`8`	`+f`
	`9`	`+(1 row)`
`7`	`10`
`8`		`-f`
`9`	`11`	`step s1init: SELECT 'init' FROM pg_create_logical_replication_slot('isolation_slot', 'test_decoding'); <waiting ...>`
`10`	`12`	`step s3b: BEGIN;`
`11`	`13`	`step s3txid: SELECT txid_current() IS NULL;`
`12`		`-?column?`
	`14`	`+?column?`
	`15`	`+--------`
	`16`	`+f`
	`17`	`+(1 row)`
`13`	`18`
`14`		`-f`
`15`	`19`	`step s2alter: ALTER TABLE do_write ADD COLUMN addedbys2 int;`
`16`	`20`	`step s2c: COMMIT;`
`17`	`21`	`step s2b: BEGIN;`
`18`	`22`	`step s2txid: SELECT txid_current() IS NULL;`
`19`		`-?column?`
	`23`	`+?column?`
	`24`	`+--------`
	`25`	`+f`
	`26`	`+(1 row)`
`20`	`27`
`21`		`-f`
`22`	`28`	`step s3c: COMMIT;`
`23`	`29`	`step s1init: <... completed>`
`24`		`-?column?`
	`30`	`+?column?`
	`31`	`+--------`
	`32`	`+init`
	`33`	`+(1 row)`
`25`	`34`
`26`		`-init`
`27`	`35`	`step s2c: COMMIT;`
`28`	`36`	`step s1insert: INSERT INTO do_write DEFAULT VALUES;`
`29`	`37`	`step s1checkpoint: CHECKPOINT;`
`30`	`38`	`step s1start: SELECT data FROM pg_logical_slot_get_changes('isolation_slot', NULL, NULL, 'include-xids', 'false');`
`31`		`-data`
`32`		`-`
`33`		`-BEGIN`
	`39`	`+data`
	`40`	`+--------------------------------------------------------------------`
	`41`	`+BEGIN`
`34`	`42`	`table public.do_write: INSERT: id[integer]:1 addedbys2[integer]:null`
`35`		`-COMMIT`
	`43`	`+COMMIT`
	`44`	`+(3 rows)`
	`45`	`+`
`36`	`46`	`step s1insert: INSERT INTO do_write DEFAULT VALUES;`
`37`	`47`	`step s1alter: ALTER TABLE do_write ADD COLUMN addedbys1 int;`
`38`	`48`	`step s1insert: INSERT INTO do_write DEFAULT VALUES;`
`39`	`49`	`step s1start: SELECT data FROM pg_logical_slot_get_changes('isolation_slot', NULL, NULL, 'include-xids', 'false');`
`40`		`-data`
`41`		`-`
`42`		`-BEGIN`
`43`		`-table public.do_write: INSERT: id[integer]:2 addedbys2[integer]:null`
`44`		`-COMMIT`
`45`		`-BEGIN`
`46`		`-COMMIT`
`47`		`-BEGIN`
	`50`	`+data`
	`51`	`+--------------------------------------------------------------------------------------------`
	`52`	`+BEGIN`
	`53`	`+table public.do_write: INSERT: id[integer]:2 addedbys2[integer]:null`
	`54`	`+COMMIT`
	`55`	`+BEGIN`
	`56`	`+COMMIT`
	`57`	`+BEGIN`
`48`	`58`	`table public.do_write: INSERT: id[integer]:3 addedbys2[integer]:null addedbys1[integer]:null`
`49`		`-COMMIT`
`50`		`-?column?`
	`59`	`+COMMIT`
	`60`	`+(8 rows)`
	`61`	`+`
	`62`	`+?column?`
	`63`	`+--------`
	`64`	`+stop`
	`65`	`+(1 row)`
`51`	`66`
`52`		`-stop`

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

Lines changed: 30 additions & 18 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,32 +4,40 @@ starting permutation: s0_begin s0_begin_sub0 s0_log_assignment s0_sub_get_base_s`
`4`	`4`	`step s0_begin: BEGIN;`
`5`	`5`	`step s0_begin_sub0: SAVEPOINT s0;`
`6`	`6`	`step s0_log_assignment: SELECT txid_current() IS NULL;`
`7`		`-?column?`
	`7`	`+?column?`
	`8`	`+--------`
	`9`	`+f`
	`10`	`+(1 row)`
`8`	`11`
`9`		`-f`
`10`	`12`	`step s0_sub_get_base_snap: INSERT INTO dummy VALUES (0);`
`11`	`13`	`step s1_produce_new_snap: ALTER TABLE harvest ADD COLUMN mangos int;`
`12`	`14`	`step s0_insert: INSERT INTO harvest VALUES (1, 2, 3);`
`13`	`15`	`step s0_end_sub0: RELEASE SAVEPOINT s0;`
`14`	`16`	`step s0_commit: COMMIT;`
`15`	`17`	`step s0_get_changes: SELECT data FROM pg_logical_slot_get_changes('isolation_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1');`
`16`		`-data`
`17`		`-`
`18`		`-BEGIN`
`19`		`-table public.dummy: INSERT: i[integer]:0`
	`18`	`+data`
	`19`	`+----------------------------------------------------------------------------------`
	`20`	`+BEGIN`
	`21`	`+table public.dummy: INSERT: i[integer]:0`
`20`	`22`	`table public.harvest: INSERT: apples[integer]:1 pears[integer]:2 mangos[integer]:3`
`21`		`-COMMIT`
`22`		`-?column?`
	`23`	`+COMMIT`
	`24`	`+(4 rows)`
	`25`	`+`
	`26`	`+?column?`
	`27`	`+--------`
	`28`	`+stop`
	`29`	`+(1 row)`
`23`	`30`
`24`		`-stop`
`25`	`31`
`26`	`32`	`starting permutation: s0_begin s0_begin_sub0 s0_log_assignment s0_begin_sub1 s0_sub_get_base_snap s1_produce_new_snap s0_insert s0_end_sub1 s0_end_sub0 s0_commit s0_get_changes`
`27`	`33`	`step s0_begin: BEGIN;`
`28`	`34`	`step s0_begin_sub0: SAVEPOINT s0;`
`29`	`35`	`step s0_log_assignment: SELECT txid_current() IS NULL;`
`30`		`-?column?`
	`36`	`+?column?`
	`37`	`+--------`
	`38`	`+f`
	`39`	`+(1 row)`
`31`	`40`
`32`		`-f`
`33`	`41`	`step s0_begin_sub1: SAVEPOINT s1;`
`34`	`42`	`step s0_sub_get_base_snap: INSERT INTO dummy VALUES (0);`
`35`	`43`	`step s1_produce_new_snap: ALTER TABLE harvest ADD COLUMN mangos int;`
`@@ -38,12 +46,16 @@ step s0_end_sub1: RELEASE SAVEPOINT s1;`
`38`	`46`	`step s0_end_sub0: RELEASE SAVEPOINT s0;`
`39`	`47`	`step s0_commit: COMMIT;`
`40`	`48`	`step s0_get_changes: SELECT data FROM pg_logical_slot_get_changes('isolation_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1');`
`41`		`-data`
`42`		`-`
`43`		`-BEGIN`
`44`		`-table public.dummy: INSERT: i[integer]:0`
	`49`	`+data`
	`50`	`+----------------------------------------------------------------------------------`
	`51`	`+BEGIN`
	`52`	`+table public.dummy: INSERT: i[integer]:0`
`45`	`53`	`table public.harvest: INSERT: apples[integer]:1 pears[integer]:2 mangos[integer]:3`
`46`		`-COMMIT`
`47`		`-?column?`
	`54`	`+COMMIT`
	`55`	`+(4 rows)`
	`56`	`+`
	`57`	`+?column?`
	`58`	`+--------`
	`59`	`+stop`
	`60`	`+(1 row)`
`48`	`61`
`49`		`-stop`

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!

Commitb1aa0f2

File tree

89 files changed

Some content is hidden

89 files changed

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

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

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

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

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

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

0 commit comments