This is an automated email from the ASF dual-hosted git repository.
rmani pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git
The following commit(s) were added to refs/heads/master by this push:
new 11b3f30 RANGER-2536: Addon patch to avoid build issue related to Hive
Version dependency
11b3f30 is described below
commit 11b3f309176002aac571fbb459695f3106b8c04a
Author: rmani <rm...@hortonworks.com>
AuthorDate: Fri Aug 16 16:00:21 2019 -0700
RANGER-2536: Addon patch to avoid build issue related to Hive Version
dependency
---
.../hive/authorizer/RangerHiveAuthorizer.java | 21 ++++++++++++++++-----
pom.xml | 2 +-
2 files changed, 17 insertions(+), 6 deletions(-)
diff --git
a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java
b/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java
index ff6f6a7..3e255fd 100644
---
a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java
+++
b/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java
@@ -1177,6 +1177,10 @@ public class RangerHiveAuthorizer extends
RangerHiveAuthorizerBase {
HivePrivilegeObject hiveObj,
List<HivePrivilegeObject> inputs,
List<HivePrivilegeObject> outputs) {
+ if(LOG.isDebugEnabled()) {
+ LOG.debug("==> RangerHiveAuthorizer.getHiveResource(" +
"HiveOperationType: " + hiveOpType + "HivePrivilegeObject:"+ hiveObj + "
InputObjs:" + inputs + " OutputObjs:" + outputs);
+ }
+
RangerHiveResource ret = null;
HiveObjectType objectType = getObjectType(hiveObj, hiveOpType);
@@ -1184,9 +1188,9 @@ public class RangerHiveAuthorizer extends
RangerHiveAuthorizerBase {
switch(objectType) {
case DATABASE:
ret = new RangerHiveResource(objectType,
hiveObj.getDbname());
- if (!isCreateOperation(hiveOpType)) {
+ /*if (!isCreateOperation(hiveOpType)) {
ret.setOwnerUser(hiveObj.getOwnerName());
- }
+ }*/
break;
case TABLE:
@@ -1194,7 +1198,7 @@ public class RangerHiveAuthorizer extends
RangerHiveAuthorizerBase {
case FUNCTION:
ret = new RangerHiveResource(objectType,
hiveObj.getDbname(), hiveObj.getObjectName());
- String ownerName = hiveObj.getOwnerName();
+ /*String ownerName = hiveObj.getOwnerName();
if (isCreateOperation(hiveOpType)) {
HivePrivilegeObject dbObject =
getDatabaseObject(hiveObj.getDbname(), inputs, outputs);
@@ -1204,6 +1208,7 @@ public class RangerHiveAuthorizer extends
RangerHiveAuthorizerBase {
}
ret.setOwnerUser(ownerName);
+ */
break;
case PARTITION:
@@ -1213,7 +1218,7 @@ public class RangerHiveAuthorizer extends
RangerHiveAuthorizerBase {
case COLUMN:
ret = new RangerHiveResource(objectType,
hiveObj.getDbname(), hiveObj.getObjectName(),
StringUtils.join(hiveObj.getColumns(), COLUMN_SEP));
- ret.setOwnerUser(hiveObj.getOwnerName());
+ //ret.setOwnerUser(hiveObj.getOwnerName());
break;
case URI:
@@ -1233,9 +1238,14 @@ public class RangerHiveAuthorizer extends
RangerHiveAuthorizerBase {
ret.setServiceDef(hivePlugin == null ? null :
hivePlugin.getServiceDef());
}
+ if(LOG.isDebugEnabled()) {
+ LOG.debug("<= RangerHiveAuthorizer.getHiveResource(" +
" RangerHiveResource: " + ret);
+ }
+
return ret;
}
+ /*
private boolean isCreateOperation(HiveOperationType hiveOpType){
boolean ret = false;
switch (hiveOpType) {
@@ -1273,6 +1283,7 @@ public class RangerHiveAuthorizer extends
RangerHiveAuthorizerBase {
return ret;
}
+ */
private HiveObjectType getObjectType(HivePrivilegeObject hiveObj,
HiveOperationType hiveOpType) {
HiveObjectType objType = HiveObjectType.NONE;
@@ -2459,7 +2470,7 @@ public class RangerHiveAuthorizer extends
RangerHiveAuthorizerBase {
sb.append(",
'partKeys':[").append(StringUtil.toString(privObj.getPartKeys())).append("]");
sb.append(",
'commandParams':[").append(StringUtil.toString(privObj.getCommandParams())).append("]");
sb.append(",
'actionType':").append(privObj.getActionType().toString());
- sb.append(", 'owner':").append(privObj.getOwnerName());
+ //sb.append(", 'owner':").append(privObj.getOwnerName());
sb.append("}");
return sb;
diff --git a/pom.xml b/pom.xml
index 8e3a92c..13d5a5b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,7 +119,7 @@
<ozone.version>0.4.0-alpha</ozone.version>
<hamcrest.all.version>1.3</hamcrest.all.version>
<hbase.version>2.0.2</hbase.version>
- <hive.version>4.0.0-SNAPSHOT</hive.version>
+ <hive.version>3.1.0</hive.version>
<hbase-shaded-protobuf>2.0.0</hbase-shaded-protobuf>
<hbase-shaded-netty>2.0.0</hbase-shaded-netty>
<hbase-shaded-miscellaneous>2.0.0</hbase-shaded-miscellaneous>
