NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitb2694ae

committed

Reduce test runtime of src/test/modules/snapshot_too_old.

The sto_using_cursor and sto_using_select tests were coded to exerciseevery permutation of their test steps, but AFAICS there is no value inexercising more than one. This matters because each permutation costsabout six seconds, thanks to the "pg_sleep(6)". Perhaps we couldreduce that, but the useless permutations seem worth getting rid ofin any case. (Note that sto_using_hash_index got it right already.)While here, clean up some other sloppiness such as an unused table.This doesn't make too much difference in interactive testing, since thewasted time is typically masked by parallelization with other tests.However, the buildfarm runs this as a serial step, which means we canexpect to shave ~40 seconds from every buildfarm run. That makes itworth back-patching.Discussion:https://postgr.es/m/2515192.1659454702@sss.pgh.pa.us

1 parent6b67db1 commitb2694aeCopy full SHA for b2694ae

File tree

4 files changed

-137

lines changed

src/test/modules/snapshot_too_old
- expected
  - sto_using_cursor.out
  - sto_using_select.out
- specs
  - sto_using_cursor.spec
  - sto_using_select.spec

4 files changed

-137

lines changed

`‎src/test/modules/snapshot_too_old/expected/sto_using_cursor.out`

Lines changed: 0 additions & 76 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,27 +1,5 @@`
`1`	`1`	`Parsed test spec with 2 sessions`
`2`	`2`
`3`		`-starting permutation: s1decl s1f1 s1sleep s1f2 s2u`
`4`		`-step s1decl: DECLARE cursor1 CURSOR FOR SELECT c FROM sto1;`
`5`		`-step s1f1: FETCH FIRST FROM cursor1;`
`6`		`-c`
`7`		`--`
`8`		`-1`
`9`		`-(1 row)`
`10`		`-`
`11`		`-step s1sleep: SELECT setting, pg_sleep(6) FROM pg_settings WHERE name = 'old_snapshot_threshold';`
`12`		`-setting\|pg_sleep`
`13`		`--------+--------`
`14`		`- 0\|`
`15`		`-(1 row)`
`16`		`-`
`17`		`-step s1f2: FETCH FIRST FROM cursor1;`
`18`		`-c`
`19`		`--`
`20`		`-1`
`21`		`-(1 row)`
`22`		`-`
`23`		`-step s2u: UPDATE sto1 SET c = 1001 WHERE c = 1;`
`24`		`-`
`25`	`3`	`starting permutation: s1decl s1f1 s1sleep s2u s1f2`
`26`	`4`	`step s1decl: DECLARE cursor1 CURSOR FOR SELECT c FROM sto1;`
`27`	`5`	`step s1f1: FETCH FIRST FROM cursor1;`
`@@ -39,57 +17,3 @@ setting\|pg_sleep`
`39`	`17`	`step s2u: UPDATE sto1 SET c = 1001 WHERE c = 1;`
`40`	`18`	`step s1f2: FETCH FIRST FROM cursor1;`
`41`	`19`	`ERROR: snapshot too old`
`42`		`-`
`43`		`-starting permutation: s1decl s1f1 s2u s1sleep s1f2`
`44`		`-step s1decl: DECLARE cursor1 CURSOR FOR SELECT c FROM sto1;`
`45`		`-step s1f1: FETCH FIRST FROM cursor1;`
`46`		`-c`
`47`		`--`
`48`		`-1`
`49`		`-(1 row)`
`50`		`-`
`51`		`-step s2u: UPDATE sto1 SET c = 1001 WHERE c = 1;`
`52`		`-step s1sleep: SELECT setting, pg_sleep(6) FROM pg_settings WHERE name = 'old_snapshot_threshold';`
`53`		`-setting\|pg_sleep`
`54`		`--------+--------`
`55`		`- 0\|`
`56`		`-(1 row)`
`57`		`-`
`58`		`-step s1f2: FETCH FIRST FROM cursor1;`
`59`		`-ERROR: snapshot too old`
`60`		`-`
`61`		`-starting permutation: s1decl s2u s1f1 s1sleep s1f2`
`62`		`-step s1decl: DECLARE cursor1 CURSOR FOR SELECT c FROM sto1;`
`63`		`-step s2u: UPDATE sto1 SET c = 1001 WHERE c = 1;`
`64`		`-step s1f1: FETCH FIRST FROM cursor1;`
`65`		`-c`
`66`		`--`
`67`		`-1`
`68`		`-(1 row)`
`69`		`-`
`70`		`-step s1sleep: SELECT setting, pg_sleep(6) FROM pg_settings WHERE name = 'old_snapshot_threshold';`
`71`		`-setting\|pg_sleep`
`72`		`--------+--------`
`73`		`- 0\|`
`74`		`-(1 row)`
`75`		`-`
`76`		`-step s1f2: FETCH FIRST FROM cursor1;`
`77`		`-ERROR: snapshot too old`
`78`		`-`
`79`		`-starting permutation: s2u s1decl s1f1 s1sleep s1f2`
`80`		`-step s2u: UPDATE sto1 SET c = 1001 WHERE c = 1;`
`81`		`-step s1decl: DECLARE cursor1 CURSOR FOR SELECT c FROM sto1;`
`82`		`-step s1f1: FETCH FIRST FROM cursor1;`
`83`		`-c`
`84`		`--`
`85`		`-2`
`86`		`-(1 row)`
`87`		`-`
`88`		`-step s1sleep: SELECT setting, pg_sleep(6) FROM pg_settings WHERE name = 'old_snapshot_threshold';`
`89`		`-setting\|pg_sleep`
`90`		`--------+--------`
`91`		`- 0\|`
`92`		`-(1 row)`
`93`		`-`
`94`		`-step s1f2: FETCH FIRST FROM cursor1;`
`95`		`-ERROR: snapshot too old`

`‎src/test/modules/snapshot_too_old/expected/sto_using_select.out`

Lines changed: 0 additions & 55 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,26 +1,5 @@`
`1`	`1`	`Parsed test spec with 2 sessions`
`2`	`2`
`3`		`-starting permutation: s1f1 s1sleep s1f2 s2u`
`4`		`-step s1f1: SELECT c FROM sto1 ORDER BY c LIMIT 1;`
`5`		`-c`
`6`		`--`
`7`		`-1`
`8`		`-(1 row)`
`9`		`-`
`10`		`-step s1sleep: SELECT setting, pg_sleep(6) FROM pg_settings WHERE name = 'old_snapshot_threshold';`
`11`		`-setting\|pg_sleep`
`12`		`--------+--------`
`13`		`- 0\|`
`14`		`-(1 row)`
`15`		`-`
`16`		`-step s1f2: SELECT c FROM sto1 ORDER BY c LIMIT 1;`
`17`		`-c`
`18`		`--`
`19`		`-1`
`20`		`-(1 row)`
`21`		`-`
`22`		`-step s2u: UPDATE sto1 SET c = 1001 WHERE c = 1;`
`23`		`-`
`24`	`3`	`starting permutation: s1f1 s1sleep s2u s1f2`
`25`	`4`	`step s1f1: SELECT c FROM sto1 ORDER BY c LIMIT 1;`
`26`	`5`	`c`
`@@ -37,37 +16,3 @@ setting\|pg_sleep`
`37`	`16`	`step s2u: UPDATE sto1 SET c = 1001 WHERE c = 1;`
`38`	`17`	`step s1f2: SELECT c FROM sto1 ORDER BY c LIMIT 1;`
`39`	`18`	`ERROR: snapshot too old`
`40`		`-`
`41`		`-starting permutation: s1f1 s2u s1sleep s1f2`
`42`		`-step s1f1: SELECT c FROM sto1 ORDER BY c LIMIT 1;`
`43`		`-c`
`44`		`--`
`45`		`-1`
`46`		`-(1 row)`
`47`		`-`
`48`		`-step s2u: UPDATE sto1 SET c = 1001 WHERE c = 1;`
`49`		`-step s1sleep: SELECT setting, pg_sleep(6) FROM pg_settings WHERE name = 'old_snapshot_threshold';`
`50`		`-setting\|pg_sleep`
`51`		`--------+--------`
`52`		`- 0\|`
`53`		`-(1 row)`
`54`		`-`
`55`		`-step s1f2: SELECT c FROM sto1 ORDER BY c LIMIT 1;`
`56`		`-ERROR: snapshot too old`
`57`		`-`
`58`		`-starting permutation: s2u s1f1 s1sleep s1f2`
`59`		`-step s2u: UPDATE sto1 SET c = 1001 WHERE c = 1;`
`60`		`-step s1f1: SELECT c FROM sto1 ORDER BY c LIMIT 1;`
`61`		`-c`
`62`		`--`
`63`		`-2`
`64`		`-(1 row)`
`65`		`-`
`66`		`-step s1sleep: SELECT setting, pg_sleep(6) FROM pg_settings WHERE name = 'old_snapshot_threshold';`
`67`		`-setting\|pg_sleep`
`68`		`--------+--------`
`69`		`- 0\|`
`70`		`-(1 row)`
`71`		`-`
`72`		`-step s1f2: SELECT c FROM sto1 ORDER BY c LIMIT 1;`
`73`		`-ERROR: snapshot too old`

