From e3521ce32004eb3e867ef23939ab3968b1436907 Mon Sep 17 00:00:00 2001 From: Marco Slot Date: Thu, 22 Nov 2018 01:11:11 +0100 Subject: [PATCH] Test current user in task-tracker queries --- src/test/regress/expected/multi_multiuser.out | 18 +++++++++--------- .../regress/expected/multi_multiuser_0.out | 18 +++++++++--------- src/test/regress/sql/multi_multiuser.sql | 6 +++--- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/test/regress/expected/multi_multiuser.out b/src/test/regress/expected/multi_multiuser.out index 5d04ddfa1..a3a381966 100644 --- a/src/test/regress/expected/multi_multiuser.out +++ b/src/test/regress/expected/multi_multiuser.out @@ -108,10 +108,10 @@ SELECT count(*) FROM test WHERE id = 1; (1 row) SET citus.task_executor_type TO 'task-tracker'; -SELECT count(*) FROM test; - count -------- - 2 +SELECT count(*), min(current_user) FROM test; + count | min +-------+------------- + 2 | full_access (1 row) -- test re-partition query (needs to transmit intermediate results) @@ -155,10 +155,10 @@ SELECT count(*) FROM test WHERE id = 1; (1 row) SET citus.task_executor_type TO 'task-tracker'; -SELECT count(*) FROM test; - count -------- - 2 +SELECT count(*), min(current_user) FROM test; + count | min +-------+------------- + 2 | read_access (1 row) -- test re-partition query (needs to transmit intermediate results) @@ -197,7 +197,7 @@ ERROR: permission denied for table test SELECT count(*) FROM test WHERE id = 1; ERROR: permission denied for table test SET citus.task_executor_type TO 'task-tracker'; -SELECT count(*) FROM test; +SELECT count(*), min(current_user) FROM test; ERROR: permission denied for table test -- test re-partition query SELECT count(*) FROM test a JOIN test b ON (a.val = b.val) WHERE a.id = 1 AND b.id = 2; diff --git a/src/test/regress/expected/multi_multiuser_0.out b/src/test/regress/expected/multi_multiuser_0.out index 3088baa74..adbac9b1d 100644 --- a/src/test/regress/expected/multi_multiuser_0.out +++ b/src/test/regress/expected/multi_multiuser_0.out @@ -108,10 +108,10 @@ SELECT count(*) FROM test WHERE id = 1; (1 row) SET citus.task_executor_type TO 'task-tracker'; -SELECT count(*) FROM test; - count -------- - 2 +SELECT count(*), min(current_user) FROM test; + count | min +-------+------------- + 2 | full_access (1 row) -- test re-partition query (needs to transmit intermediate results) @@ -155,10 +155,10 @@ SELECT count(*) FROM test WHERE id = 1; (1 row) SET citus.task_executor_type TO 'task-tracker'; -SELECT count(*) FROM test; - count -------- - 2 +SELECT count(*), min(current_user) FROM test; + count | min +-------+------------- + 2 | read_access (1 row) -- test re-partition query (needs to transmit intermediate results) @@ -197,7 +197,7 @@ ERROR: permission denied for relation test SELECT count(*) FROM test WHERE id = 1; ERROR: permission denied for relation test SET citus.task_executor_type TO 'task-tracker'; -SELECT count(*) FROM test; +SELECT count(*), min(current_user) FROM test; ERROR: permission denied for relation test -- test re-partition query SELECT count(*) FROM test a JOIN test b ON (a.val = b.val) WHERE a.id = 1 AND b.id = 2; diff --git a/src/test/regress/sql/multi_multiuser.sql b/src/test/regress/sql/multi_multiuser.sql index 6b9529c33..ca072106d 100644 --- a/src/test/regress/sql/multi_multiuser.sql +++ b/src/test/regress/sql/multi_multiuser.sql @@ -77,7 +77,7 @@ SELECT count(*) FROM test; SELECT count(*) FROM test WHERE id = 1; SET citus.task_executor_type TO 'task-tracker'; -SELECT count(*) FROM test; +SELECT count(*), min(current_user) FROM test; -- test re-partition query (needs to transmit intermediate results) SELECT count(*) FROM test a JOIN test b ON (a.val = b.val) WHERE a.id = 1 AND b.id = 2; @@ -101,7 +101,7 @@ SELECT count(*) FROM test; SELECT count(*) FROM test WHERE id = 1; SET citus.task_executor_type TO 'task-tracker'; -SELECT count(*) FROM test; +SELECT count(*), min(current_user) FROM test; -- test re-partition query (needs to transmit intermediate results) SELECT count(*) FROM test a JOIN test b ON (a.val = b.val) WHERE a.id = 1 AND b.id = 2; @@ -128,7 +128,7 @@ SELECT count(*) FROM test; SELECT count(*) FROM test WHERE id = 1; SET citus.task_executor_type TO 'task-tracker'; -SELECT count(*) FROM test; +SELECT count(*), min(current_user) FROM test; -- test re-partition query SELECT count(*) FROM test a JOIN test b ON (a.val = b.val) WHERE a.id = 1 AND b.id = 2;