This is an automated email from the ASF dual-hosted git repository. maxyang pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudberry.git
commit 9c085803156520127ba8593f3e8a0664c53c920b Author: Tom Lane <[email protected]> AuthorDate: Wed Aug 3 11:14:55 2022 -0400 Reduce test runtime of src/test/modules/snapshot_too_old. The sto_using_cursor and sto_using_select tests were coded to exercise every permutation of their test steps, but AFAICS there is no value in exercising more than one. This matters because each permutation costs about six seconds, thanks to the "pg_sleep(6)". Perhaps we could reduce that, but the useless permutations seem worth getting rid of in 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 the wasted time is typically masked by parallelization with other tests. However, the buildfarm runs this as a serial step, which means we can expect to shave ~40 seconds from every buildfarm run. That makes it worth back-patching. Discussion: https://postgr.es/m/[email protected] --- .../snapshot_too_old/expected/sto_using_cursor.out | 76 ---------------------- .../snapshot_too_old/expected/sto_using_select.out | 55 ---------------- .../snapshot_too_old/specs/sto_using_cursor.spec | 7 +- .../snapshot_too_old/specs/sto_using_select.spec | 7 +- 4 files changed, 8 insertions(+), 137 deletions(-) diff --git a/src/test/modules/snapshot_too_old/expected/sto_using_cursor.out b/src/test/modules/snapshot_too_old/expected/sto_using_cursor.out index 4359bf2ed9..06fe4d0669 100644 --- a/src/test/modules/snapshot_too_old/expected/sto_using_cursor.out +++ b/src/test/modules/snapshot_too_old/expected/sto_using_cursor.out @@ -1,27 +1,5 @@ Parsed test spec with 2 sessions -starting permutation: s1decl s1f1 s1sleep s1f2 s2u -step s1decl: DECLARE cursor1 CURSOR FOR SELECT c FROM sto1; -step s1f1: FETCH FIRST FROM cursor1; -c -- -1 -(1 row) - -step s1sleep: SELECT setting, pg_sleep(6) FROM pg_settings WHERE name = 'old_snapshot_threshold'; -setting|pg_sleep --------+-------- - 0| -(1 row) - -step s1f2: FETCH FIRST FROM cursor1; -c -- -1 -(1 row) - -step s2u: UPDATE sto1 SET c = 1001 WHERE c = 1; - starting permutation: s1decl s1f1 s1sleep s2u s1f2 step s1decl: DECLARE cursor1 CURSOR FOR SELECT c FROM sto1; step s1f1: FETCH FIRST FROM cursor1; @@ -39,57 +17,3 @@ setting|pg_sleep step s2u: UPDATE sto1 SET c = 1001 WHERE c = 1; step s1f2: FETCH FIRST FROM cursor1; ERROR: snapshot too old - -starting permutation: s1decl s1f1 s2u s1sleep s1f2 -step s1decl: DECLARE cursor1 CURSOR FOR SELECT c FROM sto1; -step s1f1: FETCH FIRST FROM cursor1; -c -- -1 -(1 row) - -step s2u: UPDATE sto1 SET c = 1001 WHERE c = 1; -step s1sleep: SELECT setting, pg_sleep(6) FROM pg_settings WHERE name = 'old_snapshot_threshold'; -setting|pg_sleep --------+-------- - 0| -(1 row) - -step s1f2: FETCH FIRST FROM cursor1; -ERROR: snapshot too old - -starting permutation: s1decl s2u s1f1 s1sleep s1f2 -step s1decl: DECLARE cursor1 CURSOR FOR SELECT c FROM sto1; -step s2u: UPDATE sto1 SET c = 1001 WHERE c = 1; -step s1f1: FETCH FIRST FROM cursor1; -c -- -1 -(1 row) - -step s1sleep: SELECT setting, pg_sleep(6) FROM pg_settings WHERE name = 'old_snapshot_threshold'; -setting|pg_sleep --------+-------- - 0| -(1 row) - -step s1f2: FETCH FIRST FROM cursor1; -ERROR: snapshot too old - -starting permutation: s2u s1decl s1f1 s1sleep s1f2 -step s2u: UPDATE sto1 SET c = 1001 WHERE c = 1; -step s1decl: DECLARE cursor1 CURSOR FOR SELECT c FROM sto1; -step s1f1: FETCH FIRST FROM cursor1; -c -- -2 -(1 row) - -step s1sleep: SELECT setting, pg_sleep(6) FROM pg_settings WHERE name = 'old_snapshot_threshold'; -setting|pg_sleep --------+-------- - 0| -(1 row) - -step s1f2: FETCH FIRST FROM cursor1; -ERROR: snapshot too old diff --git a/src/test/modules/snapshot_too_old/expected/sto_using_select.out b/src/test/modules/snapshot_too_old/expected/sto_using_select.out index 3067e05454..e910e5c71e 100644 --- a/src/test/modules/snapshot_too_old/expected/sto_using_select.out +++ b/src/test/modules/snapshot_too_old/expected/sto_using_select.out @@ -1,26 +1,5 @@ Parsed test spec with 2 sessions -starting permutation: s1f1 s1sleep s1f2 s2u -step s1f1: SELECT c FROM sto1 ORDER BY c LIMIT 1; -c -- -1 -(1 row) - -step s1sleep: SELECT setting, pg_sleep(6) FROM pg_settings WHERE name = 'old_snapshot_threshold'; -setting|pg_sleep --------+-------- - 0| -(1 row) - -step s1f2: SELECT c FROM sto1 ORDER BY c LIMIT 1; -c -- -1 -(1 row) - -step s2u: UPDATE sto1 SET c = 1001 WHERE c = 1; - starting permutation: s1f1 s1sleep s2u s1f2 step s1f1: SELECT c FROM sto1 ORDER BY c LIMIT 1; c @@ -37,37 +16,3 @@ setting|pg_sleep step s2u: UPDATE sto1 SET c = 1001 WHERE c = 1; step s1f2: SELECT c FROM sto1 ORDER BY c LIMIT 1; ERROR: snapshot too old - -starting permutation: s1f1 s2u s1sleep s1f2 -step s1f1: SELECT c FROM sto1 ORDER BY c LIMIT 1; -c -- -1 -(1 row) - -step s2u: UPDATE sto1 SET c = 1001 WHERE c = 1; -step s1sleep: SELECT setting, pg_sleep(6) FROM pg_settings WHERE name = 'old_snapshot_threshold'; -setting|pg_sleep --------+-------- - 0| -(1 row) - -step s1f2: SELECT c FROM sto1 ORDER BY c LIMIT 1; -ERROR: snapshot too old - -starting permutation: s2u s1f1 s1sleep s1f2 -step s2u: UPDATE sto1 SET c = 1001 WHERE c = 1; -step s1f1: SELECT c FROM sto1 ORDER BY c LIMIT 1; -c -- -2 -(1 row) - -step s1sleep: SELECT setting, pg_sleep(6) FROM pg_settings WHERE name = 'old_snapshot_threshold'; -setting|pg_sleep --------+-------- - 0| -(1 row) - -step s1f2: SELECT c FROM sto1 ORDER BY c LIMIT 1; -ERROR: snapshot too old diff --git a/src/test/modules/snapshot_too_old/specs/sto_using_cursor.spec b/src/test/modules/snapshot_too_old/specs/sto_using_cursor.spec index eac18ca5b9..f3677a8fa9 100644 --- a/src/test/modules/snapshot_too_old/specs/sto_using_cursor.spec +++ b/src/test/modules/snapshot_too_old/specs/sto_using_cursor.spec @@ -6,14 +6,13 @@ # granularity is in minutes. # # Since results depend on the value of old_snapshot_threshold, sneak that into -# the line generated by the sleep, so that a surprising values isn't so hard +# the line generated by the sleep, so that a surprising value isn't so hard # to identify. setup { CREATE TABLE sto1 (c int NOT NULL); INSERT INTO sto1 SELECT generate_series(1, 1000); - CREATE TABLE sto2 (c int NOT NULL); } setup { @@ -22,7 +21,7 @@ setup teardown { - DROP TABLE sto1, sto2; + DROP TABLE sto1; } session "s1" @@ -35,3 +34,5 @@ teardown { COMMIT; } session "s2" step "s2u" { UPDATE sto1 SET c = 1001 WHERE c = 1; } + +permutation "s1decl" "s1f1" "s1sleep" "s2u" "s1f2" diff --git a/src/test/modules/snapshot_too_old/specs/sto_using_select.spec b/src/test/modules/snapshot_too_old/specs/sto_using_select.spec index d7c34f3d89..80a31763ad 100644 --- a/src/test/modules/snapshot_too_old/specs/sto_using_select.spec +++ b/src/test/modules/snapshot_too_old/specs/sto_using_select.spec @@ -6,14 +6,13 @@ # granularity is in minutes. # # Since results depend on the value of old_snapshot_threshold, sneak that into -# the line generated by the sleep, so that a surprising values isn't so hard +# the line generated by the sleep, so that a surprising value isn't so hard # to identify. setup { CREATE TABLE sto1 (c int NOT NULL); INSERT INTO sto1 SELECT generate_series(1, 1000); - CREATE TABLE sto2 (c int NOT NULL); } setup { @@ -22,7 +21,7 @@ setup teardown { - DROP TABLE sto1, sto2; + DROP TABLE sto1; } session "s1" @@ -34,3 +33,5 @@ teardown { COMMIT; } session "s2" step "s2u" { UPDATE sto1 SET c = 1001 WHERE c = 1; } + +permutation "s1f1" "s1sleep" "s2u" "s1f2" --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
