diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java index 1d0ed51..f4faf78 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java @@ -192,6 +192,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.Comparator; +import java.util.Date; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -727,7 +728,7 @@ private String writeHiveRoleGrantInfo(List roleGrants, boolean te appendNonNull(builder, roleGrant.isGrantOption()); appendNonNull(builder, roleGrant.getGrantor()); appendNonNull(builder, roleGrant.getGrantorType()); - appendNonNull(builder, testMode ? -1 : roleGrant.getGrantTime() * 1000L); + appendNonNull(builder, testMode ? new Date(-1) : new Date(roleGrant.getGrantTime() * 1000L)); } return builder.toString(); } @@ -3206,7 +3207,7 @@ public int compare(HivePrivilegeInfo o1, HivePrivilegeInfo o2) { appendNonNull(builder, principal.getType()); appendNonNull(builder, privilege.getPrivilege().getName()); appendNonNull(builder, privilege.isGrantOption()); - appendNonNull(builder, testMode ? -1 : privilege.getGrantTime() * 1000L); + appendNonNull(builder, testMode ? new Date(-1) : new Date(privilege.getGrantTime() * 1000L)); appendNonNull(builder, grantor.getName()); } return builder.toString(); @@ -3222,7 +3223,7 @@ static String writeRoleGrantsInfo(List roleGrants, boolean t for (RolePrincipalGrant roleGrant : roleGrants) { appendNonNull(builder, roleGrant.getRoleName(), true); appendNonNull(builder, roleGrant.isGrantOption()); - appendNonNull(builder, testMode ? -1 : roleGrant.getGrantTime() * 1000L); + appendNonNull(builder, testMode ? new Date(-1) : new Date(roleGrant.getGrantTime() * 1000L)); appendNonNull(builder, roleGrant.getGrantorName()); } return builder.toString(); @@ -3238,7 +3239,7 @@ static String writeRolesGrantedInfo(List roles, boolean testMode) for (HiveRoleGrant role : roles) { appendNonNull(builder, role.getRoleName(), true); appendNonNull(builder, role.isGrantOption()); - appendNonNull(builder, testMode ? -1 : role.getGrantTime() * 1000L); + appendNonNull(builder, testMode ? new Date(-1) : new Date(role.getGrantTime() * 1000L)); appendNonNull(builder, role.getGrantor()); } return builder.toString(); diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/RoleDDLDesc.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/RoleDDLDesc.java index 2aae751..2cd8936 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/plan/RoleDDLDesc.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/RoleDDLDesc.java @@ -49,14 +49,14 @@ */ private static final String roleShowGrantSchema = "role,grant_option,grant_time,grantor#" + - "string:boolean:bigint:string"; + "string:boolean:string:string"; /** * thrift ddl for the result of describe role roleName */ private static final String roleShowRolePrincipals = "principal_name,principal_type,grant_option,grantor,grantor_type,grant_time#" + - "string:string:boolean:string:string:bigint"; + "string:string:boolean:string:string:string"; public static String getRoleNameSchema() { return roleNameSchema; diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowGrantDesc.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowGrantDesc.java index d27da3d..e4bbb28 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowGrantDesc.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowGrantDesc.java @@ -32,7 +32,7 @@ private static final String tabularSchema = "database,table,partition,column,principal_name,principal_type,privilege," + "grant_option,grant_time,grantor#" + - "string:string:string:string:string:string:string:boolean:bigint:string"; + "string:string:string:string:string:string:string:boolean:string:string"; public ShowGrantDesc(){ } diff --git a/ql/src/test/results/clientnegative/authorization_fail_3.q.out b/ql/src/test/results/clientnegative/authorization_fail_3.q.out index 32f6188..bd73b65 100644 --- a/ql/src/test/results/clientnegative/authorization_fail_3.q.out +++ b/ql/src/test/results/clientnegative/authorization_fail_3.q.out @@ -27,7 +27,7 @@ PREHOOK: query: show grant user hive_test_user on table authorization_fail_3 PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user hive_test_user on table authorization_fail_3 POSTHOOK: type: SHOW_GRANT -default authorization_fail_3 hive_test_user USER CREATE false -1 hive_test_user +default authorization_fail_3 hive_test_user USER CREATE false Wed Dec 31 15:59:59 PST 1969 hive_test_user PREHOOK: query: show grant user hive_test_user on table authorization_fail_3 partition (ds='2010') PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user hive_test_user on table authorization_fail_3 partition (ds='2010') diff --git a/ql/src/test/results/clientnegative/authorization_fail_4.q.out b/ql/src/test/results/clientnegative/authorization_fail_4.q.out index 88bf24a..acd4016 100644 --- a/ql/src/test/results/clientnegative/authorization_fail_4.q.out +++ b/ql/src/test/results/clientnegative/authorization_fail_4.q.out @@ -41,12 +41,12 @@ PREHOOK: query: show grant user hive_test_user on table authorization_fail_4 PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user hive_test_user on table authorization_fail_4 POSTHOOK: type: SHOW_GRANT -default authorization_fail_4 hive_test_user USER ALTER false -1 hive_test_user -default authorization_fail_4 hive_test_user USER CREATE false -1 hive_test_user +default authorization_fail_4 hive_test_user USER ALTER false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default authorization_fail_4 hive_test_user USER CREATE false Wed Dec 31 15:59:59 PST 1969 hive_test_user PREHOOK: query: show grant user hive_test_user on table authorization_fail_4 partition (ds='2010') PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user hive_test_user on table authorization_fail_4 partition (ds='2010') POSTHOOK: type: SHOW_GRANT -default authorization_fail_4 [2010] hive_test_user USER ALTER false -1 hive_test_user -default authorization_fail_4 [2010] hive_test_user USER CREATE false -1 hive_test_user +default authorization_fail_4 [2010] hive_test_user USER ALTER false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default authorization_fail_4 [2010] hive_test_user USER CREATE false Wed Dec 31 15:59:59 PST 1969 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. diff --git a/ql/src/test/results/clientnegative/authorization_fail_5.q.out b/ql/src/test/results/clientnegative/authorization_fail_5.q.out index 443a27f..e4210c2 100644 --- a/ql/src/test/results/clientnegative/authorization_fail_5.q.out +++ b/ql/src/test/results/clientnegative/authorization_fail_5.q.out @@ -47,16 +47,16 @@ PREHOOK: query: show grant user hive_test_user on table authorization_fail PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user hive_test_user on table authorization_fail POSTHOOK: type: SHOW_GRANT -default authorization_fail hive_test_user USER ALTER false -1 hive_test_user -default authorization_fail hive_test_user USER CREATE false -1 hive_test_user -default authorization_fail hive_test_user USER SELECT false -1 hive_test_user +default authorization_fail hive_test_user USER ALTER false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default authorization_fail hive_test_user USER CREATE false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default authorization_fail hive_test_user USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user PREHOOK: query: show grant user hive_test_user on table authorization_fail partition (ds='2010') PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user hive_test_user on table authorization_fail partition (ds='2010') POSTHOOK: type: SHOW_GRANT -default authorization_fail [2010] hive_test_user USER ALTER false -1 hive_test_user -default authorization_fail [2010] hive_test_user USER CREATE false -1 hive_test_user -default authorization_fail [2010] hive_test_user USER SELECT false -1 hive_test_user +default authorization_fail [2010] hive_test_user USER ALTER false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default authorization_fail [2010] hive_test_user USER CREATE false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default authorization_fail [2010] hive_test_user USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user PREHOOK: query: revoke Select on table authorization_fail partition (ds='2010') from user hive_test_user PREHOOK: type: REVOKE_PRIVILEGE PREHOOK: Output: default@authorization_fail@ds=2010 @@ -67,6 +67,6 @@ PREHOOK: query: show grant user hive_test_user on table authorization_fail parti PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user hive_test_user on table authorization_fail partition (ds='2010') POSTHOOK: type: SHOW_GRANT -default authorization_fail [2010] hive_test_user USER ALTER false -1 hive_test_user -default authorization_fail [2010] hive_test_user USER CREATE false -1 hive_test_user +default authorization_fail [2010] hive_test_user USER ALTER false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default authorization_fail [2010] hive_test_user USER CREATE false Wed Dec 31 15:59:59 PST 1969 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. diff --git a/ql/src/test/results/clientnegative/authorization_fail_7.q.out b/ql/src/test/results/clientnegative/authorization_fail_7.q.out index f282703..1a9edeb 100644 --- a/ql/src/test/results/clientnegative/authorization_fail_7.q.out +++ b/ql/src/test/results/clientnegative/authorization_fail_7.q.out @@ -28,13 +28,13 @@ 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 -hive_test_role_fail false -1 hive_test_user -public false -1 +hive_test_role_fail false Wed Dec 31 15:59:59 PST 1969 hive_test_user +public false Wed Dec 31 15:59:59 PST 1969 PREHOOK: query: show grant role hive_test_role_fail on table authorization_fail PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant role hive_test_role_fail on table authorization_fail POSTHOOK: type: SHOW_GRANT -default authorization_fail hive_test_role_fail ROLE SELECT false -1 hive_test_user +default authorization_fail hive_test_role_fail ROLE SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user PREHOOK: query: drop role hive_test_role_fail PREHOOK: type: DROPROLE POSTHOOK: query: drop role hive_test_role_fail diff --git a/ql/src/test/results/clientpositive/alter_rename_partition_authorization.q.out b/ql/src/test/results/clientpositive/alter_rename_partition_authorization.q.out index d35bf40..b25a673 100644 --- a/ql/src/test/results/clientpositive/alter_rename_partition_authorization.q.out +++ b/ql/src/test/results/clientpositive/alter_rename_partition_authorization.q.out @@ -58,9 +58,9 @@ PREHOOK: query: show grant user hive_test_user on table authorization_part PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user hive_test_user on table authorization_part POSTHOOK: type: SHOW_GRANT -default authorization_part hive_test_user USER CREATE false -1 hive_test_user -default authorization_part hive_test_user USER DROP false -1 hive_test_user -default authorization_part hive_test_user USER UPDATE false -1 hive_test_user +default authorization_part hive_test_user USER CREATE false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default authorization_part hive_test_user USER DROP false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default authorization_part hive_test_user USER UPDATE false Wed Dec 31 15:59:59 PST 1969 hive_test_user PREHOOK: query: grant select(key) on table authorization_part to user hive_test_user PREHOOK: type: GRANT_PRIVILEGE PREHOOK: Output: default@authorization_part @@ -81,7 +81,7 @@ PREHOOK: query: show grant user hive_test_user on table authorization_part(key) PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user hive_test_user on table authorization_part(key) partition (ds='2010') POSTHOOK: type: SHOW_GRANT -default authorization_part [2010] [key] hive_test_user USER SELECT false -1 hive_test_user +default authorization_part [2010] [key] hive_test_user USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user PREHOOK: query: alter table authorization_part partition (ds='2010') rename to partition (ds='2010_tmp') PREHOOK: type: ALTERTABLE_RENAMEPART PREHOOK: Input: default@authorization_part @@ -96,7 +96,7 @@ PREHOOK: query: show grant user hive_test_user on table authorization_part(key) PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user hive_test_user on table authorization_part(key) partition (ds='2010_tmp') POSTHOOK: type: SHOW_GRANT -default authorization_part [2010_tmp] [key] hive_test_user USER SELECT false -1 hive_test_user +default authorization_part [2010_tmp] [key] hive_test_user USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user PREHOOK: query: drop table authorization_part PREHOOK: type: DROPTABLE PREHOOK: Input: default@authorization_part diff --git a/ql/src/test/results/clientpositive/authorization_1.q.out b/ql/src/test/results/clientpositive/authorization_1.q.out index f9f1b34..3a45413 100644 --- a/ql/src/test/results/clientpositive/authorization_1.q.out +++ b/ql/src/test/results/clientpositive/authorization_1.q.out @@ -26,7 +26,7 @@ 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 POSTHOOK: type: SHOW_GRANT -default src_autho_test hive_test_user USER SELECT false -1 hive_test_user +default src_autho_test hive_test_user USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user PREHOOK: query: show grant user hive_test_user on table src_autho_test(key) PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user hive_test_user on table src_autho_test(key) @@ -91,7 +91,7 @@ PREHOOK: query: show grant user hive_test_user on table src_autho_test(key) PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user hive_test_user on table src_autho_test(key) POSTHOOK: type: SHOW_GRANT -default src_autho_test [key] hive_test_user USER SELECT false -1 hive_test_user +default src_autho_test [key] hive_test_user USER SELECT false Wed Dec 31 15:59:59 PST 1969 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 @@ -148,7 +148,7 @@ PREHOOK: query: show grant group hive_test_group1 on table src_autho_test PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant group hive_test_group1 on table src_autho_test POSTHOOK: type: SHOW_GRANT -default src_autho_test hive_test_group1 GROUP SELECT false -1 hive_test_user +default src_autho_test hive_test_group1 GROUP SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user PREHOOK: query: show grant group hive_test_group1 on table src_autho_test(key) PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant group hive_test_group1 on table src_autho_test(key) @@ -213,7 +213,7 @@ PREHOOK: query: show grant group hive_test_group1 on table src_autho_test(key) PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant group hive_test_group1 on table src_autho_test(key) POSTHOOK: type: SHOW_GRANT -default src_autho_test [key] hive_test_group1 GROUP SELECT false -1 hive_test_user +default src_autho_test [key] hive_test_group1 GROUP SELECT false Wed Dec 31 15:59:59 PST 1969 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 @@ -270,8 +270,8 @@ 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 -public false -1 -sRc_roLE false -1 hive_test_user +public false Wed Dec 31 15:59:59 PST 1969 +sRc_roLE false Wed Dec 31 15:59:59 PST 1969 hive_test_user PREHOOK: query: --column grant to role grant select(key) on table src_autho_test to role sRc_roLE @@ -290,7 +290,7 @@ PREHOOK: query: show grant role sRc_roLE on table src_autho_test(key) PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant role sRc_roLE on table src_autho_test(key) POSTHOOK: type: SHOW_GRANT -default src_autho_test [key] sRc_roLE ROLE SELECT false -1 hive_test_user +default src_autho_test [key] sRc_roLE ROLE SELECT false Wed Dec 31 15:59:59 PST 1969 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 @@ -367,7 +367,7 @@ PREHOOK: query: show grant role sRc_roLE on table src_autho_test PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant role sRc_roLE on table src_autho_test POSTHOOK: type: SHOW_GRANT -default src_autho_test sRc_roLE ROLE SELECT false -1 hive_test_user +default src_autho_test sRc_roLE ROLE SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user PREHOOK: query: show grant role sRc_roLE on table src_autho_test(key) PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant role sRc_roLE on table src_autho_test(key) diff --git a/ql/src/test/results/clientpositive/authorization_1_sql_std.q.out b/ql/src/test/results/clientpositive/authorization_1_sql_std.q.out index 44c2fbd..5177eb2 100644 --- a/ql/src/test/results/clientpositive/authorization_1_sql_std.q.out +++ b/ql/src/test/results/clientpositive/authorization_1_sql_std.q.out @@ -24,7 +24,7 @@ PREHOOK: query: show grant user user_sauth on table src_autho_test PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user user_sauth on table src_autho_test POSTHOOK: type: SHOW_GRANT -default src_autho_test user_sauth USER SELECT false -1 hive_admin_user +default src_autho_test user_sauth USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_admin_user PREHOOK: query: revoke select on table src_autho_test from user user_sauth PREHOOK: type: REVOKE_PRIVILEGE PREHOOK: Output: default@src_autho_test @@ -49,8 +49,8 @@ PREHOOK: query: show role grant user user_sauth PREHOOK: type: SHOW_ROLE_GRANT POSTHOOK: query: show role grant user user_sauth POSTHOOK: type: SHOW_ROLE_GRANT -public false -1 -src_role false -1 hive_admin_user +public false Wed Dec 31 15:59:59 PST 1969 +src_role false Wed Dec 31 15:59:59 PST 1969 hive_admin_user PREHOOK: query: --table grant to role -- also verify case insesitive behavior of role name @@ -67,7 +67,7 @@ PREHOOK: query: show grant role src_role on table src_autho_test PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant role src_role on table src_autho_test POSTHOOK: type: SHOW_GRANT -default src_autho_test src_role ROLE SELECT false -1 hive_admin_user +default src_autho_test src_role ROLE SELECT false Wed Dec 31 15:59:59 PST 1969 hive_admin_user PREHOOK: query: revoke select on table src_autho_test from role src_rolE PREHOOK: type: REVOKE_PRIVILEGE PREHOOK: Output: default@src_autho_test diff --git a/ql/src/test/results/clientpositive/authorization_2.q.out b/ql/src/test/results/clientpositive/authorization_2.q.out index e92763c..cb5e438 100644 --- a/ql/src/test/results/clientpositive/authorization_2.q.out +++ b/ql/src/test/results/clientpositive/authorization_2.q.out @@ -58,9 +58,9 @@ PREHOOK: query: show grant user hive_test_user on table authorization_part PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user hive_test_user on table authorization_part POSTHOOK: type: SHOW_GRANT -default authorization_part hive_test_user USER CREATE false -1 hive_test_user -default authorization_part hive_test_user USER DROP false -1 hive_test_user -default authorization_part hive_test_user USER UPDATE false -1 hive_test_user +default authorization_part hive_test_user USER CREATE false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default authorization_part hive_test_user USER DROP false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default authorization_part hive_test_user USER UPDATE false Wed Dec 31 15:59:59 PST 1969 hive_test_user PREHOOK: query: alter table authorization_part add partition (ds='2010') PREHOOK: type: ALTERTABLE_ADDPARTS PREHOOK: Output: default@authorization_part @@ -72,9 +72,9 @@ PREHOOK: query: show grant user hive_test_user on table authorization_part parti PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user hive_test_user on table authorization_part partition (ds='2010') POSTHOOK: type: SHOW_GRANT -default authorization_part [2010] hive_test_user USER CREATE false -1 hive_test_user -default authorization_part [2010] hive_test_user USER DROP false -1 hive_test_user -default authorization_part [2010] hive_test_user USER UPDATE false -1 hive_test_user +default authorization_part [2010] hive_test_user USER CREATE false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default authorization_part [2010] hive_test_user USER DROP false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default authorization_part [2010] hive_test_user USER UPDATE false Wed Dec 31 15:59:59 PST 1969 hive_test_user PREHOOK: query: grant select(key) on table authorization_part to user hive_test_user PREHOOK: type: GRANT_PRIVILEGE PREHOOK: Output: default@authorization_part @@ -103,12 +103,12 @@ PREHOOK: query: show grant user hive_test_user on table authorization_part(key) PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user hive_test_user on table authorization_part(key) partition (ds='2010') POSTHOOK: type: SHOW_GRANT -default authorization_part [2010] [key] hive_test_user USER SELECT false -1 hive_test_user +default authorization_part [2010] [key] hive_test_user USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user PREHOOK: query: show grant user hive_test_user on table authorization_part(key) PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user hive_test_user on table authorization_part(key) POSTHOOK: type: SHOW_GRANT -default authorization_part [key] hive_test_user USER SELECT false -1 hive_test_user +default authorization_part [key] hive_test_user USER SELECT false Wed Dec 31 15:59:59 PST 1969 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 @@ -153,7 +153,7 @@ PREHOOK: query: show grant user hive_test_user on table authorization_part(key) PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user hive_test_user on table authorization_part(key) partition (ds='2010') POSTHOOK: type: SHOW_GRANT -default authorization_part [2010] [key] hive_test_user USER SELECT false -1 hive_test_user +default authorization_part [2010] [key] hive_test_user USER SELECT false Wed Dec 31 15:59:59 PST 1969 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 @@ -208,9 +208,9 @@ PREHOOK: type: SHOW_GRANT POSTHOOK: query: -- table grant to user show grant user hive_test_user on table authorization_part POSTHOOK: type: SHOW_GRANT -default authorization_part hive_test_user USER CREATE false -1 hive_test_user -default authorization_part hive_test_user USER DROP false -1 hive_test_user -default authorization_part hive_test_user USER UPDATE false -1 hive_test_user +default authorization_part hive_test_user USER CREATE false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default authorization_part hive_test_user USER DROP false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default authorization_part hive_test_user USER UPDATE false Wed Dec 31 15:59:59 PST 1969 hive_test_user PREHOOK: query: alter table authorization_part add partition (ds='2010') PREHOOK: type: ALTERTABLE_ADDPARTS PREHOOK: Output: default@authorization_part @@ -222,9 +222,9 @@ PREHOOK: query: show grant user hive_test_user on table authorization_part parti PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user hive_test_user on table authorization_part partition (ds='2010') POSTHOOK: type: SHOW_GRANT -default authorization_part [2010] hive_test_user USER CREATE false -1 hive_test_user -default authorization_part [2010] hive_test_user USER DROP false -1 hive_test_user -default authorization_part [2010] hive_test_user USER UPDATE false -1 hive_test_user +default authorization_part [2010] hive_test_user USER CREATE false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default authorization_part [2010] hive_test_user USER DROP false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default authorization_part [2010] hive_test_user USER UPDATE false Wed Dec 31 15:59:59 PST 1969 hive_test_user PREHOOK: query: grant select on table authorization_part to user hive_test_user PREHOOK: type: GRANT_PRIVILEGE PREHOOK: Output: default@authorization_part @@ -253,18 +253,18 @@ PREHOOK: query: show grant user hive_test_user on table authorization_part parti PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user hive_test_user on table authorization_part partition (ds='2010') POSTHOOK: type: SHOW_GRANT -default authorization_part [2010] hive_test_user USER CREATE false -1 hive_test_user -default authorization_part [2010] hive_test_user USER DROP false -1 hive_test_user -default authorization_part [2010] hive_test_user USER SELECT false -1 hive_test_user -default authorization_part [2010] hive_test_user USER UPDATE false -1 hive_test_user +default authorization_part [2010] hive_test_user USER CREATE false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default authorization_part [2010] hive_test_user USER DROP false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default authorization_part [2010] hive_test_user USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default authorization_part [2010] hive_test_user USER UPDATE false Wed Dec 31 15:59:59 PST 1969 hive_test_user PREHOOK: query: show grant user hive_test_user on table authorization_part PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user hive_test_user on table authorization_part POSTHOOK: type: SHOW_GRANT -default authorization_part hive_test_user USER CREATE false -1 hive_test_user -default authorization_part hive_test_user USER DROP false -1 hive_test_user -default authorization_part hive_test_user USER SELECT false -1 hive_test_user -default authorization_part hive_test_user USER UPDATE false -1 hive_test_user +default authorization_part hive_test_user USER CREATE false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default authorization_part hive_test_user USER DROP false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default authorization_part hive_test_user USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default authorization_part hive_test_user USER UPDATE false Wed Dec 31 15:59:59 PST 1969 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 @@ -305,17 +305,17 @@ PREHOOK: query: show grant user hive_test_user on table authorization_part PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user hive_test_user on table authorization_part POSTHOOK: type: SHOW_GRANT -default authorization_part hive_test_user USER CREATE false -1 hive_test_user -default authorization_part hive_test_user USER DROP false -1 hive_test_user -default authorization_part hive_test_user USER UPDATE false -1 hive_test_user +default authorization_part hive_test_user USER CREATE false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default authorization_part hive_test_user USER DROP false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default authorization_part hive_test_user USER UPDATE false Wed Dec 31 15:59:59 PST 1969 hive_test_user PREHOOK: query: show grant user hive_test_user on table authorization_part partition (ds='2010') PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user hive_test_user on table authorization_part partition (ds='2010') POSTHOOK: type: SHOW_GRANT -default authorization_part [2010] hive_test_user USER CREATE false -1 hive_test_user -default authorization_part [2010] hive_test_user USER DROP false -1 hive_test_user -default authorization_part [2010] hive_test_user USER SELECT false -1 hive_test_user -default authorization_part [2010] hive_test_user USER UPDATE false -1 hive_test_user +default authorization_part [2010] hive_test_user USER CREATE false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default authorization_part [2010] hive_test_user USER DROP false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default authorization_part [2010] hive_test_user USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default authorization_part [2010] hive_test_user USER UPDATE false Wed Dec 31 15:59:59 PST 1969 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 @@ -356,9 +356,9 @@ PREHOOK: query: show grant user hive_test_user on table authorization_part parti PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user hive_test_user on table authorization_part partition (ds='2010') POSTHOOK: type: SHOW_GRANT -default authorization_part [2010] hive_test_user USER CREATE false -1 hive_test_user -default authorization_part [2010] hive_test_user USER DROP false -1 hive_test_user -default authorization_part [2010] hive_test_user USER UPDATE false -1 hive_test_user +default authorization_part [2010] hive_test_user USER CREATE false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default authorization_part [2010] hive_test_user USER DROP false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default authorization_part [2010] hive_test_user USER UPDATE false Wed Dec 31 15:59:59 PST 1969 hive_test_user PREHOOK: query: alter table authorization_part drop partition (ds='2010') PREHOOK: type: ALTERTABLE_DROPPARTS PREHOOK: Input: default@authorization_part @@ -414,12 +414,12 @@ PREHOOK: query: show grant group hive_test_group1 on table authorization_part(ke PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant group hive_test_group1 on table authorization_part(key) partition (ds='2010') POSTHOOK: type: SHOW_GRANT -default authorization_part [2010] [key] hive_test_group1 GROUP SELECT false -1 hive_test_user +default authorization_part [2010] [key] hive_test_group1 GROUP SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user PREHOOK: query: show grant group hive_test_group1 on table authorization_part(key) PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant group hive_test_group1 on table authorization_part(key) POSTHOOK: type: SHOW_GRANT -default authorization_part [key] hive_test_group1 GROUP SELECT false -1 hive_test_user +default authorization_part [key] hive_test_group1 GROUP SELECT false Wed Dec 31 15:59:59 PST 1969 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 @@ -464,7 +464,7 @@ PREHOOK: query: show grant group hive_test_group1 on table authorization_part(ke PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant group hive_test_group1 on table authorization_part(key) partition (ds='2010') POSTHOOK: type: SHOW_GRANT -default authorization_part [2010] [key] hive_test_group1 GROUP SELECT false -1 hive_test_user +default authorization_part [2010] [key] hive_test_group1 GROUP SELECT false Wed Dec 31 15:59:59 PST 1969 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 @@ -558,12 +558,12 @@ PREHOOK: query: show grant group hive_test_group1 on table authorization_part pa PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant group hive_test_group1 on table authorization_part partition (ds='2010') POSTHOOK: type: SHOW_GRANT -default authorization_part [2010] hive_test_group1 GROUP SELECT false -1 hive_test_user +default authorization_part [2010] hive_test_group1 GROUP SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user PREHOOK: query: show grant group hive_test_group1 on table authorization_part PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant group hive_test_group1 on table authorization_part POSTHOOK: type: SHOW_GRANT -default authorization_part hive_test_group1 GROUP SELECT false -1 hive_test_user +default authorization_part hive_test_group1 GROUP SELECT false Wed Dec 31 15:59:59 PST 1969 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 @@ -608,7 +608,7 @@ PREHOOK: query: show grant group hive_test_group1 on table authorization_part pa PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant group hive_test_group1 on table authorization_part partition (ds='2010') POSTHOOK: type: SHOW_GRANT -default authorization_part [2010] hive_test_group1 GROUP SELECT false -1 hive_test_user +default authorization_part [2010] hive_test_group1 GROUP SELECT false Wed Dec 31 15:59:59 PST 1969 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 diff --git a/ql/src/test/results/clientpositive/authorization_3.q.out b/ql/src/test/results/clientpositive/authorization_3.q.out index 2b53233..0a75ebf 100644 --- a/ql/src/test/results/clientpositive/authorization_3.q.out +++ b/ql/src/test/results/clientpositive/authorization_3.q.out @@ -28,8 +28,8 @@ 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 POSTHOOK: type: SHOW_GRANT -default src_autho_test hive_test_user USER DROP false -1 hive_test_user -default src_autho_test hive_test_user USER SELECT false -1 hive_test_user +default src_autho_test hive_test_user USER DROP false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default src_autho_test hive_test_user USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user PREHOOK: query: revoke select on table src_autho_test from user hive_test_user PREHOOK: type: REVOKE_PRIVILEGE PREHOOK: Output: default@src_autho_test @@ -52,8 +52,8 @@ 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 POSTHOOK: type: SHOW_GRANT -default src_autho_test hive_test_user USER DROP false -1 hive_test_user -default src_autho_test hive_test_user USER SELECT false -1 hive_test_user +default src_autho_test hive_test_user USER DROP false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default src_autho_test hive_test_user USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user PREHOOK: query: revoke drop,select on table src_autho_test from user hive_test_user PREHOOK: type: REVOKE_PRIVILEGE PREHOOK: Output: default@src_autho_test @@ -70,7 +70,7 @@ 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 POSTHOOK: type: SHOW_GRANT -default src_autho_test hive_test_user USER DROP false -1 hive_test_user +default src_autho_test hive_test_user USER DROP false Wed Dec 31 15:59:59 PST 1969 hive_test_user PREHOOK: query: revoke drop,select(key), select(value) on table src_autho_test from user hive_test_user PREHOOK: type: REVOKE_PRIVILEGE PREHOOK: Output: default@src_autho_test diff --git a/ql/src/test/results/clientpositive/authorization_4.q.out b/ql/src/test/results/clientpositive/authorization_4.q.out index 67a30fd..a4a5858 100644 --- a/ql/src/test/results/clientpositive/authorization_4.q.out +++ b/ql/src/test/results/clientpositive/authorization_4.q.out @@ -22,7 +22,7 @@ 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 POSTHOOK: type: SHOW_GRANT -default src_autho_test hive_test_user USER ALL false -1 hive_test_user +default src_autho_test hive_test_user USER ALL false Wed Dec 31 15:59:59 PST 1969 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 diff --git a/ql/src/test/results/clientpositive/authorization_5.q.out b/ql/src/test/results/clientpositive/authorization_5.q.out index 7917dba..813ae94 100644 --- a/ql/src/test/results/clientpositive/authorization_5.q.out +++ b/ql/src/test/results/clientpositive/authorization_5.q.out @@ -26,8 +26,8 @@ PREHOOK: query: SHOW GRANT USER hive_test_user ON DATABASE test_db PREHOOK: type: SHOW_GRANT POSTHOOK: query: SHOW GRANT USER hive_test_user ON DATABASE test_db POSTHOOK: type: SHOW_GRANT -test_db hive_test_user USER DROP false -1 hive_test_user -test_db hive_test_user USER SELECT false -1 hive_test_user +test_db hive_test_user USER DROP false Wed Dec 31 15:59:59 PST 1969 hive_test_user +test_db hive_test_user USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user PREHOOK: query: CREATE ROLE db_TEST_Role PREHOOK: type: CREATEROLE POSTHOOK: query: CREATE ROLE db_TEST_Role @@ -40,8 +40,8 @@ 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 -db_TEST_Role false -1 hive_test_user -public false -1 +db_TEST_Role false Wed Dec 31 15:59:59 PST 1969 hive_test_user +public false Wed Dec 31 15:59:59 PST 1969 PREHOOK: query: GRANT drop ON DATABASE test_db TO ROLE db_TEST_Role PREHOOK: type: GRANT_PRIVILEGE POSTHOOK: query: GRANT drop ON DATABASE test_db TO ROLE db_TEST_Role @@ -54,8 +54,8 @@ PREHOOK: query: SHOW GRANT ROLE db_TEST_Role ON DATABASE test_db PREHOOK: type: SHOW_GRANT POSTHOOK: query: SHOW GRANT ROLE db_TEST_Role ON DATABASE test_db POSTHOOK: type: SHOW_GRANT -test_db db_TEST_Role ROLE DROP false -1 hive_test_user -test_db db_TEST_Role ROLE SELECT false -1 hive_test_user +test_db db_TEST_Role ROLE DROP false Wed Dec 31 15:59:59 PST 1969 hive_test_user +test_db db_TEST_Role ROLE SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user PREHOOK: query: DROP DATABASE IF EXISTS test_db PREHOOK: type: DROPDATABASE PREHOOK: Input: database:test_db diff --git a/ql/src/test/results/clientpositive/authorization_6.q.out b/ql/src/test/results/clientpositive/authorization_6.q.out index 0341094..07f92b1 100644 --- a/ql/src/test/results/clientpositive/authorization_6.q.out +++ b/ql/src/test/results/clientpositive/authorization_6.q.out @@ -58,9 +58,9 @@ PREHOOK: query: show grant user hive_test_user on table authorization_part PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user hive_test_user on table authorization_part POSTHOOK: type: SHOW_GRANT -default authorization_part hive_test_user USER CREATE false -1 hive_test_user -default authorization_part hive_test_user USER DROP false -1 hive_test_user -default authorization_part hive_test_user USER UPDATE false -1 hive_test_user +default authorization_part hive_test_user USER CREATE false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default authorization_part hive_test_user USER DROP false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default authorization_part hive_test_user USER UPDATE false Wed Dec 31 15:59:59 PST 1969 hive_test_user PREHOOK: query: grant select(key) on table authorization_part to user hive_test_user PREHOOK: type: GRANT_PRIVILEGE PREHOOK: Output: default@authorization_part @@ -91,17 +91,17 @@ PREHOOK: query: show grant user hive_test_user on table authorization_part(key) PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user hive_test_user on table authorization_part(key) partition (ds='2010') POSTHOOK: type: SHOW_GRANT -default authorization_part [2010] [key] hive_test_user USER SELECT false -1 hive_test_user +default authorization_part [2010] [key] hive_test_user USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user PREHOOK: query: show grant user hive_test_user on table authorization_part(key) partition (ds='2011') PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user hive_test_user on table authorization_part(key) partition (ds='2011') POSTHOOK: type: SHOW_GRANT -default authorization_part [2011] [key] hive_test_user USER SELECT false -1 hive_test_user +default authorization_part [2011] [key] hive_test_user USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user PREHOOK: query: show grant user hive_test_user on table authorization_part(key) PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user hive_test_user on table authorization_part(key) POSTHOOK: type: SHOW_GRANT -default authorization_part [key] hive_test_user USER SELECT false -1 hive_test_user +default authorization_part [key] hive_test_user USER SELECT false Wed Dec 31 15:59:59 PST 1969 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 @@ -174,8 +174,8 @@ PREHOOK: query: show grant user hive_test_user on table authorization_part PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user hive_test_user on table authorization_part POSTHOOK: type: SHOW_GRANT -default authorization_part hive_test_user USER CREATE false -1 hive_test_user -default authorization_part hive_test_user USER UPDATE false -1 hive_test_user +default authorization_part hive_test_user USER CREATE false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default authorization_part hive_test_user USER UPDATE false Wed Dec 31 15:59:59 PST 1969 hive_test_user PREHOOK: query: grant select(key) on table authorization_part to user hive_test_user PREHOOK: type: GRANT_PRIVILEGE PREHOOK: Output: default@authorization_part @@ -214,7 +214,7 @@ PREHOOK: query: show grant user hive_test_user on table authorization_part(key) PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user hive_test_user on table authorization_part(key) POSTHOOK: type: SHOW_GRANT -default authorization_part [key] hive_test_user USER SELECT false -1 hive_test_user +default authorization_part [key] hive_test_user USER SELECT false Wed Dec 31 15:59:59 PST 1969 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 diff --git a/ql/src/test/results/clientpositive/authorization_9.q.out b/ql/src/test/results/clientpositive/authorization_9.q.out index 7f95f5e..91bfc53 100644 --- a/ql/src/test/results/clientpositive/authorization_9.q.out +++ b/ql/src/test/results/clientpositive/authorization_9.q.out @@ -34,21 +34,21 @@ PREHOOK: query: show grant user hive_test_user on database default PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user hive_test_user on database default POSTHOOK: type: SHOW_GRANT -default hive_test_user USER SELECT false -1 hive_test_user +default hive_test_user USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user PREHOOK: query: show grant user hive_test_user on table dummy PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user hive_test_user on table dummy POSTHOOK: type: SHOW_GRANT -default dummy hive_test_user USER SELECT false -1 hive_test_user +default dummy hive_test_user USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user PREHOOK: query: show grant user hive_test_user on all PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user hive_test_user on all POSTHOOK: type: SHOW_GRANT - hive_test_user USER SELECT false -1 hive_test_user -default hive_test_user USER SELECT false -1 hive_test_user -default dummy hive_test_user USER SELECT false -1 hive_test_user -default dummy [key] hive_test_user USER SELECT false -1 hive_test_user -default dummy [value] hive_test_user USER SELECT false -1 hive_test_user + hive_test_user USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default hive_test_user USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default dummy hive_test_user USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default dummy [key] hive_test_user USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default dummy [value] hive_test_user USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user PREHOOK: query: grant select to user hive_test_user2 PREHOOK: type: GRANT_PRIVILEGE POSTHOOK: query: grant select to user hive_test_user2 @@ -73,35 +73,35 @@ PREHOOK: query: show grant on all PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant on all POSTHOOK: type: SHOW_GRANT - admin ROLE ALL true -1 admin - hive_test_user USER SELECT false -1 hive_test_user - hive_test_user2 USER SELECT false -1 hive_test_user -default hive_test_user USER SELECT false -1 hive_test_user -default hive_test_user2 USER SELECT false -1 hive_test_user -default dummy hive_test_user USER SELECT false -1 hive_test_user -default dummy hive_test_user2 USER SELECT false -1 hive_test_user -default dummy [key] hive_test_user USER SELECT false -1 hive_test_user -default dummy [key] hive_test_user2 USER SELECT false -1 hive_test_user -default dummy [value] hive_test_user USER SELECT false -1 hive_test_user -default dummy [value] hive_test_user2 USER SELECT false -1 hive_test_user + admin ROLE ALL true Wed Dec 31 15:59:59 PST 1969 admin + hive_test_user USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user + hive_test_user2 USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default hive_test_user USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default hive_test_user2 USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default dummy hive_test_user USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default dummy hive_test_user2 USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default dummy [key] hive_test_user USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default dummy [key] hive_test_user2 USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default dummy [value] hive_test_user USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default dummy [value] hive_test_user2 USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user PREHOOK: query: show grant user hive_test_user on all PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user hive_test_user on all POSTHOOK: type: SHOW_GRANT - hive_test_user USER SELECT false -1 hive_test_user -default hive_test_user USER SELECT false -1 hive_test_user -default dummy hive_test_user USER SELECT false -1 hive_test_user -default dummy [key] hive_test_user USER SELECT false -1 hive_test_user -default dummy [value] hive_test_user USER SELECT false -1 hive_test_user + hive_test_user USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default hive_test_user USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default dummy hive_test_user USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default dummy [key] hive_test_user USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default dummy [value] hive_test_user USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user PREHOOK: query: show grant user hive_test_user2 on all PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user hive_test_user2 on all POSTHOOK: type: SHOW_GRANT - hive_test_user2 USER SELECT false -1 hive_test_user -default hive_test_user2 USER SELECT false -1 hive_test_user -default dummy hive_test_user2 USER SELECT false -1 hive_test_user -default dummy [key] hive_test_user2 USER SELECT false -1 hive_test_user -default dummy [value] hive_test_user2 USER SELECT false -1 hive_test_user + hive_test_user2 USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default hive_test_user2 USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default dummy hive_test_user2 USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default dummy [key] hive_test_user2 USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user +default dummy [value] hive_test_user2 USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user PREHOOK: query: revoke select from user hive_test_user PREHOOK: type: REVOKE_PRIVILEGE POSTHOOK: query: revoke select from user hive_test_user diff --git a/ql/src/test/results/clientpositive/authorization_role_grant1.q.out b/ql/src/test/results/clientpositive/authorization_role_grant1.q.out index 9cd3f99..ece94a1 100644 --- a/ql/src/test/results/clientpositive/authorization_role_grant1.q.out +++ b/ql/src/test/results/clientpositive/authorization_role_grant1.q.out @@ -20,8 +20,8 @@ PREHOOK: query: show role grant user user2 PREHOOK: type: SHOW_ROLE_GRANT POSTHOOK: query: show role grant user user2 POSTHOOK: type: SHOW_ROLE_GRANT -public false -1 -src_role2 false -1 hive_admin_user +public false Wed Dec 31 15:59:59 PST 1969 +src_role2 false Wed Dec 31 15:59:59 PST 1969 hive_admin_user PREHOOK: query: show roles PREHOOK: type: SHOW_ROLES POSTHOOK: query: show roles @@ -39,7 +39,7 @@ PREHOOK: query: show role grant user user2 PREHOOK: type: SHOW_ROLE_GRANT POSTHOOK: query: show role grant user user2 POSTHOOK: type: SHOW_ROLE_GRANT -public false -1 +public false Wed Dec 31 15:59:59 PST 1969 PREHOOK: query: show roles PREHOOK: type: SHOW_ROLES POSTHOOK: query: show roles @@ -67,8 +67,8 @@ PREHOOK: query: show role grant user user2 PREHOOK: type: SHOW_ROLE_GRANT POSTHOOK: query: show role grant user user2 POSTHOOK: type: SHOW_ROLE_GRANT -public false -1 -src_role_wadmin true -1 hive_admin_user +public false Wed Dec 31 15:59:59 PST 1969 +src_role_wadmin true Wed Dec 31 15:59:59 PST 1969 hive_admin_user PREHOOK: query: -- revoke admin option revoke admin option for src_role_wadmin from user user2 PREHOOK: type: REVOKE_ROLE @@ -79,8 +79,8 @@ PREHOOK: query: show role grant user user2 PREHOOK: type: SHOW_ROLE_GRANT POSTHOOK: query: show role grant user user2 POSTHOOK: type: SHOW_ROLE_GRANT -public false -1 -src_role_wadmin false -1 hive_admin_user +public false Wed Dec 31 15:59:59 PST 1969 +src_role_wadmin false Wed Dec 31 15:59:59 PST 1969 hive_admin_user PREHOOK: query: -- revoke role without role keyword revoke src_role_wadmin from user user2 PREHOOK: type: REVOKE_ROLE @@ -91,7 +91,7 @@ PREHOOK: query: show role grant user user2 PREHOOK: type: SHOW_ROLE_GRANT POSTHOOK: query: show role grant user user2 POSTHOOK: type: SHOW_ROLE_GRANT -public false -1 +public false Wed Dec 31 15:59:59 PST 1969 PREHOOK: query: -- drop roles show roles PREHOOK: type: SHOW_ROLES diff --git a/ql/src/test/results/clientpositive/keyword_1.q.out b/ql/src/test/results/clientpositive/keyword_1.q.out index 135d8e5..b2f0eb9 100644 --- a/ql/src/test/results/clientpositive/keyword_1.q.out +++ b/ql/src/test/results/clientpositive/keyword_1.q.out @@ -41,7 +41,7 @@ PREHOOK: query: show grant user hive_test on table test_user PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user hive_test on table test_user POSTHOOK: type: SHOW_GRANT -default test_user hive_test USER SELECT false -1 hive_test_user +default test_user hive_test USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user PREHOOK: query: drop table test_user PREHOOK: type: DROPTABLE PREHOOK: Input: default@test_user @@ -89,7 +89,7 @@ PREHOOK: query: show grant user hive_test on table test_user PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user hive_test on table test_user POSTHOOK: type: SHOW_GRANT -default test_user hive_test USER SELECT false -1 hive_test_user +default test_user hive_test USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user PREHOOK: query: drop table test_user PREHOOK: type: DROPTABLE PREHOOK: Input: default@test_user