From 00dd42dc44d3091a79b383ac01c334096f6feeec Mon Sep 17 00:00:00 2001 From: Burak Yucesoy Date: Wed, 25 Jan 2017 11:37:47 +0200 Subject: [PATCH] Add ORDER BY to some tests to have consistent output --- .../regress/expected/multi_metadata_sync.out | 6 ++--- .../multi_transactional_drop_shards.out | 22 +++++++++---------- src/test/regress/sql/multi_metadata_sync.sql | 6 ++--- .../sql/multi_transactional_drop_shards.sql | 16 +++++++------- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/test/regress/expected/multi_metadata_sync.out b/src/test/regress/expected/multi_metadata_sync.out index f034c3a73..310e52aba 100644 --- a/src/test/regress/expected/multi_metadata_sync.out +++ b/src/test/regress/expected/multi_metadata_sync.out @@ -228,7 +228,7 @@ SELECT * FROM pg_dist_shard ORDER BY shardid; mx_testing_schema.mx_test_table | 1310007 | t | 1610612736 | 2147483647 (8 rows) -SELECT * FROM pg_dist_shard_placement ORDER BY shardid; +SELECT * FROM pg_dist_shard_placement ORDER BY shardid, nodename, nodeport; shardid | shardstate | shardlength | nodename | nodeport | placementid ---------+------------+-------------+-----------+----------+------------- 1310000 | 1 | 0 | localhost | 57637 | 100000 @@ -358,7 +358,7 @@ SELECT * FROM pg_dist_shard ORDER BY shardid; mx_testing_schema.mx_test_table | 1310007 | t | 1610612736 | 2147483647 (8 rows) -SELECT * FROM pg_dist_shard_placement ORDER BY shardid; +SELECT * FROM pg_dist_shard_placement ORDER BY shardid, nodename, nodeport; shardid | shardstate | shardlength | nodename | nodeport | placementid ---------+------------+-------------+-----------+----------+------------- 1310000 | 1 | 0 | localhost | 57637 | 100000 @@ -654,7 +654,7 @@ SELECT * FROM pg_dist_shard; --------------+---------+--------------+---------------+--------------- (0 rows) -SELECT * FROM pg_dist_shard_placement; +SELECT * FROM pg_dist_shard_placement ORDER BY shardid, nodename, nodeport; shardid | shardstate | shardlength | nodename | nodeport | placementid ---------+------------+-------------+----------+----------+------------- (0 rows) diff --git a/src/test/regress/expected/multi_transactional_drop_shards.out b/src/test/regress/expected/multi_transactional_drop_shards.out index 88bf6a0ba..98987b13c 100644 --- a/src/test/regress/expected/multi_transactional_drop_shards.out +++ b/src/test/regress/expected/multi_transactional_drop_shards.out @@ -33,17 +33,17 @@ FROM WHERE shardid IN (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'transactional_drop_shards'::regclass ORDER BY shardid) ORDER BY - shardid; + shardid, nodename, nodeport; shardid | shardstate | nodename | nodeport ---------+------------+-----------+---------- 1410000 | 1 | localhost | 57637 1410000 | 1 | localhost | 57638 - 1410001 | 1 | localhost | 57638 1410001 | 1 | localhost | 57637 + 1410001 | 1 | localhost | 57638 1410002 | 1 | localhost | 57637 1410002 | 1 | localhost | 57638 - 1410003 | 1 | localhost | 57638 1410003 | 1 | localhost | 57637 + 1410003 | 1 | localhost | 57638 (8 rows) -- verify table is not dropped @@ -94,7 +94,7 @@ FROM WHERE shardid IN (1410000, 1410001, 1410002, 1410003) ORDER BY - shardid; + shardid, nodename, nodeport; shardid | shardstate | nodename | nodeport ---------+------------+----------+---------- (0 rows) @@ -141,11 +141,11 @@ FROM WHERE shardid IN (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'transactional_drop_shards'::regclass ORDER BY shardid) ORDER BY - shardid; + shardid, nodename, nodeport; shardid | shardstate | nodename | nodeport ---------+------------+-----------+---------- - 1410004 | 1 | localhost | 57638 1410004 | 1 | localhost | 57637 + 1410004 | 1 | localhost | 57638 (2 rows) -- verify shards are not dropped @@ -179,7 +179,7 @@ FROM WHERE shardid IN (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'transactional_drop_shards'::regclass ORDER BY shardid) ORDER BY - shardid; + shardid, nodename, nodeport; shardid | shardstate | nodename | nodeport ---------+------------+----------+---------- (0 rows) @@ -216,7 +216,7 @@ FROM WHERE shardid IN (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'transactional_drop_shards'::regclass ORDER BY shardid) ORDER BY - shardid; + shardid, nodename, nodeport; shardid | shardstate | nodename | nodeport ---------+------------+-----------+---------- 1410005 | 1 | localhost | 57637 @@ -259,7 +259,7 @@ FROM WHERE shardid IN (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'transactional_drop_shards'::regclass ORDER BY shardid) ORDER BY - shardid; + shardid, nodename, nodeport; shardid | shardstate | nodename | nodeport ---------+------------+-----------+---------- 1410005 | 1 | localhost | 57637 @@ -300,7 +300,7 @@ FROM WHERE shardid IN (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'transactional_drop_shards'::regclass ORDER BY shardid) ORDER BY - shardid; + shardid, nodename, nodeport; shardid | shardstate | nodename | nodeport ---------+------------+-----------+---------- 1410005 | 1 | localhost | 57637 @@ -391,7 +391,7 @@ FROM WHERE shardid IN (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'transactional_drop_shards'::regclass ORDER BY shardid) ORDER BY - shardid; + shardid, nodename, nodeport; shardid | shardstate | nodename | nodeport ---------+------------+-----------+---------- 1410005 | 1 | localhost | 57637 diff --git a/src/test/regress/sql/multi_metadata_sync.sql b/src/test/regress/sql/multi_metadata_sync.sql index 68ad4f615..3d431abc2 100644 --- a/src/test/regress/sql/multi_metadata_sync.sql +++ b/src/test/regress/sql/multi_metadata_sync.sql @@ -78,7 +78,7 @@ SELECT * FROM pg_dist_local_group; SELECT * FROM pg_dist_node ORDER BY nodeid; SELECT * FROM pg_dist_partition ORDER BY logicalrelid; SELECT * FROM pg_dist_shard ORDER BY shardid; -SELECT * FROM pg_dist_shard_placement ORDER BY shardid; +SELECT * FROM pg_dist_shard_placement ORDER BY shardid, nodename, nodeport; \d mx_testing_schema.mx_test_table -- Check that pg_dist_colocation is not synced @@ -126,7 +126,7 @@ SELECT * FROM pg_dist_local_group; SELECT * FROM pg_dist_node ORDER BY nodeid; SELECT * FROM pg_dist_partition ORDER BY logicalrelid; SELECT * FROM pg_dist_shard ORDER BY shardid; -SELECT * FROM pg_dist_shard_placement ORDER BY shardid; +SELECT * FROM pg_dist_shard_placement ORDER BY shardid, nodename, nodeport; \d mx_testing_schema.mx_test_table SELECT count(*) FROM pg_trigger WHERE tgrelid='mx_testing_schema.mx_test_table'::regclass; @@ -254,7 +254,7 @@ ORDER BY SELECT * FROM pg_dist_partition; SELECT * FROM pg_dist_shard; -SELECT * FROM pg_dist_shard_placement; +SELECT * FROM pg_dist_shard_placement ORDER BY shardid, nodename, nodeport; -- Check that CREATE INDEX statement is propagated \c - - - :master_port diff --git a/src/test/regress/sql/multi_transactional_drop_shards.sql b/src/test/regress/sql/multi_transactional_drop_shards.sql index 37a6924a1..cf259f4c3 100644 --- a/src/test/regress/sql/multi_transactional_drop_shards.sql +++ b/src/test/regress/sql/multi_transactional_drop_shards.sql @@ -26,7 +26,7 @@ FROM WHERE shardid IN (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'transactional_drop_shards'::regclass ORDER BY shardid) ORDER BY - shardid; + shardid, nodename, nodeport; -- verify table is not dropped \d transactional_drop_shards; @@ -51,7 +51,7 @@ FROM WHERE shardid IN (1410000, 1410001, 1410002, 1410003) ORDER BY - shardid; + shardid, nodename, nodeport; -- verify table is dropped \d transactional_drop_shards; @@ -80,7 +80,7 @@ FROM WHERE shardid IN (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'transactional_drop_shards'::regclass ORDER BY shardid) ORDER BY - shardid; + shardid, nodename, nodeport; -- verify shards are not dropped \c - - - :worker_1_port @@ -102,7 +102,7 @@ FROM WHERE shardid IN (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'transactional_drop_shards'::regclass ORDER BY shardid) ORDER BY - shardid; + shardid, nodename, nodeport; -- verify shards are dropped \c - - - :worker_1_port @@ -127,7 +127,7 @@ FROM WHERE shardid IN (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'transactional_drop_shards'::regclass ORDER BY shardid) ORDER BY - shardid; + shardid, nodename, nodeport; -- verify table is not dropped \d transactional_drop_shards; @@ -153,7 +153,7 @@ FROM WHERE shardid IN (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'transactional_drop_shards'::regclass ORDER BY shardid) ORDER BY - shardid; + shardid, nodename, nodeport; -- verify shards are not dropped \c - - - :worker_1_port @@ -184,7 +184,7 @@ FROM WHERE shardid IN (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'transactional_drop_shards'::regclass ORDER BY shardid) ORDER BY - shardid; + shardid, nodename, nodeport; -- verify table is not dropped \d transactional_drop_shards; @@ -237,7 +237,7 @@ FROM WHERE shardid IN (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'transactional_drop_shards'::regclass ORDER BY shardid) ORDER BY - shardid; + shardid, nodename, nodeport; -- verify shards are not dropped \c - - - :worker_1_port