Author: xuefu
Date: Wed Dec 17 04:50:46 2014
New Revision: 1646156
URL: http://svn.apache.org/r1646156
Log:
HIVE-8787: UT: update hive-site.xml for spark UTs to add hive_admin_user to
admin role
Added:
hive/branches/spark/ql/src/test/results/clientpositive/spark/authorization_admin_almighty1.q.out
Modified:
hive/branches/spark/data/conf/spark/hive-site.xml
hive/branches/spark/itests/src/test/resources/testconfiguration.properties
Modified: hive/branches/spark/data/conf/spark/hive-site.xml
URL:
http://svn.apache.org/viewvc/hive/branches/spark/data/conf/spark/hive-site.xml?rev=1646156&r1=1646155&r2=1646156&view=diff
==============================================================================
--- hive/branches/spark/data/conf/spark/hive-site.xml (original)
+++ hive/branches/spark/data/conf/spark/hive-site.xml Wed Dec 17 04:50:46 2014
@@ -220,4 +220,9 @@
<value>${maven.local.repository}/org/apache/hive/hive-it-util/${hive.version}/hive-it-util-${hive.version}.jar</value>
</property>
+<property>
+ <name>hive.users.in.admin.role</name>
+ <value>hive_admin_user</value>
+</property>
+
</configuration>
Modified:
hive/branches/spark/itests/src/test/resources/testconfiguration.properties
URL:
http://svn.apache.org/viewvc/hive/branches/spark/itests/src/test/resources/testconfiguration.properties?rev=1646156&r1=1646155&r2=1646156&view=diff
==============================================================================
--- hive/branches/spark/itests/src/test/resources/testconfiguration.properties
(original)
+++ hive/branches/spark/itests/src/test/resources/testconfiguration.properties
Wed Dec 17 04:50:46 2014
@@ -456,6 +456,7 @@ spark.query.files=add_part_multiple.q, \
alter_merge_orc.q, \
alter_merge_stats_orc.q, \
annotate_stats_join.q, \
+ authorization_admin_almighty1.q, \
auto_join0.q, \
auto_join1.q, \
auto_join2.q, \
Added:
hive/branches/spark/ql/src/test/results/clientpositive/spark/authorization_admin_almighty1.q.out
URL:
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/authorization_admin_almighty1.q.out?rev=1646156&view=auto
==============================================================================
---
hive/branches/spark/ql/src/test/results/clientpositive/spark/authorization_admin_almighty1.q.out
(added)
+++
hive/branches/spark/ql/src/test/results/clientpositive/spark/authorization_admin_almighty1.q.out
Wed Dec 17 04:50:46 2014
@@ -0,0 +1,56 @@
+PREHOOK: query: -- actions from admin should work as if admin has all
privileges
+
+create table t1(i int)
+PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
+PREHOOK: Output: default@t1
+POSTHOOK: query: -- actions from admin should work as if admin has all
privileges
+
+create table t1(i int)
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@t1
+PREHOOK: query: show current roles
+PREHOOK: type: SHOW_ROLES
+POSTHOOK: query: show current roles
+POSTHOOK: type: SHOW_ROLES
+public
+PREHOOK: query: set role ADMIN
+PREHOOK: type: SHOW_ROLES
+POSTHOOK: query: set role ADMIN
+POSTHOOK: type: SHOW_ROLES
+PREHOOK: query: show current roles
+PREHOOK: type: SHOW_ROLES
+POSTHOOK: query: show current roles
+POSTHOOK: type: SHOW_ROLES
+admin
+PREHOOK: query: select * from t1
+PREHOOK: type: QUERY
+PREHOOK: Input: default@t1
+#### A masked pattern was here ####
+POSTHOOK: query: select * from t1
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1
+#### A masked pattern was here ####
+PREHOOK: query: grant all on table t1 to user user1
+PREHOOK: type: GRANT_PRIVILEGE
+PREHOOK: Output: default@t1
+POSTHOOK: query: grant all on table t1 to user user1
+POSTHOOK: type: GRANT_PRIVILEGE
+POSTHOOK: Output: default@t1
+PREHOOK: query: show grant user user1 on table t1
+PREHOOK: type: SHOW_GRANT
+POSTHOOK: query: show grant user user1 on table t1
+POSTHOOK: type: SHOW_GRANT
+default t1 user1 USER DELETE false
1418683689000 hive_admin_user
+default t1 user1 USER INSERT false
1418683689000 hive_admin_user
+default t1 user1 USER SELECT false
1418683689000 hive_admin_user
+default t1 user1 USER UPDATE false
1418683689000 hive_admin_user
+PREHOOK: query: drop table t1
+PREHOOK: type: DROPTABLE
+PREHOOK: Input: default@t1
+PREHOOK: Output: default@t1
+POSTHOOK: query: drop table t1
+POSTHOOK: type: DROPTABLE
+POSTHOOK: Input: default@t1
+POSTHOOK: Output: default@t1
