diff --git a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcDriver2.java b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcDriver2.java index 23a1b97..87f3ac0 100644 --- a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcDriver2.java +++ b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcDriver2.java @@ -2090,7 +2090,7 @@ public void testShowGrant() throws SQLException { assertEquals("USER", res.getString(6)); assertEquals("SELECT", res.getString(7)); assertEquals(false, res.getBoolean(8)); // grant option - assertEquals(-1, res.getLong(9)); + assertEquals((new Date(-1)).toString(), res.getString(9)); assertNotNull(res.getString(10)); // grantor assertFalse(res.next()); res.close(); 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/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/clientnegative/authorization_fail_8.q.out b/ql/src/test/results/clientnegative/authorization_fail_8.q.out index a4292d1..7eeb642 100644 --- a/ql/src/test/results/clientnegative/authorization_fail_8.q.out +++ b/ql/src/test/results/clientnegative/authorization_fail_8.q.out @@ -16,7 +16,7 @@ PREHOOK: query: SHOW GRANT USER user2 ON TABLE authorization_fail PREHOOK: type: SHOW_GRANT POSTHOOK: query: SHOW GRANT USER user2 ON TABLE authorization_fail POSTHOOK: type: SHOW_GRANT -default authorization_fail user2 USER SELECT true -1 user1 +default authorization_fail user2 USER SELECT true Wed Dec 31 15:59:59 PST 1969 user1 PREHOOK: query: -- user2 current has grant option, this should work GRANT SELECT ON authorization_fail TO USER user3 PREHOOK: type: GRANT_PRIVILEGE @@ -41,7 +41,7 @@ PREHOOK: query: SHOW GRANT USER user2 ON TABLE authorization_fail PREHOOK: type: SHOW_GRANT POSTHOOK: query: SHOW GRANT USER user2 ON TABLE authorization_fail POSTHOOK: type: SHOW_GRANT -default authorization_fail user2 USER SELECT false -1 user1 +default authorization_fail user2 USER SELECT false Wed Dec 31 15:59:59 PST 1969 user1 PREHOOK: query: -- Now that grant option has been revoked, granting to other users should fail GRANT SELECT ON authorization_fail TO USER user3 PREHOOK: type: GRANT_PRIVILEGE diff --git a/ql/src/test/results/clientnegative/authorization_grant_table_dup.q.out b/ql/src/test/results/clientnegative/authorization_grant_table_dup.q.out index 1a70539..6a97ce0 100644 --- a/ql/src/test/results/clientnegative/authorization_grant_table_dup.q.out +++ b/ql/src/test/results/clientnegative/authorization_grant_table_dup.q.out @@ -22,9 +22,9 @@ PREHOOK: query: show grant user user1 on table tauth_gdup PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user user1 on table tauth_gdup POSTHOOK: type: SHOW_GRANT -default tauth_gdup user1 USER DELETE true -1 user1 -default tauth_gdup user1 USER INSERT true -1 user1 -default tauth_gdup user1 USER UPDATE true -1 user1 +default tauth_gdup user1 USER DELETE true Wed Dec 31 15:59:59 PST 1969 user1 +default tauth_gdup user1 USER INSERT true Wed Dec 31 15:59:59 PST 1969 user1 +default tauth_gdup user1 USER UPDATE true Wed Dec 31 15:59:59 PST 1969 user1 #### A masked pattern was here #### -- and result in error GRANT INSERT ON tauth_gdup TO USER user1 diff --git a/ql/src/test/results/clientnegative/authorization_insertoverwrite_nodel.q.out b/ql/src/test/results/clientnegative/authorization_insertoverwrite_nodel.q.out index 926066b..6c85560 100644 --- a/ql/src/test/results/clientnegative/authorization_insertoverwrite_nodel.q.out +++ b/ql/src/test/results/clientnegative/authorization_insertoverwrite_nodel.q.out @@ -18,15 +18,15 @@ PREHOOK: query: show grant user hive_test_user on table t1 PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user hive_test_user on table t1 POSTHOOK: type: SHOW_GRANT -default t1 hive_test_user USER DELETE true -1 hive_test_user -default t1 hive_test_user USER INSERT true -1 hive_test_user -default t1 hive_test_user USER SELECT true -1 hive_test_user -default t1 hive_test_user USER UPDATE true -1 hive_test_user +default t1 hive_test_user USER DELETE true Wed Dec 31 15:59:59 PST 1969 hive_test_user +default t1 hive_test_user USER INSERT true Wed Dec 31 15:59:59 PST 1969 hive_test_user +default t1 hive_test_user USER SELECT true Wed Dec 31 15:59:59 PST 1969 hive_test_user +default t1 hive_test_user USER UPDATE true Wed Dec 31 15:59:59 PST 1969 hive_test_user PREHOOK: query: show grant user user1 on table t1 PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user user1 on table t1 POSTHOOK: type: SHOW_GRANT -default t1 user1 USER INSERT false -1 hive_test_user +default t1 user1 USER INSERT false Wed Dec 31 15:59:59 PST 1969 hive_test_user PREHOOK: query: create table user1tab(i int) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default diff --git a/ql/src/test/results/clientnegative/authorization_part.q.out b/ql/src/test/results/clientnegative/authorization_part.q.out index 6238782..430b26a 100644 --- a/ql/src/test/results/clientnegative/authorization_part.q.out +++ b/ql/src/test/results/clientnegative/authorization_part.q.out @@ -72,7 +72,7 @@ PREHOOK: query: show grant group hive_test_group1 on table authorization_part_fa PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant group hive_test_group1 on table authorization_part_fail POSTHOOK: type: SHOW_GRANT -default authorization_part_fail hive_test_group1 GROUP SELECT false -1 hive_test_user +default authorization_part_fail hive_test_group1 GROUP SELECT false Wed Dec 31 15:59:59 PST 1969 hive_test_user PREHOOK: query: insert overwrite table authorization_part_fail partition (ds='2010') select key, value from src_auth PREHOOK: type: QUERY PREHOOK: Input: default@src_auth @@ -87,12 +87,12 @@ PREHOOK: query: show grant group hive_test_group1 on table authorization_part_fa PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant group hive_test_group1 on table authorization_part_fail(key) partition (ds='2010') POSTHOOK: type: SHOW_GRANT -default authorization_part_fail [2010] [key] hive_test_group1 GROUP SELECT false -1 hive_test_user +default authorization_part_fail [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_fail partition (ds='2010') PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant group hive_test_group1 on table authorization_part_fail partition (ds='2010') POSTHOOK: type: SHOW_GRANT -default authorization_part_fail [2010] hive_test_group1 GROUP SELECT false -1 hive_test_user +default authorization_part_fail [2010] hive_test_group1 GROUP SELECT false Wed Dec 31 15:59:59 PST 1969 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 @@ -137,12 +137,12 @@ PREHOOK: query: show grant group hive_test_group1 on table authorization_part_fa PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant group hive_test_group1 on table authorization_part_fail(key) partition (ds='2011') POSTHOOK: type: SHOW_GRANT -default authorization_part_fail [2011] [key] hive_test_group1 GROUP SELECT false -1 hive_test_user +default authorization_part_fail [2011] [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_fail partition (ds='2011') PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant group hive_test_group1 on table authorization_part_fail partition (ds='2011') POSTHOOK: type: SHOW_GRANT -default authorization_part_fail [2011] hive_test_group1 GROUP SELECT false -1 hive_test_user +default authorization_part_fail [2011] hive_test_group1 GROUP SELECT false Wed Dec 31 15:59:59 PST 1969 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 diff --git a/ql/src/test/results/clientnegative/authorization_priv_current_role_neg.q.out b/ql/src/test/results/clientnegative/authorization_priv_current_role_neg.q.out index 1cbfb3e..6522570 100644 --- a/ql/src/test/results/clientnegative/authorization_priv_current_role_neg.q.out +++ b/ql/src/test/results/clientnegative/authorization_priv_current_role_neg.q.out @@ -64,10 +64,10 @@ PREHOOK: query: show grant user user4 on table tpriv_current_role PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user user4 on table tpriv_current_role POSTHOOK: type: SHOW_GRANT -default tpriv_current_role user4 USER DELETE false -1 user2 -default tpriv_current_role user4 USER INSERT false -1 user2 -default tpriv_current_role user4 USER SELECT false -1 user2 -default tpriv_current_role user4 USER UPDATE false -1 user2 +default tpriv_current_role user4 USER DELETE false Wed Dec 31 15:59:59 PST 1969 user2 +default tpriv_current_role user4 USER INSERT false Wed Dec 31 15:59:59 PST 1969 user2 +default tpriv_current_role user4 USER SELECT false Wed Dec 31 15:59:59 PST 1969 user2 +default tpriv_current_role user4 USER UPDATE false Wed Dec 31 15:59:59 PST 1969 user2 PREHOOK: query: set role PUBLIC PREHOOK: type: SHOW_ROLES POSTHOOK: query: set role PUBLIC diff --git a/ql/src/test/results/clientnegative/authorization_role_grant.q.out b/ql/src/test/results/clientnegative/authorization_role_grant.q.out index bd0f0a3..6e5e0d4 100644 --- a/ql/src/test/results/clientnegative/authorization_role_grant.q.out +++ b/ql/src/test/results/clientnegative/authorization_role_grant.q.out @@ -32,9 +32,9 @@ 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 -role_noadmin false -1 hive_admin_user -src_role_wadmin true -1 hive_admin_user +public false Wed Dec 31 15:59:59 PST 1969 +role_noadmin false Wed Dec 31 15:59:59 PST 1969 hive_admin_user +src_role_wadmin true Wed Dec 31 15:59:59 PST 1969 hive_admin_user PREHOOK: query: set role role_noadmin PREHOOK: type: SHOW_ROLES POSTHOOK: query: set role role_noadmin diff --git a/ql/src/test/results/clientnegative/authorization_role_grant2.q.out b/ql/src/test/results/clientnegative/authorization_role_grant2.q.out index 2156d49..cc9b2f3 100644 --- a/ql/src/test/results/clientnegative/authorization_role_grant2.q.out +++ b/ql/src/test/results/clientnegative/authorization_role_grant2.q.out @@ -24,8 +24,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: set role src_role_wadmin PREHOOK: type: SHOW_ROLES POSTHOOK: query: set role src_role_wadmin @@ -50,8 +50,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: set role src_role_wadmin PREHOOK: type: SHOW_ROLES POSTHOOK: query: set role src_role_wadmin diff --git a/ql/src/test/results/clientnegative/authorization_role_grant_otheruser.q.out b/ql/src/test/results/clientnegative/authorization_role_grant_otheruser.q.out index 37fb402..1d4cd83 100644 --- a/ql/src/test/results/clientnegative/authorization_role_grant_otheruser.q.out +++ b/ql/src/test/results/clientnegative/authorization_role_grant_otheruser.q.out @@ -2,7 +2,7 @@ PREHOOK: query: show role grant user ruser1 PREHOOK: type: SHOW_ROLE_GRANT POSTHOOK: query: show role grant user ruser1 POSTHOOK: type: SHOW_ROLE_GRANT -public false -1 +public false Wed Dec 31 15:59:59 PST 1969 PREHOOK: query: set role ADMIN PREHOOK: type: SHOW_ROLES POSTHOOK: query: set role ADMIN @@ -11,12 +11,12 @@ PREHOOK: query: show role grant user ruser1 PREHOOK: type: SHOW_ROLE_GRANT POSTHOOK: query: show role grant user ruser1 POSTHOOK: type: SHOW_ROLE_GRANT -public false -1 +public false Wed Dec 31 15:59:59 PST 1969 PREHOOK: query: show role grant user ruser2 PREHOOK: type: SHOW_ROLE_GRANT POSTHOOK: query: show role grant user ruser2 POSTHOOK: type: SHOW_ROLE_GRANT -public false -1 +public false Wed Dec 31 15:59:59 PST 1969 PREHOOK: query: -- show role grant for another user as non admin user should fail show role grant user ruser2 PREHOOK: type: SHOW_ROLE_GRANT 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_admin_almighty1.q.out b/ql/src/test/results/clientpositive/authorization_admin_almighty1.q.out index 53619c3..e997528 100644 --- a/ql/src/test/results/clientpositive/authorization_admin_almighty1.q.out +++ b/ql/src/test/results/clientpositive/authorization_admin_almighty1.q.out @@ -42,10 +42,10 @@ PREHOOK: query: show grant user user1 on table t1 PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user user1 on table t1 POSTHOOK: type: SHOW_GRANT -default t1 user1 USER DELETE false -1 hive_admin_user -default t1 user1 USER INSERT false -1 hive_admin_user -default t1 user1 USER SELECT false -1 hive_admin_user -default t1 user1 USER UPDATE false -1 hive_admin_user +default t1 user1 USER DELETE false Wed Dec 31 15:59:59 PST 1969 hive_admin_user +default t1 user1 USER INSERT false Wed Dec 31 15:59:59 PST 1969 hive_admin_user +default t1 user1 USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_admin_user +default t1 user1 USER UPDATE false Wed Dec 31 15:59:59 PST 1969 hive_admin_user PREHOOK: query: drop table t1 PREHOOK: type: DROPTABLE PREHOOK: Input: default@t1 diff --git a/ql/src/test/results/clientpositive/authorization_cli_createtab.q.out b/ql/src/test/results/clientpositive/authorization_cli_createtab.q.out index a75d64b..03d9b3d 100644 --- a/ql/src/test/results/clientpositive/authorization_cli_createtab.q.out +++ b/ql/src/test/results/clientpositive/authorization_cli_createtab.q.out @@ -16,10 +16,10 @@ PREHOOK: query: show grant user hive_test_user on t_cli PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user hive_test_user on t_cli POSTHOOK: type: SHOW_GRANT -default t_cli hive_test_user USER DELETE true -1 hive_test_user -default t_cli hive_test_user USER INSERT true -1 hive_test_user -default t_cli hive_test_user USER SELECT true -1 hive_test_user -default t_cli hive_test_user USER UPDATE true -1 hive_test_user +default t_cli hive_test_user USER DELETE true Wed Dec 31 15:59:59 PST 1969 hive_test_user +default t_cli hive_test_user USER INSERT true Wed Dec 31 15:59:59 PST 1969 hive_test_user +default t_cli hive_test_user USER SELECT true Wed Dec 31 15:59:59 PST 1969 hive_test_user +default t_cli hive_test_user USER UPDATE true Wed Dec 31 15:59:59 PST 1969 hive_test_user PREHOOK: query: create view v_cli (i) as select i from t_cli PREHOOK: type: CREATEVIEW PREHOOK: Input: default@t_cli @@ -34,7 +34,7 @@ PREHOOK: query: show grant user hive_test_user on v_cli PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user hive_test_user on v_cli POSTHOOK: type: SHOW_GRANT -default v_cli hive_test_user USER DELETE true -1 hive_test_user -default v_cli hive_test_user USER INSERT true -1 hive_test_user -default v_cli hive_test_user USER SELECT true -1 hive_test_user -default v_cli hive_test_user USER UPDATE true -1 hive_test_user +default v_cli hive_test_user USER DELETE true Wed Dec 31 15:59:59 PST 1969 hive_test_user +default v_cli hive_test_user USER INSERT true Wed Dec 31 15:59:59 PST 1969 hive_test_user +default v_cli hive_test_user USER SELECT true Wed Dec 31 15:59:59 PST 1969 hive_test_user +default v_cli hive_test_user USER UPDATE true Wed Dec 31 15:59:59 PST 1969 hive_test_user diff --git a/ql/src/test/results/clientpositive/authorization_create_table_owner_privs.q.out b/ql/src/test/results/clientpositive/authorization_create_table_owner_privs.q.out index 7130db8..1064d19 100644 --- a/ql/src/test/results/clientpositive/authorization_create_table_owner_privs.q.out +++ b/ql/src/test/results/clientpositive/authorization_create_table_owner_privs.q.out @@ -14,7 +14,7 @@ POSTHOOK: query: -- all privileges should have been set for user show grant user user1 on table create_table_creator_priv_test POSTHOOK: type: SHOW_GRANT -default create_table_creator_priv_test user1 USER DELETE true -1 user1 -default create_table_creator_priv_test user1 USER INSERT true -1 user1 -default create_table_creator_priv_test user1 USER SELECT true -1 user1 -default create_table_creator_priv_test user1 USER UPDATE true -1 user1 +default create_table_creator_priv_test user1 USER DELETE true Wed Dec 31 15:59:59 PST 1969 user1 +default create_table_creator_priv_test user1 USER INSERT true Wed Dec 31 15:59:59 PST 1969 user1 +default create_table_creator_priv_test user1 USER SELECT true Wed Dec 31 15:59:59 PST 1969 user1 +default create_table_creator_priv_test user1 USER UPDATE true Wed Dec 31 15:59:59 PST 1969 user1 diff --git a/ql/src/test/results/clientpositive/authorization_default_create_table_owner_privs.q.out b/ql/src/test/results/clientpositive/authorization_default_create_table_owner_privs.q.out index eaa037e..a61476d 100644 --- a/ql/src/test/results/clientpositive/authorization_default_create_table_owner_privs.q.out +++ b/ql/src/test/results/clientpositive/authorization_default_create_table_owner_privs.q.out @@ -12,4 +12,4 @@ PREHOOK: type: SHOW_GRANT #### A masked pattern was here #### show grant on table default_auth_table_creator_priv_test POSTHOOK: type: SHOW_GRANT -default default_auth_table_creator_priv_test hive_test_user USER ALL true -1 hive_test_user +default default_auth_table_creator_priv_test hive_test_user USER ALL true Wed Dec 31 15:59:59 PST 1969 hive_test_user diff --git a/ql/src/test/results/clientpositive/authorization_delete.q.out b/ql/src/test/results/clientpositive/authorization_delete.q.out index 260b9a4..203d8f1 100644 --- a/ql/src/test/results/clientpositive/authorization_delete.q.out +++ b/ql/src/test/results/clientpositive/authorization_delete.q.out @@ -32,12 +32,12 @@ PREHOOK: query: SHOW GRANT ON TABLE t_auth_del PREHOOK: type: SHOW_GRANT POSTHOOK: query: SHOW GRANT ON TABLE t_auth_del POSTHOOK: type: SHOW_GRANT -default t_auth_del user1 USER DELETE true -1 user1 -default t_auth_del user1 USER INSERT true -1 user1 -default t_auth_del user1 USER SELECT true -1 user1 -default t_auth_del user1 USER UPDATE true -1 user1 -default t_auth_del userWIns USER DELETE false -1 user1 -default t_auth_del userWIns USER SELECT false -1 user1 +default t_auth_del user1 USER DELETE true Wed Dec 31 15:59:59 PST 1969 user1 +default t_auth_del user1 USER INSERT true Wed Dec 31 15:59:59 PST 1969 user1 +default t_auth_del user1 USER SELECT true Wed Dec 31 15:59:59 PST 1969 user1 +default t_auth_del user1 USER UPDATE true Wed Dec 31 15:59:59 PST 1969 user1 +default t_auth_del userWIns USER DELETE false Wed Dec 31 15:59:59 PST 1969 user1 +default t_auth_del userWIns USER SELECT false Wed Dec 31 15:59:59 PST 1969 user1 PREHOOK: query: delete from t_auth_del where i > 0 PREHOOK: type: QUERY PREHOOK: Input: default@t_auth_del diff --git a/ql/src/test/results/clientpositive/authorization_grant_option_role.q.out b/ql/src/test/results/clientpositive/authorization_grant_option_role.q.out index 745a8ae..1566ef0 100644 --- a/ql/src/test/results/clientpositive/authorization_grant_option_role.q.out +++ b/ql/src/test/results/clientpositive/authorization_grant_option_role.q.out @@ -46,18 +46,18 @@ PREHOOK: type: SHOW_GRANT POSTHOOK: query: -- check privileges on table show grant on table t1 POSTHOOK: type: SHOW_GRANT -default t1 r1 ROLE DELETE true -1 user1 -default t1 r1 ROLE INSERT true -1 user1 -default t1 r1 ROLE SELECT true -1 user1 -default t1 r1 ROLE UPDATE true -1 user1 -default t1 user1 USER DELETE true -1 hive_admin_user -default t1 user1 USER INSERT true -1 hive_admin_user -default t1 user1 USER SELECT true -1 hive_admin_user -default t1 user1 USER UPDATE true -1 hive_admin_user -default t1 user3 USER DELETE false -1 r1user -default t1 user3 USER INSERT false -1 r1user -default t1 user3 USER SELECT false -1 r1user -default t1 user3 USER UPDATE false -1 r1user +default t1 r1 ROLE DELETE true Wed Dec 31 15:59:59 PST 1969 user1 +default t1 r1 ROLE INSERT true Wed Dec 31 15:59:59 PST 1969 user1 +default t1 r1 ROLE SELECT true Wed Dec 31 15:59:59 PST 1969 user1 +default t1 r1 ROLE UPDATE true Wed Dec 31 15:59:59 PST 1969 user1 +default t1 user1 USER DELETE true Wed Dec 31 15:59:59 PST 1969 hive_admin_user +default t1 user1 USER INSERT true Wed Dec 31 15:59:59 PST 1969 hive_admin_user +default t1 user1 USER SELECT true Wed Dec 31 15:59:59 PST 1969 hive_admin_user +default t1 user1 USER UPDATE true Wed Dec 31 15:59:59 PST 1969 hive_admin_user +default t1 user3 USER DELETE false Wed Dec 31 15:59:59 PST 1969 r1user +default t1 user3 USER INSERT false Wed Dec 31 15:59:59 PST 1969 r1user +default t1 user3 USER SELECT false Wed Dec 31 15:59:59 PST 1969 r1user +default t1 user3 USER UPDATE false Wed Dec 31 15:59:59 PST 1969 r1user PREHOOK: query: -- check if drop role removes privileges for that role drop role r1 PREHOOK: type: DROPROLE @@ -68,11 +68,11 @@ PREHOOK: query: show grant on table t1 PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant on table t1 POSTHOOK: type: SHOW_GRANT -default t1 user1 USER DELETE true -1 hive_admin_user -default t1 user1 USER INSERT true -1 hive_admin_user -default t1 user1 USER SELECT true -1 hive_admin_user -default t1 user1 USER UPDATE true -1 hive_admin_user -default t1 user3 USER DELETE false -1 r1user -default t1 user3 USER INSERT false -1 r1user -default t1 user3 USER SELECT false -1 r1user -default t1 user3 USER UPDATE false -1 r1user +default t1 user1 USER DELETE true Wed Dec 31 15:59:59 PST 1969 hive_admin_user +default t1 user1 USER INSERT true Wed Dec 31 15:59:59 PST 1969 hive_admin_user +default t1 user1 USER SELECT true Wed Dec 31 15:59:59 PST 1969 hive_admin_user +default t1 user1 USER UPDATE true Wed Dec 31 15:59:59 PST 1969 hive_admin_user +default t1 user3 USER DELETE false Wed Dec 31 15:59:59 PST 1969 r1user +default t1 user3 USER INSERT false Wed Dec 31 15:59:59 PST 1969 r1user +default t1 user3 USER SELECT false Wed Dec 31 15:59:59 PST 1969 r1user +default t1 user3 USER UPDATE false Wed Dec 31 15:59:59 PST 1969 r1user diff --git a/ql/src/test/results/clientpositive/authorization_grant_public_role.q.out b/ql/src/test/results/clientpositive/authorization_grant_public_role.q.out index 1b3cfdc..616a603 100644 --- a/ql/src/test/results/clientpositive/authorization_grant_public_role.q.out +++ b/ql/src/test/results/clientpositive/authorization_grant_public_role.q.out @@ -24,18 +24,18 @@ PREHOOK: query: SHOW GRANT USER user1 ON TABLE t_gpr1 PREHOOK: type: SHOW_GRANT POSTHOOK: query: SHOW GRANT USER user1 ON TABLE t_gpr1 POSTHOOK: type: SHOW_GRANT -default t_gpr1 user1 USER DELETE true -1 user1 -default t_gpr1 user1 USER INSERT true -1 user1 -default t_gpr1 user1 USER SELECT true -1 user1 -default t_gpr1 user1 USER UPDATE true -1 user1 +default t_gpr1 user1 USER DELETE true Wed Dec 31 15:59:59 PST 1969 user1 +default t_gpr1 user1 USER INSERT true Wed Dec 31 15:59:59 PST 1969 user1 +default t_gpr1 user1 USER SELECT true Wed Dec 31 15:59:59 PST 1969 user1 +default t_gpr1 user1 USER UPDATE true Wed Dec 31 15:59:59 PST 1969 user1 PREHOOK: query: SHOW GRANT ROLE pubLic ON TABLE t_gpr1 PREHOOK: type: SHOW_GRANT POSTHOOK: query: SHOW GRANT ROLE pubLic ON TABLE t_gpr1 POSTHOOK: type: SHOW_GRANT -default t_gpr1 public ROLE DELETE false -1 user1 -default t_gpr1 public ROLE INSERT false -1 user1 -default t_gpr1 public ROLE SELECT false -1 user1 -default t_gpr1 public ROLE UPDATE false -1 user1 +default t_gpr1 public ROLE DELETE false Wed Dec 31 15:59:59 PST 1969 user1 +default t_gpr1 public ROLE INSERT false Wed Dec 31 15:59:59 PST 1969 user1 +default t_gpr1 public ROLE SELECT false Wed Dec 31 15:59:59 PST 1969 user1 +default t_gpr1 public ROLE UPDATE false Wed Dec 31 15:59:59 PST 1969 user1 PREHOOK: query: SHOW CURRENT ROLES PREHOOK: type: SHOW_ROLES POSTHOOK: query: SHOW CURRENT ROLES diff --git a/ql/src/test/results/clientpositive/authorization_grant_table_priv.q.out b/ql/src/test/results/clientpositive/authorization_grant_table_priv.q.out index 58ede72..4f0d1dee 100644 --- a/ql/src/test/results/clientpositive/authorization_grant_table_priv.q.out +++ b/ql/src/test/results/clientpositive/authorization_grant_table_priv.q.out @@ -26,7 +26,7 @@ PREHOOK: query: SHOW GRANT USER user2 ON TABLE table_priv1 PREHOOK: type: SHOW_GRANT POSTHOOK: query: SHOW GRANT USER user2 ON TABLE table_priv1 POSTHOOK: type: SHOW_GRANT -default table_priv1 user2 USER INSERT false -1 user1 +default table_priv1 user2 USER INSERT false Wed Dec 31 15:59:59 PST 1969 user1 PREHOOK: query: -- grant select privilege to another user with grant GRANT SELECT ON table_priv1 TO USER user2 with grant option PREHOOK: type: GRANT_PRIVILEGE @@ -39,8 +39,8 @@ PREHOOK: query: SHOW GRANT USER user2 ON TABLE table_priv1 PREHOOK: type: SHOW_GRANT POSTHOOK: query: SHOW GRANT USER user2 ON TABLE table_priv1 POSTHOOK: type: SHOW_GRANT -default table_priv1 user2 USER INSERT false -1 user1 -default table_priv1 user2 USER SELECT true -1 user1 +default table_priv1 user2 USER INSERT false Wed Dec 31 15:59:59 PST 1969 user1 +default table_priv1 user2 USER SELECT true Wed Dec 31 15:59:59 PST 1969 user1 PREHOOK: query: -- changed to other user - user2 -- grant permissions to another user as user2 GRANT SELECT ON table_priv1 TO USER user3 with grant option @@ -55,7 +55,7 @@ PREHOOK: query: SHOW GRANT USER user3 ON TABLE table_priv1 PREHOOK: type: SHOW_GRANT POSTHOOK: query: SHOW GRANT USER user3 ON TABLE table_priv1 POSTHOOK: type: SHOW_GRANT -default table_priv1 user3 USER SELECT true -1 user2 +default table_priv1 user3 USER SELECT true Wed Dec 31 15:59:59 PST 1969 user2 PREHOOK: query: -- change to other user - user3 -- grant permissions to another user as user3 GRANT SELECT ON table_priv1 TO USER user4 with grant option @@ -70,7 +70,7 @@ PREHOOK: query: SHOW GRANT USER user4 ON TABLE table_priv1 PREHOOK: type: SHOW_GRANT POSTHOOK: query: SHOW GRANT USER user4 ON TABLE table_priv1 POSTHOOK: type: SHOW_GRANT -default table_priv1 user4 USER SELECT true -1 user3 +default table_priv1 user4 USER SELECT true Wed Dec 31 15:59:59 PST 1969 user3 #### A masked pattern was here #### -- grant all with grant to user22 @@ -87,10 +87,10 @@ PREHOOK: query: SHOW GRANT USER user22 ON TABLE table_priv1 PREHOOK: type: SHOW_GRANT POSTHOOK: query: SHOW GRANT USER user22 ON TABLE table_priv1 POSTHOOK: type: SHOW_GRANT -default table_priv1 user22 USER DELETE true -1 user1 -default table_priv1 user22 USER INSERT true -1 user1 -default table_priv1 user22 USER SELECT true -1 user1 -default table_priv1 user22 USER UPDATE true -1 user1 +default table_priv1 user22 USER DELETE true Wed Dec 31 15:59:59 PST 1969 user1 +default table_priv1 user22 USER INSERT true Wed Dec 31 15:59:59 PST 1969 user1 +default table_priv1 user22 USER SELECT true Wed Dec 31 15:59:59 PST 1969 user1 +default table_priv1 user22 USER UPDATE true Wed Dec 31 15:59:59 PST 1969 user1 PREHOOK: query: -- grant all without grant to user33 GRANT ALL ON table_priv1 TO USER user33 with grant option PREHOOK: type: GRANT_PRIVILEGE @@ -103,7 +103,7 @@ PREHOOK: query: SHOW GRANT USER user33 ON TABLE table_priv1 PREHOOK: type: SHOW_GRANT POSTHOOK: query: SHOW GRANT USER user33 ON TABLE table_priv1 POSTHOOK: type: SHOW_GRANT -default table_priv1 user33 USER DELETE true -1 user22 -default table_priv1 user33 USER INSERT true -1 user22 -default table_priv1 user33 USER SELECT true -1 user22 -default table_priv1 user33 USER UPDATE true -1 user22 +default table_priv1 user33 USER DELETE true Wed Dec 31 15:59:59 PST 1969 user22 +default table_priv1 user33 USER INSERT true Wed Dec 31 15:59:59 PST 1969 user22 +default table_priv1 user33 USER SELECT true Wed Dec 31 15:59:59 PST 1969 user22 +default table_priv1 user33 USER UPDATE true Wed Dec 31 15:59:59 PST 1969 user22 diff --git a/ql/src/test/results/clientpositive/authorization_insert.q.out b/ql/src/test/results/clientpositive/authorization_insert.q.out index d49e6c2..2ac3dd6 100644 --- a/ql/src/test/results/clientpositive/authorization_insert.q.out +++ b/ql/src/test/results/clientpositive/authorization_insert.q.out @@ -46,13 +46,13 @@ PREHOOK: query: SHOW GRANT ON TABLE t_auth_ins PREHOOK: type: SHOW_GRANT POSTHOOK: query: SHOW GRANT ON TABLE t_auth_ins POSTHOOK: type: SHOW_GRANT -default t_auth_ins user1 USER DELETE true -1 user1 -default t_auth_ins user1 USER INSERT true -1 user1 -default t_auth_ins user1 USER SELECT true -1 user1 -default t_auth_ins user1 USER UPDATE true -1 user1 -default t_auth_ins userWIns USER INSERT false -1 user1 -default t_auth_ins userWInsAndDel USER DELETE false -1 user1 -default t_auth_ins userWInsAndDel USER INSERT false -1 user1 +default t_auth_ins user1 USER DELETE true Wed Dec 31 15:59:59 PST 1969 user1 +default t_auth_ins user1 USER INSERT true Wed Dec 31 15:59:59 PST 1969 user1 +default t_auth_ins user1 USER SELECT true Wed Dec 31 15:59:59 PST 1969 user1 +default t_auth_ins user1 USER UPDATE true Wed Dec 31 15:59:59 PST 1969 user1 +default t_auth_ins userWIns USER INSERT false Wed Dec 31 15:59:59 PST 1969 user1 +default t_auth_ins userWInsAndDel USER DELETE false Wed Dec 31 15:59:59 PST 1969 user1 +default t_auth_ins userWInsAndDel USER INSERT false Wed Dec 31 15:59:59 PST 1969 user1 PREHOOK: query: INSERT INTO TABLE t_auth_ins SELECT * from t_select PREHOOK: type: QUERY PREHOOK: Input: default@t_select diff --git a/ql/src/test/results/clientpositive/authorization_non_id.q.out b/ql/src/test/results/clientpositive/authorization_non_id.q.out index 9b81d22..d269841 100644 --- a/ql/src/test/results/clientpositive/authorization_non_id.q.out +++ b/ql/src/test/results/clientpositive/authorization_non_id.q.out @@ -30,14 +30,14 @@ PREHOOK: query: show role grant user bar PREHOOK: type: SHOW_ROLE_GRANT POSTHOOK: query: show role grant user bar 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 role grant user `foo-1` PREHOOK: type: SHOW_ROLE_GRANT POSTHOOK: query: show role grant user `foo-1` 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: grant select on table src_autho_test to user bar PREHOOK: type: GRANT_PRIVILEGE PREHOOK: Output: default@src_autho_test @@ -54,12 +54,12 @@ PREHOOK: query: show grant user bar on all PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user bar on all POSTHOOK: type: SHOW_GRANT -default src_autho_test bar USER SELECT false -1 hive_admin_user +default src_autho_test bar USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_admin_user PREHOOK: query: show grant user `foo-1` on all PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user `foo-1` on all POSTHOOK: type: SHOW_GRANT -default src_autho_test foo-1 USER SELECT false -1 hive_admin_user +default src_autho_test foo-1 USER SELECT false Wed Dec 31 15:59:59 PST 1969 hive_admin_user PREHOOK: query: drop table src_autho_test PREHOOK: type: DROPTABLE PREHOOK: Input: default@src_autho_test diff --git a/ql/src/test/results/clientpositive/authorization_revoke_table_priv.q.out b/ql/src/test/results/clientpositive/authorization_revoke_table_priv.q.out index 187dc63..f0e0899 100644 --- a/ql/src/test/results/clientpositive/authorization_revoke_table_priv.q.out +++ b/ql/src/test/results/clientpositive/authorization_revoke_table_priv.q.out @@ -22,12 +22,12 @@ PREHOOK: query: SHOW GRANT USER user2 ON TABLE table_priv_rev PREHOOK: type: SHOW_GRANT POSTHOOK: query: SHOW GRANT USER user2 ON TABLE table_priv_rev POSTHOOK: type: SHOW_GRANT -default table_priv_rev user2 USER INSERT false -1 user1 +default table_priv_rev user2 USER INSERT false Wed Dec 31 15:59:59 PST 1969 user1 PREHOOK: query: SHOW GRANT USER user2 ON ALL PREHOOK: type: SHOW_GRANT POSTHOOK: query: SHOW GRANT USER user2 ON ALL POSTHOOK: type: SHOW_GRANT -default table_priv_rev user2 USER INSERT false -1 user1 +default table_priv_rev user2 USER INSERT false Wed Dec 31 15:59:59 PST 1969 user1 PREHOOK: query: -- revoke insert privilege from user2 REVOKE INSERT ON TABLE table_priv_rev FROM USER user2 PREHOOK: type: REVOKE_PRIVILEGE @@ -54,12 +54,12 @@ PREHOOK: query: SHOW GRANT USER user2 ON TABLE table_priv_rev PREHOOK: type: SHOW_GRANT POSTHOOK: query: SHOW GRANT USER user2 ON TABLE table_priv_rev POSTHOOK: type: SHOW_GRANT -default table_priv_rev user2 USER INSERT false -1 user1 +default table_priv_rev user2 USER INSERT false Wed Dec 31 15:59:59 PST 1969 user1 PREHOOK: query: SHOW GRANT USER user2 ON ALL PREHOOK: type: SHOW_GRANT POSTHOOK: query: SHOW GRANT USER user2 ON ALL POSTHOOK: type: SHOW_GRANT -default table_priv_rev user2 USER INSERT false -1 user1 +default table_priv_rev user2 USER INSERT false Wed Dec 31 15:59:59 PST 1969 user1 PREHOOK: query: -- grant select privilege to user2, with grant option GRANT SELECT ON table_priv_rev TO USER user2 WITH GRANT OPTION PREHOOK: type: GRANT_PRIVILEGE @@ -72,8 +72,8 @@ PREHOOK: query: SHOW GRANT USER user2 ON TABLE table_priv_rev PREHOOK: type: SHOW_GRANT POSTHOOK: query: SHOW GRANT USER user2 ON TABLE table_priv_rev POSTHOOK: type: SHOW_GRANT -default table_priv_rev user2 USER INSERT false -1 user1 -default table_priv_rev user2 USER SELECT true -1 user1 +default table_priv_rev user2 USER INSERT false Wed Dec 31 15:59:59 PST 1969 user1 +default table_priv_rev user2 USER SELECT true Wed Dec 31 15:59:59 PST 1969 user1 PREHOOK: query: -- grant update privilege to user2 GRANT UPDATE ON table_priv_rev TO USER user2 PREHOOK: type: GRANT_PRIVILEGE @@ -86,9 +86,9 @@ PREHOOK: query: SHOW GRANT USER user2 ON TABLE table_priv_rev PREHOOK: type: SHOW_GRANT POSTHOOK: query: SHOW GRANT USER user2 ON TABLE table_priv_rev POSTHOOK: type: SHOW_GRANT -default table_priv_rev user2 USER INSERT false -1 user1 -default table_priv_rev user2 USER SELECT true -1 user1 -default table_priv_rev user2 USER UPDATE false -1 user1 +default table_priv_rev user2 USER INSERT false Wed Dec 31 15:59:59 PST 1969 user1 +default table_priv_rev user2 USER SELECT true Wed Dec 31 15:59:59 PST 1969 user1 +default table_priv_rev user2 USER UPDATE false Wed Dec 31 15:59:59 PST 1969 user1 PREHOOK: query: -- grant delete privilege to user2 GRANT DELETE ON table_priv_rev TO USER user2 PREHOOK: type: GRANT_PRIVILEGE @@ -101,10 +101,10 @@ PREHOOK: query: SHOW GRANT USER user2 ON TABLE table_priv_rev PREHOOK: type: SHOW_GRANT POSTHOOK: query: SHOW GRANT USER user2 ON TABLE table_priv_rev POSTHOOK: type: SHOW_GRANT -default table_priv_rev user2 USER DELETE false -1 user1 -default table_priv_rev user2 USER INSERT false -1 user1 -default table_priv_rev user2 USER SELECT true -1 user1 -default table_priv_rev user2 USER UPDATE false -1 user1 +default table_priv_rev user2 USER DELETE false Wed Dec 31 15:59:59 PST 1969 user1 +default table_priv_rev user2 USER INSERT false Wed Dec 31 15:59:59 PST 1969 user1 +default table_priv_rev user2 USER SELECT true Wed Dec 31 15:59:59 PST 1969 user1 +default table_priv_rev user2 USER UPDATE false Wed Dec 31 15:59:59 PST 1969 user1 PREHOOK: query: -- start revoking -- -- revoke update privilege from user2 REVOKE UPDATE ON TABLE table_priv_rev FROM USER user2 @@ -119,16 +119,16 @@ PREHOOK: query: SHOW GRANT USER user2 ON TABLE table_priv_rev PREHOOK: type: SHOW_GRANT POSTHOOK: query: SHOW GRANT USER user2 ON TABLE table_priv_rev POSTHOOK: type: SHOW_GRANT -default table_priv_rev user2 USER DELETE false -1 user1 -default table_priv_rev user2 USER INSERT false -1 user1 -default table_priv_rev user2 USER SELECT true -1 user1 +default table_priv_rev user2 USER DELETE false Wed Dec 31 15:59:59 PST 1969 user1 +default table_priv_rev user2 USER INSERT false Wed Dec 31 15:59:59 PST 1969 user1 +default table_priv_rev user2 USER SELECT true Wed Dec 31 15:59:59 PST 1969 user1 PREHOOK: query: SHOW GRANT USER user2 ON ALL PREHOOK: type: SHOW_GRANT POSTHOOK: query: SHOW GRANT USER user2 ON ALL POSTHOOK: type: SHOW_GRANT -default table_priv_rev user2 USER DELETE false -1 user1 -default table_priv_rev user2 USER INSERT false -1 user1 -default table_priv_rev user2 USER SELECT true -1 user1 +default table_priv_rev user2 USER DELETE false Wed Dec 31 15:59:59 PST 1969 user1 +default table_priv_rev user2 USER INSERT false Wed Dec 31 15:59:59 PST 1969 user1 +default table_priv_rev user2 USER SELECT true Wed Dec 31 15:59:59 PST 1969 user1 PREHOOK: query: -- revoke DELETE privilege from user2 REVOKE DELETE ON TABLE table_priv_rev FROM USER user2 PREHOOK: type: REVOKE_PRIVILEGE @@ -141,8 +141,8 @@ PREHOOK: query: SHOW GRANT USER user2 ON TABLE table_priv_rev PREHOOK: type: SHOW_GRANT POSTHOOK: query: SHOW GRANT USER user2 ON TABLE table_priv_rev POSTHOOK: type: SHOW_GRANT -default table_priv_rev user2 USER INSERT false -1 user1 -default table_priv_rev user2 USER SELECT true -1 user1 +default table_priv_rev user2 USER INSERT false Wed Dec 31 15:59:59 PST 1969 user1 +default table_priv_rev user2 USER SELECT true Wed Dec 31 15:59:59 PST 1969 user1 PREHOOK: query: -- revoke insert privilege from user2 REVOKE INSERT ON TABLE table_priv_rev FROM USER user2 PREHOOK: type: REVOKE_PRIVILEGE @@ -155,7 +155,7 @@ PREHOOK: query: SHOW GRANT USER user2 ON TABLE table_priv_rev PREHOOK: type: SHOW_GRANT POSTHOOK: query: SHOW GRANT USER user2 ON TABLE table_priv_rev POSTHOOK: type: SHOW_GRANT -default table_priv_rev user2 USER SELECT true -1 user1 +default table_priv_rev user2 USER SELECT true Wed Dec 31 15:59:59 PST 1969 user1 PREHOOK: query: -- revoke grant option for select privilege from user2 REVOKE GRANT OPTION FOR SELECT ON TABLE table_priv_rev FROM USER user2 PREHOOK: type: REVOKE_PRIVILEGE @@ -168,7 +168,7 @@ PREHOOK: query: SHOW GRANT USER user2 ON TABLE table_priv_rev PREHOOK: type: SHOW_GRANT POSTHOOK: query: SHOW GRANT USER user2 ON TABLE table_priv_rev POSTHOOK: type: SHOW_GRANT -default table_priv_rev user2 USER SELECT false -1 user1 +default table_priv_rev user2 USER SELECT false Wed Dec 31 15:59:59 PST 1969 user1 PREHOOK: query: -- revoke select privilege from user2 REVOKE SELECT ON TABLE table_priv_rev FROM USER user2 PREHOOK: type: REVOKE_PRIVILEGE @@ -197,10 +197,10 @@ PREHOOK: query: SHOW GRANT USER user2 ON TABLE table_priv_rev PREHOOK: type: SHOW_GRANT POSTHOOK: query: SHOW GRANT USER user2 ON TABLE table_priv_rev POSTHOOK: type: SHOW_GRANT -default table_priv_rev user2 USER DELETE false -1 user1 -default table_priv_rev user2 USER INSERT false -1 user1 -default table_priv_rev user2 USER SELECT false -1 user1 -default table_priv_rev user2 USER UPDATE false -1 user1 +default table_priv_rev user2 USER DELETE false Wed Dec 31 15:59:59 PST 1969 user1 +default table_priv_rev user2 USER INSERT false Wed Dec 31 15:59:59 PST 1969 user1 +default table_priv_rev user2 USER SELECT false Wed Dec 31 15:59:59 PST 1969 user1 +default table_priv_rev user2 USER UPDATE false Wed Dec 31 15:59:59 PST 1969 user1 PREHOOK: query: REVOKE ALL ON TABLE table_priv_rev FROM USER user2 PREHOOK: type: REVOKE_PRIVILEGE PREHOOK: Output: default@table_priv_rev 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/authorization_role_grant2.q.out b/ql/src/test/results/clientpositive/authorization_role_grant2.q.out index 3db507e..5e86e22 100644 --- a/ql/src/test/results/clientpositive/authorization_role_grant2.q.out +++ b/ql/src/test/results/clientpositive/authorization_role_grant2.q.out @@ -29,14 +29,14 @@ PREHOOK: type: SHOW_ROLE_GRANT POSTHOOK: query: show role grant user user2 POSTHOOK: type: SHOW_ROLE_GRANT role grant_option grant_time grantor -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: show principals src_role_wadmin PREHOOK: type: SHOW_ROLE_PRINCIPALS POSTHOOK: query: show principals src_role_wadmin POSTHOOK: type: SHOW_ROLE_PRINCIPALS principal_name principal_type grant_option grantor grantor_type grant_time -user2 USER true hive_admin_user USER -1 +user2 USER true hive_admin_user USER Wed Dec 31 15:59:59 PST 1969 PREHOOK: query: set role src_role_WadMin PREHOOK: type: SHOW_ROLES POSTHOOK: query: set role src_role_WadMin @@ -46,7 +46,7 @@ PREHOOK: type: SHOW_ROLE_PRINCIPALS POSTHOOK: query: show principals src_role_wadmin POSTHOOK: type: SHOW_ROLE_PRINCIPALS principal_name principal_type grant_option grantor grantor_type grant_time -user2 USER true hive_admin_user USER -1 +user2 USER true hive_admin_user USER Wed Dec 31 15:59:59 PST 1969 PREHOOK: query: -- grant role to another user grant src_Role_wadmin to user user3 PREHOOK: type: GRANT_ROLE @@ -58,8 +58,8 @@ PREHOOK: type: SHOW_ROLE_GRANT POSTHOOK: query: show role grant user user3 POSTHOOK: type: SHOW_ROLE_GRANT role grant_option grant_time grantor -public false -1 -src_role_wadmin false -1 user2 +public false Wed Dec 31 15:59:59 PST 1969 +src_role_wadmin false Wed Dec 31 15:59:59 PST 1969 user2 PREHOOK: query: -- grant role to another role grant src_role_wadmin to role sRc_role2 PREHOOK: type: GRANT_ROLE @@ -81,7 +81,7 @@ POSTHOOK: query: -- as user3 belings to src_role2 hierarchy, its should be able show role grant role src_Role2 POSTHOOK: type: SHOW_ROLE_GRANT role grant_option grant_time grantor -src_role_wadmin false -1 user2 +src_role_wadmin false Wed Dec 31 15:59:59 PST 1969 user2 PREHOOK: query: set role ADMIN PREHOOK: type: SHOW_ROLES POSTHOOK: query: set role ADMIN @@ -91,9 +91,9 @@ PREHOOK: type: SHOW_ROLE_PRINCIPALS POSTHOOK: query: show principals src_ROle_wadmin POSTHOOK: type: SHOW_ROLE_PRINCIPALS principal_name principal_type grant_option grantor grantor_type grant_time -src_role2 ROLE false user2 USER -1 -user2 USER true hive_admin_user USER -1 -user3 USER false user2 USER -1 +src_role2 ROLE false user2 USER Wed Dec 31 15:59:59 PST 1969 +user2 USER true hive_admin_user USER Wed Dec 31 15:59:59 PST 1969 +user3 USER false user2 USER Wed Dec 31 15:59:59 PST 1969 PREHOOK: query: set role src_role_wadmin PREHOOK: type: SHOW_ROLES POSTHOOK: query: set role src_role_wadmin @@ -109,8 +109,8 @@ PREHOOK: type: SHOW_ROLE_GRANT POSTHOOK: query: show role grant user user3 POSTHOOK: type: SHOW_ROLE_GRANT role grant_option grant_time grantor -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: -- revoke role from role revoke src_rolE_wadmin from role sRc_role2 PREHOOK: type: REVOKE_ROLE @@ -131,4 +131,4 @@ PREHOOK: type: SHOW_ROLE_PRINCIPALS POSTHOOK: query: show principals src_role_wadmin POSTHOOK: type: SHOW_ROLE_PRINCIPALS principal_name principal_type grant_option grantor grantor_type grant_time -user2 USER true hive_admin_user USER -1 +user2 USER true hive_admin_user USER Wed Dec 31 15:59:59 PST 1969 diff --git a/ql/src/test/results/clientpositive/authorization_show_grant.q.out b/ql/src/test/results/clientpositive/authorization_show_grant.q.out index 2e7d7f6..db062d2 100644 --- a/ql/src/test/results/clientpositive/authorization_show_grant.q.out +++ b/ql/src/test/results/clientpositive/authorization_show_grant.q.out @@ -80,65 +80,65 @@ PREHOOK: type: SHOW_GRANT POSTHOOK: query: -- as user in admin role, it should be possible to see other users grant show grant user user1 on table t1 POSTHOOK: type: SHOW_GRANT -default t1 user1 USER DELETE true -1 hive_admin_user -default t1 user1 USER INSERT true -1 hive_admin_user -default t1 user1 USER SELECT true -1 hive_admin_user -default t1 user1 USER UPDATE true -1 hive_admin_user +default t1 user1 USER DELETE true Wed Dec 31 15:59:59 PST 1969 hive_admin_user +default t1 user1 USER INSERT true Wed Dec 31 15:59:59 PST 1969 hive_admin_user +default t1 user1 USER SELECT true Wed Dec 31 15:59:59 PST 1969 hive_admin_user +default t1 user1 USER UPDATE true Wed Dec 31 15:59:59 PST 1969 hive_admin_user PREHOOK: query: show grant user user1 PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user user1 POSTHOOK: type: SHOW_GRANT -default t1 user1 USER DELETE true -1 hive_admin_user -default t1 user1 USER INSERT true -1 hive_admin_user -default t1 user1 USER SELECT true -1 hive_admin_user -default t1 user1 USER UPDATE true -1 hive_admin_user -default t2 user1 USER DELETE true -1 hive_admin_user -default t2 user1 USER INSERT true -1 hive_admin_user -default t2 user1 USER SELECT true -1 hive_admin_user -default t2 user1 USER UPDATE true -1 hive_admin_user +default t1 user1 USER DELETE true Wed Dec 31 15:59:59 PST 1969 hive_admin_user +default t1 user1 USER INSERT true Wed Dec 31 15:59:59 PST 1969 hive_admin_user +default t1 user1 USER SELECT true Wed Dec 31 15:59:59 PST 1969 hive_admin_user +default t1 user1 USER UPDATE true Wed Dec 31 15:59:59 PST 1969 hive_admin_user +default t2 user1 USER DELETE true Wed Dec 31 15:59:59 PST 1969 hive_admin_user +default t2 user1 USER INSERT true Wed Dec 31 15:59:59 PST 1969 hive_admin_user +default t2 user1 USER SELECT true Wed Dec 31 15:59:59 PST 1969 hive_admin_user +default t2 user1 USER UPDATE true Wed Dec 31 15:59:59 PST 1969 hive_admin_user PREHOOK: query: show grant role roleA on table t1 PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant role roleA on table t1 POSTHOOK: type: SHOW_GRANT -default t1 rolea ROLE SELECT false -1 user1 +default t1 rolea ROLE SELECT false Wed Dec 31 15:59:59 PST 1969 user1 PREHOOK: query: show grant role roleA PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant role roleA POSTHOOK: type: SHOW_GRANT -default t1 rolea ROLE SELECT false -1 user1 -default t2 rolea ROLE INSERT false -1 user1 +default t1 rolea ROLE SELECT false Wed Dec 31 15:59:59 PST 1969 user1 +default t2 rolea ROLE INSERT false Wed Dec 31 15:59:59 PST 1969 user1 PREHOOK: query: show grant PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant POSTHOOK: type: SHOW_GRANT -default t1 rolea ROLE SELECT false -1 user1 -default t1 user1 USER DELETE true -1 hive_admin_user -default t1 user1 USER INSERT true -1 hive_admin_user -default t1 user1 USER SELECT true -1 hive_admin_user -default t1 user1 USER UPDATE true -1 hive_admin_user -default t1 userA USER DELETE false -1 user1 -default t1 userA USER INSERT false -1 user1 -default t2 rolea ROLE INSERT false -1 user1 -default t2 roleb ROLE INSERT false -1 user1 -default t2 user1 USER DELETE true -1 hive_admin_user -default t2 user1 USER INSERT true -1 hive_admin_user -default t2 user1 USER SELECT true -1 hive_admin_user -default t2 user1 USER UPDATE true -1 hive_admin_user -default t2 userA USER INSERT false -1 user1 -default t2 userA USER SELECT false -1 user1 +default t1 rolea ROLE SELECT false Wed Dec 31 15:59:59 PST 1969 user1 +default t1 user1 USER DELETE true Wed Dec 31 15:59:59 PST 1969 hive_admin_user +default t1 user1 USER INSERT true Wed Dec 31 15:59:59 PST 1969 hive_admin_user +default t1 user1 USER SELECT true Wed Dec 31 15:59:59 PST 1969 hive_admin_user +default t1 user1 USER UPDATE true Wed Dec 31 15:59:59 PST 1969 hive_admin_user +default t1 userA USER DELETE false Wed Dec 31 15:59:59 PST 1969 user1 +default t1 userA USER INSERT false Wed Dec 31 15:59:59 PST 1969 user1 +default t2 rolea ROLE INSERT false Wed Dec 31 15:59:59 PST 1969 user1 +default t2 roleb ROLE INSERT false Wed Dec 31 15:59:59 PST 1969 user1 +default t2 user1 USER DELETE true Wed Dec 31 15:59:59 PST 1969 hive_admin_user +default t2 user1 USER INSERT true Wed Dec 31 15:59:59 PST 1969 hive_admin_user +default t2 user1 USER SELECT true Wed Dec 31 15:59:59 PST 1969 hive_admin_user +default t2 user1 USER UPDATE true Wed Dec 31 15:59:59 PST 1969 hive_admin_user +default t2 userA USER INSERT false Wed Dec 31 15:59:59 PST 1969 user1 +default t2 userA USER SELECT false Wed Dec 31 15:59:59 PST 1969 user1 PREHOOK: query: -- user belonging to role should be able to see it show grant role roleA on table t1 PREHOOK: type: SHOW_GRANT POSTHOOK: query: -- user belonging to role should be able to see it show grant role roleA on table t1 POSTHOOK: type: SHOW_GRANT -default t1 rolea ROLE SELECT false -1 user1 +default t1 rolea ROLE SELECT false Wed Dec 31 15:59:59 PST 1969 user1 PREHOOK: query: show grant role roleA PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant role roleA POSTHOOK: type: SHOW_GRANT -default t1 rolea ROLE SELECT false -1 user1 -default t2 rolea ROLE INSERT false -1 user1 +default t1 rolea ROLE SELECT false Wed Dec 31 15:59:59 PST 1969 user1 +default t2 rolea ROLE INSERT false Wed Dec 31 15:59:59 PST 1969 user1 PREHOOK: query: show grant role roleB on table t1 PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant role roleB on table t1 @@ -147,18 +147,18 @@ PREHOOK: query: show grant role roleB PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant role roleB POSTHOOK: type: SHOW_GRANT -default t2 roleb ROLE INSERT false -1 user1 +default t2 roleb ROLE INSERT false Wed Dec 31 15:59:59 PST 1969 user1 PREHOOK: query: show grant user userA on table t1 PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user userA on table t1 POSTHOOK: type: SHOW_GRANT -default t1 userA USER DELETE false -1 user1 -default t1 userA USER INSERT false -1 user1 +default t1 userA USER DELETE false Wed Dec 31 15:59:59 PST 1969 user1 +default t1 userA USER INSERT false Wed Dec 31 15:59:59 PST 1969 user1 PREHOOK: query: show grant user userA PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user userA POSTHOOK: type: SHOW_GRANT -default t1 userA USER DELETE false -1 user1 -default t1 userA USER INSERT false -1 user1 -default t2 userA USER INSERT false -1 user1 -default t2 userA USER SELECT false -1 user1 +default t1 userA USER DELETE false Wed Dec 31 15:59:59 PST 1969 user1 +default t1 userA USER INSERT false Wed Dec 31 15:59:59 PST 1969 user1 +default t2 userA USER INSERT false Wed Dec 31 15:59:59 PST 1969 user1 +default t2 userA USER SELECT false Wed Dec 31 15:59:59 PST 1969 user1 diff --git a/ql/src/test/results/clientpositive/authorization_show_role_principals_v1.q.out b/ql/src/test/results/clientpositive/authorization_show_role_principals_v1.q.out index 7c87e2c..ea24563 100644 --- a/ql/src/test/results/clientpositive/authorization_show_role_principals_v1.q.out +++ b/ql/src/test/results/clientpositive/authorization_show_role_principals_v1.q.out @@ -14,17 +14,17 @@ PREHOOK: query: show role grant user user1 PREHOOK: type: SHOW_ROLE_GRANT POSTHOOK: query: show role grant user user1 POSTHOOK: type: SHOW_ROLE_GRANT -public false -1 -role1 true -1 hive_test_user +public false Wed Dec 31 15:59:59 PST 1969 +role1 true Wed Dec 31 15:59:59 PST 1969 hive_test_user 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 -role1 true -1 hive_test_user +public false Wed Dec 31 15:59:59 PST 1969 +role1 true Wed Dec 31 15:59:59 PST 1969 hive_test_user PREHOOK: query: show principals role1 PREHOOK: type: SHOW_ROLE_PRINCIPALS POSTHOOK: query: show principals role1 POSTHOOK: type: SHOW_ROLE_PRINCIPALS -user1 USER true hive_test_user USER -1 -user2 USER true hive_test_user USER -1 +user1 USER true hive_test_user USER Wed Dec 31 15:59:59 PST 1969 +user2 USER true hive_test_user USER Wed Dec 31 15:59:59 PST 1969 diff --git a/ql/src/test/results/clientpositive/authorization_update.q.out b/ql/src/test/results/clientpositive/authorization_update.q.out index ef65b33..1b69b15 100644 --- a/ql/src/test/results/clientpositive/authorization_update.q.out +++ b/ql/src/test/results/clientpositive/authorization_update.q.out @@ -46,12 +46,12 @@ PREHOOK: query: SHOW GRANT ON TABLE t_auth_up PREHOOK: type: SHOW_GRANT POSTHOOK: query: SHOW GRANT ON TABLE t_auth_up POSTHOOK: type: SHOW_GRANT -default t_auth_up user1 USER DELETE true -1 user1 -default t_auth_up user1 USER INSERT true -1 user1 -default t_auth_up user1 USER SELECT true -1 user1 -default t_auth_up user1 USER UPDATE true -1 user1 -default t_auth_up userWIns USER SELECT false -1 user1 -default t_auth_up userWIns USER UPDATE false -1 user1 +default t_auth_up user1 USER DELETE true Wed Dec 31 15:59:59 PST 1969 user1 +default t_auth_up user1 USER INSERT true Wed Dec 31 15:59:59 PST 1969 user1 +default t_auth_up user1 USER SELECT true Wed Dec 31 15:59:59 PST 1969 user1 +default t_auth_up user1 USER UPDATE true Wed Dec 31 15:59:59 PST 1969 user1 +default t_auth_up userWIns USER SELECT false Wed Dec 31 15:59:59 PST 1969 user1 +default t_auth_up userWIns USER UPDATE false Wed Dec 31 15:59:59 PST 1969 user1 PREHOOK: query: update t_auth_up set i = 0 where i > 0 PREHOOK: type: QUERY PREHOOK: Input: default@t_auth_up diff --git a/ql/src/test/results/clientpositive/authorization_view_sqlstd.q.out b/ql/src/test/results/clientpositive/authorization_view_sqlstd.q.out index 54c4ce7..b6560bc 100644 --- a/ql/src/test/results/clientpositive/authorization_view_sqlstd.q.out +++ b/ql/src/test/results/clientpositive/authorization_view_sqlstd.q.out @@ -14,10 +14,10 @@ PREHOOK: query: show grant user user1 on table t1 PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user user1 on table t1 POSTHOOK: type: SHOW_GRANT -default t1 user1 USER DELETE true -1 user1 -default t1 user1 USER INSERT true -1 user1 -default t1 user1 USER SELECT true -1 user1 -default t1 user1 USER UPDATE true -1 user1 +default t1 user1 USER DELETE true Wed Dec 31 15:59:59 PST 1969 user1 +default t1 user1 USER INSERT true Wed Dec 31 15:59:59 PST 1969 user1 +default t1 user1 USER SELECT true Wed Dec 31 15:59:59 PST 1969 user1 +default t1 user1 USER UPDATE true Wed Dec 31 15:59:59 PST 1969 user1 PREHOOK: query: -- protecting certain columns create view vt1 as select i,k from t1 PREHOOK: type: CREATEVIEW @@ -46,18 +46,18 @@ PREHOOK: query: show grant user user1 on all PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user user1 on all POSTHOOK: type: SHOW_GRANT -default t1 user1 USER DELETE true -1 user1 -default t1 user1 USER INSERT true -1 user1 -default t1 user1 USER SELECT true -1 user1 -default t1 user1 USER UPDATE true -1 user1 -default vt1 user1 USER DELETE true -1 user1 -default vt1 user1 USER INSERT true -1 user1 -default vt1 user1 USER SELECT true -1 user1 -default vt1 user1 USER UPDATE true -1 user1 -default vt2 user1 USER DELETE true -1 user1 -default vt2 user1 USER INSERT true -1 user1 -default vt2 user1 USER SELECT true -1 user1 -default vt2 user1 USER UPDATE true -1 user1 +default t1 user1 USER DELETE true Wed Dec 31 15:59:59 PST 1969 user1 +default t1 user1 USER INSERT true Wed Dec 31 15:59:59 PST 1969 user1 +default t1 user1 USER SELECT true Wed Dec 31 15:59:59 PST 1969 user1 +default t1 user1 USER UPDATE true Wed Dec 31 15:59:59 PST 1969 user1 +default vt1 user1 USER DELETE true Wed Dec 31 15:59:59 PST 1969 user1 +default vt1 user1 USER INSERT true Wed Dec 31 15:59:59 PST 1969 user1 +default vt1 user1 USER SELECT true Wed Dec 31 15:59:59 PST 1969 user1 +default vt1 user1 USER UPDATE true Wed Dec 31 15:59:59 PST 1969 user1 +default vt2 user1 USER DELETE true Wed Dec 31 15:59:59 PST 1969 user1 +default vt2 user1 USER INSERT true Wed Dec 31 15:59:59 PST 1969 user1 +default vt2 user1 USER SELECT true Wed Dec 31 15:59:59 PST 1969 user1 +default vt2 user1 USER UPDATE true Wed Dec 31 15:59:59 PST 1969 user1 PREHOOK: query: --view grant to user -- try with and without table keyword @@ -80,12 +80,12 @@ PREHOOK: query: show grant user user2 on table vt1 PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user user2 on table vt1 POSTHOOK: type: SHOW_GRANT -default vt1 user2 USER SELECT false -1 user1 +default vt1 user2 USER SELECT false Wed Dec 31 15:59:59 PST 1969 user1 PREHOOK: query: show grant user user3 on table vt1 PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user user3 on table vt1 POSTHOOK: type: SHOW_GRANT -default vt1 user3 USER INSERT false -1 user1 +default vt1 user3 USER INSERT false Wed Dec 31 15:59:59 PST 1969 user1 PREHOOK: query: explain authorization select * from vt1 PREHOOK: type: QUERY POSTHOOK: query: explain authorization select * from vt1 @@ -119,19 +119,19 @@ PREHOOK: query: show grant user user2 on table vt2 PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user user2 on table vt2 POSTHOOK: type: SHOW_GRANT -default vt2 user2 USER DELETE false -1 user1 -default vt2 user2 USER INSERT false -1 user1 -default vt2 user2 USER SELECT false -1 user1 -default vt2 user2 USER UPDATE false -1 user1 +default vt2 user2 USER DELETE false Wed Dec 31 15:59:59 PST 1969 user1 +default vt2 user2 USER INSERT false Wed Dec 31 15:59:59 PST 1969 user1 +default vt2 user2 USER SELECT false Wed Dec 31 15:59:59 PST 1969 user1 +default vt2 user2 USER UPDATE false Wed Dec 31 15:59:59 PST 1969 user1 PREHOOK: query: show grant user user2 on all PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant user user2 on all POSTHOOK: type: SHOW_GRANT -default vt1 user2 USER SELECT false -1 user1 -default vt2 user2 USER DELETE false -1 user1 -default vt2 user2 USER INSERT false -1 user1 -default vt2 user2 USER SELECT false -1 user1 -default vt2 user2 USER UPDATE false -1 user1 +default vt1 user2 USER SELECT false Wed Dec 31 15:59:59 PST 1969 user1 +default vt2 user2 USER DELETE false Wed Dec 31 15:59:59 PST 1969 user1 +default vt2 user2 USER INSERT false Wed Dec 31 15:59:59 PST 1969 user1 +default vt2 user2 USER SELECT false Wed Dec 31 15:59:59 PST 1969 user1 +default vt2 user2 USER UPDATE false Wed Dec 31 15:59:59 PST 1969 user1 PREHOOK: query: revoke all on vt2 from user user2 PREHOOK: type: REVOKE_PRIVILEGE PREHOOK: Output: default@vt2 @@ -150,10 +150,10 @@ PREHOOK: query: show grant on table vt2 PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant on table vt2 POSTHOOK: type: SHOW_GRANT -default vt2 user1 USER DELETE true -1 user1 -default vt2 user1 USER INSERT true -1 user1 -default vt2 user1 USER SELECT true -1 user1 -default vt2 user1 USER UPDATE true -1 user1 +default vt2 user1 USER DELETE true Wed Dec 31 15:59:59 PST 1969 user1 +default vt2 user1 USER INSERT true Wed Dec 31 15:59:59 PST 1969 user1 +default vt2 user1 USER SELECT true Wed Dec 31 15:59:59 PST 1969 user1 +default vt2 user1 USER UPDATE true Wed Dec 31 15:59:59 PST 1969 user1 PREHOOK: query: revoke select on table vt1 from user user2 PREHOOK: type: REVOKE_PRIVILEGE PREHOOK: Output: default@vt1 @@ -174,7 +174,7 @@ PREHOOK: type: SHOW_GRANT POSTHOOK: query: -- grant privileges on roles for view, after next statement show grant user user3 on table vt1 POSTHOOK: type: SHOW_GRANT -default vt1 user3 USER INSERT false -1 user1 +default vt1 user3 USER INSERT false Wed Dec 31 15:59:59 PST 1969 user1 PREHOOK: query: show current roles PREHOOK: type: SHOW_ROLES POSTHOOK: query: show current roles @@ -196,8 +196,8 @@ PREHOOK: query: show role grant user user4 PREHOOK: type: SHOW_ROLE_GRANT POSTHOOK: query: show role grant user user4 POSTHOOK: type: SHOW_ROLE_GRANT -public false -1 -role_v false -1 hive_admin_user +public false Wed Dec 31 15:59:59 PST 1969 +role_v false Wed Dec 31 15:59:59 PST 1969 hive_admin_user PREHOOK: query: show roles PREHOOK: type: SHOW_ROLES POSTHOOK: query: show roles @@ -215,10 +215,10 @@ PREHOOK: query: show grant role role_v on table vt2 PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant role role_v on table vt2 POSTHOOK: type: SHOW_GRANT -default vt2 role_v ROLE DELETE false -1 hive_admin_user -default vt2 role_v ROLE INSERT false -1 hive_admin_user -default vt2 role_v ROLE SELECT false -1 hive_admin_user -default vt2 role_v ROLE UPDATE false -1 hive_admin_user +default vt2 role_v ROLE DELETE false Wed Dec 31 15:59:59 PST 1969 hive_admin_user +default vt2 role_v ROLE INSERT false Wed Dec 31 15:59:59 PST 1969 hive_admin_user +default vt2 role_v ROLE SELECT false Wed Dec 31 15:59:59 PST 1969 hive_admin_user +default vt2 role_v ROLE UPDATE false Wed Dec 31 15:59:59 PST 1969 hive_admin_user PREHOOK: query: revoke delete on table vt2 from role role_v PREHOOK: type: REVOKE_PRIVILEGE PREHOOK: Output: default@vt2 @@ -229,17 +229,17 @@ PREHOOK: query: show grant role role_v on table vt2 PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant role role_v on table vt2 POSTHOOK: type: SHOW_GRANT -default vt2 role_v ROLE INSERT false -1 hive_admin_user -default vt2 role_v ROLE SELECT false -1 hive_admin_user -default vt2 role_v ROLE UPDATE false -1 hive_admin_user +default vt2 role_v ROLE INSERT false Wed Dec 31 15:59:59 PST 1969 hive_admin_user +default vt2 role_v ROLE SELECT false Wed Dec 31 15:59:59 PST 1969 hive_admin_user +default vt2 role_v ROLE UPDATE false Wed Dec 31 15:59:59 PST 1969 hive_admin_user PREHOOK: query: show grant on table vt2 PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant on table vt2 POSTHOOK: type: SHOW_GRANT -default vt2 role_v ROLE INSERT false -1 hive_admin_user -default vt2 role_v ROLE SELECT false -1 hive_admin_user -default vt2 role_v ROLE UPDATE false -1 hive_admin_user -default vt2 user1 USER DELETE true -1 user1 -default vt2 user1 USER INSERT true -1 user1 -default vt2 user1 USER SELECT true -1 user1 -default vt2 user1 USER UPDATE true -1 user1 +default vt2 role_v ROLE INSERT false Wed Dec 31 15:59:59 PST 1969 hive_admin_user +default vt2 role_v ROLE SELECT false Wed Dec 31 15:59:59 PST 1969 hive_admin_user +default vt2 role_v ROLE UPDATE false Wed Dec 31 15:59:59 PST 1969 hive_admin_user +default vt2 user1 USER DELETE true Wed Dec 31 15:59:59 PST 1969 user1 +default vt2 user1 USER INSERT true Wed Dec 31 15:59:59 PST 1969 user1 +default vt2 user1 USER SELECT true Wed Dec 31 15:59:59 PST 1969 user1 +default vt2 user1 USER UPDATE true Wed Dec 31 15:59:59 PST 1969 user1 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