You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2014/04/03 23:09:20 UTC
svn commit: r1584396 - in /hive/trunk:
itests/hive-unit/src/test/java/org/apache/hadoop/hive/jdbc/
itests/hive-unit/src/test/java/org/apache/hive/jdbc/
metastore/src/java/org/apache/hadoop/hive/metastore/
ql/src/java/org/apache/hadoop/hive/ql/parse/aut...
Author: hashutosh
Date: Thu Apr 3 21:09:19 2014
New Revision: 1584396
URL: http://svn.apache.org/r1584396
Log:
HIVE-6796 : Create/drop roles is case-sensitive whereas set role is case insensitive (Ashutosh Chauhan via Thejas Nair)
Added:
hive/trunk/ql/src/test/queries/clientnegative/authorization_caseinsensitivity.q
hive/trunk/ql/src/test/results/clientnegative/authorization_caseinsensitivity.q.out
Modified:
hive/trunk/itests/hive-unit/src/test/java/org/apache/hadoop/hive/jdbc/TestJdbcDriver.java
hive/trunk/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcDriver2.java
hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/authorization/HiveAuthorizationTaskFactoryImpl.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/GrantRevokeRoleDDL.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PrincipalDesc.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/RoleDDLDesc.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLStdHiveAccessController.java
hive/trunk/ql/src/test/results/clientnegative/authorization_drop_db_cascade.q.out
hive/trunk/ql/src/test/results/clientnegative/authorization_drop_db_empty.q.out
hive/trunk/ql/src/test/results/clientnegative/authorization_drop_role_no_admin.q.out
hive/trunk/ql/src/test/results/clientnegative/authorization_fail_7.q.out
hive/trunk/ql/src/test/results/clientnegative/authorization_priv_current_role_neg.q.out
hive/trunk/ql/src/test/results/clientnegative/authorization_public_create.q.out
hive/trunk/ql/src/test/results/clientnegative/authorization_public_drop.q.out
hive/trunk/ql/src/test/results/clientnegative/authorization_role_grant.q.out
hive/trunk/ql/src/test/results/clientnegative/authorization_rolehierarchy_privs.q.out
hive/trunk/ql/src/test/results/clientnegative/authorize_grant_public.q.out
hive/trunk/ql/src/test/results/clientnegative/authorize_revoke_public.q.out
hive/trunk/ql/src/test/results/clientpositive/authorization_1.q.out
hive/trunk/ql/src/test/results/clientpositive/authorization_1_sql_std.q.out
hive/trunk/ql/src/test/results/clientpositive/authorization_5.q.out
hive/trunk/ql/src/test/results/clientpositive/authorization_9.q.out
hive/trunk/ql/src/test/results/clientpositive/authorization_admin_almighty1.q.out
hive/trunk/ql/src/test/results/clientpositive/authorization_role_grant1.q.out
hive/trunk/ql/src/test/results/clientpositive/authorization_role_grant2.q.out
hive/trunk/ql/src/test/results/clientpositive/authorization_set_show_current_role.q.out
hive/trunk/ql/src/test/results/clientpositive/authorization_view_sqlstd.q.out
hive/trunk/ql/src/test/results/clientpositive/show_roles.q.out
Modified: hive/trunk/itests/hive-unit/src/test/java/org/apache/hadoop/hive/jdbc/TestJdbcDriver.java
URL: http://svn.apache.org/viewvc/hive/trunk/itests/hive-unit/src/test/java/org/apache/hadoop/hive/jdbc/TestJdbcDriver.java?rev=1584396&r1=1584395&r2=1584396&view=diff
==============================================================================
--- hive/trunk/itests/hive-unit/src/test/java/org/apache/hadoop/hive/jdbc/TestJdbcDriver.java (original)
+++ hive/trunk/itests/hive-unit/src/test/java/org/apache/hadoop/hive/jdbc/TestJdbcDriver.java Thu Apr 3 21:09:19 2014
@@ -644,7 +644,7 @@ public class TestJdbcDriver extends Test
tests.put("", new Object[]{});
for (String checkPattern: tests.keySet()) {
- ResultSet rs = (ResultSet)con.getMetaData().getTables("default", null, checkPattern, null);
+ ResultSet rs = con.getMetaData().getTables("default", null, checkPattern, null);
int cnt = 0;
while (rs.next()) {
String resultTableName = rs.getString("TABLE_NAME");
@@ -663,7 +663,7 @@ public class TestJdbcDriver extends Test
}
// only ask for the views.
- ResultSet rs = (ResultSet)con.getMetaData().getTables("default", null, null
+ ResultSet rs = con.getMetaData().getTables("default", null, null
, new String[]{"VIEW"});
int cnt=0;
while (rs.next()) {
@@ -674,7 +674,7 @@ public class TestJdbcDriver extends Test
}
public void testMetaDataGetCatalogs() throws SQLException {
- ResultSet rs = (ResultSet)con.getMetaData().getCatalogs();
+ ResultSet rs = con.getMetaData().getCatalogs();
int cnt = 0;
while (rs.next()) {
String catalogname = rs.getString("TABLE_CAT");
@@ -694,7 +694,7 @@ public class TestJdbcDriver extends Test
}
public void testMetaDataGetSchemas() throws SQLException {
- ResultSet rs = (ResultSet)con.getMetaData().getSchemas();
+ ResultSet rs = con.getMetaData().getSchemas();
int cnt = 0;
while (rs.next()) {
cnt++;
@@ -704,7 +704,7 @@ public class TestJdbcDriver extends Test
}
public void testMetaDataGetTableTypes() throws SQLException {
- ResultSet rs = (ResultSet)con.getMetaData().getTableTypes();
+ ResultSet rs = con.getMetaData().getTableTypes();
Set<String> tabletypes = new HashSet();
tabletypes.add("TABLE");
tabletypes.add("EXTERNAL TABLE");
@@ -772,7 +772,7 @@ public class TestJdbcDriver extends Test
* Validate the Metadata for the result set of a metadata getColumns call.
*/
public void testMetaDataGetColumnsMetaData() throws SQLException {
- ResultSet rs = (ResultSet)con.getMetaData().getColumns(null, null
+ ResultSet rs = con.getMetaData().getColumns(null, null
, "testhivejdbcdriver\\_table", null);
ResultSetMetaData rsmd = rs.getMetaData();
@@ -791,6 +791,7 @@ public class TestJdbcDriver extends Test
, Arrays.asList("long")
, Arrays.asList(1234, "1234", "abc")) {
private int cnt=1;
+ @Override
public boolean next() throws SQLException {
if (cnt<data.size()) {
row = Arrays.asList(data.get(cnt));
@@ -1170,7 +1171,7 @@ public class TestJdbcDriver extends Test
ResultSet res = stmt.getResultSet();
assertTrue(res.next());
- assertEquals("PUBLIC", res.getString(1));
+ assertEquals("public", res.getString(1));
assertTrue(res.next());
assertEquals("role1", res.getString(1));
res.close();
Modified: hive/trunk/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcDriver2.java
URL: http://svn.apache.org/viewvc/hive/trunk/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcDriver2.java?rev=1584396&r1=1584395&r2=1584396&view=diff
==============================================================================
--- hive/trunk/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcDriver2.java (original)
+++ hive/trunk/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcDriver2.java Thu Apr 3 21:09:19 2014
@@ -2003,7 +2003,7 @@ public class TestJdbcDriver2 {
ResultSet res = stmt.getResultSet();
assertTrue(res.next());
- assertEquals("PUBLIC", res.getString(1));
+ assertEquals("public", res.getString(1));
assertTrue(res.next());
assertEquals("role1", res.getString(1));
res.close();
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=1584396&r1=1584395&r2=1584396&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 Thu Apr 3 21:09:19 2014
@@ -202,8 +202,8 @@ public class HiveMetaStore extends Thrif
* default port on which to start the Hive server
*/
private static final int DEFAULT_HIVE_METASTORE_PORT = 9083;
- public static final String ADMIN = "ADMIN";
- public static final String PUBLIC = "PUBLIC";
+ public static final String ADMIN = "admin";
+ public static final String PUBLIC = "public";
private static HadoopThriftAuthBridge.Server saslServer;
private static boolean useSasl;
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/authorization/HiveAuthorizationTaskFactoryImpl.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/authorization/HiveAuthorizationTaskFactoryImpl.java?rev=1584396&r1=1584395&r2=1584396&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/authorization/HiveAuthorizationTaskFactoryImpl.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/authorization/HiveAuthorizationTaskFactoryImpl.java Thu Apr 3 21:09:19 2014
@@ -72,14 +72,14 @@ public class HiveAuthorizationTaskFactor
public Task<? extends Serializable> createCreateRoleTask(ASTNode ast, HashSet<ReadEntity> inputs,
HashSet<WriteEntity> outputs) {
String roleName = BaseSemanticAnalyzer.unescapeIdentifier(ast.getChild(0).getText());
- RoleDDLDesc roleDesc = new RoleDDLDesc(roleName, RoleDDLDesc.RoleOperation.CREATE_ROLE);
+ RoleDDLDesc roleDesc = new RoleDDLDesc(roleName, PrincipalType.ROLE, RoleDDLDesc.RoleOperation.CREATE_ROLE, null);
return TaskFactory.get(new DDLWork(inputs, outputs, roleDesc), conf);
}
@Override
public Task<? extends Serializable> createDropRoleTask(ASTNode ast, HashSet<ReadEntity> inputs,
HashSet<WriteEntity> outputs) {
String roleName = BaseSemanticAnalyzer.unescapeIdentifier(ast.getChild(0).getText());
- RoleDDLDesc roleDesc = new RoleDDLDesc(roleName, RoleDDLDesc.RoleOperation.DROP_ROLE);
+ RoleDDLDesc roleDesc = new RoleDDLDesc(roleName, PrincipalType.ROLE, RoleDDLDesc.RoleOperation.DROP_ROLE, null);
return TaskFactory.get(new DDLWork(inputs, outputs, roleDesc), conf);
}
@Override
@@ -219,7 +219,7 @@ public class HiveAuthorizationTaskFactor
List<String> roles = new ArrayList<String>();
for (int i = rolesStartPos; i < ast.getChildCount(); i++) {
- roles.add(BaseSemanticAnalyzer.unescapeIdentifier(ast.getChild(i).getText()));
+ roles.add(BaseSemanticAnalyzer.unescapeIdentifier(ast.getChild(i).getText()).toLowerCase());
}
String roleOwnerName = SessionState.getUserFromAuthenticator();
@@ -324,8 +324,8 @@ public class HiveAuthorizationTaskFactor
public Task<? extends Serializable> createSetRoleTask(String roleName,
HashSet<ReadEntity> inputs, HashSet<WriteEntity> outputs)
throws SemanticException {
- return TaskFactory.get(new DDLWork(inputs, outputs, new RoleDDLDesc(roleName,
- RoleDDLDesc.RoleOperation.SET_ROLE)), conf);
+ return TaskFactory.get(new DDLWork(inputs, outputs, new RoleDDLDesc(roleName, PrincipalType.ROLE,
+ RoleDDLDesc.RoleOperation.SET_ROLE, null)), conf);
}
@Override
@@ -349,7 +349,8 @@ public class HiveAuthorizationTaskFactor
throw new AssertionError("Unexpected Tokens in SHOW ROLE PRINCIPALS");
}
- RoleDDLDesc roleDDLDesc = new RoleDDLDesc(roleName, RoleOperation.SHOW_ROLE_PRINCIPALS);
+ RoleDDLDesc roleDDLDesc = new RoleDDLDesc(roleName, PrincipalType.ROLE,
+ RoleOperation.SHOW_ROLE_PRINCIPALS, null);
roleDDLDesc.setResFile(resFile.toString());
return TaskFactory.get(new DDLWork(inputs, outputs, roleDDLDesc), conf);
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/GrantRevokeRoleDDL.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/GrantRevokeRoleDDL.java?rev=1584396&r1=1584395&r2=1584396&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/GrantRevokeRoleDDL.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/GrantRevokeRoleDDL.java Thu Apr 3 21:09:19 2014
@@ -24,19 +24,19 @@ import org.apache.hadoop.hive.metastore.
@Explain(displayName="grant or revoke roles")
public class GrantRevokeRoleDDL {
-
+
private boolean grant;
-
+
private List<PrincipalDesc> principalDesc;
-
+
private List<String> roles;
-
+
private String grantor;
-
+
private PrincipalType grantorType;
-
+
private boolean grantOption;
-
+
public GrantRevokeRoleDDL() {
}
@@ -110,6 +110,6 @@ public class GrantRevokeRoleDDL {
public void setGrantOption(boolean grantOption) {
this.grantOption = grantOption;
- }
+ }
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PrincipalDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PrincipalDesc.java?rev=1584396&r1=1584395&r2=1584396&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PrincipalDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PrincipalDesc.java Thu Apr 3 21:09:19 2014
@@ -26,9 +26,9 @@ import org.apache.hadoop.hive.metastore.
public class PrincipalDesc implements Serializable, Cloneable {
private static final long serialVersionUID = 1L;
-
+
private String name;
-
+
private PrincipalType type;
public PrincipalDesc(String name, PrincipalType type) {
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/RoleDDLDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/RoleDDLDesc.java?rev=1584396&r1=1584395&r2=1584396&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/RoleDDLDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/RoleDDLDesc.java Thu Apr 3 21:09:19 2014
@@ -102,7 +102,8 @@ public class RoleDDLDesc extends DDLDesc
public RoleDDLDesc(String principalName, PrincipalType principalType,
RoleOperation operation, String roleOwnerName) {
- this.name = principalName;
+ this.name = (principalName != null && principalType == PrincipalType.ROLE) ?
+ principalName.toLowerCase() : principalName;
this.principalType = principalType;
this.operation = operation;
this.roleOwnerName = roleOwnerName;
@@ -113,10 +114,6 @@ public class RoleDDLDesc extends DDLDesc
return name;
}
- public void setName(String roleName) {
- this.name = roleName;
- }
-
@Explain(displayName = "role operation")
public RoleOperation getOperation() {
return operation;
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLStdHiveAccessController.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLStdHiveAccessController.java?rev=1584396&r1=1584395&r2=1584396&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLStdHiveAccessController.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLStdHiveAccessController.java Thu Apr 3 21:09:19 2014
@@ -252,8 +252,8 @@ public class SQLStdHiveAccessController
String grantorName = adminGrantor == null ? null : adminGrantor.getName();
metastoreClientFactory.getHiveMetastoreClient().create_role(
new Role(roleName, 0, grantorName));
- } catch (Exception e) {
- throw new HiveAuthzPluginException("Error create role", e);
+ } catch (TException e) {
+ throw new HiveAuthzPluginException("Error create role : " + e.getMessage(), e);
}
}
Added: hive/trunk/ql/src/test/queries/clientnegative/authorization_caseinsensitivity.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientnegative/authorization_caseinsensitivity.q?rev=1584396&view=auto
==============================================================================
--- hive/trunk/ql/src/test/queries/clientnegative/authorization_caseinsensitivity.q (added)
+++ hive/trunk/ql/src/test/queries/clientnegative/authorization_caseinsensitivity.q Thu Apr 3 21:09:19 2014
@@ -0,0 +1,17 @@
+set hive.users.in.admin.role=hive_admin_user;
+set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactory;
+set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
+set user.name=hive_admin_user;
+set role ADMIN;
+
+create role testrole;
+show roles;
+drop role TESTROLE;
+show roles;
+create role TESTROLE;
+show roles;
+grant role testROLE to user hive_admin_user;
+set role testrolE;
+set role adMin;
+show roles;
+create role TESTRoLE;
Added: hive/trunk/ql/src/test/results/clientnegative/authorization_caseinsensitivity.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientnegative/authorization_caseinsensitivity.q.out?rev=1584396&view=auto
==============================================================================
--- hive/trunk/ql/src/test/results/clientnegative/authorization_caseinsensitivity.q.out (added)
+++ hive/trunk/ql/src/test/results/clientnegative/authorization_caseinsensitivity.q.out Thu Apr 3 21:09:19 2014
@@ -0,0 +1,62 @@
+PREHOOK: query: set role ADMIN
+PREHOOK: type: SHOW_ROLES
+POSTHOOK: query: set role ADMIN
+POSTHOOK: type: SHOW_ROLES
+PREHOOK: query: create role testrole
+PREHOOK: type: CREATEROLE
+POSTHOOK: query: create role testrole
+POSTHOOK: type: CREATEROLE
+PREHOOK: query: show roles
+PREHOOK: type: SHOW_ROLES
+POSTHOOK: query: show roles
+POSTHOOK: type: SHOW_ROLES
+admin
+public
+testrole
+
+PREHOOK: query: drop role TESTROLE
+PREHOOK: type: DROPROLE
+POSTHOOK: query: drop role TESTROLE
+POSTHOOK: type: DROPROLE
+PREHOOK: query: show roles
+PREHOOK: type: SHOW_ROLES
+POSTHOOK: query: show roles
+POSTHOOK: type: SHOW_ROLES
+admin
+public
+
+PREHOOK: query: create role TESTROLE
+PREHOOK: type: CREATEROLE
+POSTHOOK: query: create role TESTROLE
+POSTHOOK: type: CREATEROLE
+PREHOOK: query: show roles
+PREHOOK: type: SHOW_ROLES
+POSTHOOK: query: show roles
+POSTHOOK: type: SHOW_ROLES
+admin
+public
+testrole
+
+PREHOOK: query: grant role testROLE to user hive_admin_user
+PREHOOK: type: GRANT_ROLE
+POSTHOOK: query: grant role testROLE to user hive_admin_user
+POSTHOOK: type: GRANT_ROLE
+PREHOOK: query: set role testrolE
+PREHOOK: type: SHOW_ROLES
+POSTHOOK: query: set role testrolE
+POSTHOOK: type: SHOW_ROLES
+PREHOOK: query: set role adMin
+PREHOOK: type: SHOW_ROLES
+POSTHOOK: query: set role adMin
+POSTHOOK: type: SHOW_ROLES
+PREHOOK: query: show roles
+PREHOOK: type: SHOW_ROLES
+POSTHOOK: query: show roles
+POSTHOOK: type: SHOW_ROLES
+admin
+public
+testrole
+
+PREHOOK: query: create role TESTRoLE
+PREHOOK: type: CREATEROLE
+FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. InvalidObjectException(message:Role testrole already exists.)
Modified: hive/trunk/ql/src/test/results/clientnegative/authorization_drop_db_cascade.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientnegative/authorization_drop_db_cascade.q.out?rev=1584396&r1=1584395&r2=1584396&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientnegative/authorization_drop_db_cascade.q.out (original)
+++ hive/trunk/ql/src/test/results/clientnegative/authorization_drop_db_cascade.q.out Thu Apr 3 21:09:19 2014
@@ -48,6 +48,6 @@ PREHOOK: query: show current roles
PREHOOK: type: SHOW_ROLES
POSTHOOK: query: show current roles
POSTHOOK: type: SHOW_ROLES
-PUBLIC
+public
FAILED: HiveAccessControlException Permission denied. Principal [name=user2, type=USER] does not have following privileges on Object [type=TABLE_OR_VIEW, name=dba2.tab2] : [OBJECT OWNERSHIP]
Modified: hive/trunk/ql/src/test/results/clientnegative/authorization_drop_db_empty.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientnegative/authorization_drop_db_empty.q.out?rev=1584396&r1=1584395&r2=1584396&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientnegative/authorization_drop_db_empty.q.out (original)
+++ hive/trunk/ql/src/test/results/clientnegative/authorization_drop_db_empty.q.out Thu Apr 3 21:09:19 2014
@@ -18,7 +18,7 @@ PREHOOK: query: show current roles
PREHOOK: type: SHOW_ROLES
POSTHOOK: query: show current roles
POSTHOOK: type: SHOW_ROLES
-PUBLIC
+public
PREHOOK: query: drop database dba1
PREHOOK: type: DROPDATABASE
@@ -34,7 +34,7 @@ PREHOOK: type: SHOW_ROLES
POSTHOOK: query: -- check if dropping db as another user fails
show current roles
POSTHOOK: type: SHOW_ROLES
-PUBLIC
+public
PREHOOK: query: create database dba2
PREHOOK: type: CREATEDATABASE
@@ -44,6 +44,6 @@ PREHOOK: query: show current roles
PREHOOK: type: SHOW_ROLES
POSTHOOK: query: show current roles
POSTHOOK: type: SHOW_ROLES
-PUBLIC
+public
FAILED: HiveAccessControlException Permission denied. Principal [name=user2, type=USER] does not have following privileges on Object [type=DATABASE, name=dba2] : [OBJECT OWNERSHIP]
Modified: hive/trunk/ql/src/test/results/clientnegative/authorization_drop_role_no_admin.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientnegative/authorization_drop_role_no_admin.q.out?rev=1584396&r1=1584395&r2=1584396&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientnegative/authorization_drop_role_no_admin.q.out (original)
+++ hive/trunk/ql/src/test/results/clientnegative/authorization_drop_role_no_admin.q.out Thu Apr 3 21:09:19 2014
@@ -6,7 +6,7 @@ PREHOOK: query: show current roles
PREHOOK: type: SHOW_ROLES
POSTHOOK: query: show current roles
POSTHOOK: type: SHOW_ROLES
-ADMIN
+admin
PREHOOK: query: create role r1
PREHOOK: type: CREATEROLE
@@ -20,7 +20,7 @@ PREHOOK: query: show current roles
PREHOOK: type: SHOW_ROLES
POSTHOOK: query: show current roles
POSTHOOK: type: SHOW_ROLES
-PUBLIC
+public
PREHOOK: query: drop role r1
PREHOOK: type: DROPROLE
Modified: hive/trunk/ql/src/test/results/clientnegative/authorization_fail_7.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientnegative/authorization_fail_7.q.out?rev=1584396&r1=1584395&r2=1584396&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientnegative/authorization_fail_7.q.out (original)
+++ hive/trunk/ql/src/test/results/clientnegative/authorization_fail_7.q.out Thu Apr 3 21:09:19 2014
@@ -27,8 +27,8 @@ PREHOOK: query: show role grant user hiv
PREHOOK: type: SHOW_ROLE_GRANT
POSTHOOK: query: show role grant user hive_test_user
POSTHOOK: type: SHOW_ROLE_GRANT
-PUBLIC false -1
hive_test_role_fail false -1 hive_test_user
+public false -1
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
Modified: hive/trunk/ql/src/test/results/clientnegative/authorization_priv_current_role_neg.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientnegative/authorization_priv_current_role_neg.q.out?rev=1584396&r1=1584395&r2=1584396&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientnegative/authorization_priv_current_role_neg.q.out (original)
+++ hive/trunk/ql/src/test/results/clientnegative/authorization_priv_current_role_neg.q.out Thu Apr 3 21:09:19 2014
@@ -39,7 +39,7 @@ POSTHOOK: query: -- switch to user2
-- by default all roles should be in current roles, and grant to new user should work
show current roles
POSTHOOK: type: SHOW_ROLES
-PUBLIC
+public
role2
PREHOOK: query: grant all on table tpriv_current_role to user user3
Modified: hive/trunk/ql/src/test/results/clientnegative/authorization_public_create.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientnegative/authorization_public_create.q.out?rev=1584396&r1=1584395&r2=1584396&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientnegative/authorization_public_create.q.out (original)
+++ hive/trunk/ql/src/test/results/clientnegative/authorization_public_create.q.out Thu Apr 3 21:09:19 2014
@@ -1,4 +1,4 @@
PREHOOK: query: create role PUBLIC
PREHOOK: type: CREATEROLE
-Error in role operation create_role on role name PUBLIC, error message MetaException(message:PUBLIC role implictly exists. It can't be created.)
+Error in role operation create_role on role name public, error message MetaException(message:public role implictly exists. It can't be created.)
FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask
Modified: hive/trunk/ql/src/test/results/clientnegative/authorization_public_drop.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientnegative/authorization_public_drop.q.out?rev=1584396&r1=1584395&r2=1584396&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientnegative/authorization_public_drop.q.out (original)
+++ hive/trunk/ql/src/test/results/clientnegative/authorization_public_drop.q.out Thu Apr 3 21:09:19 2014
@@ -1,4 +1,4 @@
PREHOOK: query: drop role PUBLIC
PREHOOK: type: DROPROLE
-Error in role operation drop_role on role name PUBLIC, error message MetaException(message:PUBLIC/ADMIN role can't be dropped.)
+Error in role operation drop_role on role name public, error message MetaException(message:public/admin role can't be dropped.)
FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask
Modified: hive/trunk/ql/src/test/results/clientnegative/authorization_role_grant.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientnegative/authorization_role_grant.q.out?rev=1584396&r1=1584395&r2=1584396&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientnegative/authorization_role_grant.q.out (original)
+++ hive/trunk/ql/src/test/results/clientnegative/authorization_role_grant.q.out Thu Apr 3 21:09:19 2014
@@ -32,7 +32,7 @@ PREHOOK: query: show role grant user use
PREHOOK: type: SHOW_ROLE_GRANT
POSTHOOK: query: show role grant user user2
POSTHOOK: type: SHOW_ROLE_GRANT
-PUBLIC false -1
+public false -1
role_noadmin false -1 hive_admin_user
src_role_wadmin true -1 hive_admin_user
PREHOOK: query: set role role_noadmin
Modified: hive/trunk/ql/src/test/results/clientnegative/authorization_rolehierarchy_privs.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientnegative/authorization_rolehierarchy_privs.q.out?rev=1584396&r1=1584395&r2=1584396&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientnegative/authorization_rolehierarchy_privs.q.out (original)
+++ hive/trunk/ql/src/test/results/clientnegative/authorization_rolehierarchy_privs.q.out Thu Apr 3 21:09:19 2014
@@ -2,7 +2,7 @@ PREHOOK: query: show current roles
PREHOOK: type: SHOW_ROLES
POSTHOOK: query: show current roles
POSTHOOK: type: SHOW_ROLES
-PUBLIC
+public
PREHOOK: query: set role ADMIN
PREHOOK: type: SHOW_ROLES
@@ -59,7 +59,7 @@ PREHOOK: query: show current roles
PREHOOK: type: SHOW_ROLES
POSTHOOK: query: show current roles
POSTHOOK: type: SHOW_ROLES
-PUBLIC
+public
role1
role2
role3
@@ -76,7 +76,7 @@ PREHOOK: query: show current roles
PREHOOK: type: SHOW_ROLES
POSTHOOK: query: show current roles
POSTHOOK: type: SHOW_ROLES
-PUBLIC
+public
PREHOOK: query: grant select on t1 to role role2
PREHOOK: type: GRANT_PRIVILEGE
@@ -88,7 +88,7 @@ PREHOOK: query: show current roles
PREHOOK: type: SHOW_ROLES
POSTHOOK: query: show current roles
POSTHOOK: type: SHOW_ROLES
-PUBLIC
+public
role1
role2
role3
@@ -109,7 +109,7 @@ PREHOOK: query: show current roles
PREHOOK: type: SHOW_ROLES
POSTHOOK: query: show current roles
POSTHOOK: type: SHOW_ROLES
-ADMIN
+admin
PREHOOK: query: revoke select on table t1 from role role2
PREHOOK: type: REVOKE_PRIVILEGE
@@ -133,7 +133,7 @@ PREHOOK: query: show current roles
PREHOOK: type: SHOW_ROLES
POSTHOOK: query: show current roles
POSTHOOK: type: SHOW_ROLES
-PUBLIC
+public
role1
role2
role3
@@ -151,7 +151,7 @@ PREHOOK: query: show current roles
PREHOOK: type: SHOW_ROLES
POSTHOOK: query: show current roles
POSTHOOK: type: SHOW_ROLES
-PUBLIC
+public
PREHOOK: query: set role ADMIN
PREHOOK: type: SHOW_ROLES
@@ -169,7 +169,7 @@ PREHOOK: query: show current roles
PREHOOK: type: SHOW_ROLES
POSTHOOK: query: show current roles
POSTHOOK: type: SHOW_ROLES
-PUBLIC
+public
role1
role2
role3
@@ -187,7 +187,7 @@ PREHOOK: query: show current roles
PREHOOK: type: SHOW_ROLES
POSTHOOK: query: show current roles
POSTHOOK: type: SHOW_ROLES
-PUBLIC
+public
PREHOOK: query: set role ADMIN
PREHOOK: type: SHOW_ROLES
@@ -201,7 +201,7 @@ PREHOOK: query: show current roles
PREHOOK: type: SHOW_ROLES
POSTHOOK: query: show current roles
POSTHOOK: type: SHOW_ROLES
-PUBLIC
+public
role1
role2
role4
Modified: hive/trunk/ql/src/test/results/clientnegative/authorize_grant_public.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientnegative/authorize_grant_public.q.out?rev=1584396&r1=1584395&r2=1584396&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientnegative/authorize_grant_public.q.out (original)
+++ hive/trunk/ql/src/test/results/clientnegative/authorize_grant_public.q.out Thu Apr 3 21:09:19 2014
@@ -1,3 +1,3 @@
PREHOOK: query: grant role PUBLIC to user hive_test_user
PREHOOK: type: GRANT_ROLE
-FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. org.apache.hadoop.hive.ql.metadata.HiveException: MetaException(message:No user can be added to PUBLIC. Since all users implictly belong to PUBLIC role.)
+FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. org.apache.hadoop.hive.ql.metadata.HiveException: MetaException(message:No user can be added to public. Since all users implictly belong to public role.)
Modified: hive/trunk/ql/src/test/results/clientnegative/authorize_revoke_public.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientnegative/authorize_revoke_public.q.out?rev=1584396&r1=1584395&r2=1584396&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientnegative/authorize_revoke_public.q.out (original)
+++ hive/trunk/ql/src/test/results/clientnegative/authorize_revoke_public.q.out Thu Apr 3 21:09:19 2014
@@ -1,3 +1,3 @@
PREHOOK: query: revoke role PUBLIC from user hive_test_user
PREHOOK: type: REVOKE_ROLE
-FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. org.apache.hadoop.hive.ql.metadata.HiveException: MetaException(message:PUBLIC role can't be revoked.)
+FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. org.apache.hadoop.hive.ql.metadata.HiveException: MetaException(message:public role can't be revoked.)
Modified: hive/trunk/ql/src/test/results/clientpositive/authorization_1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/authorization_1.q.out?rev=1584396&r1=1584395&r2=1584396&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/authorization_1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/authorization_1.q.out Thu Apr 3 21:09:19 2014
@@ -267,7 +267,7 @@ PREHOOK: query: show role grant user hiv
PREHOOK: type: SHOW_ROLE_GRANT
POSTHOOK: query: show role grant user hive_test_user
POSTHOOK: type: SHOW_ROLE_GRANT
-PUBLIC false -1
+public false -1
src_role false -1 hive_test_user
PREHOOK: query: --column grant to role
Modified: hive/trunk/ql/src/test/results/clientpositive/authorization_1_sql_std.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/authorization_1_sql_std.q.out?rev=1584396&r1=1584395&r2=1584396&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/authorization_1_sql_std.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/authorization_1_sql_std.q.out Thu Apr 3 21:09:19 2014
@@ -48,7 +48,7 @@ PREHOOK: query: show role grant user use
PREHOOK: type: SHOW_ROLE_GRANT
POSTHOOK: query: show role grant user user_sauth
POSTHOOK: type: SHOW_ROLE_GRANT
-PUBLIC false -1
+public false -1
src_role false -1 hive_admin_user
PREHOOK: query: --table grant to role
Modified: hive/trunk/ql/src/test/results/clientpositive/authorization_5.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/authorization_5.q.out?rev=1584396&r1=1584395&r2=1584396&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/authorization_5.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/authorization_5.q.out Thu Apr 3 21:09:19 2014
@@ -38,8 +38,8 @@ PREHOOK: query: SHOW ROLE GRANT USER hiv
PREHOOK: type: SHOW_ROLE_GRANT
POSTHOOK: query: SHOW ROLE GRANT USER hive_test_user
POSTHOOK: type: SHOW_ROLE_GRANT
-PUBLIC false -1
db_test_role false -1 hive_test_user
+public false -1
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
Modified: hive/trunk/ql/src/test/results/clientpositive/authorization_9.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/authorization_9.q.out?rev=1584396&r1=1584395&r2=1584396&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/authorization_9.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/authorization_9.q.out Thu Apr 3 21:09:19 2014
@@ -63,7 +63,7 @@ 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
+ admin ROLE All true -1 admin
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
Modified: hive/trunk/ql/src/test/results/clientpositive/authorization_admin_almighty1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/authorization_admin_almighty1.q.out?rev=1584396&r1=1584395&r2=1584396&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/authorization_admin_almighty1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/authorization_admin_almighty1.q.out Thu Apr 3 21:09:19 2014
@@ -13,7 +13,7 @@ PREHOOK: query: show current roles
PREHOOK: type: SHOW_ROLES
POSTHOOK: query: show current roles
POSTHOOK: type: SHOW_ROLES
-PUBLIC
+public
PREHOOK: query: set role ADMIN
PREHOOK: type: SHOW_ROLES
@@ -23,7 +23,7 @@ PREHOOK: query: show current roles
PREHOOK: type: SHOW_ROLES
POSTHOOK: query: show current roles
POSTHOOK: type: SHOW_ROLES
-ADMIN
+admin
PREHOOK: query: select * from t1
PREHOOK: type: QUERY
Modified: hive/trunk/ql/src/test/results/clientpositive/authorization_role_grant1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/authorization_role_grant1.q.out?rev=1584396&r1=1584395&r2=1584396&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/authorization_role_grant1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/authorization_role_grant1.q.out Thu Apr 3 21:09:19 2014
@@ -18,14 +18,14 @@ PREHOOK: query: show role grant user use
PREHOOK: type: SHOW_ROLE_GRANT
POSTHOOK: query: show role grant user user2
POSTHOOK: type: SHOW_ROLE_GRANT
-PUBLIC false -1
+public false -1
src_role2 false -1 hive_admin_user
PREHOOK: query: show roles
PREHOOK: type: SHOW_ROLES
POSTHOOK: query: show roles
POSTHOOK: type: SHOW_ROLES
-ADMIN
-PUBLIC
+admin
+public
src_role2
PREHOOK: query: -- revoke role without role keyword
@@ -38,13 +38,13 @@ PREHOOK: query: show role grant user use
PREHOOK: type: SHOW_ROLE_GRANT
POSTHOOK: query: show role grant user user2
POSTHOOK: type: SHOW_ROLE_GRANT
-PUBLIC false -1
+public false -1
PREHOOK: query: show roles
PREHOOK: type: SHOW_ROLES
POSTHOOK: query: show roles
POSTHOOK: type: SHOW_ROLES
-ADMIN
-PUBLIC
+admin
+public
src_role2
PREHOOK: query: ----------------------------------------
@@ -67,7 +67,7 @@ PREHOOK: query: show role grant user use
PREHOOK: type: SHOW_ROLE_GRANT
POSTHOOK: query: show role grant user user2
POSTHOOK: type: SHOW_ROLE_GRANT
-PUBLIC false -1
+public false -1
src_role_wadmin true -1 hive_admin_user
PREHOOK: query: -- revoke role without role keyword
revoke src_role_wadmin from user user2
@@ -79,15 +79,15 @@ PREHOOK: query: show role grant user use
PREHOOK: type: SHOW_ROLE_GRANT
POSTHOOK: query: show role grant user user2
POSTHOOK: type: SHOW_ROLE_GRANT
-PUBLIC false -1
+public false -1
PREHOOK: query: -- drop roles
show roles
PREHOOK: type: SHOW_ROLES
POSTHOOK: query: -- drop roles
show roles
POSTHOOK: type: SHOW_ROLES
-ADMIN
-PUBLIC
+admin
+public
src_role2
src_role_wadmin
@@ -99,8 +99,8 @@ PREHOOK: query: show roles
PREHOOK: type: SHOW_ROLES
POSTHOOK: query: show roles
POSTHOOK: type: SHOW_ROLES
-ADMIN
-PUBLIC
+admin
+public
src_role_wadmin
PREHOOK: query: drop role src_role_wadmin
@@ -111,6 +111,6 @@ PREHOOK: query: show roles
PREHOOK: type: SHOW_ROLES
POSTHOOK: query: show roles
POSTHOOK: type: SHOW_ROLES
-ADMIN
-PUBLIC
+admin
+public
Modified: hive/trunk/ql/src/test/results/clientpositive/authorization_role_grant2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/authorization_role_grant2.q.out?rev=1584396&r1=1584395&r2=1584396&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/authorization_role_grant2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/authorization_role_grant2.q.out Thu Apr 3 21:09:19 2014
@@ -23,7 +23,7 @@ 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
+public false -1
src_role_wadmin true -1 hive_admin_user
PREHOOK: query: show principals src_role_wadmin
PREHOOK: type: SHOW_ROLE_PRINCIPALS
@@ -44,7 +44,7 @@ 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
+public false -1
src_role_wadmin false -1 user2
PREHOOK: query: set role ADMIN
PREHOOK: type: SHOW_ROLES
@@ -70,7 +70,7 @@ 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
+public false -1
PREHOOK: query: set role ADMIN
PREHOOK: type: SHOW_ROLES
POSTHOOK: query: set role ADMIN
Modified: hive/trunk/ql/src/test/results/clientpositive/authorization_set_show_current_role.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/authorization_set_show_current_role.q.out?rev=1584396&r1=1584395&r2=1584396&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/authorization_set_show_current_role.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/authorization_set_show_current_role.q.out Thu Apr 3 21:09:19 2014
@@ -6,7 +6,7 @@ PREHOOK: query: show current roles
PREHOOK: type: SHOW_ROLES
POSTHOOK: query: show current roles
POSTHOOK: type: SHOW_ROLES
-ADMIN
+admin
PREHOOK: query: create role r1
PREHOOK: type: CREATEROLE
@@ -34,7 +34,7 @@ PREHOOK: query: show current roles
PREHOOK: type: SHOW_ROLES
POSTHOOK: query: show current roles
POSTHOOK: type: SHOW_ROLES
-PUBLIC
+public
PREHOOK: query: set role ALL
PREHOOK: type: SHOW_ROLES
@@ -44,7 +44,7 @@ PREHOOK: query: show current roles
PREHOOK: type: SHOW_ROLES
POSTHOOK: query: show current roles
POSTHOOK: type: SHOW_ROLES
-PUBLIC
+public
r1
PREHOOK: query: set role ADMIN
Modified: hive/trunk/ql/src/test/results/clientpositive/authorization_view_sqlstd.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/authorization_view_sqlstd.q.out?rev=1584396&r1=1584395&r2=1584396&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/authorization_view_sqlstd.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/authorization_view_sqlstd.q.out Thu Apr 3 21:09:19 2014
@@ -155,7 +155,7 @@ PREHOOK: query: show current roles
PREHOOK: type: SHOW_ROLES
POSTHOOK: query: show current roles
POSTHOOK: type: SHOW_ROLES
-PUBLIC
+public
PREHOOK: query: set role ADMIN
PREHOOK: type: SHOW_ROLES
@@ -173,14 +173,14 @@ PREHOOK: query: show role grant user use
PREHOOK: type: SHOW_ROLE_GRANT
POSTHOOK: query: show role grant user user4
POSTHOOK: type: SHOW_ROLE_GRANT
-PUBLIC false -1
+public false -1
role_v false -1 hive_admin_user
PREHOOK: query: show roles
PREHOOK: type: SHOW_ROLES
POSTHOOK: query: show roles
POSTHOOK: type: SHOW_ROLES
-ADMIN
-PUBLIC
+admin
+public
role_v
PREHOOK: query: grant all on table vt2 to role role_v
Modified: hive/trunk/ql/src/test/results/clientpositive/show_roles.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/show_roles.q.out?rev=1584396&r1=1584395&r2=1584396&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/show_roles.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/show_roles.q.out Thu Apr 3 21:09:19 2014
@@ -10,7 +10,7 @@ PREHOOK: query: show roles
PREHOOK: type: SHOW_ROLES
POSTHOOK: query: show roles
POSTHOOK: type: SHOW_ROLES
-ADMIN
-PUBLIC
+admin
+public
role1
role2