`‎src/test/modules/snapshot_too_old/specs/sto_using_cursor.spec`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,14 +6,13 @@`
`6`	`6`	`# granularity is in minutes.`
`7`	`7`	`#`
`8`	`8`	`# Since results depend on the value of old_snapshot_threshold, sneak that into`
`9`		`-# the line generated by the sleep, so that a surprisingvalues isn't so hard`
	`9`	`+# the line generated by the sleep, so that a surprisingvalue isn't so hard`
`10`	`10`	`# to identify.`
`11`	`11`
`12`	`12`	`setup`
`13`	`13`	`{`
`14`	`14`	`CREATETABLEsto1(cintNOTNULL);`
`15`	`15`	`INSERTINTOsto1SELECTgenerate_series(1,1000);`
`16`		`-CREATETABLEsto2 (cintNOTNULL);`
`17`	`16`	`}`
`18`	`17`	`setup`
`19`	`18`	`{`
`@@ -22,7 +21,7 @@ setup`
`22`	`21`
`23`	`22`	`teardown`
`24`	`23`	`{`
`25`		`-DROPTABLEsto1,sto2;`
	`24`	`+DROPTABLEsto1;`
`26`	`25`	`}`
`27`	`26`
`28`	`27`	`session"s1"`
`@@ -35,3 +34,5 @@ teardown{ COMMIT; }`
`35`	`34`
`36`	`35`	`session"s2"`
`37`	`36`	`step"s2u"{UPDATEsto1SETc=1001WHEREc=1;}`
	`37`	`+`
	`38`	`+permutation"s1decl""s1f1""s1sleep""s2u""s1f2"`

