From a41dceb67a542867a6ac152afe88e96c07d50ea5 Mon Sep 17 00:00:00 2001 From: Nils Dijk Date: Tue, 13 Dec 2022 14:42:32 +0100 Subject: [PATCH] fix enterprise test output --- src/test/regress/expected/multi_tenant_isolation.out | 8 ++++---- .../expected/multi_tenant_isolation_nonblocking.out | 8 ++++---- src/test/regress/sql/multi_tenant_isolation.sql | 8 ++++---- .../regress/sql/multi_tenant_isolation_nonblocking.sql | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/test/regress/expected/multi_tenant_isolation.out b/src/test/regress/expected/multi_tenant_isolation.out index b370ba6c6..dc017bcfa 100644 --- a/src/test/regress/expected/multi_tenant_isolation.out +++ b/src/test/regress/expected/multi_tenant_isolation.out @@ -165,7 +165,7 @@ SELECT count(*) FROM orders_streaming WHERE o_orderkey = 103; 1 (1 row) -SELECT * FROM pg_dist_shard +SELECT logicalrelid, shardid, shardstorage, shardminvalue, shardmaxvalue FROM pg_dist_shard WHERE logicalrelid = 'lineitem_streaming'::regclass OR logicalrelid = 'orders_streaming'::regclass ORDER BY shardminvalue::BIGINT, logicalrelid; logicalrelid | shardid | shardstorage | shardminvalue | shardmaxvalue @@ -384,7 +384,7 @@ SELECT count(*) FROM orders_streaming WHERE o_orderkey = 103; 1 (1 row) -SELECT * FROM pg_dist_shard +SELECT logicalrelid, shardid, shardstorage, shardminvalue, shardmaxvalue FROM pg_dist_shard WHERE logicalrelid = 'lineitem_streaming'::regclass OR logicalrelid = 'orders_streaming'::regclass ORDER BY shardminvalue::BIGINT, logicalrelid; logicalrelid | shardid | shardstorage | shardminvalue | shardmaxvalue @@ -538,7 +538,7 @@ SELECT "Column", "Type", "Modifiers" FROM public.table_desc WHERE relid='orders_ \c - mx_isolation_role_ent - :worker_1_port SET search_path to "Tenant Isolation"; -- check MX metadata -SELECT * FROM pg_dist_shard +SELECT logicalrelid, shardid, shardstorage, shardminvalue, shardmaxvalue FROM pg_dist_shard WHERE logicalrelid = 'lineitem_streaming'::regclass OR logicalrelid = 'orders_streaming'::regclass ORDER BY shardminvalue::BIGINT, logicalrelid; logicalrelid | shardid | shardstorage | shardminvalue | shardmaxvalue @@ -681,7 +681,7 @@ SELECT create_distributed_table('test_append', 'tenant_id', 'append'); SELECT isolate_tenant_to_new_shard('test_append', 100, shard_transfer_mode => 'block_writes'); ERROR: cannot isolate tenant because tenant isolation is only support for hash distributed tables -- check metadata for comparison -SELECT * FROM pg_dist_shard +SELECT logicalrelid, shardid, shardstorage, shardminvalue, shardmaxvalue FROM pg_dist_shard WHERE logicalrelid = 'lineitem_streaming'::regclass OR logicalrelid = 'orders_streaming'::regclass ORDER BY shardminvalue::BIGINT, logicalrelid; logicalrelid | shardid | shardstorage | shardminvalue | shardmaxvalue diff --git a/src/test/regress/expected/multi_tenant_isolation_nonblocking.out b/src/test/regress/expected/multi_tenant_isolation_nonblocking.out index dbd15b056..e7fea1dc5 100644 --- a/src/test/regress/expected/multi_tenant_isolation_nonblocking.out +++ b/src/test/regress/expected/multi_tenant_isolation_nonblocking.out @@ -165,7 +165,7 @@ SELECT count(*) FROM orders_streaming WHERE o_orderkey = 103; 1 (1 row) -SELECT * FROM pg_dist_shard +SELECT logicalrelid, shardid, shardstorage, shardminvalue, shardmaxvalue FROM pg_dist_shard WHERE logicalrelid = 'lineitem_streaming'::regclass OR logicalrelid = 'orders_streaming'::regclass ORDER BY shardminvalue::BIGINT, logicalrelid; logicalrelid | shardid | shardstorage | shardminvalue | shardmaxvalue @@ -396,7 +396,7 @@ SELECT count(*) FROM orders_streaming WHERE o_orderkey = 103; 1 (1 row) -SELECT * FROM pg_dist_shard +SELECT logicalrelid, shardid, shardstorage, shardminvalue, shardmaxvalue FROM pg_dist_shard WHERE logicalrelid = 'lineitem_streaming'::regclass OR logicalrelid = 'orders_streaming'::regclass ORDER BY shardminvalue::BIGINT, logicalrelid; logicalrelid | shardid | shardstorage | shardminvalue | shardmaxvalue @@ -550,7 +550,7 @@ SELECT "Column", "Type", "Modifiers" FROM public.table_desc WHERE relid='orders_ \c - mx_isolation_role_ent - :worker_1_port SET search_path to "Tenant Isolation"; -- check MX metadata -SELECT * FROM pg_dist_shard +SELECT logicalrelid, shardid, shardstorage, shardminvalue, shardmaxvalue FROM pg_dist_shard WHERE logicalrelid = 'lineitem_streaming'::regclass OR logicalrelid = 'orders_streaming'::regclass ORDER BY shardminvalue::BIGINT, logicalrelid; logicalrelid | shardid | shardstorage | shardminvalue | shardmaxvalue @@ -725,7 +725,7 @@ SELECT create_distributed_table('test_append', 'tenant_id', 'append'); SELECT isolate_tenant_to_new_shard('test_append', 100, shard_transfer_mode => 'force_logical'); ERROR: cannot isolate tenant because tenant isolation is only support for hash distributed tables -- check metadata for comparison -SELECT * FROM pg_dist_shard +SELECT logicalrelid, shardid, shardstorage, shardminvalue, shardmaxvalue FROM pg_dist_shard WHERE logicalrelid = 'lineitem_streaming'::regclass OR logicalrelid = 'orders_streaming'::regclass ORDER BY shardminvalue::BIGINT, logicalrelid; logicalrelid | shardid | shardstorage | shardminvalue | shardmaxvalue diff --git a/src/test/regress/sql/multi_tenant_isolation.sql b/src/test/regress/sql/multi_tenant_isolation.sql index 52ce044dc..4ec612683 100644 --- a/src/test/regress/sql/multi_tenant_isolation.sql +++ b/src/test/regress/sql/multi_tenant_isolation.sql @@ -130,7 +130,7 @@ SELECT count(*) FROM orders_streaming WHERE o_orderkey = 101; SELECT count(*) FROM orders_streaming WHERE o_orderkey = 102; SELECT count(*) FROM orders_streaming WHERE o_orderkey = 103; -SELECT * FROM pg_dist_shard +SELECT logicalrelid, shardid, shardstorage, shardminvalue, shardmaxvalue FROM pg_dist_shard WHERE logicalrelid = 'lineitem_streaming'::regclass OR logicalrelid = 'orders_streaming'::regclass ORDER BY shardminvalue::BIGINT, logicalrelid; @@ -212,7 +212,7 @@ SELECT count(*) FROM orders_streaming WHERE o_orderkey = 101; SELECT count(*) FROM orders_streaming WHERE o_orderkey = 102; SELECT count(*) FROM orders_streaming WHERE o_orderkey = 103; -SELECT * FROM pg_dist_shard +SELECT logicalrelid, shardid, shardstorage, shardminvalue, shardmaxvalue FROM pg_dist_shard WHERE logicalrelid = 'lineitem_streaming'::regclass OR logicalrelid = 'orders_streaming'::regclass ORDER BY shardminvalue::BIGINT, logicalrelid; @@ -262,7 +262,7 @@ SELECT "Column", "Type", "Modifiers" FROM public.table_desc WHERE relid='orders_ SET search_path to "Tenant Isolation"; -- check MX metadata -SELECT * FROM pg_dist_shard +SELECT logicalrelid, shardid, shardstorage, shardminvalue, shardmaxvalue FROM pg_dist_shard WHERE logicalrelid = 'lineitem_streaming'::regclass OR logicalrelid = 'orders_streaming'::regclass ORDER BY shardminvalue::BIGINT, logicalrelid; @@ -330,7 +330,7 @@ SELECT create_distributed_table('test_append', 'tenant_id', 'append'); SELECT isolate_tenant_to_new_shard('test_append', 100, shard_transfer_mode => 'block_writes'); -- check metadata for comparison -SELECT * FROM pg_dist_shard +SELECT logicalrelid, shardid, shardstorage, shardminvalue, shardmaxvalue FROM pg_dist_shard WHERE logicalrelid = 'lineitem_streaming'::regclass OR logicalrelid = 'orders_streaming'::regclass ORDER BY shardminvalue::BIGINT, logicalrelid; diff --git a/src/test/regress/sql/multi_tenant_isolation_nonblocking.sql b/src/test/regress/sql/multi_tenant_isolation_nonblocking.sql index f74835108..2aa2c2a12 100644 --- a/src/test/regress/sql/multi_tenant_isolation_nonblocking.sql +++ b/src/test/regress/sql/multi_tenant_isolation_nonblocking.sql @@ -131,7 +131,7 @@ SELECT count(*) FROM orders_streaming WHERE o_orderkey = 101; SELECT count(*) FROM orders_streaming WHERE o_orderkey = 102; SELECT count(*) FROM orders_streaming WHERE o_orderkey = 103; -SELECT * FROM pg_dist_shard +SELECT logicalrelid, shardid, shardstorage, shardminvalue, shardmaxvalue FROM pg_dist_shard WHERE logicalrelid = 'lineitem_streaming'::regclass OR logicalrelid = 'orders_streaming'::regclass ORDER BY shardminvalue::BIGINT, logicalrelid; @@ -217,7 +217,7 @@ SELECT count(*) FROM orders_streaming WHERE o_orderkey = 101; SELECT count(*) FROM orders_streaming WHERE o_orderkey = 102; SELECT count(*) FROM orders_streaming WHERE o_orderkey = 103; -SELECT * FROM pg_dist_shard +SELECT logicalrelid, shardid, shardstorage, shardminvalue, shardmaxvalue FROM pg_dist_shard WHERE logicalrelid = 'lineitem_streaming'::regclass OR logicalrelid = 'orders_streaming'::regclass ORDER BY shardminvalue::BIGINT, logicalrelid; @@ -267,7 +267,7 @@ SELECT "Column", "Type", "Modifiers" FROM public.table_desc WHERE relid='orders_ SET search_path to "Tenant Isolation"; -- check MX metadata -SELECT * FROM pg_dist_shard +SELECT logicalrelid, shardid, shardstorage, shardminvalue, shardmaxvalue FROM pg_dist_shard WHERE logicalrelid = 'lineitem_streaming'::regclass OR logicalrelid = 'orders_streaming'::regclass ORDER BY shardminvalue::BIGINT, logicalrelid; @@ -344,7 +344,7 @@ SELECT create_distributed_table('test_append', 'tenant_id', 'append'); SELECT isolate_tenant_to_new_shard('test_append', 100, shard_transfer_mode => 'force_logical'); -- check metadata for comparison -SELECT * FROM pg_dist_shard +SELECT logicalrelid, shardid, shardstorage, shardminvalue, shardmaxvalue FROM pg_dist_shard WHERE logicalrelid = 'lineitem_streaming'::regclass OR logicalrelid = 'orders_streaming'::regclass ORDER BY shardminvalue::BIGINT, logicalrelid;