You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by jv...@apache.org on 2011/09/14 02:18:02 UTC
svn commit: r1170398 - in /hive/trunk:
metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
ql/src/test/queries/clientpositive/authorization_7.q
ql/src/test/results/clientpositive/authorization_7.q.out
Author: jvs
Date: Wed Sep 14 00:18:02 2011
New Revision: 1170398
URL: http://svn.apache.org/viewvc?rev=1170398&view=rev
Log:
HIVE-2405. get_privilege does not get user level privilege
(He Yongqiang via jvs)
Added:
hive/trunk/ql/src/test/queries/clientpositive/authorization_7.q
hive/trunk/ql/src/test/results/clientpositive/authorization_7.q.out
Modified:
hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
Modified: hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java?rev=1170398&r1=1170397&r2=1170398&view=diff
==============================================================================
--- hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java (original)
+++ hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java Wed Sep 14 00:18:02 2011
@@ -26,6 +26,7 @@ import static org.apache.hadoop.hive.met
import java.io.IOException;
import java.net.InetAddress;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Formatter;
import java.util.HashMap;
import java.util.LinkedHashMap;
@@ -2679,6 +2680,8 @@ public class HiveMetaStore extends Thrif
} else if (hiveObject.getObjectType() == HiveObjectType.TABLE) {
return this.get_table_privilege_set(hiveObject.getDbName(), hiveObject
.getObjectName(), userName, groupNames);
+ } else if (hiveObject.getObjectType() == HiveObjectType.GLOBAL) {
+ return this.get_user_privilege_set(userName, groupNames);
}
return null;
}
@@ -3035,7 +3038,7 @@ public class HiveMetaStore extends Thrif
partName = Warehouse.makePartName(tbl.getPartitionKeys(), partValues);
}
- List<HiveObjectPrivilege> result = null;
+ List<HiveObjectPrivilege> result = Collections.<HiveObjectPrivilege>emptyList();
if (partName != null) {
Partition part = null;
@@ -3119,7 +3122,7 @@ public class HiveMetaStore extends Thrif
}
return result;
}
- return null;
+ return Collections.<HiveObjectPrivilege>emptyList();
}
});
} catch (MetaException e) {
@@ -3163,7 +3166,7 @@ public class HiveMetaStore extends Thrif
}
return result;
}
- return null;
+ return Collections.<HiveObjectPrivilege>emptyList();
}
});
} catch (MetaException e) {
@@ -3202,7 +3205,7 @@ public class HiveMetaStore extends Thrif
}
return result;
}
- return null;
+ return Collections.<HiveObjectPrivilege>emptyList();
}
});
} catch (MetaException e) {
@@ -3240,7 +3243,7 @@ public class HiveMetaStore extends Thrif
}
return result;
}
- return null;
+ return Collections.<HiveObjectPrivilege>emptyList();
}
});
} catch (MetaException e) {
Added: hive/trunk/ql/src/test/queries/clientpositive/authorization_7.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/authorization_7.q?rev=1170398&view=auto
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/authorization_7.q (added)
+++ hive/trunk/ql/src/test/queries/clientpositive/authorization_7.q Wed Sep 14 00:18:02 2011
@@ -0,0 +1,15 @@
+GRANT ALL TO USER hive_test_user;
+SET hive.security.authorization.enabled=true;
+CREATE TABLE src_authorization_7 (key int, value string);
+DESCRIBE src_authorization_7;
+DROP TABLE src_authorization_7;
+REVOKE ALL FROM USER hive_test_user;
+
+SET hive.security.authorization.enabled=false;
+
+GRANT ALL TO GROUP hive_test_group1;
+SET hive.security.authorization.enabled=true;
+CREATE TABLE src_authorization_7 (key int, value string);
+DESCRIBE src_authorization_7;
+DROP TABLE src_authorization_7;
+REVOKE ALL FROM GROUP hive_test_group1;
\ No newline at end of file
Added: hive/trunk/ql/src/test/results/clientpositive/authorization_7.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/authorization_7.q.out?rev=1170398&view=auto
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/authorization_7.q.out (added)
+++ hive/trunk/ql/src/test/results/clientpositive/authorization_7.q.out Wed Sep 14 00:18:02 2011
@@ -0,0 +1,54 @@
+PREHOOK: query: GRANT ALL TO USER hive_test_user
+PREHOOK: type: GRANT_PRIVILEGE
+POSTHOOK: query: GRANT ALL TO USER hive_test_user
+POSTHOOK: type: GRANT_PRIVILEGE
+PREHOOK: query: CREATE TABLE src_authorization_7 (key int, value string)
+PREHOOK: type: CREATETABLE
+POSTHOOK: query: CREATE TABLE src_authorization_7 (key int, value string)
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: default@src_authorization_7
+PREHOOK: query: DESCRIBE src_authorization_7
+PREHOOK: type: DESCTABLE
+POSTHOOK: query: DESCRIBE src_authorization_7
+POSTHOOK: type: DESCTABLE
+key int
+value string
+PREHOOK: query: DROP TABLE src_authorization_7
+PREHOOK: type: DROPTABLE
+PREHOOK: Input: default@src_authorization_7
+PREHOOK: Output: default@src_authorization_7
+POSTHOOK: query: DROP TABLE src_authorization_7
+POSTHOOK: type: DROPTABLE
+POSTHOOK: Input: default@src_authorization_7
+POSTHOOK: Output: default@src_authorization_7
+PREHOOK: query: REVOKE ALL FROM USER hive_test_user
+PREHOOK: type: REVOKE_PRIVILEGE
+POSTHOOK: query: REVOKE ALL FROM USER hive_test_user
+POSTHOOK: type: REVOKE_PRIVILEGE
+PREHOOK: query: GRANT ALL TO GROUP hive_test_group1
+PREHOOK: type: GRANT_PRIVILEGE
+POSTHOOK: query: GRANT ALL TO GROUP hive_test_group1
+POSTHOOK: type: GRANT_PRIVILEGE
+PREHOOK: query: CREATE TABLE src_authorization_7 (key int, value string)
+PREHOOK: type: CREATETABLE
+POSTHOOK: query: CREATE TABLE src_authorization_7 (key int, value string)
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: default@src_authorization_7
+PREHOOK: query: DESCRIBE src_authorization_7
+PREHOOK: type: DESCTABLE
+POSTHOOK: query: DESCRIBE src_authorization_7
+POSTHOOK: type: DESCTABLE
+key int
+value string
+PREHOOK: query: DROP TABLE src_authorization_7
+PREHOOK: type: DROPTABLE
+PREHOOK: Input: default@src_authorization_7
+PREHOOK: Output: default@src_authorization_7
+POSTHOOK: query: DROP TABLE src_authorization_7
+POSTHOOK: type: DROPTABLE
+POSTHOOK: Input: default@src_authorization_7
+POSTHOOK: Output: default@src_authorization_7
+PREHOOK: query: REVOKE ALL FROM GROUP hive_test_group1
+PREHOOK: type: REVOKE_PRIVILEGE
+POSTHOOK: query: REVOKE ALL FROM GROUP hive_test_group1
+POSTHOOK: type: REVOKE_PRIVILEGE