diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g b/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g index 4d58f96..fc30498 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g +++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g @@ -1423,7 +1423,6 @@ privObjectType @init {pushMsg("privilege object type type", state);} @after {popMsg(state);} : KW_DATABASE -> ^(TOK_DB_TYPE) - | KW_VIEW -> ^(TOK_TABLE_TYPE) | KW_TABLE? -> ^(TOK_TABLE_TYPE) ; diff --git a/ql/src/test/queries/clientpositive/authorization_view.q b/ql/src/test/queries/clientpositive/authorization_view.q deleted file mode 100644 index f6f774c..0000000 --- a/ql/src/test/queries/clientpositive/authorization_view.q +++ /dev/null @@ -1,77 +0,0 @@ --- SORT_BEFORE_DIFF - -create view src_autho_test as select * from src; - -set hive.security.authorization.enabled=true; - ---view grant to user - -grant select on view src_autho_test to user hive_test_user; - -show grant user hive_test_user on view src_autho_test; -show grant user hive_test_user on view src_autho_test(key); - -revoke select on view src_autho_test from user hive_test_user; -show grant user hive_test_user on view src_autho_test; -show grant user hive_test_user on view src_autho_test(key); - ---column grant to user - -grant select(key) on view src_autho_test to user hive_test_user; - -show grant user hive_test_user on view src_autho_test; -show grant user hive_test_user on view src_autho_test(key); - -revoke select(key) on view src_autho_test from user hive_test_user; -show grant user hive_test_user on view src_autho_test; -show grant user hive_test_user on view src_autho_test(key); - ---view grant to group - -grant select on view src_autho_test to group hive_test_group1; - -show grant group hive_test_group1 on view src_autho_test; -show grant group hive_test_group1 on view src_autho_test(key); - -revoke select on view src_autho_test from group hive_test_group1; -show grant group hive_test_group1 on view src_autho_test; -show grant group hive_test_group1 on view src_autho_test(key); - ---column grant to group - -grant select(key) on view src_autho_test to group hive_test_group1; - -show grant group hive_test_group1 on view src_autho_test; -show grant group hive_test_group1 on view src_autho_test(key); - -revoke select(key) on view src_autho_test from group hive_test_group1; -show grant group hive_test_group1 on view src_autho_test; -show grant group hive_test_group1 on view src_autho_test(key); - ---role -create role src_role; -grant role src_role to user hive_test_user; -show role grant user hive_test_user; - ---column grant to role - -grant select(key) on view src_autho_test to role src_role; - -show grant role src_role on view src_autho_test; -show grant role src_role on view src_autho_test(key); - -revoke select(key) on view src_autho_test from role src_role; - ---view grant to role - -grant select on view src_autho_test to role src_role; - -show grant role src_role on view src_autho_test; -show grant role src_role on view src_autho_test(key); -revoke select on view src_autho_test from role src_role; - --- drop role -drop role src_role; - -set hive.security.authorization.enabled=false; -drop view src_autho_test; diff --git a/ql/src/test/results/clientpositive/authorization_view.q.out b/ql/src/test/results/clientpositive/authorization_view.q.out deleted file mode 100644 index 594d9d8..0000000 --- a/ql/src/test/results/clientpositive/authorization_view.q.out +++ /dev/null @@ -1,223 +0,0 @@ -PREHOOK: query: -- SORT_BEFORE_DIFF - -create view src_autho_test as select * from src -PREHOOK: type: CREATEVIEW -PREHOOK: Input: default@src -POSTHOOK: query: -- SORT_BEFORE_DIFF - -create view src_autho_test as select * from src -POSTHOOK: type: CREATEVIEW -POSTHOOK: Input: default@src -POSTHOOK: Output: default@src_autho_test -PREHOOK: query: --view grant to user - -grant select on view src_autho_test to user hive_test_user -PREHOOK: type: GRANT_PRIVILEGE -PREHOOK: Output: default@src_autho_test -POSTHOOK: query: --view grant to user - -grant select on view src_autho_test to user hive_test_user -POSTHOOK: type: GRANT_PRIVILEGE -POSTHOOK: Output: default@src_autho_test -PREHOOK: query: show grant user hive_test_user on view src_autho_test -PREHOOK: type: SHOW_GRANT -POSTHOOK: query: show grant user hive_test_user on view src_autho_test -POSTHOOK: type: SHOW_GRANT -default src_autho_test hive_test_user USER Select false -1 hive_test_user -PREHOOK: query: show grant user hive_test_user on view src_autho_test(key) -PREHOOK: type: SHOW_GRANT -POSTHOOK: query: show grant user hive_test_user on view src_autho_test(key) -POSTHOOK: type: SHOW_GRANT -PREHOOK: query: revoke select on view src_autho_test from user hive_test_user -PREHOOK: type: REVOKE_PRIVILEGE -PREHOOK: Output: default@src_autho_test -POSTHOOK: query: revoke select on view src_autho_test from user hive_test_user -POSTHOOK: type: REVOKE_PRIVILEGE -POSTHOOK: Output: default@src_autho_test -PREHOOK: query: show grant user hive_test_user on view src_autho_test -PREHOOK: type: SHOW_GRANT -POSTHOOK: query: show grant user hive_test_user on view src_autho_test -POSTHOOK: type: SHOW_GRANT -PREHOOK: query: show grant user hive_test_user on view src_autho_test(key) -PREHOOK: type: SHOW_GRANT -POSTHOOK: query: show grant user hive_test_user on view src_autho_test(key) -POSTHOOK: type: SHOW_GRANT -PREHOOK: query: --column grant to user - -grant select(key) on view src_autho_test to user hive_test_user -PREHOOK: type: GRANT_PRIVILEGE -PREHOOK: Output: default@src_autho_test -POSTHOOK: query: --column grant to user - -grant select(key) on view src_autho_test to user hive_test_user -POSTHOOK: type: GRANT_PRIVILEGE -POSTHOOK: Output: default@src_autho_test -PREHOOK: query: show grant user hive_test_user on view src_autho_test -PREHOOK: type: SHOW_GRANT -POSTHOOK: query: show grant user hive_test_user on view src_autho_test -POSTHOOK: type: SHOW_GRANT -PREHOOK: query: show grant user hive_test_user on view src_autho_test(key) -PREHOOK: type: SHOW_GRANT -POSTHOOK: query: show grant user hive_test_user on view src_autho_test(key) -POSTHOOK: type: SHOW_GRANT -default src_autho_test key hive_test_user USER Select false -1 hive_test_user -PREHOOK: query: revoke select(key) on view src_autho_test from user hive_test_user -PREHOOK: type: REVOKE_PRIVILEGE -PREHOOK: Output: default@src_autho_test -POSTHOOK: query: revoke select(key) on view src_autho_test from user hive_test_user -POSTHOOK: type: REVOKE_PRIVILEGE -POSTHOOK: Output: default@src_autho_test -PREHOOK: query: show grant user hive_test_user on view src_autho_test -PREHOOK: type: SHOW_GRANT -POSTHOOK: query: show grant user hive_test_user on view src_autho_test -POSTHOOK: type: SHOW_GRANT -PREHOOK: query: show grant user hive_test_user on view src_autho_test(key) -PREHOOK: type: SHOW_GRANT -POSTHOOK: query: show grant user hive_test_user on view src_autho_test(key) -POSTHOOK: type: SHOW_GRANT -PREHOOK: query: --view grant to group - -grant select on view src_autho_test to group hive_test_group1 -PREHOOK: type: GRANT_PRIVILEGE -PREHOOK: Output: default@src_autho_test -POSTHOOK: query: --view grant to group - -grant select on view src_autho_test to group hive_test_group1 -POSTHOOK: type: GRANT_PRIVILEGE -POSTHOOK: Output: default@src_autho_test -PREHOOK: query: show grant group hive_test_group1 on view src_autho_test -PREHOOK: type: SHOW_GRANT -POSTHOOK: query: show grant group hive_test_group1 on view src_autho_test -POSTHOOK: type: SHOW_GRANT -default src_autho_test hive_test_group1 GROUP Select false -1 hive_test_user -PREHOOK: query: show grant group hive_test_group1 on view src_autho_test(key) -PREHOOK: type: SHOW_GRANT -POSTHOOK: query: show grant group hive_test_group1 on view src_autho_test(key) -POSTHOOK: type: SHOW_GRANT -PREHOOK: query: revoke select on view src_autho_test from group hive_test_group1 -PREHOOK: type: REVOKE_PRIVILEGE -PREHOOK: Output: default@src_autho_test -POSTHOOK: query: revoke select on view src_autho_test from group hive_test_group1 -POSTHOOK: type: REVOKE_PRIVILEGE -POSTHOOK: Output: default@src_autho_test -PREHOOK: query: show grant group hive_test_group1 on view src_autho_test -PREHOOK: type: SHOW_GRANT -POSTHOOK: query: show grant group hive_test_group1 on view src_autho_test -POSTHOOK: type: SHOW_GRANT -PREHOOK: query: show grant group hive_test_group1 on view src_autho_test(key) -PREHOOK: type: SHOW_GRANT -POSTHOOK: query: show grant group hive_test_group1 on view src_autho_test(key) -POSTHOOK: type: SHOW_GRANT -PREHOOK: query: --column grant to group - -grant select(key) on view src_autho_test to group hive_test_group1 -PREHOOK: type: GRANT_PRIVILEGE -PREHOOK: Output: default@src_autho_test -POSTHOOK: query: --column grant to group - -grant select(key) on view src_autho_test to group hive_test_group1 -POSTHOOK: type: GRANT_PRIVILEGE -POSTHOOK: Output: default@src_autho_test -PREHOOK: query: show grant group hive_test_group1 on view src_autho_test -PREHOOK: type: SHOW_GRANT -POSTHOOK: query: show grant group hive_test_group1 on view src_autho_test -POSTHOOK: type: SHOW_GRANT -PREHOOK: query: show grant group hive_test_group1 on view src_autho_test(key) -PREHOOK: type: SHOW_GRANT -POSTHOOK: query: show grant group hive_test_group1 on view src_autho_test(key) -POSTHOOK: type: SHOW_GRANT -default src_autho_test key hive_test_group1 GROUP Select false -1 hive_test_user -PREHOOK: query: revoke select(key) on view src_autho_test from group hive_test_group1 -PREHOOK: type: REVOKE_PRIVILEGE -PREHOOK: Output: default@src_autho_test -POSTHOOK: query: revoke select(key) on view src_autho_test from group hive_test_group1 -POSTHOOK: type: REVOKE_PRIVILEGE -POSTHOOK: Output: default@src_autho_test -PREHOOK: query: show grant group hive_test_group1 on view src_autho_test -PREHOOK: type: SHOW_GRANT -POSTHOOK: query: show grant group hive_test_group1 on view src_autho_test -POSTHOOK: type: SHOW_GRANT -PREHOOK: query: show grant group hive_test_group1 on view src_autho_test(key) -PREHOOK: type: SHOW_GRANT -POSTHOOK: query: show grant group hive_test_group1 on view src_autho_test(key) -POSTHOOK: type: SHOW_GRANT -PREHOOK: query: --role -create role src_role -PREHOOK: type: CREATEROLE -POSTHOOK: query: --role -create role src_role -POSTHOOK: type: CREATEROLE -PREHOOK: query: grant role src_role to user hive_test_user -PREHOOK: type: GRANT_ROLE -POSTHOOK: query: grant role src_role to user hive_test_user -POSTHOOK: type: GRANT_ROLE -PREHOOK: query: show role grant user hive_test_user -PREHOOK: type: SHOW_ROLE_GRANT -POSTHOOK: query: show role grant user hive_test_user -POSTHOOK: type: SHOW_ROLE_GRANT -src_role -1 hive_test_user USER false -1 hive_test_user -PUBLIC -1 false -1 -PREHOOK: query: --column grant to role - -grant select(key) on view src_autho_test to role src_role -PREHOOK: type: GRANT_PRIVILEGE -PREHOOK: Output: default@src_autho_test -POSTHOOK: query: --column grant to role - -grant select(key) on view src_autho_test to role src_role -POSTHOOK: type: GRANT_PRIVILEGE -POSTHOOK: Output: default@src_autho_test -PREHOOK: query: show grant role src_role on view src_autho_test -PREHOOK: type: SHOW_GRANT -POSTHOOK: query: show grant role src_role on view src_autho_test -POSTHOOK: type: SHOW_GRANT -PREHOOK: query: show grant role src_role on view src_autho_test(key) -PREHOOK: type: SHOW_GRANT -POSTHOOK: query: show grant role src_role on view src_autho_test(key) -POSTHOOK: type: SHOW_GRANT -default src_autho_test key src_role ROLE Select false -1 hive_test_user -PREHOOK: query: revoke select(key) on view src_autho_test from role src_role -PREHOOK: type: REVOKE_PRIVILEGE -PREHOOK: Output: default@src_autho_test -POSTHOOK: query: revoke select(key) on view src_autho_test from role src_role -POSTHOOK: type: REVOKE_PRIVILEGE -POSTHOOK: Output: default@src_autho_test -PREHOOK: query: --view grant to role - -grant select on view src_autho_test to role src_role -PREHOOK: type: GRANT_PRIVILEGE -PREHOOK: Output: default@src_autho_test -POSTHOOK: query: --view grant to role - -grant select on view src_autho_test to role src_role -POSTHOOK: type: GRANT_PRIVILEGE -POSTHOOK: Output: default@src_autho_test -PREHOOK: query: show grant role src_role on view src_autho_test -PREHOOK: type: SHOW_GRANT -POSTHOOK: query: show grant role src_role on view src_autho_test -POSTHOOK: type: SHOW_GRANT -default src_autho_test src_role ROLE Select false -1 hive_test_user -PREHOOK: query: show grant role src_role on view src_autho_test(key) -PREHOOK: type: SHOW_GRANT -POSTHOOK: query: show grant role src_role on view src_autho_test(key) -POSTHOOK: type: SHOW_GRANT -PREHOOK: query: revoke select on view src_autho_test from role src_role -PREHOOK: type: REVOKE_PRIVILEGE -PREHOOK: Output: default@src_autho_test -POSTHOOK: query: revoke select on view src_autho_test from role src_role -POSTHOOK: type: REVOKE_PRIVILEGE -POSTHOOK: Output: default@src_autho_test -PREHOOK: query: -- drop role -drop role src_role -PREHOOK: type: DROPROLE -POSTHOOK: query: -- drop role -drop role src_role -POSTHOOK: type: DROPROLE -PREHOOK: query: drop view src_autho_test -PREHOOK: type: DROPVIEW -PREHOOK: Input: default@src_autho_test -PREHOOK: Output: default@src_autho_test -POSTHOOK: query: drop view src_autho_test -POSTHOOK: type: DROPVIEW -POSTHOOK: Input: default@src_autho_test -POSTHOOK: Output: default@src_autho_test