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..a120ee1 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 ? -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 ? -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 ? -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 ? -1 : new Date(role.getGrantTime() * 1000L)); appendNonNull(builder, role.getGrantor()); } return builder.toString(); diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/RoleDDLDesc.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/RoleDDLDesc.java index 2aae751..2cd8936 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/plan/RoleDDLDesc.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/RoleDDLDesc.java @@ -49,14 +49,14 @@ */ private static final String roleShowGrantSchema = "role,grant_option,grant_time,grantor#" + - "string:boolean:bigint:string"; + "string:boolean:string:string"; /** * thrift ddl for the result of describe role roleName */ private static final String roleShowRolePrincipals = "principal_name,principal_type,grant_option,grantor,grantor_type,grant_time#" + - "string:string:boolean:string:string:bigint"; + "string:string:boolean:string:string:string"; public static String getRoleNameSchema() { return roleNameSchema; diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowGrantDesc.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowGrantDesc.java index d27da3d..e4bbb28 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowGrantDesc.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowGrantDesc.java @@ -32,7 +32,7 @@ private static final String tabularSchema = "database,table,partition,column,principal_name,principal_type,privilege," + "grant_option,grant_time,grantor#" + - "string:string:string:string:string:string:string:boolean:bigint:string"; + "string:string:string:string:string:string:string:boolean:string:string"; public ShowGrantDesc(){ }