From 5a7e4d8a57f2a97e44826b4d52d9833c6118c3ed 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 b8053a52b..97bc96c84 100644 --- a/src/test/regress/expected/multi_multiuser.out +++ b/src/test/regress/expected/multi_multiuser.out @@ -93,10 +93,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) @@ -140,10 +140,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) @@ -171,7 +171,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 06613b2e0..83c8794dc 100644 --- a/src/test/regress/expected/multi_multiuser_0.out +++ b/src/test/regress/expected/multi_multiuser_0.out @@ -93,10 +93,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) @@ -140,10 +140,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) @@ -171,7 +171,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 9ce6c628b..3c73952d3 100644 --- a/src/test/regress/sql/multi_multiuser.sql +++ b/src/test/regress/sql/multi_multiuser.sql @@ -70,7 +70,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; @@ -94,7 +94,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; @@ -115,7 +115,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;