From f6352a0d4e437ac8bc266f77df22d064592056c9 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Tue, 15 Jun 2021 16:09:14 -0400 Subject: [PATCH] Remove another orphan expected-result file. aborted-keyrevoke_2.out was apparently needed when it was added (in commit 0ac5ad513) to handle the case of serializable transaction mode. However, the output in serializable mode actually matches the regular aborted-keyrevoke.out file, and AFAICT has done so for a long time. There's no need to keep dragging this variant along. --- .../expected/aborted-keyrevoke_2.out | 218 ------------------ 1 file changed, 218 deletions(-) delete mode 100644 src/test/isolation/expected/aborted-keyrevoke_2.out diff --git a/src/test/isolation/expected/aborted-keyrevoke_2.out b/src/test/isolation/expected/aborted-keyrevoke_2.out deleted file mode 100644 index c286964f75..0000000000 --- a/src/test/isolation/expected/aborted-keyrevoke_2.out +++ /dev/null @@ -1,218 +0,0 @@ -Parsed test spec with 2 sessions - -starting permutation: s1s s1u s1r s1l s1c s2l s2c -step s1s: SAVEPOINT f; -step s1u: UPDATE foo SET key = 2; -step s1r: ROLLBACK TO f; -step s1l: SELECT * FROM foo FOR KEY SHARE; -key value - -1 1 -step s1c: COMMIT; -step s2l: SELECT * FROM foo FOR KEY SHARE; -key value - -1 1 -step s2c: COMMIT; - -starting permutation: s1s s1u s1r s1l s2l s1c s2c -step s1s: SAVEPOINT f; -step s1u: UPDATE foo SET key = 2; -step s1r: ROLLBACK TO f; -step s1l: SELECT * FROM foo FOR KEY SHARE; -key value - -1 1 -step s2l: SELECT * FROM foo FOR KEY SHARE; -key value - -1 1 -step s1c: COMMIT; -step s2c: COMMIT; - -starting permutation: s1s s1u s1r s1l s2l s2c s1c -step s1s: SAVEPOINT f; -step s1u: UPDATE foo SET key = 2; -step s1r: ROLLBACK TO f; -step s1l: SELECT * FROM foo FOR KEY SHARE; -key value - -1 1 -step s2l: SELECT * FROM foo FOR KEY SHARE; -key value - -1 1 -step s2c: COMMIT; -step s1c: COMMIT; - -starting permutation: s1s s1u s1r s2l s1l s1c s2c -step s1s: SAVEPOINT f; -step s1u: UPDATE foo SET key = 2; -step s1r: ROLLBACK TO f; -step s2l: SELECT * FROM foo FOR KEY SHARE; -key value - -1 1 -step s1l: SELECT * FROM foo FOR KEY SHARE; -key value - -1 1 -step s1c: COMMIT; -step s2c: COMMIT; - -starting permutation: s1s s1u s1r s2l s1l s2c s1c -step s1s: SAVEPOINT f; -step s1u: UPDATE foo SET key = 2; -step s1r: ROLLBACK TO f; -step s2l: SELECT * FROM foo FOR KEY SHARE; -key value - -1 1 -step s1l: SELECT * FROM foo FOR KEY SHARE; -key value - -1 1 -step s2c: COMMIT; -step s1c: COMMIT; - -starting permutation: s1s s1u s1r s2l s2c s1l s1c -step s1s: SAVEPOINT f; -step s1u: UPDATE foo SET key = 2; -step s1r: ROLLBACK TO f; -step s2l: SELECT * FROM foo FOR KEY SHARE; -key value - -1 1 -step s2c: COMMIT; -step s1l: SELECT * FROM foo FOR KEY SHARE; -key value - -1 1 -step s1c: COMMIT; - -starting permutation: s1s s1u s2l s1r s1l s1c s2c -step s1s: SAVEPOINT f; -step s1u: UPDATE foo SET key = 2; -step s2l: SELECT * FROM foo FOR KEY SHARE; -step s1r: ROLLBACK TO f; -step s2l: <... completed> -key value - -1 1 -step s1l: SELECT * FROM foo FOR KEY SHARE; -key value - -1 1 -step s1c: COMMIT; -step s2c: COMMIT; - -starting permutation: s1s s1u s2l s1r s1l s2c s1c -step s1s: SAVEPOINT f; -step s1u: UPDATE foo SET key = 2; -step s2l: SELECT * FROM foo FOR KEY SHARE; -step s1r: ROLLBACK TO f; -step s2l: <... completed> -key value - -1 1 -step s1l: SELECT * FROM foo FOR KEY SHARE; -key value - -1 1 -step s2c: COMMIT; -step s1c: COMMIT; - -starting permutation: s1s s1u s2l s1r s2c s1l s1c -step s1s: SAVEPOINT f; -step s1u: UPDATE foo SET key = 2; -step s2l: SELECT * FROM foo FOR KEY SHARE; -step s1r: ROLLBACK TO f; -step s2l: <... completed> -key value - -1 1 -step s2c: COMMIT; -step s1l: SELECT * FROM foo FOR KEY SHARE; -key value - -1 1 -step s1c: COMMIT; - -starting permutation: s1s s2l s1u s2c s1r s1l s1c -step s1s: SAVEPOINT f; -step s2l: SELECT * FROM foo FOR KEY SHARE; -key value - -1 1 -step s1u: UPDATE foo SET key = 2; -step s2c: COMMIT; -step s1u: <... completed> -error in steps s2c s1u: ERROR: could not serialize access due to concurrent update -step s1r: ROLLBACK TO f; -step s1l: SELECT * FROM foo FOR KEY SHARE; -key value - -1 1 -step s1c: COMMIT; - -starting permutation: s1s s2l s2c s1u s1r s1l s1c -step s1s: SAVEPOINT f; -step s2l: SELECT * FROM foo FOR KEY SHARE; -key value - -1 1 -step s2c: COMMIT; -step s1u: UPDATE foo SET key = 2; -step s1r: ROLLBACK TO f; -step s1l: SELECT * FROM foo FOR KEY SHARE; -key value - -1 1 -step s1c: COMMIT; - -starting permutation: s2l s1s s1u s2c s1r s1l s1c -step s2l: SELECT * FROM foo FOR KEY SHARE; -key value - -1 1 -step s1s: SAVEPOINT f; -step s1u: UPDATE foo SET key = 2; -step s2c: COMMIT; -step s1u: <... completed> -error in steps s2c s1u: ERROR: could not serialize access due to concurrent update -step s1r: ROLLBACK TO f; -step s1l: SELECT * FROM foo FOR KEY SHARE; -key value - -1 1 -step s1c: COMMIT; - -starting permutation: s2l s1s s2c s1u s1r s1l s1c -step s2l: SELECT * FROM foo FOR KEY SHARE; -key value - -1 1 -step s1s: SAVEPOINT f; -step s2c: COMMIT; -step s1u: UPDATE foo SET key = 2; -step s1r: ROLLBACK TO f; -step s1l: SELECT * FROM foo FOR KEY SHARE; -key value - -1 1 -step s1c: COMMIT; - -starting permutation: s2l s2c s1s s1u s1r s1l s1c -step s2l: SELECT * FROM foo FOR KEY SHARE; -key value - -1 1 -step s2c: COMMIT; -step s1s: SAVEPOINT f; -step s1u: UPDATE foo SET key = 2; -step s1r: ROLLBACK TO f; -step s1l: SELECT * FROM foo FOR KEY SHARE; -key value - -1 1 -step s1c: COMMIT;