[5/7] hive git commit: HIVE-19440: Make StorageBasedAuthorizer work with information schema (Daniel Dai, reviewed by Thejas Nair)

2018-05-29 Thread daijy 
http://git-wip-us.apache.org/repos/asf/hive/blob/80eafb4f/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
--
diff --git 
a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
 
b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
index f9bd64b..3f18605 100644
--- 
a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
+++ 
b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
@@ -810,7 +810,7 @@ public class HiveMetaStore extends ThriftHiveMetastore {
   PrivilegeBag privs = new PrivilegeBag();
   privs.addToPrivileges(new HiveObjectPrivilege( new 
HiveObjectRef(HiveObjectType.GLOBAL, null,
 null, null, null), ADMIN, PrincipalType.ROLE, new 
PrivilegeGrantInfo("All", 0, ADMIN,
-PrincipalType.ROLE, true)));
+  PrincipalType.ROLE, true), "SQL"));
   try {
 ms.grantPrivileges(privs);
   } catch (InvalidObjectException e) {
@@ -6242,14 +6242,14 @@ public class HiveMetaStore extends ThriftHiveMetastore {
 }
 
 @Override
-public GrantRevokePrivilegeResponse refresh_privileges(HiveObjectRef 
objToRefresh,
+public GrantRevokePrivilegeResponse refresh_privileges(HiveObjectRef 
objToRefresh, String authorizer,
 GrantRevokePrivilegeRequest grantRequest)
 throws TException {
   incrementCounter("refresh_privileges");
   firePreEvent(new PreAuthorizationCallEvent(this));
   GrantRevokePrivilegeResponse response = new 
GrantRevokePrivilegeResponse();
   try {
-boolean result = getMS().refreshPrivileges(objToRefresh, 
grantRequest.getPrivileges());
+boolean result = getMS().refreshPrivileges(objToRefresh, authorizer, 
grantRequest.getPrivileges());
 response.setSuccess(result);
   } catch (MetaException e) {
 throw e;

http://git-wip-us.apache.org/repos/asf/hive/blob/80eafb4f/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
--
diff --git 
a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
 
b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
index 23cf7e4..2965e72 100644
--- 
a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
+++ 
b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
@@ -2277,7 +2277,7 @@ public class HiveMetaStoreClient implements 
IMetaStoreClient, AutoCloseable {
   }
 
   @Override
-  public boolean refresh_privileges(HiveObjectRef objToRefresh,
+  public boolean refresh_privileges(HiveObjectRef objToRefresh, String 
authorizer,
   PrivilegeBag grantPrivileges) throws MetaException,
   TException {
 String defaultCat = getDefaultCatalog(conf);
@@ -2294,7 +2294,7 @@ public class HiveMetaStoreClient implements 
IMetaStoreClient, AutoCloseable {
 grantReq.setRequestType(GrantRevokeType.GRANT);
 grantReq.setPrivileges(grantPrivileges);
 
-GrantRevokePrivilegeResponse res = client.refresh_privileges(objToRefresh, 
grantReq);
+GrantRevokePrivilegeResponse res = client.refresh_privileges(objToRefresh, 
authorizer, grantReq);
 if (!res.isSetSuccess()) {
   throw new MetaException("GrantRevokePrivilegeResponse missing success 
field");
 }

http://git-wip-us.apache.org/repos/asf/hive/blob/80eafb4f/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java
--
diff --git 
a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java
 
b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java
index 09f9bb1..7ba286a 100644
--- 
a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java
+++ 
b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java
@@ -2567,12 +2567,13 @@ public interface IMetaStoreClient {
 
   /**
* @param revokePrivileges
+   * @param authorizer
* @param objToRefresh
* @return true on success
* @throws MetaException
* @throws TException
*/
-  boolean refresh_privileges(HiveObjectRef objToRefresh, PrivilegeBag 
grantPrivileges)
+  boolean refresh_privileges(HiveObjectRef objToRefresh, String authorizer, 
PrivilegeBag grantPrivileges)
   throws MetaException, TException;
 
   /**

http://git-wip-us.apache.org/repos/asf/hive/blob/80eafb4f/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java
--
diff --git 
a/standalone-metastore/src/main/java/org/apache/hadoo

[5/7] hive git commit: HIVE-19440: Make StorageBasedAuthorizer work with information schema (Daniel Dai, reviewed by Thejas Nair)

2018-05-29 Thread daijy 
http://git-wip-us.apache.org/repos/asf/hive/blob/83afdb4d/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
--
diff --git 
a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
 
b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
index c1d25db..d8b8414 100644
--- 
a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
+++ 
b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
@@ -814,7 +814,7 @@ public class HiveMetaStore extends ThriftHiveMetastore {
   PrivilegeBag privs = new PrivilegeBag();
   privs.addToPrivileges(new HiveObjectPrivilege( new 
HiveObjectRef(HiveObjectType.GLOBAL, null,
 null, null, null), ADMIN, PrincipalType.ROLE, new 
PrivilegeGrantInfo("All", 0, ADMIN,
-PrincipalType.ROLE, true)));
+  PrincipalType.ROLE, true), "SQL"));
   try {
 ms.grantPrivileges(privs);
   } catch (InvalidObjectException e) {
@@ -6226,14 +6226,14 @@ public class HiveMetaStore extends ThriftHiveMetastore {
 }
 
 @Override
-public GrantRevokePrivilegeResponse refresh_privileges(HiveObjectRef 
objToRefresh,
+public GrantRevokePrivilegeResponse refresh_privileges(HiveObjectRef 
objToRefresh, String authorizer,
 GrantRevokePrivilegeRequest grantRequest)
 throws TException {
   incrementCounter("refresh_privileges");
   firePreEvent(new PreAuthorizationCallEvent(this));
   GrantRevokePrivilegeResponse response = new 
GrantRevokePrivilegeResponse();
   try {
-boolean result = getMS().refreshPrivileges(objToRefresh, 
grantRequest.getPrivileges());
+boolean result = getMS().refreshPrivileges(objToRefresh, authorizer, 
grantRequest.getPrivileges());
 response.setSuccess(result);
   } catch (MetaException e) {
 throw e;

http://git-wip-us.apache.org/repos/asf/hive/blob/83afdb4d/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
--
diff --git 
a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
 
b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
index 6af2aa5..fd7546e 100644
--- 
a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
+++ 
b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
@@ -2288,7 +2288,7 @@ public class HiveMetaStoreClient implements 
IMetaStoreClient, AutoCloseable {
   }
 
   @Override
-  public boolean refresh_privileges(HiveObjectRef objToRefresh,
+  public boolean refresh_privileges(HiveObjectRef objToRefresh, String 
authorizer,
   PrivilegeBag grantPrivileges) throws MetaException,
   TException {
 String defaultCat = getDefaultCatalog(conf);
@@ -2305,7 +2305,7 @@ public class HiveMetaStoreClient implements 
IMetaStoreClient, AutoCloseable {
 grantReq.setRequestType(GrantRevokeType.GRANT);
 grantReq.setPrivileges(grantPrivileges);
 
-GrantRevokePrivilegeResponse res = client.refresh_privileges(objToRefresh, 
grantReq);
+GrantRevokePrivilegeResponse res = client.refresh_privileges(objToRefresh, 
authorizer, grantReq);
 if (!res.isSetSuccess()) {
   throw new MetaException("GrantRevokePrivilegeResponse missing success 
field");
 }

http://git-wip-us.apache.org/repos/asf/hive/blob/83afdb4d/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java
--
diff --git 
a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java
 
b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java
index 09f9bb1..7ba286a 100644
--- 
a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java
+++ 
b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java
@@ -2567,12 +2567,13 @@ public interface IMetaStoreClient {
 
   /**
* @param revokePrivileges
+   * @param authorizer
* @param objToRefresh
* @return true on success
* @throws MetaException
* @throws TException
*/
-  boolean refresh_privileges(HiveObjectRef objToRefresh, PrivilegeBag 
grantPrivileges)
+  boolean refresh_privileges(HiveObjectRef objToRefresh, String authorizer, 
PrivilegeBag grantPrivileges)
   throws MetaException, TException;
 
   /**

http://git-wip-us.apache.org/repos/asf/hive/blob/83afdb4d/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java
--
diff --git 
a/standalone-metastore/src/main/java/org/apache/hadoo