Remove hive privilege null check

Extracted-From: prestodb/presto#10904
trinodb · Jan 29, 2019 · d455185 · d455185
1 parent 942cde9
commit d455185
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/presto-hive/src/main/java/io/prestosql/plugin/hive/metastore/HivePrivilegeInfo.java b/presto-hive/src/main/java/io/prestosql/plugin/hive/metastore/HivePrivilegeInfo.java
@@ -106,8 +106,9 @@ public static HivePrivilege toHivePrivilege(Privilege privilege)
                 return DELETE;
             case UPDATE:
                 return UPDATE;
+            default:
+                throw new IllegalArgumentException("Unexpected privilege: " + privilege);
         }
-        return null;
     }
 
     public boolean isContainedIn(HivePrivilegeInfo hivePrivilegeInfo)

diff --git a/presto-hive/src/main/java/io/prestosql/plugin/hive/security/SqlStandardAccessControl.java b/presto-hive/src/main/java/io/prestosql/plugin/hive/security/SqlStandardAccessControl.java
@@ -253,8 +253,7 @@ public void checkCanGrantTablePrivilege(ConnectorTransactionHandle transaction,
             return;
         }
 
-        HivePrivilege hivePrivilege = toHivePrivilege(privilege);
-        if (hivePrivilege == null || !hasGrantOptionForPrivilege(transaction, identity, privilege, tableName)) {
+        if (!hasGrantOptionForPrivilege(transaction, identity, privilege, tableName)) {
             denyGrantTablePrivilege(privilege.name(), tableName.toString());
         }
     }
@@ -266,8 +265,7 @@ public void checkCanRevokeTablePrivilege(ConnectorTransactionHandle transaction,
             return;
         }
 
-        HivePrivilege hivePrivilege = toHivePrivilege(privilege);
-        if (hivePrivilege == null || !hasGrantOptionForPrivilege(transaction, identity, privilege, tableName)) {
+        if (!hasGrantOptionForPrivilege(transaction, identity, privilege, tableName)) {
             denyRevokeTablePrivilege(privilege.name(), tableName.toString());
         }
     }