`‎src/test/modules/snapshot_too_old/specs/sto_using_select.spec`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,14 +6,13 @@`
`6`	`6`	`# granularity is in minutes.`
`7`	`7`	`#`
`8`	`8`	`# Since results depend on the value of old_snapshot_threshold, sneak that into`
`9`		`-# the line generated by the sleep, so that a surprisingvalues isn't so hard`
	`9`	`+# the line generated by the sleep, so that a surprisingvalue isn't so hard`
`10`	`10`	`# to identify.`
`11`	`11`
`12`	`12`	`setup`
`13`	`13`	`{`
`14`	`14`	`CREATETABLEsto1 (cintNOTNULL);`
`15`	`15`	`INSERTINTOsto1SELECTgenerate_series(1,1000);`
`16`		`-CREATETABLEsto2 (cintNOTNULL);`
`17`	`16`	`}`
`18`	`17`	`setup`
`19`	`18`	`{`
`@@ -22,7 +21,7 @@ setup`
`22`	`21`
`23`	`22`	`teardown`
`24`	`23`	`{`
`25`		`-DROPTABLEsto1,sto2;`
	`24`	`+DROPTABLEsto1;`
`26`	`25`	`}`
`27`	`26`
`28`	`27`	`session"s1"`
`@@ -34,3 +33,5 @@ teardown{ COMMIT; }`
`34`	`33`
`35`	`34`	`session"s2"`
`36`	`35`	`step"s2u"{UPDATEsto1SETc=1001WHEREc=1; }`
	`36`	`+`
	`37`	`+permutation"s1f1""s1sleep""s2u""s1f2"`

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!

Commitb2694ae

File tree

4 files changed

4 files changed

`‎src/test/modules/snapshot_too_old/expected/sto_using_cursor.out`

`‎src/test/modules/snapshot_too_old/expected/sto_using_select.out`

`‎src/test/modules/snapshot_too_old/specs/sto_using_cursor.spec`

`‎src/test/modules/snapshot_too_old/specs/sto_using_select.spec`

0 commit comments