Commit6c8be59

committed

Revert "Fix isolation test to be less timing-dependent"

This reverts commit2268e6a. It turned out that inconsistency inthe report is still possible, so go back to the simpler formulation ofthe test and instead add an alternate expected output.Discussion:https://postgr.es/m/20180103193728.ysqpcp2xjnqpiep7@alvherre.pgsql

1 parent3e68686 commit6c8be59Copy full SHA for 6c8be59

File tree

+29

-18

lines changed

+29

-18

lines changed

Lines changed: 5 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,6 @@`
`1`		`-Parsed test spec with3 sessions`
	`1`	`+Parsed test spec with2 sessions`
`2`	`2`
`3`		`-starting permutation: s2l s1i s2i s3u`
`4`		`-pg_advisory_lock`
`5`		`-`
`6`		`-`
	`3`	`+starting permutation: s2l s1i s2i`
`7`	`4`	`step s2l: SELECT pg_advisory_lock(281457);`
`8`	`5`	`pg_advisory_lock`
`9`	`6`
`@@ -14,11 +11,9 @@ step s1i:`
`14`	`11`	`<waiting ...>`
`15`	`12`	`step s2i:`
`16`	`13`	`CREATE INDEX CONCURRENTLY mcic_two_pkey ON mcic_two (id)`
`17`		`-WHERE unlck() AND lck_shr(572814);`
`18`		`- <waiting ...>`
`19`		`-steps3u: SELECT unlck();`
	`14`	`+WHERE unlck();`
	`15`	`+`
	`16`	`+steps1i: <... completed>`
`20`	`17`	`unlck`
`21`	`18`
`22`	`19`	`t`
`23`		`-step s1i: <... completed>`
`24`		`-step s2i: <... completed>`

Lines changed: 20 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,20 @@`
	`1`	`+Parsed test spec with 2 sessions`
	`2`	`+`
	`3`	`+starting permutation: s2l s1i s2i`
	`4`	`+step s2l: SELECT pg_advisory_lock(281457);`
	`5`	`+pg_advisory_lock`
	`6`	`+`
	`7`	`+`
	`8`	`+step s1i:`
	`9`	`+CREATE INDEX CONCURRENTLY mcic_one_pkey ON mcic_one (id)`
	`10`	`+WHERE lck_shr(281457);`
	`11`	`+ <waiting ...>`
	`12`	`+step s2i:`
	`13`	`+CREATE INDEX CONCURRENTLY mcic_two_pkey ON mcic_two (id)`
	`14`	`+WHERE unlck();`
	`15`	`+ <waiting ...>`
	`16`	`+step s1i: <... completed>`
	`17`	`+step s2i: <... completed>`
	`18`	`+unlck`
	`19`	`+`
	`20`	`+t`

Lines changed: 4 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,19 +26,15 @@ session "s1"`
`26`	`26`	`step"s1i"{`
`27`	`27`	`CREATEINDEXCONCURRENTLYmcic_one_pkeyONmcic_one (id)`
`28`	`28`	`WHERElck_shr(281457);`
`29`		`-}`
`30`		`-step"s1u"{SELECTunlck(); }`
	`29`	`+}`
	`30`	`+teardown{SELECTunlck(); }`
`31`	`31`
`32`	`32`
`33`	`33`	`session"s2"`
`34`	`34`	`step"s2l" {SELECTpg_advisory_lock(281457); }`
`35`	`35`	`step"s2i"{`
`36`	`36`	`CREATEINDEXCONCURRENTLYmcic_two_pkeyONmcic_two (id)`
`37`		`-WHEREunlck()ANDlck_shr(572814);`
	`37`	`+WHEREunlck();`
`38`	`38`	`}`
`39`	`39`
`40`		`-session"s3"`
`41`		`-setup{SELECTpg_advisory_lock(572814); }`
`42`		`-step"s3u"{SELECTunlck(); }`
`43`		`-`
`44`		`-permutation"s2l""s1i""s2i""s3u"`
	`40`	`+permutation"s2l""s1i""s2i"`

Comments

(0)