From 8b5fe8aa1794aef899d0652dc8ac48081089f097 Mon Sep 17 00:00:00 2001 From: Jelte Fennema Date: Fri, 3 Jan 2020 11:42:48 +0100 Subject: [PATCH] Normalize tests: s/placement [0-9]+/placement xxxxx/g --- src/test/regress/bin/normalize.sed | 2 +- src/test/regress/expected/multi_modifying_xacts.out | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/regress/bin/normalize.sed b/src/test/regress/bin/normalize.sed index ddcc86914..71e942ade 100644 --- a/src/test/regress/bin/normalize.sed +++ b/src/test/regress/bin/normalize.sed @@ -9,7 +9,7 @@ # In all tests, normalize worker ports, placement ids, and shard ids s/localhost:[0-9]+/localhost:xxxxx/g s/ port=[0-9]+ / port=xxxxx /g -#s/placement [0-9]+/placement xxxxx/g +s/placement [0-9]+/placement xxxxx/g #s/shard [0-9]+/shard xxxxx/g #s/assigned task [0-9]+ to node/assigned task to node/ #s/node group [12] (but|does)/node group \1/ diff --git a/src/test/regress/expected/multi_modifying_xacts.out b/src/test/regress/expected/multi_modifying_xacts.out index 3fe00097f..bf69bf65d 100644 --- a/src/test/regress/expected/multi_modifying_xacts.out +++ b/src/test/regress/expected/multi_modifying_xacts.out @@ -1489,7 +1489,7 @@ SELECT user_id FROM items JOIN itemgroups ON (item_group = gid) WHERE user_id = -- because the current implementation of COPY always opens one connection -- per placement SELECTs have to use those connections for correctness ALTER TABLE itemgroups ADD COLUMN last_update timestamptz; -ERROR: cannot perform DDL on placement 1200036, which has been read over multiple connections +ERROR: cannot perform DDL on placement xxxxx, which has been read over multiple connections END; BEGIN; -- establish multiple connections to a node @@ -1507,7 +1507,7 @@ SELECT user_id FROM items JOIN itemgroups ON (item_group = gid) WHERE user_id = -- perform a DDL command on a co-located reference table ALTER TABLE usergroups ADD COLUMN last_update timestamptz; -ERROR: cannot perform DDL on placement 1200034 since a co-located placement has been read over multiple connections +ERROR: cannot perform DDL on placement xxxxx since a co-located placement has been read over multiple connections END; BEGIN; -- make a modification over connection 1