Normalize tests: s/node group [12] (but|does)/node group \1/

pull/3336/head
Jelte Fennema 2020-01-03 11:46:01 +01:00
parent 96434e898f
commit 75a9c25acd
2 changed files with 4 additions and 4 deletions

View File

@ -12,7 +12,7 @@ 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/shard [0-9]+/shard xxxxx/g
s/assigned task [0-9]+ to node/assigned task to node/ s/assigned task [0-9]+ to node/assigned task to node/
#s/node group [12] (but|does)/node group \1/ s/node group [12] (but|does)/node group \1/
# #
## Differing names can have differing table column widths ## Differing names can have differing table column widths
#s/(-+\|)+-+/---/g #s/(-+\|)+-+/---/g

View File

@ -60,7 +60,7 @@ order by s_i_id;
-- (this is :follower_master_port but substitution doesn't work here) -- (this is :follower_master_port but substitution doesn't work here)
\c "port=9070 dbname=regression options='-c\ citus.use_secondary_nodes=always'" \c "port=9070 dbname=regression options='-c\ citus.use_secondary_nodes=always'"
SELECT * FROM the_table; SELECT * FROM the_table;
ERROR: node group 1 does not have a secondary node ERROR: node group does not have a secondary node
-- add the secondary nodes and try again, the SELECT statement should work this time -- add the secondary nodes and try again, the SELECT statement should work this time
\c - - - :master_port \c - - - :master_port
SELECT 1 FROM master_add_node('localhost', :follower_worker_1_port, SELECT 1 FROM master_add_node('localhost', :follower_worker_1_port,
@ -117,13 +117,13 @@ ORDER BY
\c "port=9070 dbname=regression options='-c\ citus.use_secondary_nodes=always\ -c\ citus.cluster_name=second-cluster'" \c "port=9070 dbname=regression options='-c\ citus.use_secondary_nodes=always\ -c\ citus.cluster_name=second-cluster'"
-- there are no secondary nodes in this cluster, so this should fail! -- there are no secondary nodes in this cluster, so this should fail!
SELECT * FROM the_table; SELECT * FROM the_table;
ERROR: there is a shard placement in node group 1 but there are no nodes in that group ERROR: there is a shard placement in node group but there are no nodes in that group
select s_i_id, sum(s_order_cnt) as ordercount select s_i_id, sum(s_order_cnt) as ordercount
from stock from stock
group by s_i_id group by s_i_id
having sum(s_order_cnt) > (select max(s_order_cnt) - 3 as having_query from stock) having sum(s_order_cnt) > (select max(s_order_cnt) - 3 as having_query from stock)
order by s_i_id; order by s_i_id;
ERROR: there is a shard placement in node group 1 but there are no nodes in that group ERROR: there is a shard placement in node group but there are no nodes in that group
-- now move the secondary nodes into the new cluster and see that the follower, finally -- now move the secondary nodes into the new cluster and see that the follower, finally
-- correctly configured, can run select queries involving them -- correctly configured, can run select queries involving them
\c - - - :master_port \c - - - :master_port