upstream/postgresql
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2026-04-05 01:07:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Stabilize output of new isolation test insert-conflict-do-update-4.

Browse source 
The test added by commit 4b760a181 assumed that a table's physical
row order would be predictable after an UPDATE.  But a non-heap table
AM might produce some other order.  Even with heap AM, the assumption
seems risky; compare a3fd53bab for instance.  Adding an ORDER BY is
cheap insurance and doesn't break any goal of the test.

Author: Pavel Borisov <pashkin.elfe@gmail.com>
Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us>
Discussion: https://postgr.es/m/CALT9ZEHcE6tpvumScYPO6pGk_ASjTjWojLkodHnk33dvRPHXVw@mail.gmail.com
Backpatch-through: 14
This commit is contained in:
Tom Lane 2026-02-25 10:51:42 -05:00
parent e726620d20
commit b57d35dde7
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/test/isolation/expected/insert-conflict-do-update-4.out
View file

@ -12,11 +12,11 @@ step insert1: INSERT INTO upsert VALUES (1, 11, 111)
step update2a: UPDATE upsert SET i = i + 10 WHERE i = 1;
step c2: COMMIT;
step insert1: <... completed>
step select1: SELECT * FROM upsert;
step select1: SELECT * FROM upsert ORDER BY i;
i| j| k
--+--+---
11|10|100
1|11|111
11|10|100
(2 rows)
step c1: COMMIT;
@ -33,7 +33,7 @@ step insert1: INSERT INTO upsert VALUES (1, 11, 111)
step update2b: UPDATE upsert SET i = i + 150 WHERE i = 1;
step c2: COMMIT;
step insert1: <... completed>
step select1: SELECT * FROM upsert;
step select1: SELECT * FROM upsert ORDER BY i;
i| j| k
---+--+---
1|11|111
@ -54,7 +54,7 @@ step insert1: INSERT INTO upsert VALUES (1, 11, 111)
step delete2: DELETE FROM upsert WHERE i = 1;
step c2: COMMIT;
step insert1: <... completed>
step select1: SELECT * FROM upsert;
step select1: SELECT * FROM upsert ORDER BY i;
i| j| k
-+--+---
1|11|111

2
src/test/isolation/specs/insert-conflict-do-update-4.spec
View file

@ -23,7 +23,7 @@ session s1
setup { BEGIN ISOLATION LEVEL READ COMMITTED; }
step insert1 { INSERT INTO upsert VALUES (1, 11, 111)
ON CONFLICT (i) DO UPDATE SET k = EXCLUDED.k; }
step select1 { SELECT * FROM upsert; }
step select1 { SELECT * FROM upsert ORDER BY i; }
step c1 { COMMIT; }
session s2