Index: common/src/java/org/apache/hadoop/hive/conf/HiveConf.java =================================================================== --- common/src/java/org/apache/hadoop/hive/conf/HiveConf.java (revision 1063819) +++ common/src/java/org/apache/hadoop/hive/conf/HiveConf.java (working copy) @@ -362,12 +362,13 @@ HIVE_AUTHORIZATION_TABLE_USER_GRANTS("hive.security.authorization.createtable.user.grants", null), HIVE_AUTHORIZATION_TABLE_GROUP_GRANTS("hive.security.authorization.createtable.group.grants", null), HIVE_AUTHORIZATION_TABLE_ROLE_GRANTS("hive.security.authorization.createtable.role.grants", null), + HIVE_AUTHORIZATION_TABLE_OWNER_GRANTS("hive.security.authorization.createtable.owner.grants", null), // Print column names in output HIVE_CLI_PRINT_HEADER("hive.cli.print.header", false), HIVE_ERROR_ON_EMPTY_PARTITION("hive.error.on.empty.partition", false), - HIVE_INDEX_IGNORE_HDFS_LOC("hive.index.compact.file.ignore.hdfs", false), + HIVE_INDEX_IGNORE_HDFS_LOC("hive.index.compact.file.ignore.hdfs", false), ; Index: ql/src/java/org/apache/hadoop/hive/ql/session/CreateTableAutomaticGrant.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/session/CreateTableAutomaticGrant.java (revision 1063819) +++ ql/src/java/org/apache/hadoop/hive/ql/session/CreateTableAutomaticGrant.java (working copy) @@ -45,17 +45,18 @@ grants.roleGrants = getGrantMap(HiveConf.getVar(conf, HiveConf.ConfVars.HIVE_AUTHORIZATION_TABLE_ROLE_GRANTS)); - List ownerGrantInfoList = new ArrayList(); String grantor = null; if (SessionState.get() != null && SessionState.get().getAuthenticator() != null) { grantor = SessionState.get().getAuthenticator().getUserName(); - ownerGrantInfoList.add(new PrivilegeGrantInfo(Privilege.ALL.getPriv(), -1, grantor, - PrincipalType.USER, true)); - if (grants.userGrants == null) { - grants.userGrants = new HashMap>(); + List ownerGrant = getGrantorInfoList(HiveConf.getVar(conf, + HiveConf.ConfVars.HIVE_AUTHORIZATION_TABLE_OWNER_GRANTS)); + if(ownerGrant != null) { + if (grants.userGrants == null) { + grants.userGrants = new HashMap>(); + } + grants.userGrants.put(grantor, ownerGrant); } - grants.userGrants.put(grantor, ownerGrantInfoList); } return grants; } @@ -75,22 +76,12 @@ } String userList = principalListAndPrivList[0]; String privList = principalListAndPrivList[1]; - checkPrivilege(privList); - - String[] grantArray = privList.split(","); - List grantInfoList = new ArrayList(); - String grantor = null; - if (SessionState.get().getAuthenticator() != null) { - grantor = SessionState.get().getAuthenticator().getUserName(); - } - for (String grant : grantArray) { - grantInfoList.add(new PrivilegeGrantInfo(grant, -1, grantor, - PrincipalType.USER, true)); - } - - String[] users = userList.split(","); - for (String user : users) { - grantsMap.put(user, grantInfoList); + List grantInfoList = getGrantorInfoList(privList); + if(grantInfoList != null) { + String[] users = userList.split(","); + for (String user : users) { + grantsMap.put(user, grantInfoList); + } } } return grantsMap; @@ -98,6 +89,25 @@ return null; } + private static List getGrantorInfoList(String privList) + throws HiveException { + if (privList == null || privList.trim().equals("")) { + return null; + } + checkPrivilege(privList); + String[] grantArray = privList.split(","); + List grantInfoList = new ArrayList(); + String grantor = null; + if (SessionState.get().getAuthenticator() != null) { + grantor = SessionState.get().getAuthenticator().getUserName(); + } + for (String grant : grantArray) { + grantInfoList.add(new PrivilegeGrantInfo(grant, -1, grantor, + PrincipalType.USER, true)); + } + return grantInfoList; + } + private static void checkPrivilege(String ownerGrantsInConfig) throws HiveException { String[] ownerGrantArray = ownerGrantsInConfig.split(","); Index: ql/src/test/queries/clientnegative/authorization_fail_1.q =================================================================== --- ql/src/test/queries/clientnegative/authorization_fail_1.q (revision 1063819) +++ ql/src/test/queries/clientnegative/authorization_fail_1.q (working copy) @@ -1,8 +1,6 @@ create table authorization_fail_1 (key int, value string); set hive.security.authorization.enabled=true; -revoke `ALL` on table authorization_fail_1 from user hive_test_user; - grant `Create` on table authorization_fail_1 to user hive_test_user; grant `Create` on table authorization_fail_1 to user hive_test_user; Index: ql/src/test/queries/clientnegative/authorization_fail_2.q =================================================================== --- ql/src/test/queries/clientnegative/authorization_fail_2.q (revision 1063819) +++ ql/src/test/queries/clientnegative/authorization_fail_2.q (working copy) @@ -1,7 +1,5 @@ create table authorization_fail_2 (key int, value string) partitioned by (ds string); -revoke `ALL` on table authorization_fail_2 from user hive_test_user; - set hive.security.authorization.enabled=true; alter table authorization_fail_2 add partition (ds='2010'); Index: ql/src/test/queries/clientnegative/authorization_fail_3.q =================================================================== --- ql/src/test/queries/clientnegative/authorization_fail_3.q (revision 1063819) +++ ql/src/test/queries/clientnegative/authorization_fail_3.q (working copy) @@ -1,8 +1,6 @@ create table authorization_fail_3 (key int, value string) partitioned by (ds string); set hive.security.authorization.enabled=true; -revoke `ALL` on table authorization_fail_3 from user hive_test_user; - grant `Create` on table authorization_fail_3 to user hive_test_user; alter table authorization_fail_3 add partition (ds='2010'); Index: ql/src/test/queries/clientnegative/authorization_fail_4.q =================================================================== --- ql/src/test/queries/clientnegative/authorization_fail_4.q (revision 1063819) +++ ql/src/test/queries/clientnegative/authorization_fail_4.q (working copy) @@ -1,7 +1,5 @@ create table authorization_fail_4 (key int, value string) partitioned by (ds string); -revoke `ALL` on table authorization_fail_4 from user hive_test_user; - set hive.security.authorization.enabled=true; grant `Alter` on table authorization_fail_4 to user hive_test_user; ALTER TABLE authorization_fail_4 SET TBLPROPERTIES ("PARTITION_LEVEL_PRIVILEGE"="TRUE"); Index: ql/src/test/queries/clientnegative/authorization_fail_5.q =================================================================== --- ql/src/test/queries/clientnegative/authorization_fail_5.q (revision 1063819) +++ ql/src/test/queries/clientnegative/authorization_fail_5.q (working copy) @@ -1,8 +1,6 @@ create table authorization_fail (key int, value string) partitioned by (ds string); set hive.security.authorization.enabled=true; -revoke `ALL` on table authorization_fail from user hive_test_user; - grant `Alter` on table authorization_fail to user hive_test_user; ALTER TABLE authorization_fail SET TBLPROPERTIES ("PARTITION_LEVEL_PRIVILEGE"="TRUE"); Index: ql/src/test/queries/clientnegative/authorization_fail_6.q =================================================================== --- ql/src/test/queries/clientnegative/authorization_fail_6.q (revision 1063819) +++ ql/src/test/queries/clientnegative/authorization_fail_6.q (working copy) @@ -1,5 +1,4 @@ create table authorization_part_fail (key int, value string) partitioned by (ds string); -revoke `ALL` on table authorization_part_fail from user hive_test_user; set hive.security.authorization.enabled=true; ALTER TABLE authorization_part_fail SET TBLPROPERTIES ("PARTITION_LEVEL_PRIVILEGE"="TRUE"); Index: ql/src/test/queries/clientnegative/authorization_fail_7.q =================================================================== --- ql/src/test/queries/clientnegative/authorization_fail_7.q (revision 1063819) +++ ql/src/test/queries/clientnegative/authorization_fail_7.q (working copy) @@ -1,5 +1,4 @@ create table authorization_fail (key int, value string); -revoke `ALL` on table authorization_fail from user hive_test_user; set hive.security.authorization.enabled=true; Index: ql/src/test/queries/clientnegative/authorization_part.q =================================================================== --- ql/src/test/queries/clientnegative/authorization_part.q (revision 1063819) +++ ql/src/test/queries/clientnegative/authorization_part.q (working copy) @@ -2,8 +2,6 @@ ALTER TABLE authorization_part_fail SET TBLPROPERTIES ("PARTITION_LEVEL_PRIVILEGE"="TRUE"); set hive.security.authorization.enabled=true; -revoke `ALL` on table authorization_part_fail from user hive_test_user; - grant `Create` on table authorization_part_fail to user hive_test_user; grant `Update` on table authorization_part_fail to user hive_test_user; grant `Drop` on table authorization_part_fail to user hive_test_user; Index: ql/src/test/queries/clientpositive/authorization_1.q =================================================================== --- ql/src/test/queries/clientpositive/authorization_1.q (revision 1063819) +++ ql/src/test/queries/clientpositive/authorization_1.q (working copy) @@ -1,7 +1,5 @@ create table src_autho_test as select * from src; -revoke `ALL` on table src_autho_test from user hive_test_user; - set hive.security.authorization.enabled=true; --table grant to user Index: ql/src/test/queries/clientpositive/authorization_2.q =================================================================== --- ql/src/test/queries/clientpositive/authorization_2.q (revision 1063819) +++ ql/src/test/queries/clientpositive/authorization_2.q (working copy) @@ -1,7 +1,5 @@ create table authorization_part (key int, value string) partitioned by (ds string); -revoke `ALL` on table authorization_part from user hive_test_user; - ALTER TABLE authorization_part SET TBLPROPERTIES ("PARTITION_LEVEL_PRIVILEGE"="TRUE"); set hive.security.authorization.enabled=true; Index: ql/src/test/queries/clientpositive/authorization_3.q =================================================================== --- ql/src/test/queries/clientpositive/authorization_3.q (revision 1063819) +++ ql/src/test/queries/clientpositive/authorization_3.q (working copy) @@ -1,7 +1,5 @@ create table src_autho_test as select * from src; -revoke `ALL` on table src_autho_test from user hive_test_user; - grant `drop` on table src_autho_test to user hive_test_user; grant `select` on table src_autho_test to user hive_test_user; Index: ql/src/test/queries/clientpositive/authorization_4.q =================================================================== --- ql/src/test/queries/clientpositive/authorization_4.q (revision 1063819) +++ ql/src/test/queries/clientpositive/authorization_4.q (working copy) @@ -1,5 +1,7 @@ create table src_autho_test as select * from src; +grant `ALL` on table src_autho_test to user hive_test_user; + set hive.security.authorization.enabled=true; show grant user hive_test_user on table src_autho_test; Index: ql/src/test/queries/clientpositive/authorization_6.q =================================================================== --- ql/src/test/queries/clientpositive/authorization_6.q (revision 0) +++ ql/src/test/queries/clientpositive/authorization_6.q (revision 0) @@ -0,0 +1,5 @@ +create table src_auth_create_test as select * from src; + +show grant user hive_test_user on table src_auth_create_test; + +drop table src_auth_create_test; \ No newline at end of file Index: ql/src/test/results/clientnegative/authorization_fail_1.q.out =================================================================== --- ql/src/test/results/clientnegative/authorization_fail_1.q.out (revision 1063819) +++ ql/src/test/results/clientnegative/authorization_fail_1.q.out (working copy) @@ -3,10 +3,6 @@ POSTHOOK: query: create table authorization_fail_1 (key int, value string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: default@authorization_fail_1 -PREHOOK: query: revoke `ALL` on table authorization_fail_1 from user hive_test_user -PREHOOK: type: REVOKE_PRIVILEGE -POSTHOOK: query: revoke `ALL` on table authorization_fail_1 from user hive_test_user -POSTHOOK: type: REVOKE_PRIVILEGE PREHOOK: query: grant `Create` on table authorization_fail_1 to user hive_test_user PREHOOK: type: GRANT_PRIVILEGE POSTHOOK: query: grant `Create` on table authorization_fail_1 to user hive_test_user Index: ql/src/test/results/clientnegative/authorization_fail_2.q.out =================================================================== --- ql/src/test/results/clientnegative/authorization_fail_2.q.out (revision 1063819) +++ ql/src/test/results/clientnegative/authorization_fail_2.q.out (working copy) @@ -3,8 +3,4 @@ POSTHOOK: query: create table authorization_fail_2 (key int, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: default@authorization_fail_2 -PREHOOK: query: revoke `ALL` on table authorization_fail_2 from user hive_test_user -PREHOOK: type: REVOKE_PRIVILEGE -POSTHOOK: query: revoke `ALL` on table authorization_fail_2 from user hive_test_user -POSTHOOK: type: REVOKE_PRIVILEGE Authorization failed:No privilege 'Create' found for inputs { database:default, table:authorization_fail_2}. Use show grant to get more details. Index: ql/src/test/results/clientnegative/authorization_fail_3.q.out =================================================================== --- ql/src/test/results/clientnegative/authorization_fail_3.q.out (revision 1063819) +++ ql/src/test/results/clientnegative/authorization_fail_3.q.out (working copy) @@ -3,10 +3,6 @@ POSTHOOK: query: create table authorization_fail_3 (key int, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: default@authorization_fail_3 -PREHOOK: query: revoke `ALL` on table authorization_fail_3 from user hive_test_user -PREHOOK: type: REVOKE_PRIVILEGE -POSTHOOK: query: revoke `ALL` on table authorization_fail_3 from user hive_test_user -POSTHOOK: type: REVOKE_PRIVILEGE PREHOOK: query: grant `Create` on table authorization_fail_3 to user hive_test_user PREHOOK: type: GRANT_PRIVILEGE POSTHOOK: query: grant `Create` on table authorization_fail_3 to user hive_test_user @@ -28,7 +24,7 @@ principalName hive_test_user principalType USER privilege Create -grantTime 1292569774 +grantTime 1296070467 grantor hive_test_user PREHOOK: query: show grant user hive_test_user on table authorization_fail_3 partition (ds='2010') PREHOOK: type: SHOW_GRANT Index: ql/src/test/results/clientnegative/authorization_fail_4.q.out =================================================================== --- ql/src/test/results/clientnegative/authorization_fail_4.q.out (revision 1063819) +++ ql/src/test/results/clientnegative/authorization_fail_4.q.out (working copy) @@ -3,10 +3,6 @@ POSTHOOK: query: create table authorization_fail_4 (key int, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: default@authorization_fail_4 -PREHOOK: query: revoke `ALL` on table authorization_fail_4 from user hive_test_user -PREHOOK: type: REVOKE_PRIVILEGE -POSTHOOK: query: revoke `ALL` on table authorization_fail_4 from user hive_test_user -POSTHOOK: type: REVOKE_PRIVILEGE PREHOOK: query: grant `Alter` on table authorization_fail_4 to user hive_test_user PREHOOK: type: GRANT_PRIVILEGE POSTHOOK: query: grant `Alter` on table authorization_fail_4 to user hive_test_user @@ -40,7 +36,7 @@ principalName hive_test_user principalType USER privilege Alter -grantTime 1292569775 +grantTime 1296070468 grantor hive_test_user database default @@ -48,7 +44,7 @@ principalName hive_test_user principalType USER privilege Create -grantTime 1292569776 +grantTime 1296070469 grantor hive_test_user PREHOOK: query: show grant user hive_test_user on table authorization_fail_4 partition (ds='2010') PREHOOK: type: SHOW_GRANT @@ -61,7 +57,7 @@ principalName hive_test_user principalType USER privilege Alter -grantTime 1292569776 +grantTime 1296070469 grantor hive_test_user database default @@ -70,6 +66,6 @@ principalName hive_test_user principalType USER privilege Create -grantTime 1292569776 +grantTime 1296070469 grantor hive_test_user Authorization failed:No privilege 'Select' found for inputs { database:default, table:authorization_fail_4, partitionName:ds=2010, columnName:key}. Use show grant to get more details. Index: ql/src/test/results/clientnegative/authorization_fail_5.q.out =================================================================== --- ql/src/test/results/clientnegative/authorization_fail_5.q.out (revision 1063819) +++ ql/src/test/results/clientnegative/authorization_fail_5.q.out (working copy) @@ -3,10 +3,6 @@ POSTHOOK: query: create table authorization_fail (key int, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: default@authorization_fail -PREHOOK: query: revoke `ALL` on table authorization_fail from user hive_test_user -PREHOOK: type: REVOKE_PRIVILEGE -POSTHOOK: query: revoke `ALL` on table authorization_fail from user hive_test_user -POSTHOOK: type: REVOKE_PRIVILEGE PREHOOK: query: grant `Alter` on table authorization_fail to user hive_test_user PREHOOK: type: GRANT_PRIVILEGE POSTHOOK: query: grant `Alter` on table authorization_fail to user hive_test_user @@ -44,7 +40,7 @@ principalName hive_test_user principalType USER privilege Alter -grantTime 1292570198 +grantTime 1296070470 grantor hive_test_user database default @@ -52,7 +48,7 @@ principalName hive_test_user principalType USER privilege Create -grantTime 1292570198 +grantTime 1296070470 grantor hive_test_user database default @@ -60,7 +56,7 @@ principalName hive_test_user principalType USER privilege Select -grantTime 1292570198 +grantTime 1296070470 grantor hive_test_user PREHOOK: query: show grant user hive_test_user on table authorization_fail partition (ds='2010') PREHOOK: type: SHOW_GRANT @@ -73,7 +69,7 @@ principalName hive_test_user principalType USER privilege Alter -grantTime 1292570198 +grantTime 1296070470 grantor hive_test_user database default @@ -82,7 +78,7 @@ principalName hive_test_user principalType USER privilege Create -grantTime 1292570198 +grantTime 1296070470 grantor hive_test_user database default @@ -91,7 +87,7 @@ principalName hive_test_user principalType USER privilege Select -grantTime 1292570198 +grantTime 1296070470 grantor hive_test_user PREHOOK: query: revoke `Select` on table authorization_fail partition (ds='2010') from user hive_test_user PREHOOK: type: REVOKE_PRIVILEGE @@ -108,7 +104,7 @@ principalName hive_test_user principalType USER privilege Alter -grantTime 1292570198 +grantTime 1296070470 grantor hive_test_user database default @@ -117,6 +113,6 @@ principalName hive_test_user principalType USER privilege Create -grantTime 1292570198 +grantTime 1296070470 grantor hive_test_user Authorization failed:No privilege 'Select' found for inputs { database:default, table:authorization_fail, partitionName:ds=2010, columnName:key}. Use show grant to get more details. Index: ql/src/test/results/clientnegative/authorization_fail_6.q.out =================================================================== --- ql/src/test/results/clientnegative/authorization_fail_6.q.out (revision 1063819) +++ ql/src/test/results/clientnegative/authorization_fail_6.q.out (working copy) @@ -3,8 +3,4 @@ POSTHOOK: query: create table authorization_part_fail (key int, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: default@authorization_part_fail -PREHOOK: query: revoke `ALL` on table authorization_part_fail from user hive_test_user -PREHOOK: type: REVOKE_PRIVILEGE -POSTHOOK: query: revoke `ALL` on table authorization_part_fail from user hive_test_user -POSTHOOK: type: REVOKE_PRIVILEGE Authorization failed:No privilege 'Alter' found for inputs { database:default, table:authorization_part_fail}. Use show grant to get more details. Index: ql/src/test/results/clientnegative/authorization_fail_7.q.out =================================================================== --- ql/src/test/results/clientnegative/authorization_fail_7.q.out (revision 1063819) +++ ql/src/test/results/clientnegative/authorization_fail_7.q.out (working copy) @@ -3,10 +3,6 @@ POSTHOOK: query: create table authorization_fail (key int, value string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: default@authorization_fail -PREHOOK: query: revoke `ALL` on table authorization_fail from user hive_test_user -PREHOOK: type: REVOKE_PRIVILEGE -POSTHOOK: query: revoke `ALL` on table authorization_fail from user hive_test_user -POSTHOOK: type: REVOKE_PRIVILEGE PREHOOK: query: create role hive_test_role_fail PREHOOK: type: CREATEROLE POSTHOOK: query: create role hive_test_role_fail @@ -35,7 +31,7 @@ principalName hive_test_role_fail principalType ROLE privilege Select -grantTime 1292570201 +grantTime 1296070472 grantor hive_test_user PREHOOK: query: drop role hive_test_role_fail PREHOOK: type: DROPROLE Index: ql/src/test/results/clientnegative/authorization_part.q.out =================================================================== --- ql/src/test/results/clientnegative/authorization_part.q.out (revision 1063819) +++ ql/src/test/results/clientnegative/authorization_part.q.out (working copy) @@ -11,10 +11,6 @@ POSTHOOK: type: ALTERTABLE_PROPERTIES POSTHOOK: Input: default@authorization_part_fail POSTHOOK: Output: default@authorization_part_fail -PREHOOK: query: revoke `ALL` on table authorization_part_fail from user hive_test_user -PREHOOK: type: REVOKE_PRIVILEGE -POSTHOOK: query: revoke `ALL` on table authorization_part_fail from user hive_test_user -POSTHOOK: type: REVOKE_PRIVILEGE PREHOOK: query: grant `Create` on table authorization_part_fail to user hive_test_user PREHOOK: type: GRANT_PRIVILEGE POSTHOOK: query: grant `Create` on table authorization_part_fail to user hive_test_user @@ -53,7 +49,7 @@ principalName hive_test_group1 principalType GROUP privilege Select -grantTime 1292570477 +grantTime 1296070473 grantor hive_test_user PREHOOK: query: insert overwrite table authorization_part_fail partition (ds='2010') select key, value from src PREHOOK: type: QUERY @@ -79,7 +75,7 @@ principalName hive_test_group1 principalType GROUP privilege Select -grantTime 1292570485 +grantTime 1296070482 grantor hive_test_user PREHOOK: query: show grant group hive_test_group1 on table authorization_part_fail partition (ds='2010') PREHOOK: type: SHOW_GRANT @@ -94,16 +90,16 @@ principalName hive_test_group1 principalType GROUP privilege Select -grantTime 1292570485 +grantTime 1296070482 grantor hive_test_user PREHOOK: query: select key, value from authorization_part_fail where ds='2010' order by key limit 20 PREHOOK: type: QUERY PREHOOK: Input: default@authorization_part_fail@ds=2010 -PREHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-12-16_23-21-26_341_6045427400960012192/-mr-10000 +PREHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2011-01-26_11-34-42_495_7735328329206992483/-mr-10000 POSTHOOK: query: select key, value from authorization_part_fail where ds='2010' order by key limit 20 POSTHOOK: type: QUERY POSTHOOK: Input: default@authorization_part_fail@ds=2010 -POSTHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-12-16_23-21-26_341_6045427400960012192/-mr-10000 +POSTHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2011-01-26_11-34-42_495_7735328329206992483/-mr-10000 POSTHOOK: Lineage: authorization_part_fail PARTITION(ds=2010).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: authorization_part_fail PARTITION(ds=2010).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] 0 val_0 @@ -154,7 +150,7 @@ principalName hive_test_group1 principalType GROUP privilege Select -grantTime 1292570500 +grantTime 1296070497 grantor hive_test_user PREHOOK: query: show grant group hive_test_group1 on table authorization_part_fail partition (ds='2011') PREHOOK: type: SHOW_GRANT @@ -171,16 +167,16 @@ principalName hive_test_group1 principalType GROUP privilege Select -grantTime 1292570500 +grantTime 1296070497 grantor hive_test_user PREHOOK: query: select key, value from authorization_part_fail where ds='2011' order by key limit 20 PREHOOK: type: QUERY PREHOOK: Input: default@authorization_part_fail@ds=2011 -PREHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-12-16_23-21-40_573_6139158379776569501/-mr-10000 +PREHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2011-01-26_11-34-57_626_8520061227133833333/-mr-10000 POSTHOOK: query: select key, value from authorization_part_fail where ds='2011' order by key limit 20 POSTHOOK: type: QUERY POSTHOOK: Input: default@authorization_part_fail@ds=2011 -POSTHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-12-16_23-21-40_573_6139158379776569501/-mr-10000 +POSTHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2011-01-26_11-34-57_626_8520061227133833333/-mr-10000 POSTHOOK: Lineage: authorization_part_fail PARTITION(ds=2010).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: authorization_part_fail PARTITION(ds=2010).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: authorization_part_fail PARTITION(ds=2011).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] @@ -209,12 +205,12 @@ PREHOOK: type: QUERY PREHOOK: Input: default@authorization_part_fail@ds=2010 PREHOOK: Input: default@authorization_part_fail@ds=2011 -PREHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-12-16_23-21-46_703_8547570686064698117/-mr-10000 +PREHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2011-01-26_11-35-04_359_4584170264791374181/-mr-10000 POSTHOOK: query: select key,value, ds from authorization_part_fail where ds>='2010' order by key, ds limit 20 POSTHOOK: type: QUERY POSTHOOK: Input: default@authorization_part_fail@ds=2010 POSTHOOK: Input: default@authorization_part_fail@ds=2011 -POSTHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-12-16_23-21-46_703_8547570686064698117/-mr-10000 +POSTHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2011-01-26_11-35-04_359_4584170264791374181/-mr-10000 POSTHOOK: Lineage: authorization_part_fail PARTITION(ds=2010).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: authorization_part_fail PARTITION(ds=2010).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: authorization_part_fail PARTITION(ds=2011).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] Index: ql/src/test/results/clientpositive/authorization_1.q.out =================================================================== --- ql/src/test/results/clientpositive/authorization_1.q.out (revision 1063819) +++ ql/src/test/results/clientpositive/authorization_1.q.out (working copy) @@ -5,10 +5,6 @@ POSTHOOK: type: CREATETABLE_AS_SELECT POSTHOOK: Input: default@src POSTHOOK: Output: default@src_autho_test -PREHOOK: query: revoke `ALL` on table src_autho_test from user hive_test_user -PREHOOK: type: REVOKE_PRIVILEGE -POSTHOOK: query: revoke `ALL` on table src_autho_test from user hive_test_user -POSTHOOK: type: REVOKE_PRIVILEGE PREHOOK: query: --table grant to user grant `select` on table src_autho_test to user hive_test_user @@ -27,7 +23,7 @@ principalName hive_test_user principalType USER privilege Select -grantTime 1292567447 +grantTime 1296069401 grantor hive_test_user PREHOOK: query: show grant user hive_test_user on table src_autho_test(key) PREHOOK: type: SHOW_GRANT @@ -36,11 +32,11 @@ PREHOOK: query: select key from src_autho_test order by key limit 20 PREHOOK: type: QUERY PREHOOK: Input: default@src_autho_test -PREHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-12-16_22-30-47_550_1512695429257033493/-mr-10000 +PREHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2011-01-26_11-16-41_616_2208393858705664584/-mr-10000 POSTHOOK: query: select key from src_autho_test order by key limit 20 POSTHOOK: type: QUERY POSTHOOK: Input: default@src_autho_test -POSTHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-12-16_22-30-47_550_1512695429257033493/-mr-10000 +POSTHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2011-01-26_11-16-41_616_2208393858705664584/-mr-10000 0 0 0 @@ -96,16 +92,16 @@ principalName hive_test_user principalType USER privilege Select -grantTime 1292567455 +grantTime 1296069409 grantor hive_test_user PREHOOK: query: select key from src_autho_test order by key limit 20 PREHOOK: type: QUERY PREHOOK: Input: default@src_autho_test -PREHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-12-16_22-30-55_772_6274083496243050072/-mr-10000 +PREHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2011-01-26_11-16-49_445_2413601282825905862/-mr-10000 POSTHOOK: query: select key from src_autho_test order by key limit 20 POSTHOOK: type: QUERY POSTHOOK: Input: default@src_autho_test -POSTHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-12-16_22-30-55_772_6274083496243050072/-mr-10000 +POSTHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2011-01-26_11-16-49_445_2413601282825905862/-mr-10000 0 0 0 @@ -156,7 +152,7 @@ principalName hive_test_group1 principalType GROUP privilege Select -grantTime 1292567463 +grantTime 1296069417 grantor hive_test_user PREHOOK: query: show grant group hive_test_group1 on table src_autho_test(key) PREHOOK: type: SHOW_GRANT @@ -165,11 +161,11 @@ PREHOOK: query: select key from src_autho_test order by key limit 20 PREHOOK: type: QUERY PREHOOK: Input: default@src_autho_test -PREHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-12-16_22-31-03_700_7275195249200178582/-mr-10000 +PREHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2011-01-26_11-16-57_781_3650772702845992235/-mr-10000 POSTHOOK: query: select key from src_autho_test order by key limit 20 POSTHOOK: type: QUERY POSTHOOK: Input: default@src_autho_test -POSTHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-12-16_22-31-03_700_7275195249200178582/-mr-10000 +POSTHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2011-01-26_11-16-57_781_3650772702845992235/-mr-10000 0 0 0 @@ -225,16 +221,16 @@ principalName hive_test_group1 principalType GROUP privilege Select -grantTime 1292567471 +grantTime 1296069426 grantor hive_test_user PREHOOK: query: select key from src_autho_test order by key limit 20 PREHOOK: type: QUERY PREHOOK: Input: default@src_autho_test -PREHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-12-16_22-31-11_544_6787651330159557242/-mr-10000 +PREHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2011-01-26_11-17-06_787_7376700379296406265/-mr-10000 POSTHOOK: query: select key from src_autho_test order by key limit 20 POSTHOOK: type: QUERY POSTHOOK: Input: default@src_autho_test -POSTHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-12-16_22-31-11_544_6787651330159557242/-mr-10000 +POSTHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2011-01-26_11-17-06_787_7376700379296406265/-mr-10000 0 0 0 @@ -306,16 +302,16 @@ principalName src_role principalType ROLE privilege Select -grantTime 1292567480 +grantTime 1296069434 grantor hive_test_user PREHOOK: query: select key from src_autho_test order by key limit 20 PREHOOK: type: QUERY PREHOOK: Input: default@src_autho_test -PREHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-12-16_22-31-20_263_1898304116616741455/-mr-10000 +PREHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2011-01-26_11-17-14_922_7878816813899995746/-mr-10000 POSTHOOK: query: select key from src_autho_test order by key limit 20 POSTHOOK: type: QUERY POSTHOOK: Input: default@src_autho_test -POSTHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-12-16_22-31-20_263_1898304116616741455/-mr-10000 +POSTHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2011-01-26_11-17-14_922_7878816813899995746/-mr-10000 0 0 0 @@ -351,11 +347,11 @@ PREHOOK: query: select key from src_autho_test order by key limit 20 PREHOOK: type: QUERY PREHOOK: Input: default@src_autho_test -PREHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-12-16_22-31-26_813_7645696827575089587/-mr-10000 +PREHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2011-01-26_11-17-21_958_2436647212457230306/-mr-10000 POSTHOOK: query: select key from src_autho_test order by key limit 20 POSTHOOK: type: QUERY POSTHOOK: Input: default@src_autho_test -POSTHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-12-16_22-31-26_813_7645696827575089587/-mr-10000 +POSTHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2011-01-26_11-17-21_958_2436647212457230306/-mr-10000 0 0 0 @@ -386,7 +382,7 @@ principalName src_role principalType ROLE privilege Select -grantTime 1292567486 +grantTime 1296069441 grantor hive_test_user PREHOOK: query: show grant role src_role on table src_autho_test(key) PREHOOK: type: SHOW_GRANT Index: ql/src/test/results/clientpositive/authorization_2.q.out =================================================================== --- ql/src/test/results/clientpositive/authorization_2.q.out (revision 1063819) +++ ql/src/test/results/clientpositive/authorization_2.q.out (working copy) @@ -3,10 +3,6 @@ POSTHOOK: query: create table authorization_part (key int, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: default@authorization_part -PREHOOK: query: revoke `ALL` on table authorization_part from user hive_test_user -PREHOOK: type: REVOKE_PRIVILEGE -POSTHOOK: query: revoke `ALL` on table authorization_part from user hive_test_user -POSTHOOK: type: REVOKE_PRIVILEGE PREHOOK: query: ALTER TABLE authorization_part SET TBLPROPERTIES ("PARTITION_LEVEL_PRIVILEGE"="TRUE") PREHOOK: type: ALTERTABLE_PROPERTIES PREHOOK: Input: default@authorization_part @@ -43,7 +39,7 @@ principalName hive_test_user principalType USER privilege Create -grantTime 1292567495 +grantTime 1296069450 grantor hive_test_user database default @@ -51,7 +47,7 @@ principalName hive_test_user principalType USER privilege Update -grantTime 1292567495 +grantTime 1296069450 grantor hive_test_user database default @@ -59,7 +55,7 @@ principalName hive_test_user principalType USER privilege Drop -grantTime 1292567495 +grantTime 1296069450 grantor hive_test_user PREHOOK: query: alter table authorization_part add partition (ds='2010') PREHOOK: type: ALTERTABLE_ADDPARTS @@ -79,7 +75,7 @@ principalName hive_test_user principalType USER privilege Create -grantTime 1292567495 +grantTime 1296069451 grantor hive_test_user database default @@ -88,7 +84,7 @@ principalName hive_test_user principalType USER privilege Update -grantTime 1292567495 +grantTime 1296069451 grantor hive_test_user database default @@ -97,7 +93,7 @@ principalName hive_test_user principalType USER privilege Drop -grantTime 1292567495 +grantTime 1296069451 grantor hive_test_user PREHOOK: query: grant `select`(key) on table authorization_part to user hive_test_user PREHOOK: type: GRANT_PRIVILEGE @@ -135,7 +131,7 @@ principalName hive_test_user principalType USER privilege Select -grantTime 1292567504 +grantTime 1296069461 grantor hive_test_user PREHOOK: query: show grant user hive_test_user on table authorization_part(key) PREHOOK: type: SHOW_GRANT @@ -150,16 +146,16 @@ principalName hive_test_user principalType USER privilege Select -grantTime 1292567495 +grantTime 1296069451 grantor hive_test_user PREHOOK: query: select key from authorization_part where ds='2010' order by key limit 20 PREHOOK: type: QUERY PREHOOK: Input: default@authorization_part@ds=2010 -PREHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-12-16_22-31-44_729_6159445007917571115/-mr-10000 +PREHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2011-01-26_11-17-42_165_5880109080398153558/-mr-10000 POSTHOOK: query: select key from authorization_part where ds='2010' order by key limit 20 POSTHOOK: type: QUERY POSTHOOK: Input: default@authorization_part@ds=2010 -POSTHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-12-16_22-31-44_729_6159445007917571115/-mr-10000 +POSTHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2011-01-26_11-17-42_165_5880109080398153558/-mr-10000 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] 0 @@ -208,16 +204,16 @@ principalName hive_test_user principalType USER privilege Select -grantTime 1292567504 +grantTime 1296069461 grantor hive_test_user PREHOOK: query: select key from authorization_part where ds='2010' order by key limit 20 PREHOOK: type: QUERY PREHOOK: Input: default@authorization_part@ds=2010 -PREHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-12-16_22-31-51_427_8272622381150203232/-mr-10000 +PREHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2011-01-26_11-17-48_956_6862779276032097579/-mr-10000 POSTHOOK: query: select key from authorization_part where ds='2010' order by key limit 20 POSTHOOK: type: QUERY POSTHOOK: Input: default@authorization_part@ds=2010 -POSTHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-12-16_22-31-51_427_8272622381150203232/-mr-10000 +POSTHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2011-01-26_11-17-48_956_6862779276032097579/-mr-10000 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] 0 @@ -276,7 +272,7 @@ principalName hive_test_user principalType USER privilege Create -grantTime 1292567495 +grantTime 1296069450 grantor hive_test_user database default @@ -284,7 +280,7 @@ principalName hive_test_user principalType USER privilege Update -grantTime 1292567495 +grantTime 1296069450 grantor hive_test_user database default @@ -292,7 +288,7 @@ principalName hive_test_user principalType USER privilege Drop -grantTime 1292567495 +grantTime 1296069450 grantor hive_test_user PREHOOK: query: alter table authorization_part add partition (ds='2010') PREHOOK: type: ALTERTABLE_ADDPARTS @@ -316,7 +312,7 @@ principalName hive_test_user principalType USER privilege Create -grantTime 1292567519 +grantTime 1296069476 grantor hive_test_user database default @@ -325,7 +321,7 @@ principalName hive_test_user principalType USER privilege Update -grantTime 1292567519 +grantTime 1296069476 grantor hive_test_user database default @@ -334,7 +330,7 @@ principalName hive_test_user principalType USER privilege Drop -grantTime 1292567519 +grantTime 1296069476 grantor hive_test_user PREHOOK: query: grant `select` on table authorization_part to user hive_test_user PREHOOK: type: GRANT_PRIVILEGE @@ -379,7 +375,7 @@ principalName hive_test_user principalType USER privilege Create -grantTime 1292567529 +grantTime 1296069484 grantor hive_test_user database default @@ -388,7 +384,7 @@ principalName hive_test_user principalType USER privilege Update -grantTime 1292567529 +grantTime 1296069484 grantor hive_test_user database default @@ -397,7 +393,7 @@ principalName hive_test_user principalType USER privilege Drop -grantTime 1292567529 +grantTime 1296069484 grantor hive_test_user database default @@ -406,7 +402,7 @@ principalName hive_test_user principalType USER privilege Select -grantTime 1292567529 +grantTime 1296069484 grantor hive_test_user PREHOOK: query: show grant user hive_test_user on table authorization_part PREHOOK: type: SHOW_GRANT @@ -422,7 +418,7 @@ principalName hive_test_user principalType USER privilege Create -grantTime 1292567495 +grantTime 1296069450 grantor hive_test_user database default @@ -430,7 +426,7 @@ principalName hive_test_user principalType USER privilege Update -grantTime 1292567495 +grantTime 1296069450 grantor hive_test_user database default @@ -438,7 +434,7 @@ principalName hive_test_user principalType USER privilege Drop -grantTime 1292567495 +grantTime 1296069450 grantor hive_test_user database default @@ -446,16 +442,16 @@ principalName hive_test_user principalType USER privilege Select -grantTime 1292567519 +grantTime 1296069476 grantor hive_test_user PREHOOK: query: select key from authorization_part where ds='2010' order by key limit 20 PREHOOK: type: QUERY PREHOOK: Input: default@authorization_part@ds=2010 -PREHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-12-16_22-32-09_525_5244658946776244269/-mr-10000 +PREHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2011-01-26_11-18-05_331_1744395405335037925/-mr-10000 POSTHOOK: query: select key from authorization_part where ds='2010' order by key limit 20 POSTHOOK: type: QUERY POSTHOOK: Input: default@authorization_part@ds=2010 -POSTHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-12-16_22-32-09_525_5244658946776244269/-mr-10000 +POSTHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2011-01-26_11-18-05_331_1744395405335037925/-mr-10000 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] @@ -502,7 +498,7 @@ principalName hive_test_user principalType USER privilege Create -grantTime 1292567495 +grantTime 1296069450 grantor hive_test_user database default @@ -510,7 +506,7 @@ principalName hive_test_user principalType USER privilege Update -grantTime 1292567495 +grantTime 1296069450 grantor hive_test_user database default @@ -518,7 +514,7 @@ principalName hive_test_user principalType USER privilege Drop -grantTime 1292567495 +grantTime 1296069450 grantor hive_test_user PREHOOK: query: show grant user hive_test_user on table authorization_part partition (ds='2010') PREHOOK: type: SHOW_GRANT @@ -535,7 +531,7 @@ principalName hive_test_user principalType USER privilege Create -grantTime 1292567529 +grantTime 1296069484 grantor hive_test_user database default @@ -544,7 +540,7 @@ principalName hive_test_user principalType USER privilege Update -grantTime 1292567529 +grantTime 1296069484 grantor hive_test_user database default @@ -553,7 +549,7 @@ principalName hive_test_user principalType USER privilege Drop -grantTime 1292567529 +grantTime 1296069484 grantor hive_test_user database default @@ -562,16 +558,16 @@ principalName hive_test_user principalType USER privilege Select -grantTime 1292567529 +grantTime 1296069484 grantor hive_test_user PREHOOK: query: select key from authorization_part where ds='2010' order by key limit 20 PREHOOK: type: QUERY PREHOOK: Input: default@authorization_part@ds=2010 -PREHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-12-16_22-32-15_947_8100424728454115880/-mr-10000 +PREHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2011-01-26_11-18-11_882_7774552791322086896/-mr-10000 POSTHOOK: query: select key from authorization_part where ds='2010' order by key limit 20 POSTHOOK: type: QUERY POSTHOOK: Input: default@authorization_part@ds=2010 -POSTHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-12-16_22-32-15_947_8100424728454115880/-mr-10000 +POSTHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2011-01-26_11-18-11_882_7774552791322086896/-mr-10000 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] @@ -619,7 +615,7 @@ principalName hive_test_user principalType USER privilege Create -grantTime 1292567529 +grantTime 1296069484 grantor hive_test_user database default @@ -628,7 +624,7 @@ principalName hive_test_user principalType USER privilege Update -grantTime 1292567529 +grantTime 1296069484 grantor hive_test_user database default @@ -637,7 +633,7 @@ principalName hive_test_user principalType USER privilege Drop -grantTime 1292567529 +grantTime 1296069484 grantor hive_test_user PREHOOK: query: alter table authorization_part drop partition (ds='2010') PREHOOK: type: ALTERTABLE_DROPPARTS @@ -734,7 +730,7 @@ principalName hive_test_group1 principalType GROUP privilege Select -grantTime 1292567551 +grantTime 1296069510 grantor hive_test_user PREHOOK: query: show grant group hive_test_group1 on table authorization_part(key) PREHOOK: type: SHOW_GRANT @@ -753,16 +749,16 @@ principalName hive_test_group1 principalType GROUP privilege Select -grantTime 1292567543 +grantTime 1296069499 grantor hive_test_user PREHOOK: query: select key from authorization_part where ds='2010' order by key limit 20 PREHOOK: type: QUERY PREHOOK: Input: default@authorization_part@ds=2010 -PREHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-12-16_22-32-32_179_1859237138227238635/-mr-10000 +PREHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2011-01-26_11-18-30_597_8383614704437384191/-mr-10000 POSTHOOK: query: select key from authorization_part where ds='2010' order by key limit 20 POSTHOOK: type: QUERY POSTHOOK: Input: default@authorization_part@ds=2010 -POSTHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-12-16_22-32-32_179_1859237138227238635/-mr-10000 +POSTHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2011-01-26_11-18-30_597_8383614704437384191/-mr-10000 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] @@ -827,16 +823,16 @@ principalName hive_test_group1 principalType GROUP privilege Select -grantTime 1292567551 +grantTime 1296069510 grantor hive_test_user PREHOOK: query: select key from authorization_part where ds='2010' order by key limit 20 PREHOOK: type: QUERY PREHOOK: Input: default@authorization_part@ds=2010 -PREHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-12-16_22-32-38_657_7188861192410002773/-mr-10000 +PREHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2011-01-26_11-18-37_062_4517758063538422029/-mr-10000 POSTHOOK: query: select key from authorization_part where ds='2010' order by key limit 20 POSTHOOK: type: QUERY POSTHOOK: Input: default@authorization_part@ds=2010 -POSTHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-12-16_22-32-38_657_7188861192410002773/-mr-10000 +POSTHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2011-01-26_11-18-37_062_4517758063538422029/-mr-10000 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] @@ -991,7 +987,7 @@ principalName hive_test_group1 principalType GROUP privilege Select -grantTime 1292567574 +grantTime 1296069532 grantor hive_test_user PREHOOK: query: show grant group hive_test_group1 on table authorization_part PREHOOK: type: SHOW_GRANT @@ -1011,16 +1007,16 @@ principalName hive_test_group1 principalType GROUP privilege Select -grantTime 1292567566 +grantTime 1296069524 grantor hive_test_user PREHOOK: query: select key from authorization_part where ds='2010' order by key limit 20 PREHOOK: type: QUERY PREHOOK: Input: default@authorization_part@ds=2010 -PREHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-12-16_22-32-55_104_6462994010195124243/-mr-10000 +PREHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2011-01-26_11-18-53_179_2863553138368850079/-mr-10000 POSTHOOK: query: select key from authorization_part where ds='2010' order by key limit 20 POSTHOOK: type: QUERY POSTHOOK: Input: default@authorization_part@ds=2010 -POSTHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-12-16_22-32-55_104_6462994010195124243/-mr-10000 +POSTHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2011-01-26_11-18-53_179_2863553138368850079/-mr-10000 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] @@ -1092,16 +1088,16 @@ principalName hive_test_group1 principalType GROUP privilege Select -grantTime 1292567574 +grantTime 1296069532 grantor hive_test_user PREHOOK: query: select key from authorization_part where ds='2010' order by key limit 20 PREHOOK: type: QUERY PREHOOK: Input: default@authorization_part@ds=2010 -PREHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-12-16_22-33-01_749_5408406852569793238/-mr-10000 +PREHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2011-01-26_11-18-59_982_5316118458673033106/-mr-10000 POSTHOOK: query: select key from authorization_part where ds='2010' order by key limit 20 POSTHOOK: type: QUERY POSTHOOK: Input: default@authorization_part@ds=2010 -POSTHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-12-16_22-33-01_749_5408406852569793238/-mr-10000 +POSTHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2011-01-26_11-18-59_982_5316118458673033106/-mr-10000 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] Index: ql/src/test/results/clientpositive/authorization_3.q.out =================================================================== --- ql/src/test/results/clientpositive/authorization_3.q.out (revision 1063819) +++ ql/src/test/results/clientpositive/authorization_3.q.out (working copy) @@ -5,10 +5,6 @@ POSTHOOK: type: CREATETABLE_AS_SELECT POSTHOOK: Input: default@src POSTHOOK: Output: default@src_autho_test -PREHOOK: query: revoke `ALL` on table src_autho_test from user hive_test_user -PREHOOK: type: REVOKE_PRIVILEGE -POSTHOOK: query: revoke `ALL` on table src_autho_test from user hive_test_user -POSTHOOK: type: REVOKE_PRIVILEGE PREHOOK: query: grant `drop` on table src_autho_test to user hive_test_user PREHOOK: type: GRANT_PRIVILEGE POSTHOOK: query: grant `drop` on table src_autho_test to user hive_test_user @@ -27,7 +23,7 @@ principalName hive_test_user principalType USER privilege Drop -grantTime 1292567595 +grantTime 1296069552 grantor hive_test_user database default @@ -35,7 +31,7 @@ principalName hive_test_user principalType USER privilege Select -grantTime 1292567595 +grantTime 1296069552 grantor hive_test_user PREHOOK: query: revoke `select` on table src_autho_test from user hive_test_user PREHOOK: type: REVOKE_PRIVILEGE @@ -59,7 +55,7 @@ principalName hive_test_user principalType USER privilege Drop -grantTime 1292567595 +grantTime 1296069552 grantor hive_test_user database default @@ -67,7 +63,7 @@ principalName hive_test_user principalType USER privilege Select -grantTime 1292567595 +grantTime 1296069552 grantor hive_test_user PREHOOK: query: revoke `drop`,`select` on table src_autho_test from user hive_test_user PREHOOK: type: REVOKE_PRIVILEGE Index: ql/src/test/results/clientpositive/authorization_4.q.out =================================================================== --- ql/src/test/results/clientpositive/authorization_4.q.out (revision 1063819) +++ ql/src/test/results/clientpositive/authorization_4.q.out (working copy) @@ -5,6 +5,10 @@ POSTHOOK: type: CREATETABLE_AS_SELECT POSTHOOK: Input: default@src POSTHOOK: Output: default@src_autho_test +PREHOOK: query: grant `ALL` on table src_autho_test to user hive_test_user +PREHOOK: type: GRANT_PRIVILEGE +POSTHOOK: query: grant `ALL` on table src_autho_test to user hive_test_user +POSTHOOK: type: GRANT_PRIVILEGE PREHOOK: query: show grant user hive_test_user on table src_autho_test PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user hive_test_user on table src_autho_test @@ -15,16 +19,16 @@ principalName hive_test_user principalType USER privilege All -grantTime 1292567601 +grantTime 1296070065 grantor hive_test_user PREHOOK: query: select key from src_autho_test order by key limit 20 PREHOOK: type: QUERY PREHOOK: Input: default@src_autho_test -PREHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-12-16_22-33-22_016_7487510540844272228/-mr-10000 +PREHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2011-01-26_11-27-45_696_2867867555170990506/-mr-10000 POSTHOOK: query: select key from src_autho_test order by key limit 20 POSTHOOK: type: QUERY POSTHOOK: Input: default@src_autho_test -POSTHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2010-12-16_22-33-22_016_7487510540844272228/-mr-10000 +POSTHOOK: Output: file:/var/folders/6g/6grtCwPMEf4sqHUPpy6xQG9ByHg/-Tmp-/heyongqiang/hive_2011-01-26_11-27-45_696_2867867555170990506/-mr-10000 0 0 0 Index: ql/src/test/results/clientpositive/authorization_6.q.out =================================================================== --- ql/src/test/results/clientpositive/authorization_6.q.out (revision 0) +++ ql/src/test/results/clientpositive/authorization_6.q.out (revision 0) @@ -0,0 +1,19 @@ +PREHOOK: query: create table src_auth_create_test as select * from src +PREHOOK: type: CREATETABLE_AS_SELECT +PREHOOK: Input: default@src +POSTHOOK: query: create table src_auth_create_test as select * from src +POSTHOOK: type: CREATETABLE_AS_SELECT +POSTHOOK: Input: default@src +POSTHOOK: Output: default@src_auth_create_test +PREHOOK: query: show grant user hive_test_user on table src_auth_create_test +PREHOOK: type: SHOW_GRANT +POSTHOOK: query: show grant user hive_test_user on table src_auth_create_test +POSTHOOK: type: SHOW_GRANT +PREHOOK: query: drop table src_auth_create_test +PREHOOK: type: DROPTABLE +PREHOOK: Input: default@src_auth_create_test +PREHOOK: Output: default@src_auth_create_test +POSTHOOK: query: drop table src_auth_create_test +POSTHOOK: type: DROPTABLE +POSTHOOK: Input: default@src_auth_create_test +POSTHOOK: Output: default@src_auth_create_test