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/01 17:09:41 UTC
svn commit: r1583703 - in
/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse:
DDLSemanticAnalyzer.java authorization/HiveAuthorizationTaskFactory.java
authorization/HiveAuthorizationTaskFactoryImpl.java
Author: hashutosh
Date: Tue Apr 1 15:09:40 2014
New Revision: 1583703
URL: http://svn.apache.org/r1583703
Log:
HIVE-6793 : DDLSemanticAnalyzer.analyzeShowRoles() should use HiveAuthorizationTaskFactory (Xuefu Zhang via Ashutosh Chauhan)
Modified:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/authorization/HiveAuthorizationTaskFactory.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/authorization/HiveAuthorizationTaskFactoryImpl.java
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java?rev=1583703&r1=1583702&r2=1583703&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java Tue Apr 1 15:09:40 2014
@@ -585,13 +585,14 @@ public class DDLSemanticAnalyzer extends
}
}
- private void analyzeShowRoles(ASTNode ast) {
- RoleDDLDesc showRolesDesc = new RoleDDLDesc(null, null,
- RoleDDLDesc.RoleOperation.SHOW_ROLES, null);
- showRolesDesc.setResFile(ctx.getResFile().toString());
- rootTasks.add(TaskFactory.get(new DDLWork(getInputs(), getOutputs(),
- showRolesDesc), conf));
- setFetchTask(createFetchTask(RoleDDLDesc.getRoleNameSchema()));
+ private void analyzeShowRoles(ASTNode ast) throws SemanticException {
+ Task<DDLWork> roleDDLTask = (Task<DDLWork>) hiveAuthorizationTaskFactory
+ .createShowRolesTask(ast, ctx.getResFile(), getInputs(), getOutputs());
+
+ if (roleDDLTask != null) {
+ rootTasks.add(roleDDLTask);
+ setFetchTask(createFetchTask(RoleDDLDesc.getRoleNameSchema()));
+ }
}
private void analyzeAlterDatabaseProperties(ASTNode ast) throws SemanticException {
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/authorization/HiveAuthorizationTaskFactory.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/authorization/HiveAuthorizationTaskFactory.java?rev=1583703&r1=1583702&r2=1583703&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/authorization/HiveAuthorizationTaskFactory.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/authorization/HiveAuthorizationTaskFactory.java Tue Apr 1 15:09:40 2014
@@ -65,4 +65,8 @@ public interface HiveAuthorizationTaskFa
public Task<? extends Serializable> createShowRolePrincipalsTask(ASTNode ast, Path resFile,
HashSet<ReadEntity> inputs, HashSet<WriteEntity> outputs) throws SemanticException;
+
+ public Task<? extends Serializable> createShowRolesTask(ASTNode ast, Path resFile,
+ HashSet<ReadEntity> inputs, HashSet<WriteEntity> outputs) throws SemanticException;
+
}
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=1583703&r1=1583702&r2=1583703&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 Tue Apr 1 15:09:40 2014
@@ -353,4 +353,14 @@ public class HiveAuthorizationTaskFactor
roleDDLDesc.setResFile(resFile.toString());
return TaskFactory.get(new DDLWork(inputs, outputs, roleDDLDesc), conf);
}
+
+ @Override
+ public Task<? extends Serializable> createShowRolesTask(ASTNode ast, Path resFile,
+ HashSet<ReadEntity> inputs, HashSet<WriteEntity> outputs) throws SemanticException {
+ RoleDDLDesc showRolesDesc = new RoleDDLDesc(null, null, RoleDDLDesc.RoleOperation.SHOW_ROLES,
+ null);
+ showRolesDesc.setResFile(resFile.toString());
+ return TaskFactory.get(new DDLWork(inputs, outputs, showRolesDesc), conf);
+ }
+
}