You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sentry.apache.org by br...@apache.org on 2014/03/13 15:25:27 UTC
[1/3] SENTRY-136 - Thrift request structs should include the
groupName in addition to the userName (Shreepadma via Brock)
Repository: incubator-sentry
Updated Branches:
refs/heads/db_policy_store 066f993e5 -> 07767a1ce
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/07767a1c/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TListSentryRolesRequest.java
----------------------------------------------------------------------
diff --git a/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TListSentryRolesRequest.java b/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TListSentryRolesRequest.java
index c63a673..e144ac9 100644
--- a/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TListSentryRolesRequest.java
+++ b/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TListSentryRolesRequest.java
@@ -35,9 +35,10 @@ public class TListSentryRolesRequest implements org.apache.thrift.TBase<TListSen
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TListSentryRolesRequest");
private static final org.apache.thrift.protocol.TField PROTOCOL_VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("protocol_version", org.apache.thrift.protocol.TType.I32, (short)1);
- private static final org.apache.thrift.protocol.TField USER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("userName", org.apache.thrift.protocol.TType.STRING, (short)2);
- private static final org.apache.thrift.protocol.TField GROUP_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("groupName", org.apache.thrift.protocol.TType.STRING, (short)3);
+ private static final org.apache.thrift.protocol.TField REQUESTOR_USER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("requestorUserName", org.apache.thrift.protocol.TType.STRING, (short)2);
+ private static final org.apache.thrift.protocol.TField ROLEREQUESTOR_GROUP_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("rolerequestorGroupName", org.apache.thrift.protocol.TType.STRING, (short)3);
private static final org.apache.thrift.protocol.TField ROLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("roleName", org.apache.thrift.protocol.TType.STRING, (short)4);
+ private static final org.apache.thrift.protocol.TField REQUESTOR_GROUP_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("requestorGroupName", org.apache.thrift.protocol.TType.SET, (short)5);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -46,16 +47,18 @@ public class TListSentryRolesRequest implements org.apache.thrift.TBase<TListSen
}
private int protocol_version; // required
- private String userName; // optional
- private String groupName; // optional
- private String roleName; // optional
+ private String requestorUserName; // required
+ private String rolerequestorGroupName; // optional
+ private String roleName; // required
+ private Set<String> requestorGroupName; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
PROTOCOL_VERSION((short)1, "protocol_version"),
- USER_NAME((short)2, "userName"),
- GROUP_NAME((short)3, "groupName"),
- ROLE_NAME((short)4, "roleName");
+ REQUESTOR_USER_NAME((short)2, "requestorUserName"),
+ ROLEREQUESTOR_GROUP_NAME((short)3, "rolerequestorGroupName"),
+ ROLE_NAME((short)4, "roleName"),
+ REQUESTOR_GROUP_NAME((short)5, "requestorGroupName");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -72,12 +75,14 @@ public class TListSentryRolesRequest implements org.apache.thrift.TBase<TListSen
switch(fieldId) {
case 1: // PROTOCOL_VERSION
return PROTOCOL_VERSION;
- case 2: // USER_NAME
- return USER_NAME;
- case 3: // GROUP_NAME
- return GROUP_NAME;
+ case 2: // REQUESTOR_USER_NAME
+ return REQUESTOR_USER_NAME;
+ case 3: // ROLEREQUESTOR_GROUP_NAME
+ return ROLEREQUESTOR_GROUP_NAME;
case 4: // ROLE_NAME
return ROLE_NAME;
+ case 5: // REQUESTOR_GROUP_NAME
+ return REQUESTOR_GROUP_NAME;
default:
return null;
}
@@ -120,18 +125,21 @@ public class TListSentryRolesRequest implements org.apache.thrift.TBase<TListSen
// isset id assignments
private static final int __PROTOCOL_VERSION_ISSET_ID = 0;
private byte __isset_bitfield = 0;
- private _Fields optionals[] = {_Fields.USER_NAME,_Fields.GROUP_NAME,_Fields.ROLE_NAME};
+ private _Fields optionals[] = {_Fields.ROLEREQUESTOR_GROUP_NAME};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
tmpMap.put(_Fields.PROTOCOL_VERSION, new org.apache.thrift.meta_data.FieldMetaData("protocol_version", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
- tmpMap.put(_Fields.USER_NAME, new org.apache.thrift.meta_data.FieldMetaData("userName", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ tmpMap.put(_Fields.REQUESTOR_USER_NAME, new org.apache.thrift.meta_data.FieldMetaData("requestorUserName", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.GROUP_NAME, new org.apache.thrift.meta_data.FieldMetaData("groupName", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ tmpMap.put(_Fields.ROLEREQUESTOR_GROUP_NAME, new org.apache.thrift.meta_data.FieldMetaData("rolerequestorGroupName", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.ROLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("roleName", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ tmpMap.put(_Fields.ROLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("roleName", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.REQUESTOR_GROUP_NAME, new org.apache.thrift.meta_data.FieldMetaData("requestorGroupName", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.SetMetaData(org.apache.thrift.protocol.TType.SET,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TListSentryRolesRequest.class, metaDataMap);
}
@@ -142,11 +150,17 @@ public class TListSentryRolesRequest implements org.apache.thrift.TBase<TListSen
}
public TListSentryRolesRequest(
- int protocol_version)
+ int protocol_version,
+ String requestorUserName,
+ String roleName,
+ Set<String> requestorGroupName)
{
this();
this.protocol_version = protocol_version;
setProtocol_versionIsSet(true);
+ this.requestorUserName = requestorUserName;
+ this.roleName = roleName;
+ this.requestorGroupName = requestorGroupName;
}
/**
@@ -155,15 +169,22 @@ public class TListSentryRolesRequest implements org.apache.thrift.TBase<TListSen
public TListSentryRolesRequest(TListSentryRolesRequest other) {
__isset_bitfield = other.__isset_bitfield;
this.protocol_version = other.protocol_version;
- if (other.isSetUserName()) {
- this.userName = other.userName;
+ if (other.isSetRequestorUserName()) {
+ this.requestorUserName = other.requestorUserName;
}
- if (other.isSetGroupName()) {
- this.groupName = other.groupName;
+ if (other.isSetRolerequestorGroupName()) {
+ this.rolerequestorGroupName = other.rolerequestorGroupName;
}
if (other.isSetRoleName()) {
this.roleName = other.roleName;
}
+ if (other.isSetRequestorGroupName()) {
+ Set<String> __this__requestorGroupName = new HashSet<String>();
+ for (String other_element : other.requestorGroupName) {
+ __this__requestorGroupName.add(other_element);
+ }
+ this.requestorGroupName = __this__requestorGroupName;
+ }
}
public TListSentryRolesRequest deepCopy() {
@@ -174,9 +195,10 @@ public class TListSentryRolesRequest implements org.apache.thrift.TBase<TListSen
public void clear() {
this.protocol_version = 1;
- this.userName = null;
- this.groupName = null;
+ this.requestorUserName = null;
+ this.rolerequestorGroupName = null;
this.roleName = null;
+ this.requestorGroupName = null;
}
public int getProtocol_version() {
@@ -201,49 +223,49 @@ public class TListSentryRolesRequest implements org.apache.thrift.TBase<TListSen
__isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PROTOCOL_VERSION_ISSET_ID, value);
}
- public String getUserName() {
- return this.userName;
+ public String getRequestorUserName() {
+ return this.requestorUserName;
}
- public void setUserName(String userName) {
- this.userName = userName;
+ public void setRequestorUserName(String requestorUserName) {
+ this.requestorUserName = requestorUserName;
}
- public void unsetUserName() {
- this.userName = null;
+ public void unsetRequestorUserName() {
+ this.requestorUserName = null;
}
- /** Returns true if field userName is set (has been assigned a value) and false otherwise */
- public boolean isSetUserName() {
- return this.userName != null;
+ /** Returns true if field requestorUserName is set (has been assigned a value) and false otherwise */
+ public boolean isSetRequestorUserName() {
+ return this.requestorUserName != null;
}
- public void setUserNameIsSet(boolean value) {
+ public void setRequestorUserNameIsSet(boolean value) {
if (!value) {
- this.userName = null;
+ this.requestorUserName = null;
}
}
- public String getGroupName() {
- return this.groupName;
+ public String getRolerequestorGroupName() {
+ return this.rolerequestorGroupName;
}
- public void setGroupName(String groupName) {
- this.groupName = groupName;
+ public void setRolerequestorGroupName(String rolerequestorGroupName) {
+ this.rolerequestorGroupName = rolerequestorGroupName;
}
- public void unsetGroupName() {
- this.groupName = null;
+ public void unsetRolerequestorGroupName() {
+ this.rolerequestorGroupName = null;
}
- /** Returns true if field groupName is set (has been assigned a value) and false otherwise */
- public boolean isSetGroupName() {
- return this.groupName != null;
+ /** Returns true if field rolerequestorGroupName is set (has been assigned a value) and false otherwise */
+ public boolean isSetRolerequestorGroupName() {
+ return this.rolerequestorGroupName != null;
}
- public void setGroupNameIsSet(boolean value) {
+ public void setRolerequestorGroupNameIsSet(boolean value) {
if (!value) {
- this.groupName = null;
+ this.rolerequestorGroupName = null;
}
}
@@ -270,6 +292,44 @@ public class TListSentryRolesRequest implements org.apache.thrift.TBase<TListSen
}
}
+ public int getRequestorGroupNameSize() {
+ return (this.requestorGroupName == null) ? 0 : this.requestorGroupName.size();
+ }
+
+ public java.util.Iterator<String> getRequestorGroupNameIterator() {
+ return (this.requestorGroupName == null) ? null : this.requestorGroupName.iterator();
+ }
+
+ public void addToRequestorGroupName(String elem) {
+ if (this.requestorGroupName == null) {
+ this.requestorGroupName = new HashSet<String>();
+ }
+ this.requestorGroupName.add(elem);
+ }
+
+ public Set<String> getRequestorGroupName() {
+ return this.requestorGroupName;
+ }
+
+ public void setRequestorGroupName(Set<String> requestorGroupName) {
+ this.requestorGroupName = requestorGroupName;
+ }
+
+ public void unsetRequestorGroupName() {
+ this.requestorGroupName = null;
+ }
+
+ /** Returns true if field requestorGroupName is set (has been assigned a value) and false otherwise */
+ public boolean isSetRequestorGroupName() {
+ return this.requestorGroupName != null;
+ }
+
+ public void setRequestorGroupNameIsSet(boolean value) {
+ if (!value) {
+ this.requestorGroupName = null;
+ }
+ }
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case PROTOCOL_VERSION:
@@ -280,19 +340,19 @@ public class TListSentryRolesRequest implements org.apache.thrift.TBase<TListSen
}
break;
- case USER_NAME:
+ case REQUESTOR_USER_NAME:
if (value == null) {
- unsetUserName();
+ unsetRequestorUserName();
} else {
- setUserName((String)value);
+ setRequestorUserName((String)value);
}
break;
- case GROUP_NAME:
+ case ROLEREQUESTOR_GROUP_NAME:
if (value == null) {
- unsetGroupName();
+ unsetRolerequestorGroupName();
} else {
- setGroupName((String)value);
+ setRolerequestorGroupName((String)value);
}
break;
@@ -304,6 +364,14 @@ public class TListSentryRolesRequest implements org.apache.thrift.TBase<TListSen
}
break;
+ case REQUESTOR_GROUP_NAME:
+ if (value == null) {
+ unsetRequestorGroupName();
+ } else {
+ setRequestorGroupName((Set<String>)value);
+ }
+ break;
+
}
}
@@ -312,15 +380,18 @@ public class TListSentryRolesRequest implements org.apache.thrift.TBase<TListSen
case PROTOCOL_VERSION:
return Integer.valueOf(getProtocol_version());
- case USER_NAME:
- return getUserName();
+ case REQUESTOR_USER_NAME:
+ return getRequestorUserName();
- case GROUP_NAME:
- return getGroupName();
+ case ROLEREQUESTOR_GROUP_NAME:
+ return getRolerequestorGroupName();
case ROLE_NAME:
return getRoleName();
+ case REQUESTOR_GROUP_NAME:
+ return getRequestorGroupName();
+
}
throw new IllegalStateException();
}
@@ -334,12 +405,14 @@ public class TListSentryRolesRequest implements org.apache.thrift.TBase<TListSen
switch (field) {
case PROTOCOL_VERSION:
return isSetProtocol_version();
- case USER_NAME:
- return isSetUserName();
- case GROUP_NAME:
- return isSetGroupName();
+ case REQUESTOR_USER_NAME:
+ return isSetRequestorUserName();
+ case ROLEREQUESTOR_GROUP_NAME:
+ return isSetRolerequestorGroupName();
case ROLE_NAME:
return isSetRoleName();
+ case REQUESTOR_GROUP_NAME:
+ return isSetRequestorGroupName();
}
throw new IllegalStateException();
}
@@ -366,21 +439,21 @@ public class TListSentryRolesRequest implements org.apache.thrift.TBase<TListSen
return false;
}
- boolean this_present_userName = true && this.isSetUserName();
- boolean that_present_userName = true && that.isSetUserName();
- if (this_present_userName || that_present_userName) {
- if (!(this_present_userName && that_present_userName))
+ boolean this_present_requestorUserName = true && this.isSetRequestorUserName();
+ boolean that_present_requestorUserName = true && that.isSetRequestorUserName();
+ if (this_present_requestorUserName || that_present_requestorUserName) {
+ if (!(this_present_requestorUserName && that_present_requestorUserName))
return false;
- if (!this.userName.equals(that.userName))
+ if (!this.requestorUserName.equals(that.requestorUserName))
return false;
}
- boolean this_present_groupName = true && this.isSetGroupName();
- boolean that_present_groupName = true && that.isSetGroupName();
- if (this_present_groupName || that_present_groupName) {
- if (!(this_present_groupName && that_present_groupName))
+ boolean this_present_rolerequestorGroupName = true && this.isSetRolerequestorGroupName();
+ boolean that_present_rolerequestorGroupName = true && that.isSetRolerequestorGroupName();
+ if (this_present_rolerequestorGroupName || that_present_rolerequestorGroupName) {
+ if (!(this_present_rolerequestorGroupName && that_present_rolerequestorGroupName))
return false;
- if (!this.groupName.equals(that.groupName))
+ if (!this.rolerequestorGroupName.equals(that.rolerequestorGroupName))
return false;
}
@@ -393,6 +466,15 @@ public class TListSentryRolesRequest implements org.apache.thrift.TBase<TListSen
return false;
}
+ boolean this_present_requestorGroupName = true && this.isSetRequestorGroupName();
+ boolean that_present_requestorGroupName = true && that.isSetRequestorGroupName();
+ if (this_present_requestorGroupName || that_present_requestorGroupName) {
+ if (!(this_present_requestorGroupName && that_present_requestorGroupName))
+ return false;
+ if (!this.requestorGroupName.equals(that.requestorGroupName))
+ return false;
+ }
+
return true;
}
@@ -405,21 +487,26 @@ public class TListSentryRolesRequest implements org.apache.thrift.TBase<TListSen
if (present_protocol_version)
builder.append(protocol_version);
- boolean present_userName = true && (isSetUserName());
- builder.append(present_userName);
- if (present_userName)
- builder.append(userName);
+ boolean present_requestorUserName = true && (isSetRequestorUserName());
+ builder.append(present_requestorUserName);
+ if (present_requestorUserName)
+ builder.append(requestorUserName);
- boolean present_groupName = true && (isSetGroupName());
- builder.append(present_groupName);
- if (present_groupName)
- builder.append(groupName);
+ boolean present_rolerequestorGroupName = true && (isSetRolerequestorGroupName());
+ builder.append(present_rolerequestorGroupName);
+ if (present_rolerequestorGroupName)
+ builder.append(rolerequestorGroupName);
boolean present_roleName = true && (isSetRoleName());
builder.append(present_roleName);
if (present_roleName)
builder.append(roleName);
+ boolean present_requestorGroupName = true && (isSetRequestorGroupName());
+ builder.append(present_requestorGroupName);
+ if (present_requestorGroupName)
+ builder.append(requestorGroupName);
+
return builder.toHashCode();
}
@@ -441,22 +528,22 @@ public class TListSentryRolesRequest implements org.apache.thrift.TBase<TListSen
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetUserName()).compareTo(typedOther.isSetUserName());
+ lastComparison = Boolean.valueOf(isSetRequestorUserName()).compareTo(typedOther.isSetRequestorUserName());
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetUserName()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userName, typedOther.userName);
+ if (isSetRequestorUserName()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.requestorUserName, typedOther.requestorUserName);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetGroupName()).compareTo(typedOther.isSetGroupName());
+ lastComparison = Boolean.valueOf(isSetRolerequestorGroupName()).compareTo(typedOther.isSetRolerequestorGroupName());
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetGroupName()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.groupName, typedOther.groupName);
+ if (isSetRolerequestorGroupName()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.rolerequestorGroupName, typedOther.rolerequestorGroupName);
if (lastComparison != 0) {
return lastComparison;
}
@@ -471,6 +558,16 @@ public class TListSentryRolesRequest implements org.apache.thrift.TBase<TListSen
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetRequestorGroupName()).compareTo(typedOther.isSetRequestorGroupName());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetRequestorGroupName()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.requestorGroupName, typedOther.requestorGroupName);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -494,36 +591,40 @@ public class TListSentryRolesRequest implements org.apache.thrift.TBase<TListSen
sb.append("protocol_version:");
sb.append(this.protocol_version);
first = false;
- if (isSetUserName()) {
- if (!first) sb.append(", ");
- sb.append("userName:");
- if (this.userName == null) {
- sb.append("null");
- } else {
- sb.append(this.userName);
- }
- first = false;
+ if (!first) sb.append(", ");
+ sb.append("requestorUserName:");
+ if (this.requestorUserName == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.requestorUserName);
}
- if (isSetGroupName()) {
+ first = false;
+ if (isSetRolerequestorGroupName()) {
if (!first) sb.append(", ");
- sb.append("groupName:");
- if (this.groupName == null) {
+ sb.append("rolerequestorGroupName:");
+ if (this.rolerequestorGroupName == null) {
sb.append("null");
} else {
- sb.append(this.groupName);
+ sb.append(this.rolerequestorGroupName);
}
first = false;
}
- if (isSetRoleName()) {
- if (!first) sb.append(", ");
- sb.append("roleName:");
- if (this.roleName == null) {
- sb.append("null");
- } else {
- sb.append(this.roleName);
- }
- first = false;
+ if (!first) sb.append(", ");
+ sb.append("roleName:");
+ if (this.roleName == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.roleName);
}
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("requestorGroupName:");
+ if (this.requestorGroupName == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.requestorGroupName);
+ }
+ first = false;
sb.append(")");
return sb.toString();
}
@@ -534,6 +635,18 @@ public class TListSentryRolesRequest implements org.apache.thrift.TBase<TListSen
throw new org.apache.thrift.protocol.TProtocolException("Required field 'protocol_version' is unset! Struct:" + toString());
}
+ if (!isSetRequestorUserName()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'requestorUserName' is unset! Struct:" + toString());
+ }
+
+ if (!isSetRoleName()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'roleName' is unset! Struct:" + toString());
+ }
+
+ if (!isSetRequestorGroupName()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'requestorGroupName' is unset! Struct:" + toString());
+ }
+
// check for sub-struct validity
}
@@ -581,18 +694,18 @@ public class TListSentryRolesRequest implements org.apache.thrift.TBase<TListSen
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 2: // USER_NAME
+ case 2: // REQUESTOR_USER_NAME
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.userName = iprot.readString();
- struct.setUserNameIsSet(true);
+ struct.requestorUserName = iprot.readString();
+ struct.setRequestorUserNameIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 3: // GROUP_NAME
+ case 3: // ROLEREQUESTOR_GROUP_NAME
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.groupName = iprot.readString();
- struct.setGroupNameIsSet(true);
+ struct.rolerequestorGroupName = iprot.readString();
+ struct.setRolerequestorGroupNameIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -605,6 +718,24 @@ public class TListSentryRolesRequest implements org.apache.thrift.TBase<TListSen
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
+ case 5: // REQUESTOR_GROUP_NAME
+ if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
+ {
+ org.apache.thrift.protocol.TSet _set16 = iprot.readSetBegin();
+ struct.requestorGroupName = new HashSet<String>(2*_set16.size);
+ for (int _i17 = 0; _i17 < _set16.size; ++_i17)
+ {
+ String _elem18; // required
+ _elem18 = iprot.readString();
+ struct.requestorGroupName.add(_elem18);
+ }
+ iprot.readSetEnd();
+ }
+ struct.setRequestorGroupNameIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -621,26 +752,34 @@ public class TListSentryRolesRequest implements org.apache.thrift.TBase<TListSen
oprot.writeFieldBegin(PROTOCOL_VERSION_FIELD_DESC);
oprot.writeI32(struct.protocol_version);
oprot.writeFieldEnd();
- if (struct.userName != null) {
- if (struct.isSetUserName()) {
- oprot.writeFieldBegin(USER_NAME_FIELD_DESC);
- oprot.writeString(struct.userName);
- oprot.writeFieldEnd();
- }
+ if (struct.requestorUserName != null) {
+ oprot.writeFieldBegin(REQUESTOR_USER_NAME_FIELD_DESC);
+ oprot.writeString(struct.requestorUserName);
+ oprot.writeFieldEnd();
}
- if (struct.groupName != null) {
- if (struct.isSetGroupName()) {
- oprot.writeFieldBegin(GROUP_NAME_FIELD_DESC);
- oprot.writeString(struct.groupName);
+ if (struct.rolerequestorGroupName != null) {
+ if (struct.isSetRolerequestorGroupName()) {
+ oprot.writeFieldBegin(ROLEREQUESTOR_GROUP_NAME_FIELD_DESC);
+ oprot.writeString(struct.rolerequestorGroupName);
oprot.writeFieldEnd();
}
}
if (struct.roleName != null) {
- if (struct.isSetRoleName()) {
- oprot.writeFieldBegin(ROLE_NAME_FIELD_DESC);
- oprot.writeString(struct.roleName);
- oprot.writeFieldEnd();
+ oprot.writeFieldBegin(ROLE_NAME_FIELD_DESC);
+ oprot.writeString(struct.roleName);
+ oprot.writeFieldEnd();
+ }
+ if (struct.requestorGroupName != null) {
+ oprot.writeFieldBegin(REQUESTOR_GROUP_NAME_FIELD_DESC);
+ {
+ oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, struct.requestorGroupName.size()));
+ for (String _iter19 : struct.requestorGroupName)
+ {
+ oprot.writeString(_iter19);
+ }
+ oprot.writeSetEnd();
}
+ oprot.writeFieldEnd();
}
oprot.writeFieldStop();
oprot.writeStructEnd();
@@ -660,25 +799,22 @@ public class TListSentryRolesRequest implements org.apache.thrift.TBase<TListSen
public void write(org.apache.thrift.protocol.TProtocol prot, TListSentryRolesRequest struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
oprot.writeI32(struct.protocol_version);
+ oprot.writeString(struct.requestorUserName);
+ oprot.writeString(struct.roleName);
+ {
+ oprot.writeI32(struct.requestorGroupName.size());
+ for (String _iter20 : struct.requestorGroupName)
+ {
+ oprot.writeString(_iter20);
+ }
+ }
BitSet optionals = new BitSet();
- if (struct.isSetUserName()) {
+ if (struct.isSetRolerequestorGroupName()) {
optionals.set(0);
}
- if (struct.isSetGroupName()) {
- optionals.set(1);
- }
- if (struct.isSetRoleName()) {
- optionals.set(2);
- }
- oprot.writeBitSet(optionals, 3);
- if (struct.isSetUserName()) {
- oprot.writeString(struct.userName);
- }
- if (struct.isSetGroupName()) {
- oprot.writeString(struct.groupName);
- }
- if (struct.isSetRoleName()) {
- oprot.writeString(struct.roleName);
+ oprot.writeBitSet(optionals, 1);
+ if (struct.isSetRolerequestorGroupName()) {
+ oprot.writeString(struct.rolerequestorGroupName);
}
}
@@ -687,18 +823,25 @@ public class TListSentryRolesRequest implements org.apache.thrift.TBase<TListSen
TTupleProtocol iprot = (TTupleProtocol) prot;
struct.protocol_version = iprot.readI32();
struct.setProtocol_versionIsSet(true);
- BitSet incoming = iprot.readBitSet(3);
- if (incoming.get(0)) {
- struct.userName = iprot.readString();
- struct.setUserNameIsSet(true);
- }
- if (incoming.get(1)) {
- struct.groupName = iprot.readString();
- struct.setGroupNameIsSet(true);
+ struct.requestorUserName = iprot.readString();
+ struct.setRequestorUserNameIsSet(true);
+ struct.roleName = iprot.readString();
+ struct.setRoleNameIsSet(true);
+ {
+ org.apache.thrift.protocol.TSet _set21 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.requestorGroupName = new HashSet<String>(2*_set21.size);
+ for (int _i22 = 0; _i22 < _set21.size; ++_i22)
+ {
+ String _elem23; // required
+ _elem23 = iprot.readString();
+ struct.requestorGroupName.add(_elem23);
+ }
}
- if (incoming.get(2)) {
- struct.roleName = iprot.readString();
- struct.setRoleNameIsSet(true);
+ struct.setRequestorGroupNameIsSet(true);
+ BitSet incoming = iprot.readBitSet(1);
+ if (incoming.get(0)) {
+ struct.rolerequestorGroupName = iprot.readString();
+ struct.setRolerequestorGroupNameIsSet(true);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/07767a1c/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TListSentryRolesResponse.java
----------------------------------------------------------------------
diff --git a/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TListSentryRolesResponse.java b/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TListSentryRolesResponse.java
index b035b12..f3dfac2 100644
--- a/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TListSentryRolesResponse.java
+++ b/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TListSentryRolesResponse.java
@@ -447,14 +447,14 @@ public class TListSentryRolesResponse implements org.apache.thrift.TBase<TListSe
case 2: // ROLES
if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
{
- org.apache.thrift.protocol.TSet _set8 = iprot.readSetBegin();
- struct.roles = new HashSet<TSentryRole>(2*_set8.size);
- for (int _i9 = 0; _i9 < _set8.size; ++_i9)
+ org.apache.thrift.protocol.TSet _set24 = iprot.readSetBegin();
+ struct.roles = new HashSet<TSentryRole>(2*_set24.size);
+ for (int _i25 = 0; _i25 < _set24.size; ++_i25)
{
- TSentryRole _elem10; // required
- _elem10 = new TSentryRole();
- _elem10.read(iprot);
- struct.roles.add(_elem10);
+ TSentryRole _elem26; // required
+ _elem26 = new TSentryRole();
+ _elem26.read(iprot);
+ struct.roles.add(_elem26);
}
iprot.readSetEnd();
}
@@ -485,9 +485,9 @@ public class TListSentryRolesResponse implements org.apache.thrift.TBase<TListSe
oprot.writeFieldBegin(ROLES_FIELD_DESC);
{
oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRUCT, struct.roles.size()));
- for (TSentryRole _iter11 : struct.roles)
+ for (TSentryRole _iter27 : struct.roles)
{
- _iter11.write(oprot);
+ _iter27.write(oprot);
}
oprot.writeSetEnd();
}
@@ -513,9 +513,9 @@ public class TListSentryRolesResponse implements org.apache.thrift.TBase<TListSe
struct.status.write(oprot);
{
oprot.writeI32(struct.roles.size());
- for (TSentryRole _iter12 : struct.roles)
+ for (TSentryRole _iter28 : struct.roles)
{
- _iter12.write(oprot);
+ _iter28.write(oprot);
}
}
}
@@ -527,14 +527,14 @@ public class TListSentryRolesResponse implements org.apache.thrift.TBase<TListSe
struct.status.read(iprot);
struct.setStatusIsSet(true);
{
- org.apache.thrift.protocol.TSet _set13 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.roles = new HashSet<TSentryRole>(2*_set13.size);
- for (int _i14 = 0; _i14 < _set13.size; ++_i14)
+ org.apache.thrift.protocol.TSet _set29 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.roles = new HashSet<TSentryRole>(2*_set29.size);
+ for (int _i30 = 0; _i30 < _set29.size; ++_i30)
{
- TSentryRole _elem15; // required
- _elem15 = new TSentryRole();
- _elem15.read(iprot);
- struct.roles.add(_elem15);
+ TSentryRole _elem31; // required
+ _elem31 = new TSentryRole();
+ _elem31.read(iprot);
+ struct.roles.add(_elem31);
}
}
struct.setRolesIsSet(true);
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/07767a1c/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TSentryPrivilege.java
----------------------------------------------------------------------
diff --git a/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TSentryPrivilege.java b/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TSentryPrivilege.java
index 9796562..9e8ac4c 100644
--- a/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TSentryPrivilege.java
+++ b/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TSentryPrivilege.java
@@ -57,7 +57,7 @@ public class TSentryPrivilege implements org.apache.thrift.TBase<TSentryPrivileg
private String tableName; // optional
private String URI; // optional
private String action; // required
- private long createTime; // required
+ private long createTime; // optional
private String grantorPrincipal; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -145,7 +145,7 @@ public class TSentryPrivilege implements org.apache.thrift.TBase<TSentryPrivileg
// isset id assignments
private static final int __CREATETIME_ISSET_ID = 0;
private byte __isset_bitfield = 0;
- private _Fields optionals[] = {_Fields.PRIVILEGE_NAME,_Fields.DB_NAME,_Fields.TABLE_NAME,_Fields.URI,_Fields.GRANTOR_PRINCIPAL};
+ private _Fields optionals[] = {_Fields.PRIVILEGE_NAME,_Fields.DB_NAME,_Fields.TABLE_NAME,_Fields.URI,_Fields.CREATE_TIME,_Fields.GRANTOR_PRINCIPAL};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -163,7 +163,7 @@ public class TSentryPrivilege implements org.apache.thrift.TBase<TSentryPrivileg
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.ACTION, new org.apache.thrift.meta_data.FieldMetaData("action", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.CREATE_TIME, new org.apache.thrift.meta_data.FieldMetaData("createTime", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ tmpMap.put(_Fields.CREATE_TIME, new org.apache.thrift.meta_data.FieldMetaData("createTime", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
tmpMap.put(_Fields.GRANTOR_PRINCIPAL, new org.apache.thrift.meta_data.FieldMetaData("grantorPrincipal", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
@@ -177,15 +177,12 @@ public class TSentryPrivilege implements org.apache.thrift.TBase<TSentryPrivileg
public TSentryPrivilege(
String privilegeScope,
String serverName,
- String action,
- long createTime)
+ String action)
{
this();
this.privilegeScope = privilegeScope;
this.serverName = serverName;
this.action = action;
- this.createTime = createTime;
- setCreateTimeIsSet(true);
}
/**
@@ -659,8 +656,8 @@ public class TSentryPrivilege implements org.apache.thrift.TBase<TSentryPrivileg
return false;
}
- boolean this_present_createTime = true;
- boolean that_present_createTime = true;
+ boolean this_present_createTime = true && this.isSetCreateTime();
+ boolean that_present_createTime = true && that.isSetCreateTime();
if (this_present_createTime || that_present_createTime) {
if (!(this_present_createTime && that_present_createTime))
return false;
@@ -719,7 +716,7 @@ public class TSentryPrivilege implements org.apache.thrift.TBase<TSentryPrivileg
if (present_action)
builder.append(action);
- boolean present_createTime = true;
+ boolean present_createTime = true && (isSetCreateTime());
builder.append(present_createTime);
if (present_createTime)
builder.append(createTime);
@@ -913,10 +910,12 @@ public class TSentryPrivilege implements org.apache.thrift.TBase<TSentryPrivileg
sb.append(this.action);
}
first = false;
- if (!first) sb.append(", ");
- sb.append("createTime:");
- sb.append(this.createTime);
- first = false;
+ if (isSetCreateTime()) {
+ if (!first) sb.append(", ");
+ sb.append("createTime:");
+ sb.append(this.createTime);
+ first = false;
+ }
if (isSetGrantorPrincipal()) {
if (!first) sb.append(", ");
sb.append("grantorPrincipal:");
@@ -945,10 +944,6 @@ public class TSentryPrivilege implements org.apache.thrift.TBase<TSentryPrivileg
throw new org.apache.thrift.protocol.TProtocolException("Required field 'action' is unset! Struct:" + toString());
}
- if (!isSetCreateTime()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'createTime' is unset! Struct:" + toString());
- }
-
// check for sub-struct validity
}
@@ -1116,9 +1111,11 @@ public class TSentryPrivilege implements org.apache.thrift.TBase<TSentryPrivileg
oprot.writeString(struct.action);
oprot.writeFieldEnd();
}
- oprot.writeFieldBegin(CREATE_TIME_FIELD_DESC);
- oprot.writeI64(struct.createTime);
- oprot.writeFieldEnd();
+ if (struct.isSetCreateTime()) {
+ oprot.writeFieldBegin(CREATE_TIME_FIELD_DESC);
+ oprot.writeI64(struct.createTime);
+ oprot.writeFieldEnd();
+ }
if (struct.grantorPrincipal != null) {
if (struct.isSetGrantorPrincipal()) {
oprot.writeFieldBegin(GRANTOR_PRINCIPAL_FIELD_DESC);
@@ -1146,7 +1143,6 @@ public class TSentryPrivilege implements org.apache.thrift.TBase<TSentryPrivileg
oprot.writeString(struct.privilegeScope);
oprot.writeString(struct.serverName);
oprot.writeString(struct.action);
- oprot.writeI64(struct.createTime);
BitSet optionals = new BitSet();
if (struct.isSetPrivilegeName()) {
optionals.set(0);
@@ -1160,10 +1156,13 @@ public class TSentryPrivilege implements org.apache.thrift.TBase<TSentryPrivileg
if (struct.isSetURI()) {
optionals.set(3);
}
- if (struct.isSetGrantorPrincipal()) {
+ if (struct.isSetCreateTime()) {
optionals.set(4);
}
- oprot.writeBitSet(optionals, 5);
+ if (struct.isSetGrantorPrincipal()) {
+ optionals.set(5);
+ }
+ oprot.writeBitSet(optionals, 6);
if (struct.isSetPrivilegeName()) {
oprot.writeString(struct.privilegeName);
}
@@ -1176,6 +1175,9 @@ public class TSentryPrivilege implements org.apache.thrift.TBase<TSentryPrivileg
if (struct.isSetURI()) {
oprot.writeString(struct.URI);
}
+ if (struct.isSetCreateTime()) {
+ oprot.writeI64(struct.createTime);
+ }
if (struct.isSetGrantorPrincipal()) {
oprot.writeString(struct.grantorPrincipal);
}
@@ -1190,9 +1192,7 @@ public class TSentryPrivilege implements org.apache.thrift.TBase<TSentryPrivileg
struct.setServerNameIsSet(true);
struct.action = iprot.readString();
struct.setActionIsSet(true);
- struct.createTime = iprot.readI64();
- struct.setCreateTimeIsSet(true);
- BitSet incoming = iprot.readBitSet(5);
+ BitSet incoming = iprot.readBitSet(6);
if (incoming.get(0)) {
struct.privilegeName = iprot.readString();
struct.setPrivilegeNameIsSet(true);
@@ -1210,6 +1210,10 @@ public class TSentryPrivilege implements org.apache.thrift.TBase<TSentryPrivileg
struct.setURIIsSet(true);
}
if (incoming.get(4)) {
+ struct.createTime = iprot.readI64();
+ struct.setCreateTimeIsSet(true);
+ }
+ if (incoming.get(5)) {
struct.grantorPrincipal = iprot.readString();
struct.setGrantorPrincipalIsSet(true);
}
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/07767a1c/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/thrift/SentryPolicyStoreProcessor.java
----------------------------------------------------------------------
diff --git a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/thrift/SentryPolicyStoreProcessor.java b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/thrift/SentryPolicyStoreProcessor.java
index ff4817f..3fe47dc 100644
--- a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/thrift/SentryPolicyStoreProcessor.java
+++ b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/thrift/SentryPolicyStoreProcessor.java
@@ -252,8 +252,8 @@ public class SentryPolicyStoreProcessor implements SentryPolicyService.Iface {
TAlterSentryRoleAddGroupsRequest request) throws TException {
TAlterSentryRoleAddGroupsResponse response = new TAlterSentryRoleAddGroupsResponse();
try {
- CommitContext commitContext = sentryStore.alterSentryRoleAddGroups(request.getUserName(),
- request.getRoleName(), request.getGroups());
+ CommitContext commitContext = sentryStore.alterSentryRoleAddGroups(request.getRequestorUserName(),
+ request.getRoleName(), request.getGroups());
response.setStatus(Status.OK());
notificationHandlerInvoker.alter_sentry_role_add_groups(commitContext,
request, response);
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/07767a1c/sentry-provider/sentry-provider-db/src/main/resources/sentry_policy_service.thrift
----------------------------------------------------------------------
diff --git a/sentry-provider/sentry-provider-db/src/main/resources/sentry_policy_service.thrift b/sentry-provider/sentry-provider-db/src/main/resources/sentry_policy_service.thrift
index 7c54290..b3f7d6e 100644
--- a/sentry-provider/sentry-provider-db/src/main/resources/sentry_policy_service.thrift
+++ b/sentry-provider/sentry-provider-db/src/main/resources/sentry_policy_service.thrift
@@ -37,14 +37,16 @@ struct TSentryPrivilege {
5: optional string tableName,
6: optional string URI,
7: required string action,
-8: required i64 createTime,
-9: optional string grantorPrincipal
+8: optional i64 createTime, # Set on server side
+9: optional string grantorPrincipal # Set on server side
}
struct TSentryRole {
1: required string roleName,
# TODO privs should not be part of Sentry role as
# they are created when a grant is executed
+# They need to be returned as part of the list role API, else
+# there would be another round trip
2: required set<TSentryPrivilege> privileges,
3: required i64 createTime,
4: required string grantorPrincipal
@@ -57,8 +59,9 @@ struct TSentryGroup {
struct TCreateSentryRoleRequest {
1: required i32 protocol_version = sentry_common_service.TSENTRY_SERVICE_V1,
-2: required string userName,
-3: required TSentryRole role
+2: required string requestorUserName,
+3: required TSentryRole role,
+4: required set<string> requestorGroupName
}
struct TCreateSentryRoleResponse {
1: required sentry_common_service.TSentryResponseStatus status
@@ -66,9 +69,10 @@ struct TCreateSentryRoleResponse {
struct TListSentryRolesRequest {
1: required i32 protocol_version = sentry_common_service.TSENTRY_SERVICE_V1,
-2: optional string userName,
-3: optional string groupName,
-4: optional string roleName
+2: required string requestorUserName, # user on whose behalf the request is issued
+3: optional string rolerequestorGroupName, # list roles for this group
+4: required string roleName,
+5: required set<string> requestorGroupName # groups the requesting user belongs to
}
struct TListSentryRolesResponse {
1: required sentry_common_service.TSentryResponseStatus status
@@ -77,8 +81,9 @@ struct TListSentryRolesResponse {
struct TDropSentryRoleRequest {
1: required i32 protocol_version = sentry_common_service.TSENTRY_SERVICE_V1,
-2: optional string userName,
-3: optional string roleName
+2: required string requestorUserName,
+3: required string roleName,
+4: required set<string> requestorGroupName
}
struct TDropSentryRoleResponse {
1: required sentry_common_service.TSentryResponseStatus status
@@ -86,9 +91,10 @@ struct TDropSentryRoleResponse {
struct TAlterSentryRoleAddGroupsRequest {
1: required i32 protocol_version = sentry_common_service.TSENTRY_SERVICE_V1,
-2: required string userName,
+2: required string requestorUserName,
3: required string roleName,
-4: required set<TSentryGroup> groups
+4: required set<string> requestorGroupName,
+5: required set<TSentryGroup> groups
}
struct TAlterSentryRoleAddGroupsResponse {
@@ -97,7 +103,8 @@ struct TAlterSentryRoleAddGroupsResponse {
struct TAlterSentryRoleDeleteGroupsRequest {
1: required i32 protocol_version = sentry_common_service.TSENTRY_SERVICE_V1,
-2: required string userName,
+2: required string requestorUserName,
+3: required set<string> requestorGroupName
}
struct TAlterSentryRoleDeleteGroupsResponse {
1: required sentry_common_service.TSentryResponseStatus status
@@ -105,9 +112,10 @@ struct TAlterSentryRoleDeleteGroupsResponse {
struct TAlterSentryRoleGrantPrivilegeRequest {
1: required i32 protocol_version = sentry_common_service.TSENTRY_SERVICE_V1,
-2: required string userName,
+2: required string requestorUserName,
3: required string roleName,
-4: required TSentryPrivilege privilege
+4: required set<string> requestorGroupName,
+5: required TSentryPrivilege privilege
}
struct TAlterSentryRoleGrantPrivilegeResponse {
@@ -116,9 +124,10 @@ struct TAlterSentryRoleGrantPrivilegeResponse {
struct TAlterSentryRoleRevokePrivilegeRequest {
1: required i32 protocol_version = sentry_common_service.TSENTRY_SERVICE_V1,
-2: required string userName,
+2: required string requestorUserName,
3: required string roleName,
-4: required TSentryPrivilege privilege
+4: required set<string> requestorGroupName,
+5: required TSentryPrivilege privilege
}
struct TAlterSentryRoleRevokePrivilegeResponse {
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/07767a1c/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/service/thrift/TestSentryServiceIntegration.java
----------------------------------------------------------------------
diff --git a/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/service/thrift/TestSentryServiceIntegration.java b/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/service/thrift/TestSentryServiceIntegration.java
index dae7674..d073d8b 100644
--- a/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/service/thrift/TestSentryServiceIntegration.java
+++ b/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/service/thrift/TestSentryServiceIntegration.java
@@ -34,17 +34,23 @@ public class TestSentryServiceIntegration extends SentryServiceIntegrationBase {
@Test
public void testCreateRole() throws Exception {
+ Set<String> groupSet = new HashSet<String>();
TDropSentryRoleRequest dropReq = new TDropSentryRoleRequest();
dropReq.setProtocol_version(ThriftConstants.TSENTRY_SERVICE_VERSION_CURRENT);
dropReq.setRoleName("admin_r");
- dropReq.setUserName("user_1");
+ dropReq.setRequestorUserName("user_1");
+ groupSet.add("admin");
+ dropReq.setRequestorGroupName(groupSet);
TDropSentryRoleResponse dropResp = client.dropRole(dropReq);
assertStatus(Status.NO_SUCH_OBJECT, dropResp.getStatus());
LOGGER.info("Successfully dropped role: admin_r");
+ groupSet.clear();
TCreateSentryRoleRequest createReq = new TCreateSentryRoleRequest();
createReq.setProtocol_version(ThriftConstants.TSENTRY_SERVICE_VERSION_CURRENT);
- createReq.setUserName("user_1");
+ createReq.setRequestorUserName("user_1");
+ groupSet.add("admin");
+ createReq.setRequestorGroupName(groupSet);
TSentryRole role = new TSentryRole();
role.setRoleName("admin_r");
role.setCreateTime(System.currentTimeMillis());
@@ -54,36 +60,49 @@ public class TestSentryServiceIntegration extends SentryServiceIntegrationBase {
TCreateSentryRoleResponse createResp = client.createRole(createReq);
assertOK(createResp.getStatus());
LOGGER.info("Successfully create role: admin_r");
+ groupSet.clear();
TListSentryRolesRequest listReq = new TListSentryRolesRequest();
listReq.setProtocol_version(ThriftConstants.TSENTRY_SERVICE_VERSION_CURRENT);
listReq.setRoleName("admin_r");
- listReq.setUserName("user_1");
+ listReq.setRequestorUserName("user_1");
+ groupSet.add("admin");
+ listReq.setRequestorGroupName(groupSet);
TListSentryRolesResponse listResp = client.listRoleByName(listReq);
Set<TSentryRole> roles = listResp.getRoles();
Preconditions.checkArgument(roles.size() == 1, "Incorrect number of roles");
+ groupSet.clear();
dropReq.setProtocol_version(ThriftConstants.TSENTRY_SERVICE_VERSION_CURRENT);
dropReq.setRoleName("admin_r");
- dropReq.setUserName("user_1");
+ dropReq.setRequestorUserName("user_1");
+ groupSet.add("admin");
+ dropReq.setRequestorGroupName(groupSet);
dropResp = client.dropRole(dropReq);
assertOK(dropResp.getStatus());
LOGGER.info("Successfully dropped role: admin_r");
+ groupSet.clear();
}
@Test
public void testGrantRevokePrivilege() throws Exception {
+ Set<String> groupSet = new HashSet<String>();
TDropSentryRoleRequest dropReq = new TDropSentryRoleRequest();
dropReq.setProtocol_version(ThriftConstants.TSENTRY_SERVICE_VERSION_CURRENT);
dropReq.setRoleName("admin_testdb");
- dropReq.setUserName("server_admin");
+ dropReq.setRequestorUserName("server_admin");
+ groupSet.add("admin");
+ dropReq.setRequestorGroupName(groupSet);
TDropSentryRoleResponse dropResp = client.dropRole(dropReq);
assertStatus(Status.NO_SUCH_OBJECT, dropResp.getStatus());
LOGGER.info("Successfully dropped role: admin_testdb");
+ groupSet.clear();
TCreateSentryRoleRequest createReq = new TCreateSentryRoleRequest();
createReq.setProtocol_version(ThriftConstants.TSENTRY_SERVICE_VERSION_CURRENT);
- createReq.setUserName("server_admin");
+ createReq.setRequestorUserName("server_admin");
+ groupSet.add("admin");
+ createReq.setRequestorGroupName(groupSet);
TSentryRole role = new TSentryRole();
role.setRoleName("admin_testdb");
role.setCreateTime(System.currentTimeMillis());
@@ -93,19 +112,25 @@ public class TestSentryServiceIntegration extends SentryServiceIntegrationBase {
TCreateSentryRoleResponse createResp = client.createRole(createReq);
assertOK(createResp.getStatus());
LOGGER.info("Successfully create role: admin_testdb");
+ groupSet.clear();
TListSentryRolesRequest listReq = new TListSentryRolesRequest();
listReq.setProtocol_version(ThriftConstants.TSENTRY_SERVICE_VERSION_CURRENT);
listReq.setRoleName("admin_testdb");
- listReq.setUserName("server_admin");
+ listReq.setRequestorUserName("server_admin");
+ groupSet.add("admin");
+ listReq.setRequestorGroupName(groupSet);
TListSentryRolesResponse listResp = client.listRoleByName(listReq);
Set<TSentryRole> roles = listResp.getRoles();
Preconditions.checkArgument(roles.size() == 1, "Incorrect number of roles");
+ groupSet.clear();
TAlterSentryRoleGrantPrivilegeRequest grantReq = new TAlterSentryRoleGrantPrivilegeRequest();
grantReq.setProtocol_version(ThriftConstants.TSENTRY_SERVICE_VERSION_CURRENT);
grantReq.setRoleName("admin_testdb");
- grantReq.setUserName("server_admin");
+ grantReq.setRequestorUserName("server_admin");
+ groupSet.add("admin");
+ grantReq.setRequestorGroupName(groupSet);
TSentryPrivilege privilege = new TSentryPrivilege();
privilege.setPrivilegeScope("DB");
privilege.setServerName("server1");
@@ -117,22 +142,29 @@ public class TestSentryServiceIntegration extends SentryServiceIntegrationBase {
TAlterSentryRoleGrantPrivilegeResponse grantResp = client.grantPrivilege(grantReq);
assertOK(grantResp.getStatus());
LOGGER.info("Successfully granted privilege: " + privilege.toString());
+ groupSet.clear();
TAlterSentryRoleRevokePrivilegeRequest revokeReq = new TAlterSentryRoleRevokePrivilegeRequest();
revokeReq.setProtocol_version(ThriftConstants.TSENTRY_SERVICE_VERSION_CURRENT);
revokeReq.setRoleName("admin_testdb");
- revokeReq.setUserName("server_admin");
+ revokeReq.setRequestorUserName("server_admin");
+ groupSet.add("admin");
+ revokeReq.setRequestorGroupName(groupSet);
revokeReq.setPrivilege(privilege);
TAlterSentryRoleRevokePrivilegeResponse revokeResp = client.revokePrivilege(revokeReq);
assertOK(revokeResp.getStatus());
LOGGER.info("Successfully revoked privilege: " + privilege.toString());
+ groupSet.clear();
dropReq.setProtocol_version(ThriftConstants.TSENTRY_SERVICE_VERSION_CURRENT);
dropReq.setRoleName("admin_testdb");
- dropReq.setUserName("server_admin");
+ dropReq.setRequestorUserName("server_admin");
+ groupSet.add("admin");
+ dropReq.setRequestorGroupName(groupSet);
dropResp = client.dropRole(dropReq);
assertOK(dropResp.getStatus());
LOGGER.info("Successfully dropped role: admin_testdb");
+ groupSet.clear();
}
}
[3/3] git commit: SENTRY-136 - Thrift request structs should include
the groupName in addition to the userName (Shreepadma via Brock)
Posted by br...@apache.org.
SENTRY-136 - Thrift request structs should include the groupName in addition to the userName (Shreepadma via Brock)
Project: http://git-wip-us.apache.org/repos/asf/incubator-sentry/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-sentry/commit/07767a1c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-sentry/tree/07767a1c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-sentry/diff/07767a1c
Branch: refs/heads/db_policy_store
Commit: 07767a1ce92340d2334c9d637eb6ea2f4abac055
Parents: 066f993
Author: Brock Noland <br...@apache.org>
Authored: Thu Mar 13 09:25:00 2014 -0500
Committer: Brock Noland <br...@apache.org>
Committed: Thu Mar 13 09:25:00 2014 -0500
----------------------------------------------------------------------
.../TAlterSentryRoleAddGroupsRequest.java | 307 +++++++++----
.../TAlterSentryRoleDeleteGroupsRequest.java | 263 ++++++++---
.../TAlterSentryRoleGrantPrivilegeRequest.java | 271 ++++++++---
.../TAlterSentryRoleRevokePrivilegeRequest.java | 271 ++++++++---
.../thrift/TCreateSentryRoleRequest.java | 267 ++++++++---
.../service/thrift/TDropSentryRoleRequest.java | 331 ++++++++++----
.../service/thrift/TListSentryRolesRequest.java | 447 ++++++++++++-------
.../thrift/TListSentryRolesResponse.java | 36 +-
.../db/service/thrift/TSentryPrivilege.java | 58 +--
.../thrift/SentryPolicyStoreProcessor.java | 4 +-
.../main/resources/sentry_policy_service.thrift | 41 +-
.../thrift/TestSentryServiceIntegration.java | 52 ++-
12 files changed, 1720 insertions(+), 628 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/07767a1c/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TAlterSentryRoleAddGroupsRequest.java
----------------------------------------------------------------------
diff --git a/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TAlterSentryRoleAddGroupsRequest.java b/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TAlterSentryRoleAddGroupsRequest.java
index 86dcc54..de4985d 100644
--- a/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TAlterSentryRoleAddGroupsRequest.java
+++ b/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TAlterSentryRoleAddGroupsRequest.java
@@ -35,9 +35,10 @@ public class TAlterSentryRoleAddGroupsRequest implements org.apache.thrift.TBase
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TAlterSentryRoleAddGroupsRequest");
private static final org.apache.thrift.protocol.TField PROTOCOL_VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("protocol_version", org.apache.thrift.protocol.TType.I32, (short)1);
- private static final org.apache.thrift.protocol.TField USER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("userName", org.apache.thrift.protocol.TType.STRING, (short)2);
+ private static final org.apache.thrift.protocol.TField REQUESTOR_USER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("requestorUserName", org.apache.thrift.protocol.TType.STRING, (short)2);
private static final org.apache.thrift.protocol.TField ROLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("roleName", org.apache.thrift.protocol.TType.STRING, (short)3);
- private static final org.apache.thrift.protocol.TField GROUPS_FIELD_DESC = new org.apache.thrift.protocol.TField("groups", org.apache.thrift.protocol.TType.SET, (short)4);
+ private static final org.apache.thrift.protocol.TField REQUESTOR_GROUP_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("requestorGroupName", org.apache.thrift.protocol.TType.SET, (short)4);
+ private static final org.apache.thrift.protocol.TField GROUPS_FIELD_DESC = new org.apache.thrift.protocol.TField("groups", org.apache.thrift.protocol.TType.SET, (short)5);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -46,16 +47,18 @@ public class TAlterSentryRoleAddGroupsRequest implements org.apache.thrift.TBase
}
private int protocol_version; // required
- private String userName; // required
+ private String requestorUserName; // required
private String roleName; // required
+ private Set<String> requestorGroupName; // required
private Set<TSentryGroup> groups; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
PROTOCOL_VERSION((short)1, "protocol_version"),
- USER_NAME((short)2, "userName"),
+ REQUESTOR_USER_NAME((short)2, "requestorUserName"),
ROLE_NAME((short)3, "roleName"),
- GROUPS((short)4, "groups");
+ REQUESTOR_GROUP_NAME((short)4, "requestorGroupName"),
+ GROUPS((short)5, "groups");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -72,11 +75,13 @@ public class TAlterSentryRoleAddGroupsRequest implements org.apache.thrift.TBase
switch(fieldId) {
case 1: // PROTOCOL_VERSION
return PROTOCOL_VERSION;
- case 2: // USER_NAME
- return USER_NAME;
+ case 2: // REQUESTOR_USER_NAME
+ return REQUESTOR_USER_NAME;
case 3: // ROLE_NAME
return ROLE_NAME;
- case 4: // GROUPS
+ case 4: // REQUESTOR_GROUP_NAME
+ return REQUESTOR_GROUP_NAME;
+ case 5: // GROUPS
return GROUPS;
default:
return null;
@@ -125,10 +130,13 @@ public class TAlterSentryRoleAddGroupsRequest implements org.apache.thrift.TBase
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
tmpMap.put(_Fields.PROTOCOL_VERSION, new org.apache.thrift.meta_data.FieldMetaData("protocol_version", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
- tmpMap.put(_Fields.USER_NAME, new org.apache.thrift.meta_data.FieldMetaData("userName", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ tmpMap.put(_Fields.REQUESTOR_USER_NAME, new org.apache.thrift.meta_data.FieldMetaData("requestorUserName", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.ROLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("roleName", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.REQUESTOR_GROUP_NAME, new org.apache.thrift.meta_data.FieldMetaData("requestorGroupName", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.SetMetaData(org.apache.thrift.protocol.TType.SET,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
tmpMap.put(_Fields.GROUPS, new org.apache.thrift.meta_data.FieldMetaData("groups", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.SetMetaData(org.apache.thrift.protocol.TType.SET,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TSentryGroup.class))));
@@ -143,15 +151,17 @@ public class TAlterSentryRoleAddGroupsRequest implements org.apache.thrift.TBase
public TAlterSentryRoleAddGroupsRequest(
int protocol_version,
- String userName,
+ String requestorUserName,
String roleName,
+ Set<String> requestorGroupName,
Set<TSentryGroup> groups)
{
this();
this.protocol_version = protocol_version;
setProtocol_versionIsSet(true);
- this.userName = userName;
+ this.requestorUserName = requestorUserName;
this.roleName = roleName;
+ this.requestorGroupName = requestorGroupName;
this.groups = groups;
}
@@ -161,12 +171,19 @@ public class TAlterSentryRoleAddGroupsRequest implements org.apache.thrift.TBase
public TAlterSentryRoleAddGroupsRequest(TAlterSentryRoleAddGroupsRequest other) {
__isset_bitfield = other.__isset_bitfield;
this.protocol_version = other.protocol_version;
- if (other.isSetUserName()) {
- this.userName = other.userName;
+ if (other.isSetRequestorUserName()) {
+ this.requestorUserName = other.requestorUserName;
}
if (other.isSetRoleName()) {
this.roleName = other.roleName;
}
+ if (other.isSetRequestorGroupName()) {
+ Set<String> __this__requestorGroupName = new HashSet<String>();
+ for (String other_element : other.requestorGroupName) {
+ __this__requestorGroupName.add(other_element);
+ }
+ this.requestorGroupName = __this__requestorGroupName;
+ }
if (other.isSetGroups()) {
Set<TSentryGroup> __this__groups = new HashSet<TSentryGroup>();
for (TSentryGroup other_element : other.groups) {
@@ -184,8 +201,9 @@ public class TAlterSentryRoleAddGroupsRequest implements org.apache.thrift.TBase
public void clear() {
this.protocol_version = 1;
- this.userName = null;
+ this.requestorUserName = null;
this.roleName = null;
+ this.requestorGroupName = null;
this.groups = null;
}
@@ -211,26 +229,26 @@ public class TAlterSentryRoleAddGroupsRequest implements org.apache.thrift.TBase
__isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PROTOCOL_VERSION_ISSET_ID, value);
}
- public String getUserName() {
- return this.userName;
+ public String getRequestorUserName() {
+ return this.requestorUserName;
}
- public void setUserName(String userName) {
- this.userName = userName;
+ public void setRequestorUserName(String requestorUserName) {
+ this.requestorUserName = requestorUserName;
}
- public void unsetUserName() {
- this.userName = null;
+ public void unsetRequestorUserName() {
+ this.requestorUserName = null;
}
- /** Returns true if field userName is set (has been assigned a value) and false otherwise */
- public boolean isSetUserName() {
- return this.userName != null;
+ /** Returns true if field requestorUserName is set (has been assigned a value) and false otherwise */
+ public boolean isSetRequestorUserName() {
+ return this.requestorUserName != null;
}
- public void setUserNameIsSet(boolean value) {
+ public void setRequestorUserNameIsSet(boolean value) {
if (!value) {
- this.userName = null;
+ this.requestorUserName = null;
}
}
@@ -257,6 +275,44 @@ public class TAlterSentryRoleAddGroupsRequest implements org.apache.thrift.TBase
}
}
+ public int getRequestorGroupNameSize() {
+ return (this.requestorGroupName == null) ? 0 : this.requestorGroupName.size();
+ }
+
+ public java.util.Iterator<String> getRequestorGroupNameIterator() {
+ return (this.requestorGroupName == null) ? null : this.requestorGroupName.iterator();
+ }
+
+ public void addToRequestorGroupName(String elem) {
+ if (this.requestorGroupName == null) {
+ this.requestorGroupName = new HashSet<String>();
+ }
+ this.requestorGroupName.add(elem);
+ }
+
+ public Set<String> getRequestorGroupName() {
+ return this.requestorGroupName;
+ }
+
+ public void setRequestorGroupName(Set<String> requestorGroupName) {
+ this.requestorGroupName = requestorGroupName;
+ }
+
+ public void unsetRequestorGroupName() {
+ this.requestorGroupName = null;
+ }
+
+ /** Returns true if field requestorGroupName is set (has been assigned a value) and false otherwise */
+ public boolean isSetRequestorGroupName() {
+ return this.requestorGroupName != null;
+ }
+
+ public void setRequestorGroupNameIsSet(boolean value) {
+ if (!value) {
+ this.requestorGroupName = null;
+ }
+ }
+
public int getGroupsSize() {
return (this.groups == null) ? 0 : this.groups.size();
}
@@ -305,11 +361,11 @@ public class TAlterSentryRoleAddGroupsRequest implements org.apache.thrift.TBase
}
break;
- case USER_NAME:
+ case REQUESTOR_USER_NAME:
if (value == null) {
- unsetUserName();
+ unsetRequestorUserName();
} else {
- setUserName((String)value);
+ setRequestorUserName((String)value);
}
break;
@@ -321,6 +377,14 @@ public class TAlterSentryRoleAddGroupsRequest implements org.apache.thrift.TBase
}
break;
+ case REQUESTOR_GROUP_NAME:
+ if (value == null) {
+ unsetRequestorGroupName();
+ } else {
+ setRequestorGroupName((Set<String>)value);
+ }
+ break;
+
case GROUPS:
if (value == null) {
unsetGroups();
@@ -337,12 +401,15 @@ public class TAlterSentryRoleAddGroupsRequest implements org.apache.thrift.TBase
case PROTOCOL_VERSION:
return Integer.valueOf(getProtocol_version());
- case USER_NAME:
- return getUserName();
+ case REQUESTOR_USER_NAME:
+ return getRequestorUserName();
case ROLE_NAME:
return getRoleName();
+ case REQUESTOR_GROUP_NAME:
+ return getRequestorGroupName();
+
case GROUPS:
return getGroups();
@@ -359,10 +426,12 @@ public class TAlterSentryRoleAddGroupsRequest implements org.apache.thrift.TBase
switch (field) {
case PROTOCOL_VERSION:
return isSetProtocol_version();
- case USER_NAME:
- return isSetUserName();
+ case REQUESTOR_USER_NAME:
+ return isSetRequestorUserName();
case ROLE_NAME:
return isSetRoleName();
+ case REQUESTOR_GROUP_NAME:
+ return isSetRequestorGroupName();
case GROUPS:
return isSetGroups();
}
@@ -391,12 +460,12 @@ public class TAlterSentryRoleAddGroupsRequest implements org.apache.thrift.TBase
return false;
}
- boolean this_present_userName = true && this.isSetUserName();
- boolean that_present_userName = true && that.isSetUserName();
- if (this_present_userName || that_present_userName) {
- if (!(this_present_userName && that_present_userName))
+ boolean this_present_requestorUserName = true && this.isSetRequestorUserName();
+ boolean that_present_requestorUserName = true && that.isSetRequestorUserName();
+ if (this_present_requestorUserName || that_present_requestorUserName) {
+ if (!(this_present_requestorUserName && that_present_requestorUserName))
return false;
- if (!this.userName.equals(that.userName))
+ if (!this.requestorUserName.equals(that.requestorUserName))
return false;
}
@@ -409,6 +478,15 @@ public class TAlterSentryRoleAddGroupsRequest implements org.apache.thrift.TBase
return false;
}
+ boolean this_present_requestorGroupName = true && this.isSetRequestorGroupName();
+ boolean that_present_requestorGroupName = true && that.isSetRequestorGroupName();
+ if (this_present_requestorGroupName || that_present_requestorGroupName) {
+ if (!(this_present_requestorGroupName && that_present_requestorGroupName))
+ return false;
+ if (!this.requestorGroupName.equals(that.requestorGroupName))
+ return false;
+ }
+
boolean this_present_groups = true && this.isSetGroups();
boolean that_present_groups = true && that.isSetGroups();
if (this_present_groups || that_present_groups) {
@@ -430,16 +508,21 @@ public class TAlterSentryRoleAddGroupsRequest implements org.apache.thrift.TBase
if (present_protocol_version)
builder.append(protocol_version);
- boolean present_userName = true && (isSetUserName());
- builder.append(present_userName);
- if (present_userName)
- builder.append(userName);
+ boolean present_requestorUserName = true && (isSetRequestorUserName());
+ builder.append(present_requestorUserName);
+ if (present_requestorUserName)
+ builder.append(requestorUserName);
boolean present_roleName = true && (isSetRoleName());
builder.append(present_roleName);
if (present_roleName)
builder.append(roleName);
+ boolean present_requestorGroupName = true && (isSetRequestorGroupName());
+ builder.append(present_requestorGroupName);
+ if (present_requestorGroupName)
+ builder.append(requestorGroupName);
+
boolean present_groups = true && (isSetGroups());
builder.append(present_groups);
if (present_groups)
@@ -466,12 +549,12 @@ public class TAlterSentryRoleAddGroupsRequest implements org.apache.thrift.TBase
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetUserName()).compareTo(typedOther.isSetUserName());
+ lastComparison = Boolean.valueOf(isSetRequestorUserName()).compareTo(typedOther.isSetRequestorUserName());
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetUserName()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userName, typedOther.userName);
+ if (isSetRequestorUserName()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.requestorUserName, typedOther.requestorUserName);
if (lastComparison != 0) {
return lastComparison;
}
@@ -486,6 +569,16 @@ public class TAlterSentryRoleAddGroupsRequest implements org.apache.thrift.TBase
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetRequestorGroupName()).compareTo(typedOther.isSetRequestorGroupName());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetRequestorGroupName()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.requestorGroupName, typedOther.requestorGroupName);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
lastComparison = Boolean.valueOf(isSetGroups()).compareTo(typedOther.isSetGroups());
if (lastComparison != 0) {
return lastComparison;
@@ -520,11 +613,11 @@ public class TAlterSentryRoleAddGroupsRequest implements org.apache.thrift.TBase
sb.append(this.protocol_version);
first = false;
if (!first) sb.append(", ");
- sb.append("userName:");
- if (this.userName == null) {
+ sb.append("requestorUserName:");
+ if (this.requestorUserName == null) {
sb.append("null");
} else {
- sb.append(this.userName);
+ sb.append(this.requestorUserName);
}
first = false;
if (!first) sb.append(", ");
@@ -536,6 +629,14 @@ public class TAlterSentryRoleAddGroupsRequest implements org.apache.thrift.TBase
}
first = false;
if (!first) sb.append(", ");
+ sb.append("requestorGroupName:");
+ if (this.requestorGroupName == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.requestorGroupName);
+ }
+ first = false;
+ if (!first) sb.append(", ");
sb.append("groups:");
if (this.groups == null) {
sb.append("null");
@@ -553,14 +654,18 @@ public class TAlterSentryRoleAddGroupsRequest implements org.apache.thrift.TBase
throw new org.apache.thrift.protocol.TProtocolException("Required field 'protocol_version' is unset! Struct:" + toString());
}
- if (!isSetUserName()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'userName' is unset! Struct:" + toString());
+ if (!isSetRequestorUserName()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'requestorUserName' is unset! Struct:" + toString());
}
if (!isSetRoleName()) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'roleName' is unset! Struct:" + toString());
}
+ if (!isSetRequestorGroupName()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'requestorGroupName' is unset! Struct:" + toString());
+ }
+
if (!isSetGroups()) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'groups' is unset! Struct:" + toString());
}
@@ -612,10 +717,10 @@ public class TAlterSentryRoleAddGroupsRequest implements org.apache.thrift.TBase
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 2: // USER_NAME
+ case 2: // REQUESTOR_USER_NAME
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.userName = iprot.readString();
- struct.setUserNameIsSet(true);
+ struct.requestorUserName = iprot.readString();
+ struct.setRequestorUserNameIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -628,17 +733,35 @@ public class TAlterSentryRoleAddGroupsRequest implements org.apache.thrift.TBase
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 4: // GROUPS
+ case 4: // REQUESTOR_GROUP_NAME
+ if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
+ {
+ org.apache.thrift.protocol.TSet _set40 = iprot.readSetBegin();
+ struct.requestorGroupName = new HashSet<String>(2*_set40.size);
+ for (int _i41 = 0; _i41 < _set40.size; ++_i41)
+ {
+ String _elem42; // required
+ _elem42 = iprot.readString();
+ struct.requestorGroupName.add(_elem42);
+ }
+ iprot.readSetEnd();
+ }
+ struct.setRequestorGroupNameIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 5: // GROUPS
if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
{
- org.apache.thrift.protocol.TSet _set16 = iprot.readSetBegin();
- struct.groups = new HashSet<TSentryGroup>(2*_set16.size);
- for (int _i17 = 0; _i17 < _set16.size; ++_i17)
+ org.apache.thrift.protocol.TSet _set43 = iprot.readSetBegin();
+ struct.groups = new HashSet<TSentryGroup>(2*_set43.size);
+ for (int _i44 = 0; _i44 < _set43.size; ++_i44)
{
- TSentryGroup _elem18; // required
- _elem18 = new TSentryGroup();
- _elem18.read(iprot);
- struct.groups.add(_elem18);
+ TSentryGroup _elem45; // required
+ _elem45 = new TSentryGroup();
+ _elem45.read(iprot);
+ struct.groups.add(_elem45);
}
iprot.readSetEnd();
}
@@ -663,9 +786,9 @@ public class TAlterSentryRoleAddGroupsRequest implements org.apache.thrift.TBase
oprot.writeFieldBegin(PROTOCOL_VERSION_FIELD_DESC);
oprot.writeI32(struct.protocol_version);
oprot.writeFieldEnd();
- if (struct.userName != null) {
- oprot.writeFieldBegin(USER_NAME_FIELD_DESC);
- oprot.writeString(struct.userName);
+ if (struct.requestorUserName != null) {
+ oprot.writeFieldBegin(REQUESTOR_USER_NAME_FIELD_DESC);
+ oprot.writeString(struct.requestorUserName);
oprot.writeFieldEnd();
}
if (struct.roleName != null) {
@@ -673,13 +796,25 @@ public class TAlterSentryRoleAddGroupsRequest implements org.apache.thrift.TBase
oprot.writeString(struct.roleName);
oprot.writeFieldEnd();
}
+ if (struct.requestorGroupName != null) {
+ oprot.writeFieldBegin(REQUESTOR_GROUP_NAME_FIELD_DESC);
+ {
+ oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, struct.requestorGroupName.size()));
+ for (String _iter46 : struct.requestorGroupName)
+ {
+ oprot.writeString(_iter46);
+ }
+ oprot.writeSetEnd();
+ }
+ oprot.writeFieldEnd();
+ }
if (struct.groups != null) {
oprot.writeFieldBegin(GROUPS_FIELD_DESC);
{
oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRUCT, struct.groups.size()));
- for (TSentryGroup _iter19 : struct.groups)
+ for (TSentryGroup _iter47 : struct.groups)
{
- _iter19.write(oprot);
+ _iter47.write(oprot);
}
oprot.writeSetEnd();
}
@@ -703,13 +838,20 @@ public class TAlterSentryRoleAddGroupsRequest implements org.apache.thrift.TBase
public void write(org.apache.thrift.protocol.TProtocol prot, TAlterSentryRoleAddGroupsRequest struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
oprot.writeI32(struct.protocol_version);
- oprot.writeString(struct.userName);
+ oprot.writeString(struct.requestorUserName);
oprot.writeString(struct.roleName);
{
+ oprot.writeI32(struct.requestorGroupName.size());
+ for (String _iter48 : struct.requestorGroupName)
+ {
+ oprot.writeString(_iter48);
+ }
+ }
+ {
oprot.writeI32(struct.groups.size());
- for (TSentryGroup _iter20 : struct.groups)
+ for (TSentryGroup _iter49 : struct.groups)
{
- _iter20.write(oprot);
+ _iter49.write(oprot);
}
}
}
@@ -719,19 +861,30 @@ public class TAlterSentryRoleAddGroupsRequest implements org.apache.thrift.TBase
TTupleProtocol iprot = (TTupleProtocol) prot;
struct.protocol_version = iprot.readI32();
struct.setProtocol_versionIsSet(true);
- struct.userName = iprot.readString();
- struct.setUserNameIsSet(true);
+ struct.requestorUserName = iprot.readString();
+ struct.setRequestorUserNameIsSet(true);
struct.roleName = iprot.readString();
struct.setRoleNameIsSet(true);
{
- org.apache.thrift.protocol.TSet _set21 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.groups = new HashSet<TSentryGroup>(2*_set21.size);
- for (int _i22 = 0; _i22 < _set21.size; ++_i22)
+ org.apache.thrift.protocol.TSet _set50 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.requestorGroupName = new HashSet<String>(2*_set50.size);
+ for (int _i51 = 0; _i51 < _set50.size; ++_i51)
+ {
+ String _elem52; // required
+ _elem52 = iprot.readString();
+ struct.requestorGroupName.add(_elem52);
+ }
+ }
+ struct.setRequestorGroupNameIsSet(true);
+ {
+ org.apache.thrift.protocol.TSet _set53 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.groups = new HashSet<TSentryGroup>(2*_set53.size);
+ for (int _i54 = 0; _i54 < _set53.size; ++_i54)
{
- TSentryGroup _elem23; // required
- _elem23 = new TSentryGroup();
- _elem23.read(iprot);
- struct.groups.add(_elem23);
+ TSentryGroup _elem55; // required
+ _elem55 = new TSentryGroup();
+ _elem55.read(iprot);
+ struct.groups.add(_elem55);
}
}
struct.setGroupsIsSet(true);
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/07767a1c/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TAlterSentryRoleDeleteGroupsRequest.java
----------------------------------------------------------------------
diff --git a/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TAlterSentryRoleDeleteGroupsRequest.java b/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TAlterSentryRoleDeleteGroupsRequest.java
index a1530d1..acfa5f5 100644
--- a/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TAlterSentryRoleDeleteGroupsRequest.java
+++ b/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TAlterSentryRoleDeleteGroupsRequest.java
@@ -35,7 +35,8 @@ public class TAlterSentryRoleDeleteGroupsRequest implements org.apache.thrift.TB
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TAlterSentryRoleDeleteGroupsRequest");
private static final org.apache.thrift.protocol.TField PROTOCOL_VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("protocol_version", org.apache.thrift.protocol.TType.I32, (short)1);
- private static final org.apache.thrift.protocol.TField USER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("userName", org.apache.thrift.protocol.TType.STRING, (short)2);
+ private static final org.apache.thrift.protocol.TField REQUESTOR_USER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("requestorUserName", org.apache.thrift.protocol.TType.STRING, (short)2);
+ private static final org.apache.thrift.protocol.TField REQUESTOR_GROUP_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("requestorGroupName", org.apache.thrift.protocol.TType.SET, (short)3);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -44,12 +45,14 @@ public class TAlterSentryRoleDeleteGroupsRequest implements org.apache.thrift.TB
}
private int protocol_version; // required
- private String userName; // required
+ private String requestorUserName; // required
+ private Set<String> requestorGroupName; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
PROTOCOL_VERSION((short)1, "protocol_version"),
- USER_NAME((short)2, "userName");
+ REQUESTOR_USER_NAME((short)2, "requestorUserName"),
+ REQUESTOR_GROUP_NAME((short)3, "requestorGroupName");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -66,8 +69,10 @@ public class TAlterSentryRoleDeleteGroupsRequest implements org.apache.thrift.TB
switch(fieldId) {
case 1: // PROTOCOL_VERSION
return PROTOCOL_VERSION;
- case 2: // USER_NAME
- return USER_NAME;
+ case 2: // REQUESTOR_USER_NAME
+ return REQUESTOR_USER_NAME;
+ case 3: // REQUESTOR_GROUP_NAME
+ return REQUESTOR_GROUP_NAME;
default:
return null;
}
@@ -115,8 +120,11 @@ public class TAlterSentryRoleDeleteGroupsRequest implements org.apache.thrift.TB
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
tmpMap.put(_Fields.PROTOCOL_VERSION, new org.apache.thrift.meta_data.FieldMetaData("protocol_version", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
- tmpMap.put(_Fields.USER_NAME, new org.apache.thrift.meta_data.FieldMetaData("userName", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ tmpMap.put(_Fields.REQUESTOR_USER_NAME, new org.apache.thrift.meta_data.FieldMetaData("requestorUserName", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.REQUESTOR_GROUP_NAME, new org.apache.thrift.meta_data.FieldMetaData("requestorGroupName", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.SetMetaData(org.apache.thrift.protocol.TType.SET,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TAlterSentryRoleDeleteGroupsRequest.class, metaDataMap);
}
@@ -128,12 +136,14 @@ public class TAlterSentryRoleDeleteGroupsRequest implements org.apache.thrift.TB
public TAlterSentryRoleDeleteGroupsRequest(
int protocol_version,
- String userName)
+ String requestorUserName,
+ Set<String> requestorGroupName)
{
this();
this.protocol_version = protocol_version;
setProtocol_versionIsSet(true);
- this.userName = userName;
+ this.requestorUserName = requestorUserName;
+ this.requestorGroupName = requestorGroupName;
}
/**
@@ -142,8 +152,15 @@ public class TAlterSentryRoleDeleteGroupsRequest implements org.apache.thrift.TB
public TAlterSentryRoleDeleteGroupsRequest(TAlterSentryRoleDeleteGroupsRequest other) {
__isset_bitfield = other.__isset_bitfield;
this.protocol_version = other.protocol_version;
- if (other.isSetUserName()) {
- this.userName = other.userName;
+ if (other.isSetRequestorUserName()) {
+ this.requestorUserName = other.requestorUserName;
+ }
+ if (other.isSetRequestorGroupName()) {
+ Set<String> __this__requestorGroupName = new HashSet<String>();
+ for (String other_element : other.requestorGroupName) {
+ __this__requestorGroupName.add(other_element);
+ }
+ this.requestorGroupName = __this__requestorGroupName;
}
}
@@ -155,7 +172,8 @@ public class TAlterSentryRoleDeleteGroupsRequest implements org.apache.thrift.TB
public void clear() {
this.protocol_version = 1;
- this.userName = null;
+ this.requestorUserName = null;
+ this.requestorGroupName = null;
}
public int getProtocol_version() {
@@ -180,26 +198,64 @@ public class TAlterSentryRoleDeleteGroupsRequest implements org.apache.thrift.TB
__isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PROTOCOL_VERSION_ISSET_ID, value);
}
- public String getUserName() {
- return this.userName;
+ public String getRequestorUserName() {
+ return this.requestorUserName;
+ }
+
+ public void setRequestorUserName(String requestorUserName) {
+ this.requestorUserName = requestorUserName;
+ }
+
+ public void unsetRequestorUserName() {
+ this.requestorUserName = null;
+ }
+
+ /** Returns true if field requestorUserName is set (has been assigned a value) and false otherwise */
+ public boolean isSetRequestorUserName() {
+ return this.requestorUserName != null;
+ }
+
+ public void setRequestorUserNameIsSet(boolean value) {
+ if (!value) {
+ this.requestorUserName = null;
+ }
+ }
+
+ public int getRequestorGroupNameSize() {
+ return (this.requestorGroupName == null) ? 0 : this.requestorGroupName.size();
+ }
+
+ public java.util.Iterator<String> getRequestorGroupNameIterator() {
+ return (this.requestorGroupName == null) ? null : this.requestorGroupName.iterator();
+ }
+
+ public void addToRequestorGroupName(String elem) {
+ if (this.requestorGroupName == null) {
+ this.requestorGroupName = new HashSet<String>();
+ }
+ this.requestorGroupName.add(elem);
+ }
+
+ public Set<String> getRequestorGroupName() {
+ return this.requestorGroupName;
}
- public void setUserName(String userName) {
- this.userName = userName;
+ public void setRequestorGroupName(Set<String> requestorGroupName) {
+ this.requestorGroupName = requestorGroupName;
}
- public void unsetUserName() {
- this.userName = null;
+ public void unsetRequestorGroupName() {
+ this.requestorGroupName = null;
}
- /** Returns true if field userName is set (has been assigned a value) and false otherwise */
- public boolean isSetUserName() {
- return this.userName != null;
+ /** Returns true if field requestorGroupName is set (has been assigned a value) and false otherwise */
+ public boolean isSetRequestorGroupName() {
+ return this.requestorGroupName != null;
}
- public void setUserNameIsSet(boolean value) {
+ public void setRequestorGroupNameIsSet(boolean value) {
if (!value) {
- this.userName = null;
+ this.requestorGroupName = null;
}
}
@@ -213,11 +269,19 @@ public class TAlterSentryRoleDeleteGroupsRequest implements org.apache.thrift.TB
}
break;
- case USER_NAME:
+ case REQUESTOR_USER_NAME:
if (value == null) {
- unsetUserName();
+ unsetRequestorUserName();
} else {
- setUserName((String)value);
+ setRequestorUserName((String)value);
+ }
+ break;
+
+ case REQUESTOR_GROUP_NAME:
+ if (value == null) {
+ unsetRequestorGroupName();
+ } else {
+ setRequestorGroupName((Set<String>)value);
}
break;
@@ -229,8 +293,11 @@ public class TAlterSentryRoleDeleteGroupsRequest implements org.apache.thrift.TB
case PROTOCOL_VERSION:
return Integer.valueOf(getProtocol_version());
- case USER_NAME:
- return getUserName();
+ case REQUESTOR_USER_NAME:
+ return getRequestorUserName();
+
+ case REQUESTOR_GROUP_NAME:
+ return getRequestorGroupName();
}
throw new IllegalStateException();
@@ -245,8 +312,10 @@ public class TAlterSentryRoleDeleteGroupsRequest implements org.apache.thrift.TB
switch (field) {
case PROTOCOL_VERSION:
return isSetProtocol_version();
- case USER_NAME:
- return isSetUserName();
+ case REQUESTOR_USER_NAME:
+ return isSetRequestorUserName();
+ case REQUESTOR_GROUP_NAME:
+ return isSetRequestorGroupName();
}
throw new IllegalStateException();
}
@@ -273,12 +342,21 @@ public class TAlterSentryRoleDeleteGroupsRequest implements org.apache.thrift.TB
return false;
}
- boolean this_present_userName = true && this.isSetUserName();
- boolean that_present_userName = true && that.isSetUserName();
- if (this_present_userName || that_present_userName) {
- if (!(this_present_userName && that_present_userName))
+ boolean this_present_requestorUserName = true && this.isSetRequestorUserName();
+ boolean that_present_requestorUserName = true && that.isSetRequestorUserName();
+ if (this_present_requestorUserName || that_present_requestorUserName) {
+ if (!(this_present_requestorUserName && that_present_requestorUserName))
return false;
- if (!this.userName.equals(that.userName))
+ if (!this.requestorUserName.equals(that.requestorUserName))
+ return false;
+ }
+
+ boolean this_present_requestorGroupName = true && this.isSetRequestorGroupName();
+ boolean that_present_requestorGroupName = true && that.isSetRequestorGroupName();
+ if (this_present_requestorGroupName || that_present_requestorGroupName) {
+ if (!(this_present_requestorGroupName && that_present_requestorGroupName))
+ return false;
+ if (!this.requestorGroupName.equals(that.requestorGroupName))
return false;
}
@@ -294,10 +372,15 @@ public class TAlterSentryRoleDeleteGroupsRequest implements org.apache.thrift.TB
if (present_protocol_version)
builder.append(protocol_version);
- boolean present_userName = true && (isSetUserName());
- builder.append(present_userName);
- if (present_userName)
- builder.append(userName);
+ boolean present_requestorUserName = true && (isSetRequestorUserName());
+ builder.append(present_requestorUserName);
+ if (present_requestorUserName)
+ builder.append(requestorUserName);
+
+ boolean present_requestorGroupName = true && (isSetRequestorGroupName());
+ builder.append(present_requestorGroupName);
+ if (present_requestorGroupName)
+ builder.append(requestorGroupName);
return builder.toHashCode();
}
@@ -320,12 +403,22 @@ public class TAlterSentryRoleDeleteGroupsRequest implements org.apache.thrift.TB
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetUserName()).compareTo(typedOther.isSetUserName());
+ lastComparison = Boolean.valueOf(isSetRequestorUserName()).compareTo(typedOther.isSetRequestorUserName());
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetUserName()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userName, typedOther.userName);
+ if (isSetRequestorUserName()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.requestorUserName, typedOther.requestorUserName);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetRequestorGroupName()).compareTo(typedOther.isSetRequestorGroupName());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetRequestorGroupName()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.requestorGroupName, typedOther.requestorGroupName);
if (lastComparison != 0) {
return lastComparison;
}
@@ -354,11 +447,19 @@ public class TAlterSentryRoleDeleteGroupsRequest implements org.apache.thrift.TB
sb.append(this.protocol_version);
first = false;
if (!first) sb.append(", ");
- sb.append("userName:");
- if (this.userName == null) {
+ sb.append("requestorUserName:");
+ if (this.requestorUserName == null) {
sb.append("null");
} else {
- sb.append(this.userName);
+ sb.append(this.requestorUserName);
+ }
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("requestorGroupName:");
+ if (this.requestorGroupName == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.requestorGroupName);
}
first = false;
sb.append(")");
@@ -371,8 +472,12 @@ public class TAlterSentryRoleDeleteGroupsRequest implements org.apache.thrift.TB
throw new org.apache.thrift.protocol.TProtocolException("Required field 'protocol_version' is unset! Struct:" + toString());
}
- if (!isSetUserName()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'userName' is unset! Struct:" + toString());
+ if (!isSetRequestorUserName()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'requestorUserName' is unset! Struct:" + toString());
+ }
+
+ if (!isSetRequestorGroupName()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'requestorGroupName' is unset! Struct:" + toString());
}
// check for sub-struct validity
@@ -422,10 +527,28 @@ public class TAlterSentryRoleDeleteGroupsRequest implements org.apache.thrift.TB
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 2: // USER_NAME
+ case 2: // REQUESTOR_USER_NAME
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.userName = iprot.readString();
- struct.setUserNameIsSet(true);
+ struct.requestorUserName = iprot.readString();
+ struct.setRequestorUserNameIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 3: // REQUESTOR_GROUP_NAME
+ if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
+ {
+ org.apache.thrift.protocol.TSet _set56 = iprot.readSetBegin();
+ struct.requestorGroupName = new HashSet<String>(2*_set56.size);
+ for (int _i57 = 0; _i57 < _set56.size; ++_i57)
+ {
+ String _elem58; // required
+ _elem58 = iprot.readString();
+ struct.requestorGroupName.add(_elem58);
+ }
+ iprot.readSetEnd();
+ }
+ struct.setRequestorGroupNameIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -446,9 +569,21 @@ public class TAlterSentryRoleDeleteGroupsRequest implements org.apache.thrift.TB
oprot.writeFieldBegin(PROTOCOL_VERSION_FIELD_DESC);
oprot.writeI32(struct.protocol_version);
oprot.writeFieldEnd();
- if (struct.userName != null) {
- oprot.writeFieldBegin(USER_NAME_FIELD_DESC);
- oprot.writeString(struct.userName);
+ if (struct.requestorUserName != null) {
+ oprot.writeFieldBegin(REQUESTOR_USER_NAME_FIELD_DESC);
+ oprot.writeString(struct.requestorUserName);
+ oprot.writeFieldEnd();
+ }
+ if (struct.requestorGroupName != null) {
+ oprot.writeFieldBegin(REQUESTOR_GROUP_NAME_FIELD_DESC);
+ {
+ oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, struct.requestorGroupName.size()));
+ for (String _iter59 : struct.requestorGroupName)
+ {
+ oprot.writeString(_iter59);
+ }
+ oprot.writeSetEnd();
+ }
oprot.writeFieldEnd();
}
oprot.writeFieldStop();
@@ -469,7 +604,14 @@ public class TAlterSentryRoleDeleteGroupsRequest implements org.apache.thrift.TB
public void write(org.apache.thrift.protocol.TProtocol prot, TAlterSentryRoleDeleteGroupsRequest struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
oprot.writeI32(struct.protocol_version);
- oprot.writeString(struct.userName);
+ oprot.writeString(struct.requestorUserName);
+ {
+ oprot.writeI32(struct.requestorGroupName.size());
+ for (String _iter60 : struct.requestorGroupName)
+ {
+ oprot.writeString(_iter60);
+ }
+ }
}
@Override
@@ -477,8 +619,19 @@ public class TAlterSentryRoleDeleteGroupsRequest implements org.apache.thrift.TB
TTupleProtocol iprot = (TTupleProtocol) prot;
struct.protocol_version = iprot.readI32();
struct.setProtocol_versionIsSet(true);
- struct.userName = iprot.readString();
- struct.setUserNameIsSet(true);
+ struct.requestorUserName = iprot.readString();
+ struct.setRequestorUserNameIsSet(true);
+ {
+ org.apache.thrift.protocol.TSet _set61 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.requestorGroupName = new HashSet<String>(2*_set61.size);
+ for (int _i62 = 0; _i62 < _set61.size; ++_i62)
+ {
+ String _elem63; // required
+ _elem63 = iprot.readString();
+ struct.requestorGroupName.add(_elem63);
+ }
+ }
+ struct.setRequestorGroupNameIsSet(true);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/07767a1c/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TAlterSentryRoleGrantPrivilegeRequest.java
----------------------------------------------------------------------
diff --git a/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TAlterSentryRoleGrantPrivilegeRequest.java b/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TAlterSentryRoleGrantPrivilegeRequest.java
index 237f55d..71e950c 100644
--- a/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TAlterSentryRoleGrantPrivilegeRequest.java
+++ b/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TAlterSentryRoleGrantPrivilegeRequest.java
@@ -35,9 +35,10 @@ public class TAlterSentryRoleGrantPrivilegeRequest implements org.apache.thrift.
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TAlterSentryRoleGrantPrivilegeRequest");
private static final org.apache.thrift.protocol.TField PROTOCOL_VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("protocol_version", org.apache.thrift.protocol.TType.I32, (short)1);
- private static final org.apache.thrift.protocol.TField USER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("userName", org.apache.thrift.protocol.TType.STRING, (short)2);
+ private static final org.apache.thrift.protocol.TField REQUESTOR_USER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("requestorUserName", org.apache.thrift.protocol.TType.STRING, (short)2);
private static final org.apache.thrift.protocol.TField ROLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("roleName", org.apache.thrift.protocol.TType.STRING, (short)3);
- private static final org.apache.thrift.protocol.TField PRIVILEGE_FIELD_DESC = new org.apache.thrift.protocol.TField("privilege", org.apache.thrift.protocol.TType.STRUCT, (short)4);
+ private static final org.apache.thrift.protocol.TField REQUESTOR_GROUP_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("requestorGroupName", org.apache.thrift.protocol.TType.SET, (short)4);
+ private static final org.apache.thrift.protocol.TField PRIVILEGE_FIELD_DESC = new org.apache.thrift.protocol.TField("privilege", org.apache.thrift.protocol.TType.STRUCT, (short)5);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -46,16 +47,18 @@ public class TAlterSentryRoleGrantPrivilegeRequest implements org.apache.thrift.
}
private int protocol_version; // required
- private String userName; // required
+ private String requestorUserName; // required
private String roleName; // required
+ private Set<String> requestorGroupName; // required
private TSentryPrivilege privilege; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
PROTOCOL_VERSION((short)1, "protocol_version"),
- USER_NAME((short)2, "userName"),
+ REQUESTOR_USER_NAME((short)2, "requestorUserName"),
ROLE_NAME((short)3, "roleName"),
- PRIVILEGE((short)4, "privilege");
+ REQUESTOR_GROUP_NAME((short)4, "requestorGroupName"),
+ PRIVILEGE((short)5, "privilege");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -72,11 +75,13 @@ public class TAlterSentryRoleGrantPrivilegeRequest implements org.apache.thrift.
switch(fieldId) {
case 1: // PROTOCOL_VERSION
return PROTOCOL_VERSION;
- case 2: // USER_NAME
- return USER_NAME;
+ case 2: // REQUESTOR_USER_NAME
+ return REQUESTOR_USER_NAME;
case 3: // ROLE_NAME
return ROLE_NAME;
- case 4: // PRIVILEGE
+ case 4: // REQUESTOR_GROUP_NAME
+ return REQUESTOR_GROUP_NAME;
+ case 5: // PRIVILEGE
return PRIVILEGE;
default:
return null;
@@ -125,10 +130,13 @@ public class TAlterSentryRoleGrantPrivilegeRequest implements org.apache.thrift.
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
tmpMap.put(_Fields.PROTOCOL_VERSION, new org.apache.thrift.meta_data.FieldMetaData("protocol_version", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
- tmpMap.put(_Fields.USER_NAME, new org.apache.thrift.meta_data.FieldMetaData("userName", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ tmpMap.put(_Fields.REQUESTOR_USER_NAME, new org.apache.thrift.meta_data.FieldMetaData("requestorUserName", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.ROLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("roleName", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.REQUESTOR_GROUP_NAME, new org.apache.thrift.meta_data.FieldMetaData("requestorGroupName", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.SetMetaData(org.apache.thrift.protocol.TType.SET,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
tmpMap.put(_Fields.PRIVILEGE, new org.apache.thrift.meta_data.FieldMetaData("privilege", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TSentryPrivilege.class)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
@@ -142,15 +150,17 @@ public class TAlterSentryRoleGrantPrivilegeRequest implements org.apache.thrift.
public TAlterSentryRoleGrantPrivilegeRequest(
int protocol_version,
- String userName,
+ String requestorUserName,
String roleName,
+ Set<String> requestorGroupName,
TSentryPrivilege privilege)
{
this();
this.protocol_version = protocol_version;
setProtocol_versionIsSet(true);
- this.userName = userName;
+ this.requestorUserName = requestorUserName;
this.roleName = roleName;
+ this.requestorGroupName = requestorGroupName;
this.privilege = privilege;
}
@@ -160,12 +170,19 @@ public class TAlterSentryRoleGrantPrivilegeRequest implements org.apache.thrift.
public TAlterSentryRoleGrantPrivilegeRequest(TAlterSentryRoleGrantPrivilegeRequest other) {
__isset_bitfield = other.__isset_bitfield;
this.protocol_version = other.protocol_version;
- if (other.isSetUserName()) {
- this.userName = other.userName;
+ if (other.isSetRequestorUserName()) {
+ this.requestorUserName = other.requestorUserName;
}
if (other.isSetRoleName()) {
this.roleName = other.roleName;
}
+ if (other.isSetRequestorGroupName()) {
+ Set<String> __this__requestorGroupName = new HashSet<String>();
+ for (String other_element : other.requestorGroupName) {
+ __this__requestorGroupName.add(other_element);
+ }
+ this.requestorGroupName = __this__requestorGroupName;
+ }
if (other.isSetPrivilege()) {
this.privilege = new TSentryPrivilege(other.privilege);
}
@@ -179,8 +196,9 @@ public class TAlterSentryRoleGrantPrivilegeRequest implements org.apache.thrift.
public void clear() {
this.protocol_version = 1;
- this.userName = null;
+ this.requestorUserName = null;
this.roleName = null;
+ this.requestorGroupName = null;
this.privilege = null;
}
@@ -206,26 +224,26 @@ public class TAlterSentryRoleGrantPrivilegeRequest implements org.apache.thrift.
__isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PROTOCOL_VERSION_ISSET_ID, value);
}
- public String getUserName() {
- return this.userName;
+ public String getRequestorUserName() {
+ return this.requestorUserName;
}
- public void setUserName(String userName) {
- this.userName = userName;
+ public void setRequestorUserName(String requestorUserName) {
+ this.requestorUserName = requestorUserName;
}
- public void unsetUserName() {
- this.userName = null;
+ public void unsetRequestorUserName() {
+ this.requestorUserName = null;
}
- /** Returns true if field userName is set (has been assigned a value) and false otherwise */
- public boolean isSetUserName() {
- return this.userName != null;
+ /** Returns true if field requestorUserName is set (has been assigned a value) and false otherwise */
+ public boolean isSetRequestorUserName() {
+ return this.requestorUserName != null;
}
- public void setUserNameIsSet(boolean value) {
+ public void setRequestorUserNameIsSet(boolean value) {
if (!value) {
- this.userName = null;
+ this.requestorUserName = null;
}
}
@@ -252,6 +270,44 @@ public class TAlterSentryRoleGrantPrivilegeRequest implements org.apache.thrift.
}
}
+ public int getRequestorGroupNameSize() {
+ return (this.requestorGroupName == null) ? 0 : this.requestorGroupName.size();
+ }
+
+ public java.util.Iterator<String> getRequestorGroupNameIterator() {
+ return (this.requestorGroupName == null) ? null : this.requestorGroupName.iterator();
+ }
+
+ public void addToRequestorGroupName(String elem) {
+ if (this.requestorGroupName == null) {
+ this.requestorGroupName = new HashSet<String>();
+ }
+ this.requestorGroupName.add(elem);
+ }
+
+ public Set<String> getRequestorGroupName() {
+ return this.requestorGroupName;
+ }
+
+ public void setRequestorGroupName(Set<String> requestorGroupName) {
+ this.requestorGroupName = requestorGroupName;
+ }
+
+ public void unsetRequestorGroupName() {
+ this.requestorGroupName = null;
+ }
+
+ /** Returns true if field requestorGroupName is set (has been assigned a value) and false otherwise */
+ public boolean isSetRequestorGroupName() {
+ return this.requestorGroupName != null;
+ }
+
+ public void setRequestorGroupNameIsSet(boolean value) {
+ if (!value) {
+ this.requestorGroupName = null;
+ }
+ }
+
public TSentryPrivilege getPrivilege() {
return this.privilege;
}
@@ -285,11 +341,11 @@ public class TAlterSentryRoleGrantPrivilegeRequest implements org.apache.thrift.
}
break;
- case USER_NAME:
+ case REQUESTOR_USER_NAME:
if (value == null) {
- unsetUserName();
+ unsetRequestorUserName();
} else {
- setUserName((String)value);
+ setRequestorUserName((String)value);
}
break;
@@ -301,6 +357,14 @@ public class TAlterSentryRoleGrantPrivilegeRequest implements org.apache.thrift.
}
break;
+ case REQUESTOR_GROUP_NAME:
+ if (value == null) {
+ unsetRequestorGroupName();
+ } else {
+ setRequestorGroupName((Set<String>)value);
+ }
+ break;
+
case PRIVILEGE:
if (value == null) {
unsetPrivilege();
@@ -317,12 +381,15 @@ public class TAlterSentryRoleGrantPrivilegeRequest implements org.apache.thrift.
case PROTOCOL_VERSION:
return Integer.valueOf(getProtocol_version());
- case USER_NAME:
- return getUserName();
+ case REQUESTOR_USER_NAME:
+ return getRequestorUserName();
case ROLE_NAME:
return getRoleName();
+ case REQUESTOR_GROUP_NAME:
+ return getRequestorGroupName();
+
case PRIVILEGE:
return getPrivilege();
@@ -339,10 +406,12 @@ public class TAlterSentryRoleGrantPrivilegeRequest implements org.apache.thrift.
switch (field) {
case PROTOCOL_VERSION:
return isSetProtocol_version();
- case USER_NAME:
- return isSetUserName();
+ case REQUESTOR_USER_NAME:
+ return isSetRequestorUserName();
case ROLE_NAME:
return isSetRoleName();
+ case REQUESTOR_GROUP_NAME:
+ return isSetRequestorGroupName();
case PRIVILEGE:
return isSetPrivilege();
}
@@ -371,12 +440,12 @@ public class TAlterSentryRoleGrantPrivilegeRequest implements org.apache.thrift.
return false;
}
- boolean this_present_userName = true && this.isSetUserName();
- boolean that_present_userName = true && that.isSetUserName();
- if (this_present_userName || that_present_userName) {
- if (!(this_present_userName && that_present_userName))
+ boolean this_present_requestorUserName = true && this.isSetRequestorUserName();
+ boolean that_present_requestorUserName = true && that.isSetRequestorUserName();
+ if (this_present_requestorUserName || that_present_requestorUserName) {
+ if (!(this_present_requestorUserName && that_present_requestorUserName))
return false;
- if (!this.userName.equals(that.userName))
+ if (!this.requestorUserName.equals(that.requestorUserName))
return false;
}
@@ -389,6 +458,15 @@ public class TAlterSentryRoleGrantPrivilegeRequest implements org.apache.thrift.
return false;
}
+ boolean this_present_requestorGroupName = true && this.isSetRequestorGroupName();
+ boolean that_present_requestorGroupName = true && that.isSetRequestorGroupName();
+ if (this_present_requestorGroupName || that_present_requestorGroupName) {
+ if (!(this_present_requestorGroupName && that_present_requestorGroupName))
+ return false;
+ if (!this.requestorGroupName.equals(that.requestorGroupName))
+ return false;
+ }
+
boolean this_present_privilege = true && this.isSetPrivilege();
boolean that_present_privilege = true && that.isSetPrivilege();
if (this_present_privilege || that_present_privilege) {
@@ -410,16 +488,21 @@ public class TAlterSentryRoleGrantPrivilegeRequest implements org.apache.thrift.
if (present_protocol_version)
builder.append(protocol_version);
- boolean present_userName = true && (isSetUserName());
- builder.append(present_userName);
- if (present_userName)
- builder.append(userName);
+ boolean present_requestorUserName = true && (isSetRequestorUserName());
+ builder.append(present_requestorUserName);
+ if (present_requestorUserName)
+ builder.append(requestorUserName);
boolean present_roleName = true && (isSetRoleName());
builder.append(present_roleName);
if (present_roleName)
builder.append(roleName);
+ boolean present_requestorGroupName = true && (isSetRequestorGroupName());
+ builder.append(present_requestorGroupName);
+ if (present_requestorGroupName)
+ builder.append(requestorGroupName);
+
boolean present_privilege = true && (isSetPrivilege());
builder.append(present_privilege);
if (present_privilege)
@@ -446,12 +529,12 @@ public class TAlterSentryRoleGrantPrivilegeRequest implements org.apache.thrift.
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetUserName()).compareTo(typedOther.isSetUserName());
+ lastComparison = Boolean.valueOf(isSetRequestorUserName()).compareTo(typedOther.isSetRequestorUserName());
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetUserName()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userName, typedOther.userName);
+ if (isSetRequestorUserName()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.requestorUserName, typedOther.requestorUserName);
if (lastComparison != 0) {
return lastComparison;
}
@@ -466,6 +549,16 @@ public class TAlterSentryRoleGrantPrivilegeRequest implements org.apache.thrift.
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetRequestorGroupName()).compareTo(typedOther.isSetRequestorGroupName());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetRequestorGroupName()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.requestorGroupName, typedOther.requestorGroupName);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
lastComparison = Boolean.valueOf(isSetPrivilege()).compareTo(typedOther.isSetPrivilege());
if (lastComparison != 0) {
return lastComparison;
@@ -500,11 +593,11 @@ public class TAlterSentryRoleGrantPrivilegeRequest implements org.apache.thrift.
sb.append(this.protocol_version);
first = false;
if (!first) sb.append(", ");
- sb.append("userName:");
- if (this.userName == null) {
+ sb.append("requestorUserName:");
+ if (this.requestorUserName == null) {
sb.append("null");
} else {
- sb.append(this.userName);
+ sb.append(this.requestorUserName);
}
first = false;
if (!first) sb.append(", ");
@@ -516,6 +609,14 @@ public class TAlterSentryRoleGrantPrivilegeRequest implements org.apache.thrift.
}
first = false;
if (!first) sb.append(", ");
+ sb.append("requestorGroupName:");
+ if (this.requestorGroupName == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.requestorGroupName);
+ }
+ first = false;
+ if (!first) sb.append(", ");
sb.append("privilege:");
if (this.privilege == null) {
sb.append("null");
@@ -533,14 +634,18 @@ public class TAlterSentryRoleGrantPrivilegeRequest implements org.apache.thrift.
throw new org.apache.thrift.protocol.TProtocolException("Required field 'protocol_version' is unset! Struct:" + toString());
}
- if (!isSetUserName()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'userName' is unset! Struct:" + toString());
+ if (!isSetRequestorUserName()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'requestorUserName' is unset! Struct:" + toString());
}
if (!isSetRoleName()) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'roleName' is unset! Struct:" + toString());
}
+ if (!isSetRequestorGroupName()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'requestorGroupName' is unset! Struct:" + toString());
+ }
+
if (!isSetPrivilege()) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'privilege' is unset! Struct:" + toString());
}
@@ -595,10 +700,10 @@ public class TAlterSentryRoleGrantPrivilegeRequest implements org.apache.thrift.
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 2: // USER_NAME
+ case 2: // REQUESTOR_USER_NAME
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.userName = iprot.readString();
- struct.setUserNameIsSet(true);
+ struct.requestorUserName = iprot.readString();
+ struct.setRequestorUserNameIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -611,7 +716,25 @@ public class TAlterSentryRoleGrantPrivilegeRequest implements org.apache.thrift.
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 4: // PRIVILEGE
+ case 4: // REQUESTOR_GROUP_NAME
+ if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
+ {
+ org.apache.thrift.protocol.TSet _set64 = iprot.readSetBegin();
+ struct.requestorGroupName = new HashSet<String>(2*_set64.size);
+ for (int _i65 = 0; _i65 < _set64.size; ++_i65)
+ {
+ String _elem66; // required
+ _elem66 = iprot.readString();
+ struct.requestorGroupName.add(_elem66);
+ }
+ iprot.readSetEnd();
+ }
+ struct.setRequestorGroupNameIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 5: // PRIVILEGE
if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
struct.privilege = new TSentryPrivilege();
struct.privilege.read(iprot);
@@ -636,9 +759,9 @@ public class TAlterSentryRoleGrantPrivilegeRequest implements org.apache.thrift.
oprot.writeFieldBegin(PROTOCOL_VERSION_FIELD_DESC);
oprot.writeI32(struct.protocol_version);
oprot.writeFieldEnd();
- if (struct.userName != null) {
- oprot.writeFieldBegin(USER_NAME_FIELD_DESC);
- oprot.writeString(struct.userName);
+ if (struct.requestorUserName != null) {
+ oprot.writeFieldBegin(REQUESTOR_USER_NAME_FIELD_DESC);
+ oprot.writeString(struct.requestorUserName);
oprot.writeFieldEnd();
}
if (struct.roleName != null) {
@@ -646,6 +769,18 @@ public class TAlterSentryRoleGrantPrivilegeRequest implements org.apache.thrift.
oprot.writeString(struct.roleName);
oprot.writeFieldEnd();
}
+ if (struct.requestorGroupName != null) {
+ oprot.writeFieldBegin(REQUESTOR_GROUP_NAME_FIELD_DESC);
+ {
+ oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, struct.requestorGroupName.size()));
+ for (String _iter67 : struct.requestorGroupName)
+ {
+ oprot.writeString(_iter67);
+ }
+ oprot.writeSetEnd();
+ }
+ oprot.writeFieldEnd();
+ }
if (struct.privilege != null) {
oprot.writeFieldBegin(PRIVILEGE_FIELD_DESC);
struct.privilege.write(oprot);
@@ -669,8 +804,15 @@ public class TAlterSentryRoleGrantPrivilegeRequest implements org.apache.thrift.
public void write(org.apache.thrift.protocol.TProtocol prot, TAlterSentryRoleGrantPrivilegeRequest struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
oprot.writeI32(struct.protocol_version);
- oprot.writeString(struct.userName);
+ oprot.writeString(struct.requestorUserName);
oprot.writeString(struct.roleName);
+ {
+ oprot.writeI32(struct.requestorGroupName.size());
+ for (String _iter68 : struct.requestorGroupName)
+ {
+ oprot.writeString(_iter68);
+ }
+ }
struct.privilege.write(oprot);
}
@@ -679,10 +821,21 @@ public class TAlterSentryRoleGrantPrivilegeRequest implements org.apache.thrift.
TTupleProtocol iprot = (TTupleProtocol) prot;
struct.protocol_version = iprot.readI32();
struct.setProtocol_versionIsSet(true);
- struct.userName = iprot.readString();
- struct.setUserNameIsSet(true);
+ struct.requestorUserName = iprot.readString();
+ struct.setRequestorUserNameIsSet(true);
struct.roleName = iprot.readString();
struct.setRoleNameIsSet(true);
+ {
+ org.apache.thrift.protocol.TSet _set69 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.requestorGroupName = new HashSet<String>(2*_set69.size);
+ for (int _i70 = 0; _i70 < _set69.size; ++_i70)
+ {
+ String _elem71; // required
+ _elem71 = iprot.readString();
+ struct.requestorGroupName.add(_elem71);
+ }
+ }
+ struct.setRequestorGroupNameIsSet(true);
struct.privilege = new TSentryPrivilege();
struct.privilege.read(iprot);
struct.setPrivilegeIsSet(true);
[2/3] SENTRY-136 - Thrift request structs should include the
groupName in addition to the userName (Shreepadma via Brock)
Posted by br...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/07767a1c/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TAlterSentryRoleRevokePrivilegeRequest.java
----------------------------------------------------------------------
diff --git a/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TAlterSentryRoleRevokePrivilegeRequest.java b/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TAlterSentryRoleRevokePrivilegeRequest.java
index 43a6055..dea8fa8 100644
--- a/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TAlterSentryRoleRevokePrivilegeRequest.java
+++ b/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TAlterSentryRoleRevokePrivilegeRequest.java
@@ -35,9 +35,10 @@ public class TAlterSentryRoleRevokePrivilegeRequest implements org.apache.thrift
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TAlterSentryRoleRevokePrivilegeRequest");
private static final org.apache.thrift.protocol.TField PROTOCOL_VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("protocol_version", org.apache.thrift.protocol.TType.I32, (short)1);
- private static final org.apache.thrift.protocol.TField USER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("userName", org.apache.thrift.protocol.TType.STRING, (short)2);
+ private static final org.apache.thrift.protocol.TField REQUESTOR_USER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("requestorUserName", org.apache.thrift.protocol.TType.STRING, (short)2);
private static final org.apache.thrift.protocol.TField ROLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("roleName", org.apache.thrift.protocol.TType.STRING, (short)3);
- private static final org.apache.thrift.protocol.TField PRIVILEGE_FIELD_DESC = new org.apache.thrift.protocol.TField("privilege", org.apache.thrift.protocol.TType.STRUCT, (short)4);
+ private static final org.apache.thrift.protocol.TField REQUESTOR_GROUP_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("requestorGroupName", org.apache.thrift.protocol.TType.SET, (short)4);
+ private static final org.apache.thrift.protocol.TField PRIVILEGE_FIELD_DESC = new org.apache.thrift.protocol.TField("privilege", org.apache.thrift.protocol.TType.STRUCT, (short)5);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -46,16 +47,18 @@ public class TAlterSentryRoleRevokePrivilegeRequest implements org.apache.thrift
}
private int protocol_version; // required
- private String userName; // required
+ private String requestorUserName; // required
private String roleName; // required
+ private Set<String> requestorGroupName; // required
private TSentryPrivilege privilege; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
PROTOCOL_VERSION((short)1, "protocol_version"),
- USER_NAME((short)2, "userName"),
+ REQUESTOR_USER_NAME((short)2, "requestorUserName"),
ROLE_NAME((short)3, "roleName"),
- PRIVILEGE((short)4, "privilege");
+ REQUESTOR_GROUP_NAME((short)4, "requestorGroupName"),
+ PRIVILEGE((short)5, "privilege");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -72,11 +75,13 @@ public class TAlterSentryRoleRevokePrivilegeRequest implements org.apache.thrift
switch(fieldId) {
case 1: // PROTOCOL_VERSION
return PROTOCOL_VERSION;
- case 2: // USER_NAME
- return USER_NAME;
+ case 2: // REQUESTOR_USER_NAME
+ return REQUESTOR_USER_NAME;
case 3: // ROLE_NAME
return ROLE_NAME;
- case 4: // PRIVILEGE
+ case 4: // REQUESTOR_GROUP_NAME
+ return REQUESTOR_GROUP_NAME;
+ case 5: // PRIVILEGE
return PRIVILEGE;
default:
return null;
@@ -125,10 +130,13 @@ public class TAlterSentryRoleRevokePrivilegeRequest implements org.apache.thrift
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
tmpMap.put(_Fields.PROTOCOL_VERSION, new org.apache.thrift.meta_data.FieldMetaData("protocol_version", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
- tmpMap.put(_Fields.USER_NAME, new org.apache.thrift.meta_data.FieldMetaData("userName", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ tmpMap.put(_Fields.REQUESTOR_USER_NAME, new org.apache.thrift.meta_data.FieldMetaData("requestorUserName", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.ROLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("roleName", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.REQUESTOR_GROUP_NAME, new org.apache.thrift.meta_data.FieldMetaData("requestorGroupName", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.SetMetaData(org.apache.thrift.protocol.TType.SET,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
tmpMap.put(_Fields.PRIVILEGE, new org.apache.thrift.meta_data.FieldMetaData("privilege", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TSentryPrivilege.class)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
@@ -142,15 +150,17 @@ public class TAlterSentryRoleRevokePrivilegeRequest implements org.apache.thrift
public TAlterSentryRoleRevokePrivilegeRequest(
int protocol_version,
- String userName,
+ String requestorUserName,
String roleName,
+ Set<String> requestorGroupName,
TSentryPrivilege privilege)
{
this();
this.protocol_version = protocol_version;
setProtocol_versionIsSet(true);
- this.userName = userName;
+ this.requestorUserName = requestorUserName;
this.roleName = roleName;
+ this.requestorGroupName = requestorGroupName;
this.privilege = privilege;
}
@@ -160,12 +170,19 @@ public class TAlterSentryRoleRevokePrivilegeRequest implements org.apache.thrift
public TAlterSentryRoleRevokePrivilegeRequest(TAlterSentryRoleRevokePrivilegeRequest other) {
__isset_bitfield = other.__isset_bitfield;
this.protocol_version = other.protocol_version;
- if (other.isSetUserName()) {
- this.userName = other.userName;
+ if (other.isSetRequestorUserName()) {
+ this.requestorUserName = other.requestorUserName;
}
if (other.isSetRoleName()) {
this.roleName = other.roleName;
}
+ if (other.isSetRequestorGroupName()) {
+ Set<String> __this__requestorGroupName = new HashSet<String>();
+ for (String other_element : other.requestorGroupName) {
+ __this__requestorGroupName.add(other_element);
+ }
+ this.requestorGroupName = __this__requestorGroupName;
+ }
if (other.isSetPrivilege()) {
this.privilege = new TSentryPrivilege(other.privilege);
}
@@ -179,8 +196,9 @@ public class TAlterSentryRoleRevokePrivilegeRequest implements org.apache.thrift
public void clear() {
this.protocol_version = 1;
- this.userName = null;
+ this.requestorUserName = null;
this.roleName = null;
+ this.requestorGroupName = null;
this.privilege = null;
}
@@ -206,26 +224,26 @@ public class TAlterSentryRoleRevokePrivilegeRequest implements org.apache.thrift
__isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PROTOCOL_VERSION_ISSET_ID, value);
}
- public String getUserName() {
- return this.userName;
+ public String getRequestorUserName() {
+ return this.requestorUserName;
}
- public void setUserName(String userName) {
- this.userName = userName;
+ public void setRequestorUserName(String requestorUserName) {
+ this.requestorUserName = requestorUserName;
}
- public void unsetUserName() {
- this.userName = null;
+ public void unsetRequestorUserName() {
+ this.requestorUserName = null;
}
- /** Returns true if field userName is set (has been assigned a value) and false otherwise */
- public boolean isSetUserName() {
- return this.userName != null;
+ /** Returns true if field requestorUserName is set (has been assigned a value) and false otherwise */
+ public boolean isSetRequestorUserName() {
+ return this.requestorUserName != null;
}
- public void setUserNameIsSet(boolean value) {
+ public void setRequestorUserNameIsSet(boolean value) {
if (!value) {
- this.userName = null;
+ this.requestorUserName = null;
}
}
@@ -252,6 +270,44 @@ public class TAlterSentryRoleRevokePrivilegeRequest implements org.apache.thrift
}
}
+ public int getRequestorGroupNameSize() {
+ return (this.requestorGroupName == null) ? 0 : this.requestorGroupName.size();
+ }
+
+ public java.util.Iterator<String> getRequestorGroupNameIterator() {
+ return (this.requestorGroupName == null) ? null : this.requestorGroupName.iterator();
+ }
+
+ public void addToRequestorGroupName(String elem) {
+ if (this.requestorGroupName == null) {
+ this.requestorGroupName = new HashSet<String>();
+ }
+ this.requestorGroupName.add(elem);
+ }
+
+ public Set<String> getRequestorGroupName() {
+ return this.requestorGroupName;
+ }
+
+ public void setRequestorGroupName(Set<String> requestorGroupName) {
+ this.requestorGroupName = requestorGroupName;
+ }
+
+ public void unsetRequestorGroupName() {
+ this.requestorGroupName = null;
+ }
+
+ /** Returns true if field requestorGroupName is set (has been assigned a value) and false otherwise */
+ public boolean isSetRequestorGroupName() {
+ return this.requestorGroupName != null;
+ }
+
+ public void setRequestorGroupNameIsSet(boolean value) {
+ if (!value) {
+ this.requestorGroupName = null;
+ }
+ }
+
public TSentryPrivilege getPrivilege() {
return this.privilege;
}
@@ -285,11 +341,11 @@ public class TAlterSentryRoleRevokePrivilegeRequest implements org.apache.thrift
}
break;
- case USER_NAME:
+ case REQUESTOR_USER_NAME:
if (value == null) {
- unsetUserName();
+ unsetRequestorUserName();
} else {
- setUserName((String)value);
+ setRequestorUserName((String)value);
}
break;
@@ -301,6 +357,14 @@ public class TAlterSentryRoleRevokePrivilegeRequest implements org.apache.thrift
}
break;
+ case REQUESTOR_GROUP_NAME:
+ if (value == null) {
+ unsetRequestorGroupName();
+ } else {
+ setRequestorGroupName((Set<String>)value);
+ }
+ break;
+
case PRIVILEGE:
if (value == null) {
unsetPrivilege();
@@ -317,12 +381,15 @@ public class TAlterSentryRoleRevokePrivilegeRequest implements org.apache.thrift
case PROTOCOL_VERSION:
return Integer.valueOf(getProtocol_version());
- case USER_NAME:
- return getUserName();
+ case REQUESTOR_USER_NAME:
+ return getRequestorUserName();
case ROLE_NAME:
return getRoleName();
+ case REQUESTOR_GROUP_NAME:
+ return getRequestorGroupName();
+
case PRIVILEGE:
return getPrivilege();
@@ -339,10 +406,12 @@ public class TAlterSentryRoleRevokePrivilegeRequest implements org.apache.thrift
switch (field) {
case PROTOCOL_VERSION:
return isSetProtocol_version();
- case USER_NAME:
- return isSetUserName();
+ case REQUESTOR_USER_NAME:
+ return isSetRequestorUserName();
case ROLE_NAME:
return isSetRoleName();
+ case REQUESTOR_GROUP_NAME:
+ return isSetRequestorGroupName();
case PRIVILEGE:
return isSetPrivilege();
}
@@ -371,12 +440,12 @@ public class TAlterSentryRoleRevokePrivilegeRequest implements org.apache.thrift
return false;
}
- boolean this_present_userName = true && this.isSetUserName();
- boolean that_present_userName = true && that.isSetUserName();
- if (this_present_userName || that_present_userName) {
- if (!(this_present_userName && that_present_userName))
+ boolean this_present_requestorUserName = true && this.isSetRequestorUserName();
+ boolean that_present_requestorUserName = true && that.isSetRequestorUserName();
+ if (this_present_requestorUserName || that_present_requestorUserName) {
+ if (!(this_present_requestorUserName && that_present_requestorUserName))
return false;
- if (!this.userName.equals(that.userName))
+ if (!this.requestorUserName.equals(that.requestorUserName))
return false;
}
@@ -389,6 +458,15 @@ public class TAlterSentryRoleRevokePrivilegeRequest implements org.apache.thrift
return false;
}
+ boolean this_present_requestorGroupName = true && this.isSetRequestorGroupName();
+ boolean that_present_requestorGroupName = true && that.isSetRequestorGroupName();
+ if (this_present_requestorGroupName || that_present_requestorGroupName) {
+ if (!(this_present_requestorGroupName && that_present_requestorGroupName))
+ return false;
+ if (!this.requestorGroupName.equals(that.requestorGroupName))
+ return false;
+ }
+
boolean this_present_privilege = true && this.isSetPrivilege();
boolean that_present_privilege = true && that.isSetPrivilege();
if (this_present_privilege || that_present_privilege) {
@@ -410,16 +488,21 @@ public class TAlterSentryRoleRevokePrivilegeRequest implements org.apache.thrift
if (present_protocol_version)
builder.append(protocol_version);
- boolean present_userName = true && (isSetUserName());
- builder.append(present_userName);
- if (present_userName)
- builder.append(userName);
+ boolean present_requestorUserName = true && (isSetRequestorUserName());
+ builder.append(present_requestorUserName);
+ if (present_requestorUserName)
+ builder.append(requestorUserName);
boolean present_roleName = true && (isSetRoleName());
builder.append(present_roleName);
if (present_roleName)
builder.append(roleName);
+ boolean present_requestorGroupName = true && (isSetRequestorGroupName());
+ builder.append(present_requestorGroupName);
+ if (present_requestorGroupName)
+ builder.append(requestorGroupName);
+
boolean present_privilege = true && (isSetPrivilege());
builder.append(present_privilege);
if (present_privilege)
@@ -446,12 +529,12 @@ public class TAlterSentryRoleRevokePrivilegeRequest implements org.apache.thrift
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetUserName()).compareTo(typedOther.isSetUserName());
+ lastComparison = Boolean.valueOf(isSetRequestorUserName()).compareTo(typedOther.isSetRequestorUserName());
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetUserName()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userName, typedOther.userName);
+ if (isSetRequestorUserName()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.requestorUserName, typedOther.requestorUserName);
if (lastComparison != 0) {
return lastComparison;
}
@@ -466,6 +549,16 @@ public class TAlterSentryRoleRevokePrivilegeRequest implements org.apache.thrift
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetRequestorGroupName()).compareTo(typedOther.isSetRequestorGroupName());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetRequestorGroupName()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.requestorGroupName, typedOther.requestorGroupName);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
lastComparison = Boolean.valueOf(isSetPrivilege()).compareTo(typedOther.isSetPrivilege());
if (lastComparison != 0) {
return lastComparison;
@@ -500,11 +593,11 @@ public class TAlterSentryRoleRevokePrivilegeRequest implements org.apache.thrift
sb.append(this.protocol_version);
first = false;
if (!first) sb.append(", ");
- sb.append("userName:");
- if (this.userName == null) {
+ sb.append("requestorUserName:");
+ if (this.requestorUserName == null) {
sb.append("null");
} else {
- sb.append(this.userName);
+ sb.append(this.requestorUserName);
}
first = false;
if (!first) sb.append(", ");
@@ -516,6 +609,14 @@ public class TAlterSentryRoleRevokePrivilegeRequest implements org.apache.thrift
}
first = false;
if (!first) sb.append(", ");
+ sb.append("requestorGroupName:");
+ if (this.requestorGroupName == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.requestorGroupName);
+ }
+ first = false;
+ if (!first) sb.append(", ");
sb.append("privilege:");
if (this.privilege == null) {
sb.append("null");
@@ -533,14 +634,18 @@ public class TAlterSentryRoleRevokePrivilegeRequest implements org.apache.thrift
throw new org.apache.thrift.protocol.TProtocolException("Required field 'protocol_version' is unset! Struct:" + toString());
}
- if (!isSetUserName()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'userName' is unset! Struct:" + toString());
+ if (!isSetRequestorUserName()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'requestorUserName' is unset! Struct:" + toString());
}
if (!isSetRoleName()) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'roleName' is unset! Struct:" + toString());
}
+ if (!isSetRequestorGroupName()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'requestorGroupName' is unset! Struct:" + toString());
+ }
+
if (!isSetPrivilege()) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'privilege' is unset! Struct:" + toString());
}
@@ -595,10 +700,10 @@ public class TAlterSentryRoleRevokePrivilegeRequest implements org.apache.thrift
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 2: // USER_NAME
+ case 2: // REQUESTOR_USER_NAME
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.userName = iprot.readString();
- struct.setUserNameIsSet(true);
+ struct.requestorUserName = iprot.readString();
+ struct.setRequestorUserNameIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -611,7 +716,25 @@ public class TAlterSentryRoleRevokePrivilegeRequest implements org.apache.thrift
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 4: // PRIVILEGE
+ case 4: // REQUESTOR_GROUP_NAME
+ if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
+ {
+ org.apache.thrift.protocol.TSet _set72 = iprot.readSetBegin();
+ struct.requestorGroupName = new HashSet<String>(2*_set72.size);
+ for (int _i73 = 0; _i73 < _set72.size; ++_i73)
+ {
+ String _elem74; // required
+ _elem74 = iprot.readString();
+ struct.requestorGroupName.add(_elem74);
+ }
+ iprot.readSetEnd();
+ }
+ struct.setRequestorGroupNameIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 5: // PRIVILEGE
if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
struct.privilege = new TSentryPrivilege();
struct.privilege.read(iprot);
@@ -636,9 +759,9 @@ public class TAlterSentryRoleRevokePrivilegeRequest implements org.apache.thrift
oprot.writeFieldBegin(PROTOCOL_VERSION_FIELD_DESC);
oprot.writeI32(struct.protocol_version);
oprot.writeFieldEnd();
- if (struct.userName != null) {
- oprot.writeFieldBegin(USER_NAME_FIELD_DESC);
- oprot.writeString(struct.userName);
+ if (struct.requestorUserName != null) {
+ oprot.writeFieldBegin(REQUESTOR_USER_NAME_FIELD_DESC);
+ oprot.writeString(struct.requestorUserName);
oprot.writeFieldEnd();
}
if (struct.roleName != null) {
@@ -646,6 +769,18 @@ public class TAlterSentryRoleRevokePrivilegeRequest implements org.apache.thrift
oprot.writeString(struct.roleName);
oprot.writeFieldEnd();
}
+ if (struct.requestorGroupName != null) {
+ oprot.writeFieldBegin(REQUESTOR_GROUP_NAME_FIELD_DESC);
+ {
+ oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, struct.requestorGroupName.size()));
+ for (String _iter75 : struct.requestorGroupName)
+ {
+ oprot.writeString(_iter75);
+ }
+ oprot.writeSetEnd();
+ }
+ oprot.writeFieldEnd();
+ }
if (struct.privilege != null) {
oprot.writeFieldBegin(PRIVILEGE_FIELD_DESC);
struct.privilege.write(oprot);
@@ -669,8 +804,15 @@ public class TAlterSentryRoleRevokePrivilegeRequest implements org.apache.thrift
public void write(org.apache.thrift.protocol.TProtocol prot, TAlterSentryRoleRevokePrivilegeRequest struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
oprot.writeI32(struct.protocol_version);
- oprot.writeString(struct.userName);
+ oprot.writeString(struct.requestorUserName);
oprot.writeString(struct.roleName);
+ {
+ oprot.writeI32(struct.requestorGroupName.size());
+ for (String _iter76 : struct.requestorGroupName)
+ {
+ oprot.writeString(_iter76);
+ }
+ }
struct.privilege.write(oprot);
}
@@ -679,10 +821,21 @@ public class TAlterSentryRoleRevokePrivilegeRequest implements org.apache.thrift
TTupleProtocol iprot = (TTupleProtocol) prot;
struct.protocol_version = iprot.readI32();
struct.setProtocol_versionIsSet(true);
- struct.userName = iprot.readString();
- struct.setUserNameIsSet(true);
+ struct.requestorUserName = iprot.readString();
+ struct.setRequestorUserNameIsSet(true);
struct.roleName = iprot.readString();
struct.setRoleNameIsSet(true);
+ {
+ org.apache.thrift.protocol.TSet _set77 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.requestorGroupName = new HashSet<String>(2*_set77.size);
+ for (int _i78 = 0; _i78 < _set77.size; ++_i78)
+ {
+ String _elem79; // required
+ _elem79 = iprot.readString();
+ struct.requestorGroupName.add(_elem79);
+ }
+ }
+ struct.setRequestorGroupNameIsSet(true);
struct.privilege = new TSentryPrivilege();
struct.privilege.read(iprot);
struct.setPrivilegeIsSet(true);
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/07767a1c/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TCreateSentryRoleRequest.java
----------------------------------------------------------------------
diff --git a/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TCreateSentryRoleRequest.java b/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TCreateSentryRoleRequest.java
index a1e09fd..1f9eace 100644
--- a/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TCreateSentryRoleRequest.java
+++ b/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TCreateSentryRoleRequest.java
@@ -35,8 +35,9 @@ public class TCreateSentryRoleRequest implements org.apache.thrift.TBase<TCreate
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TCreateSentryRoleRequest");
private static final org.apache.thrift.protocol.TField PROTOCOL_VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("protocol_version", org.apache.thrift.protocol.TType.I32, (short)1);
- private static final org.apache.thrift.protocol.TField USER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("userName", org.apache.thrift.protocol.TType.STRING, (short)2);
+ private static final org.apache.thrift.protocol.TField REQUESTOR_USER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("requestorUserName", org.apache.thrift.protocol.TType.STRING, (short)2);
private static final org.apache.thrift.protocol.TField ROLE_FIELD_DESC = new org.apache.thrift.protocol.TField("role", org.apache.thrift.protocol.TType.STRUCT, (short)3);
+ private static final org.apache.thrift.protocol.TField REQUESTOR_GROUP_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("requestorGroupName", org.apache.thrift.protocol.TType.SET, (short)4);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -45,14 +46,16 @@ public class TCreateSentryRoleRequest implements org.apache.thrift.TBase<TCreate
}
private int protocol_version; // required
- private String userName; // required
+ private String requestorUserName; // required
private TSentryRole role; // required
+ private Set<String> requestorGroupName; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
PROTOCOL_VERSION((short)1, "protocol_version"),
- USER_NAME((short)2, "userName"),
- ROLE((short)3, "role");
+ REQUESTOR_USER_NAME((short)2, "requestorUserName"),
+ ROLE((short)3, "role"),
+ REQUESTOR_GROUP_NAME((short)4, "requestorGroupName");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -69,10 +72,12 @@ public class TCreateSentryRoleRequest implements org.apache.thrift.TBase<TCreate
switch(fieldId) {
case 1: // PROTOCOL_VERSION
return PROTOCOL_VERSION;
- case 2: // USER_NAME
- return USER_NAME;
+ case 2: // REQUESTOR_USER_NAME
+ return REQUESTOR_USER_NAME;
case 3: // ROLE
return ROLE;
+ case 4: // REQUESTOR_GROUP_NAME
+ return REQUESTOR_GROUP_NAME;
default:
return null;
}
@@ -120,10 +125,13 @@ public class TCreateSentryRoleRequest implements org.apache.thrift.TBase<TCreate
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
tmpMap.put(_Fields.PROTOCOL_VERSION, new org.apache.thrift.meta_data.FieldMetaData("protocol_version", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
- tmpMap.put(_Fields.USER_NAME, new org.apache.thrift.meta_data.FieldMetaData("userName", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ tmpMap.put(_Fields.REQUESTOR_USER_NAME, new org.apache.thrift.meta_data.FieldMetaData("requestorUserName", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.ROLE, new org.apache.thrift.meta_data.FieldMetaData("role", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TSentryRole.class)));
+ tmpMap.put(_Fields.REQUESTOR_GROUP_NAME, new org.apache.thrift.meta_data.FieldMetaData("requestorGroupName", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.SetMetaData(org.apache.thrift.protocol.TType.SET,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TCreateSentryRoleRequest.class, metaDataMap);
}
@@ -135,14 +143,16 @@ public class TCreateSentryRoleRequest implements org.apache.thrift.TBase<TCreate
public TCreateSentryRoleRequest(
int protocol_version,
- String userName,
- TSentryRole role)
+ String requestorUserName,
+ TSentryRole role,
+ Set<String> requestorGroupName)
{
this();
this.protocol_version = protocol_version;
setProtocol_versionIsSet(true);
- this.userName = userName;
+ this.requestorUserName = requestorUserName;
this.role = role;
+ this.requestorGroupName = requestorGroupName;
}
/**
@@ -151,12 +161,19 @@ public class TCreateSentryRoleRequest implements org.apache.thrift.TBase<TCreate
public TCreateSentryRoleRequest(TCreateSentryRoleRequest other) {
__isset_bitfield = other.__isset_bitfield;
this.protocol_version = other.protocol_version;
- if (other.isSetUserName()) {
- this.userName = other.userName;
+ if (other.isSetRequestorUserName()) {
+ this.requestorUserName = other.requestorUserName;
}
if (other.isSetRole()) {
this.role = new TSentryRole(other.role);
}
+ if (other.isSetRequestorGroupName()) {
+ Set<String> __this__requestorGroupName = new HashSet<String>();
+ for (String other_element : other.requestorGroupName) {
+ __this__requestorGroupName.add(other_element);
+ }
+ this.requestorGroupName = __this__requestorGroupName;
+ }
}
public TCreateSentryRoleRequest deepCopy() {
@@ -167,8 +184,9 @@ public class TCreateSentryRoleRequest implements org.apache.thrift.TBase<TCreate
public void clear() {
this.protocol_version = 1;
- this.userName = null;
+ this.requestorUserName = null;
this.role = null;
+ this.requestorGroupName = null;
}
public int getProtocol_version() {
@@ -193,26 +211,26 @@ public class TCreateSentryRoleRequest implements org.apache.thrift.TBase<TCreate
__isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PROTOCOL_VERSION_ISSET_ID, value);
}
- public String getUserName() {
- return this.userName;
+ public String getRequestorUserName() {
+ return this.requestorUserName;
}
- public void setUserName(String userName) {
- this.userName = userName;
+ public void setRequestorUserName(String requestorUserName) {
+ this.requestorUserName = requestorUserName;
}
- public void unsetUserName() {
- this.userName = null;
+ public void unsetRequestorUserName() {
+ this.requestorUserName = null;
}
- /** Returns true if field userName is set (has been assigned a value) and false otherwise */
- public boolean isSetUserName() {
- return this.userName != null;
+ /** Returns true if field requestorUserName is set (has been assigned a value) and false otherwise */
+ public boolean isSetRequestorUserName() {
+ return this.requestorUserName != null;
}
- public void setUserNameIsSet(boolean value) {
+ public void setRequestorUserNameIsSet(boolean value) {
if (!value) {
- this.userName = null;
+ this.requestorUserName = null;
}
}
@@ -239,6 +257,44 @@ public class TCreateSentryRoleRequest implements org.apache.thrift.TBase<TCreate
}
}
+ public int getRequestorGroupNameSize() {
+ return (this.requestorGroupName == null) ? 0 : this.requestorGroupName.size();
+ }
+
+ public java.util.Iterator<String> getRequestorGroupNameIterator() {
+ return (this.requestorGroupName == null) ? null : this.requestorGroupName.iterator();
+ }
+
+ public void addToRequestorGroupName(String elem) {
+ if (this.requestorGroupName == null) {
+ this.requestorGroupName = new HashSet<String>();
+ }
+ this.requestorGroupName.add(elem);
+ }
+
+ public Set<String> getRequestorGroupName() {
+ return this.requestorGroupName;
+ }
+
+ public void setRequestorGroupName(Set<String> requestorGroupName) {
+ this.requestorGroupName = requestorGroupName;
+ }
+
+ public void unsetRequestorGroupName() {
+ this.requestorGroupName = null;
+ }
+
+ /** Returns true if field requestorGroupName is set (has been assigned a value) and false otherwise */
+ public boolean isSetRequestorGroupName() {
+ return this.requestorGroupName != null;
+ }
+
+ public void setRequestorGroupNameIsSet(boolean value) {
+ if (!value) {
+ this.requestorGroupName = null;
+ }
+ }
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case PROTOCOL_VERSION:
@@ -249,11 +305,11 @@ public class TCreateSentryRoleRequest implements org.apache.thrift.TBase<TCreate
}
break;
- case USER_NAME:
+ case REQUESTOR_USER_NAME:
if (value == null) {
- unsetUserName();
+ unsetRequestorUserName();
} else {
- setUserName((String)value);
+ setRequestorUserName((String)value);
}
break;
@@ -265,6 +321,14 @@ public class TCreateSentryRoleRequest implements org.apache.thrift.TBase<TCreate
}
break;
+ case REQUESTOR_GROUP_NAME:
+ if (value == null) {
+ unsetRequestorGroupName();
+ } else {
+ setRequestorGroupName((Set<String>)value);
+ }
+ break;
+
}
}
@@ -273,12 +337,15 @@ public class TCreateSentryRoleRequest implements org.apache.thrift.TBase<TCreate
case PROTOCOL_VERSION:
return Integer.valueOf(getProtocol_version());
- case USER_NAME:
- return getUserName();
+ case REQUESTOR_USER_NAME:
+ return getRequestorUserName();
case ROLE:
return getRole();
+ case REQUESTOR_GROUP_NAME:
+ return getRequestorGroupName();
+
}
throw new IllegalStateException();
}
@@ -292,10 +359,12 @@ public class TCreateSentryRoleRequest implements org.apache.thrift.TBase<TCreate
switch (field) {
case PROTOCOL_VERSION:
return isSetProtocol_version();
- case USER_NAME:
- return isSetUserName();
+ case REQUESTOR_USER_NAME:
+ return isSetRequestorUserName();
case ROLE:
return isSetRole();
+ case REQUESTOR_GROUP_NAME:
+ return isSetRequestorGroupName();
}
throw new IllegalStateException();
}
@@ -322,12 +391,12 @@ public class TCreateSentryRoleRequest implements org.apache.thrift.TBase<TCreate
return false;
}
- boolean this_present_userName = true && this.isSetUserName();
- boolean that_present_userName = true && that.isSetUserName();
- if (this_present_userName || that_present_userName) {
- if (!(this_present_userName && that_present_userName))
+ boolean this_present_requestorUserName = true && this.isSetRequestorUserName();
+ boolean that_present_requestorUserName = true && that.isSetRequestorUserName();
+ if (this_present_requestorUserName || that_present_requestorUserName) {
+ if (!(this_present_requestorUserName && that_present_requestorUserName))
return false;
- if (!this.userName.equals(that.userName))
+ if (!this.requestorUserName.equals(that.requestorUserName))
return false;
}
@@ -340,6 +409,15 @@ public class TCreateSentryRoleRequest implements org.apache.thrift.TBase<TCreate
return false;
}
+ boolean this_present_requestorGroupName = true && this.isSetRequestorGroupName();
+ boolean that_present_requestorGroupName = true && that.isSetRequestorGroupName();
+ if (this_present_requestorGroupName || that_present_requestorGroupName) {
+ if (!(this_present_requestorGroupName && that_present_requestorGroupName))
+ return false;
+ if (!this.requestorGroupName.equals(that.requestorGroupName))
+ return false;
+ }
+
return true;
}
@@ -352,16 +430,21 @@ public class TCreateSentryRoleRequest implements org.apache.thrift.TBase<TCreate
if (present_protocol_version)
builder.append(protocol_version);
- boolean present_userName = true && (isSetUserName());
- builder.append(present_userName);
- if (present_userName)
- builder.append(userName);
+ boolean present_requestorUserName = true && (isSetRequestorUserName());
+ builder.append(present_requestorUserName);
+ if (present_requestorUserName)
+ builder.append(requestorUserName);
boolean present_role = true && (isSetRole());
builder.append(present_role);
if (present_role)
builder.append(role);
+ boolean present_requestorGroupName = true && (isSetRequestorGroupName());
+ builder.append(present_requestorGroupName);
+ if (present_requestorGroupName)
+ builder.append(requestorGroupName);
+
return builder.toHashCode();
}
@@ -383,12 +466,12 @@ public class TCreateSentryRoleRequest implements org.apache.thrift.TBase<TCreate
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetUserName()).compareTo(typedOther.isSetUserName());
+ lastComparison = Boolean.valueOf(isSetRequestorUserName()).compareTo(typedOther.isSetRequestorUserName());
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetUserName()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userName, typedOther.userName);
+ if (isSetRequestorUserName()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.requestorUserName, typedOther.requestorUserName);
if (lastComparison != 0) {
return lastComparison;
}
@@ -403,6 +486,16 @@ public class TCreateSentryRoleRequest implements org.apache.thrift.TBase<TCreate
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetRequestorGroupName()).compareTo(typedOther.isSetRequestorGroupName());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetRequestorGroupName()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.requestorGroupName, typedOther.requestorGroupName);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -427,11 +520,11 @@ public class TCreateSentryRoleRequest implements org.apache.thrift.TBase<TCreate
sb.append(this.protocol_version);
first = false;
if (!first) sb.append(", ");
- sb.append("userName:");
- if (this.userName == null) {
+ sb.append("requestorUserName:");
+ if (this.requestorUserName == null) {
sb.append("null");
} else {
- sb.append(this.userName);
+ sb.append(this.requestorUserName);
}
first = false;
if (!first) sb.append(", ");
@@ -442,6 +535,14 @@ public class TCreateSentryRoleRequest implements org.apache.thrift.TBase<TCreate
sb.append(this.role);
}
first = false;
+ if (!first) sb.append(", ");
+ sb.append("requestorGroupName:");
+ if (this.requestorGroupName == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.requestorGroupName);
+ }
+ first = false;
sb.append(")");
return sb.toString();
}
@@ -452,14 +553,18 @@ public class TCreateSentryRoleRequest implements org.apache.thrift.TBase<TCreate
throw new org.apache.thrift.protocol.TProtocolException("Required field 'protocol_version' is unset! Struct:" + toString());
}
- if (!isSetUserName()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'userName' is unset! Struct:" + toString());
+ if (!isSetRequestorUserName()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'requestorUserName' is unset! Struct:" + toString());
}
if (!isSetRole()) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'role' is unset! Struct:" + toString());
}
+ if (!isSetRequestorGroupName()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'requestorGroupName' is unset! Struct:" + toString());
+ }
+
// check for sub-struct validity
if (role != null) {
role.validate();
@@ -510,10 +615,10 @@ public class TCreateSentryRoleRequest implements org.apache.thrift.TBase<TCreate
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 2: // USER_NAME
+ case 2: // REQUESTOR_USER_NAME
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.userName = iprot.readString();
- struct.setUserNameIsSet(true);
+ struct.requestorUserName = iprot.readString();
+ struct.setRequestorUserNameIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -527,6 +632,24 @@ public class TCreateSentryRoleRequest implements org.apache.thrift.TBase<TCreate
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
+ case 4: // REQUESTOR_GROUP_NAME
+ if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
+ {
+ org.apache.thrift.protocol.TSet _set8 = iprot.readSetBegin();
+ struct.requestorGroupName = new HashSet<String>(2*_set8.size);
+ for (int _i9 = 0; _i9 < _set8.size; ++_i9)
+ {
+ String _elem10; // required
+ _elem10 = iprot.readString();
+ struct.requestorGroupName.add(_elem10);
+ }
+ iprot.readSetEnd();
+ }
+ struct.setRequestorGroupNameIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -543,9 +666,9 @@ public class TCreateSentryRoleRequest implements org.apache.thrift.TBase<TCreate
oprot.writeFieldBegin(PROTOCOL_VERSION_FIELD_DESC);
oprot.writeI32(struct.protocol_version);
oprot.writeFieldEnd();
- if (struct.userName != null) {
- oprot.writeFieldBegin(USER_NAME_FIELD_DESC);
- oprot.writeString(struct.userName);
+ if (struct.requestorUserName != null) {
+ oprot.writeFieldBegin(REQUESTOR_USER_NAME_FIELD_DESC);
+ oprot.writeString(struct.requestorUserName);
oprot.writeFieldEnd();
}
if (struct.role != null) {
@@ -553,6 +676,18 @@ public class TCreateSentryRoleRequest implements org.apache.thrift.TBase<TCreate
struct.role.write(oprot);
oprot.writeFieldEnd();
}
+ if (struct.requestorGroupName != null) {
+ oprot.writeFieldBegin(REQUESTOR_GROUP_NAME_FIELD_DESC);
+ {
+ oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, struct.requestorGroupName.size()));
+ for (String _iter11 : struct.requestorGroupName)
+ {
+ oprot.writeString(_iter11);
+ }
+ oprot.writeSetEnd();
+ }
+ oprot.writeFieldEnd();
+ }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -571,8 +706,15 @@ public class TCreateSentryRoleRequest implements org.apache.thrift.TBase<TCreate
public void write(org.apache.thrift.protocol.TProtocol prot, TCreateSentryRoleRequest struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
oprot.writeI32(struct.protocol_version);
- oprot.writeString(struct.userName);
+ oprot.writeString(struct.requestorUserName);
struct.role.write(oprot);
+ {
+ oprot.writeI32(struct.requestorGroupName.size());
+ for (String _iter12 : struct.requestorGroupName)
+ {
+ oprot.writeString(_iter12);
+ }
+ }
}
@Override
@@ -580,11 +722,22 @@ public class TCreateSentryRoleRequest implements org.apache.thrift.TBase<TCreate
TTupleProtocol iprot = (TTupleProtocol) prot;
struct.protocol_version = iprot.readI32();
struct.setProtocol_versionIsSet(true);
- struct.userName = iprot.readString();
- struct.setUserNameIsSet(true);
+ struct.requestorUserName = iprot.readString();
+ struct.setRequestorUserNameIsSet(true);
struct.role = new TSentryRole();
struct.role.read(iprot);
struct.setRoleIsSet(true);
+ {
+ org.apache.thrift.protocol.TSet _set13 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.requestorGroupName = new HashSet<String>(2*_set13.size);
+ for (int _i14 = 0; _i14 < _set13.size; ++_i14)
+ {
+ String _elem15; // required
+ _elem15 = iprot.readString();
+ struct.requestorGroupName.add(_elem15);
+ }
+ }
+ struct.setRequestorGroupNameIsSet(true);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/07767a1c/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TDropSentryRoleRequest.java
----------------------------------------------------------------------
diff --git a/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TDropSentryRoleRequest.java b/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TDropSentryRoleRequest.java
index cb7cf0b..353a82f 100644
--- a/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TDropSentryRoleRequest.java
+++ b/sentry-provider/sentry-provider-db/src/gen/thrift/gen-javabean/org/apache/sentry/provider/db/service/thrift/TDropSentryRoleRequest.java
@@ -35,8 +35,9 @@ public class TDropSentryRoleRequest implements org.apache.thrift.TBase<TDropSent
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TDropSentryRoleRequest");
private static final org.apache.thrift.protocol.TField PROTOCOL_VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("protocol_version", org.apache.thrift.protocol.TType.I32, (short)1);
- private static final org.apache.thrift.protocol.TField USER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("userName", org.apache.thrift.protocol.TType.STRING, (short)2);
+ private static final org.apache.thrift.protocol.TField REQUESTOR_USER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("requestorUserName", org.apache.thrift.protocol.TType.STRING, (short)2);
private static final org.apache.thrift.protocol.TField ROLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("roleName", org.apache.thrift.protocol.TType.STRING, (short)3);
+ private static final org.apache.thrift.protocol.TField REQUESTOR_GROUP_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("requestorGroupName", org.apache.thrift.protocol.TType.SET, (short)4);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -45,14 +46,16 @@ public class TDropSentryRoleRequest implements org.apache.thrift.TBase<TDropSent
}
private int protocol_version; // required
- private String userName; // optional
- private String roleName; // optional
+ private String requestorUserName; // required
+ private String roleName; // required
+ private Set<String> requestorGroupName; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
PROTOCOL_VERSION((short)1, "protocol_version"),
- USER_NAME((short)2, "userName"),
- ROLE_NAME((short)3, "roleName");
+ REQUESTOR_USER_NAME((short)2, "requestorUserName"),
+ ROLE_NAME((short)3, "roleName"),
+ REQUESTOR_GROUP_NAME((short)4, "requestorGroupName");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -69,10 +72,12 @@ public class TDropSentryRoleRequest implements org.apache.thrift.TBase<TDropSent
switch(fieldId) {
case 1: // PROTOCOL_VERSION
return PROTOCOL_VERSION;
- case 2: // USER_NAME
- return USER_NAME;
+ case 2: // REQUESTOR_USER_NAME
+ return REQUESTOR_USER_NAME;
case 3: // ROLE_NAME
return ROLE_NAME;
+ case 4: // REQUESTOR_GROUP_NAME
+ return REQUESTOR_GROUP_NAME;
default:
return null;
}
@@ -115,16 +120,18 @@ public class TDropSentryRoleRequest implements org.apache.thrift.TBase<TDropSent
// isset id assignments
private static final int __PROTOCOL_VERSION_ISSET_ID = 0;
private byte __isset_bitfield = 0;
- private _Fields optionals[] = {_Fields.USER_NAME,_Fields.ROLE_NAME};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
tmpMap.put(_Fields.PROTOCOL_VERSION, new org.apache.thrift.meta_data.FieldMetaData("protocol_version", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
- tmpMap.put(_Fields.USER_NAME, new org.apache.thrift.meta_data.FieldMetaData("userName", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ tmpMap.put(_Fields.REQUESTOR_USER_NAME, new org.apache.thrift.meta_data.FieldMetaData("requestorUserName", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.ROLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("roleName", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ tmpMap.put(_Fields.ROLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("roleName", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.REQUESTOR_GROUP_NAME, new org.apache.thrift.meta_data.FieldMetaData("requestorGroupName", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.SetMetaData(org.apache.thrift.protocol.TType.SET,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TDropSentryRoleRequest.class, metaDataMap);
}
@@ -135,11 +142,17 @@ public class TDropSentryRoleRequest implements org.apache.thrift.TBase<TDropSent
}
public TDropSentryRoleRequest(
- int protocol_version)
+ int protocol_version,
+ String requestorUserName,
+ String roleName,
+ Set<String> requestorGroupName)
{
this();
this.protocol_version = protocol_version;
setProtocol_versionIsSet(true);
+ this.requestorUserName = requestorUserName;
+ this.roleName = roleName;
+ this.requestorGroupName = requestorGroupName;
}
/**
@@ -148,12 +161,19 @@ public class TDropSentryRoleRequest implements org.apache.thrift.TBase<TDropSent
public TDropSentryRoleRequest(TDropSentryRoleRequest other) {
__isset_bitfield = other.__isset_bitfield;
this.protocol_version = other.protocol_version;
- if (other.isSetUserName()) {
- this.userName = other.userName;
+ if (other.isSetRequestorUserName()) {
+ this.requestorUserName = other.requestorUserName;
}
if (other.isSetRoleName()) {
this.roleName = other.roleName;
}
+ if (other.isSetRequestorGroupName()) {
+ Set<String> __this__requestorGroupName = new HashSet<String>();
+ for (String other_element : other.requestorGroupName) {
+ __this__requestorGroupName.add(other_element);
+ }
+ this.requestorGroupName = __this__requestorGroupName;
+ }
}
public TDropSentryRoleRequest deepCopy() {
@@ -164,8 +184,9 @@ public class TDropSentryRoleRequest implements org.apache.thrift.TBase<TDropSent
public void clear() {
this.protocol_version = 1;
- this.userName = null;
+ this.requestorUserName = null;
this.roleName = null;
+ this.requestorGroupName = null;
}
public int getProtocol_version() {
@@ -190,26 +211,26 @@ public class TDropSentryRoleRequest implements org.apache.thrift.TBase<TDropSent
__isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PROTOCOL_VERSION_ISSET_ID, value);
}
- public String getUserName() {
- return this.userName;
+ public String getRequestorUserName() {
+ return this.requestorUserName;
}
- public void setUserName(String userName) {
- this.userName = userName;
+ public void setRequestorUserName(String requestorUserName) {
+ this.requestorUserName = requestorUserName;
}
- public void unsetUserName() {
- this.userName = null;
+ public void unsetRequestorUserName() {
+ this.requestorUserName = null;
}
- /** Returns true if field userName is set (has been assigned a value) and false otherwise */
- public boolean isSetUserName() {
- return this.userName != null;
+ /** Returns true if field requestorUserName is set (has been assigned a value) and false otherwise */
+ public boolean isSetRequestorUserName() {
+ return this.requestorUserName != null;
}
- public void setUserNameIsSet(boolean value) {
+ public void setRequestorUserNameIsSet(boolean value) {
if (!value) {
- this.userName = null;
+ this.requestorUserName = null;
}
}
@@ -236,6 +257,44 @@ public class TDropSentryRoleRequest implements org.apache.thrift.TBase<TDropSent
}
}
+ public int getRequestorGroupNameSize() {
+ return (this.requestorGroupName == null) ? 0 : this.requestorGroupName.size();
+ }
+
+ public java.util.Iterator<String> getRequestorGroupNameIterator() {
+ return (this.requestorGroupName == null) ? null : this.requestorGroupName.iterator();
+ }
+
+ public void addToRequestorGroupName(String elem) {
+ if (this.requestorGroupName == null) {
+ this.requestorGroupName = new HashSet<String>();
+ }
+ this.requestorGroupName.add(elem);
+ }
+
+ public Set<String> getRequestorGroupName() {
+ return this.requestorGroupName;
+ }
+
+ public void setRequestorGroupName(Set<String> requestorGroupName) {
+ this.requestorGroupName = requestorGroupName;
+ }
+
+ public void unsetRequestorGroupName() {
+ this.requestorGroupName = null;
+ }
+
+ /** Returns true if field requestorGroupName is set (has been assigned a value) and false otherwise */
+ public boolean isSetRequestorGroupName() {
+ return this.requestorGroupName != null;
+ }
+
+ public void setRequestorGroupNameIsSet(boolean value) {
+ if (!value) {
+ this.requestorGroupName = null;
+ }
+ }
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case PROTOCOL_VERSION:
@@ -246,11 +305,11 @@ public class TDropSentryRoleRequest implements org.apache.thrift.TBase<TDropSent
}
break;
- case USER_NAME:
+ case REQUESTOR_USER_NAME:
if (value == null) {
- unsetUserName();
+ unsetRequestorUserName();
} else {
- setUserName((String)value);
+ setRequestorUserName((String)value);
}
break;
@@ -262,6 +321,14 @@ public class TDropSentryRoleRequest implements org.apache.thrift.TBase<TDropSent
}
break;
+ case REQUESTOR_GROUP_NAME:
+ if (value == null) {
+ unsetRequestorGroupName();
+ } else {
+ setRequestorGroupName((Set<String>)value);
+ }
+ break;
+
}
}
@@ -270,12 +337,15 @@ public class TDropSentryRoleRequest implements org.apache.thrift.TBase<TDropSent
case PROTOCOL_VERSION:
return Integer.valueOf(getProtocol_version());
- case USER_NAME:
- return getUserName();
+ case REQUESTOR_USER_NAME:
+ return getRequestorUserName();
case ROLE_NAME:
return getRoleName();
+ case REQUESTOR_GROUP_NAME:
+ return getRequestorGroupName();
+
}
throw new IllegalStateException();
}
@@ -289,10 +359,12 @@ public class TDropSentryRoleRequest implements org.apache.thrift.TBase<TDropSent
switch (field) {
case PROTOCOL_VERSION:
return isSetProtocol_version();
- case USER_NAME:
- return isSetUserName();
+ case REQUESTOR_USER_NAME:
+ return isSetRequestorUserName();
case ROLE_NAME:
return isSetRoleName();
+ case REQUESTOR_GROUP_NAME:
+ return isSetRequestorGroupName();
}
throw new IllegalStateException();
}
@@ -319,12 +391,12 @@ public class TDropSentryRoleRequest implements org.apache.thrift.TBase<TDropSent
return false;
}
- boolean this_present_userName = true && this.isSetUserName();
- boolean that_present_userName = true && that.isSetUserName();
- if (this_present_userName || that_present_userName) {
- if (!(this_present_userName && that_present_userName))
+ boolean this_present_requestorUserName = true && this.isSetRequestorUserName();
+ boolean that_present_requestorUserName = true && that.isSetRequestorUserName();
+ if (this_present_requestorUserName || that_present_requestorUserName) {
+ if (!(this_present_requestorUserName && that_present_requestorUserName))
return false;
- if (!this.userName.equals(that.userName))
+ if (!this.requestorUserName.equals(that.requestorUserName))
return false;
}
@@ -337,6 +409,15 @@ public class TDropSentryRoleRequest implements org.apache.thrift.TBase<TDropSent
return false;
}
+ boolean this_present_requestorGroupName = true && this.isSetRequestorGroupName();
+ boolean that_present_requestorGroupName = true && that.isSetRequestorGroupName();
+ if (this_present_requestorGroupName || that_present_requestorGroupName) {
+ if (!(this_present_requestorGroupName && that_present_requestorGroupName))
+ return false;
+ if (!this.requestorGroupName.equals(that.requestorGroupName))
+ return false;
+ }
+
return true;
}
@@ -349,16 +430,21 @@ public class TDropSentryRoleRequest implements org.apache.thrift.TBase<TDropSent
if (present_protocol_version)
builder.append(protocol_version);
- boolean present_userName = true && (isSetUserName());
- builder.append(present_userName);
- if (present_userName)
- builder.append(userName);
+ boolean present_requestorUserName = true && (isSetRequestorUserName());
+ builder.append(present_requestorUserName);
+ if (present_requestorUserName)
+ builder.append(requestorUserName);
boolean present_roleName = true && (isSetRoleName());
builder.append(present_roleName);
if (present_roleName)
builder.append(roleName);
+ boolean present_requestorGroupName = true && (isSetRequestorGroupName());
+ builder.append(present_requestorGroupName);
+ if (present_requestorGroupName)
+ builder.append(requestorGroupName);
+
return builder.toHashCode();
}
@@ -380,12 +466,12 @@ public class TDropSentryRoleRequest implements org.apache.thrift.TBase<TDropSent
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetUserName()).compareTo(typedOther.isSetUserName());
+ lastComparison = Boolean.valueOf(isSetRequestorUserName()).compareTo(typedOther.isSetRequestorUserName());
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetUserName()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userName, typedOther.userName);
+ if (isSetRequestorUserName()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.requestorUserName, typedOther.requestorUserName);
if (lastComparison != 0) {
return lastComparison;
}
@@ -400,6 +486,16 @@ public class TDropSentryRoleRequest implements org.apache.thrift.TBase<TDropSent
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetRequestorGroupName()).compareTo(typedOther.isSetRequestorGroupName());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetRequestorGroupName()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.requestorGroupName, typedOther.requestorGroupName);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -423,26 +519,30 @@ public class TDropSentryRoleRequest implements org.apache.thrift.TBase<TDropSent
sb.append("protocol_version:");
sb.append(this.protocol_version);
first = false;
- if (isSetUserName()) {
- if (!first) sb.append(", ");
- sb.append("userName:");
- if (this.userName == null) {
- sb.append("null");
- } else {
- sb.append(this.userName);
- }
- first = false;
+ if (!first) sb.append(", ");
+ sb.append("requestorUserName:");
+ if (this.requestorUserName == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.requestorUserName);
}
- if (isSetRoleName()) {
- if (!first) sb.append(", ");
- sb.append("roleName:");
- if (this.roleName == null) {
- sb.append("null");
- } else {
- sb.append(this.roleName);
- }
- first = false;
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("roleName:");
+ if (this.roleName == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.roleName);
+ }
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("requestorGroupName:");
+ if (this.requestorGroupName == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.requestorGroupName);
}
+ first = false;
sb.append(")");
return sb.toString();
}
@@ -453,6 +553,18 @@ public class TDropSentryRoleRequest implements org.apache.thrift.TBase<TDropSent
throw new org.apache.thrift.protocol.TProtocolException("Required field 'protocol_version' is unset! Struct:" + toString());
}
+ if (!isSetRequestorUserName()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'requestorUserName' is unset! Struct:" + toString());
+ }
+
+ if (!isSetRoleName()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'roleName' is unset! Struct:" + toString());
+ }
+
+ if (!isSetRequestorGroupName()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'requestorGroupName' is unset! Struct:" + toString());
+ }
+
// check for sub-struct validity
}
@@ -500,10 +612,10 @@ public class TDropSentryRoleRequest implements org.apache.thrift.TBase<TDropSent
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 2: // USER_NAME
+ case 2: // REQUESTOR_USER_NAME
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.userName = iprot.readString();
- struct.setUserNameIsSet(true);
+ struct.requestorUserName = iprot.readString();
+ struct.setRequestorUserNameIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -516,6 +628,24 @@ public class TDropSentryRoleRequest implements org.apache.thrift.TBase<TDropSent
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
+ case 4: // REQUESTOR_GROUP_NAME
+ if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
+ {
+ org.apache.thrift.protocol.TSet _set32 = iprot.readSetBegin();
+ struct.requestorGroupName = new HashSet<String>(2*_set32.size);
+ for (int _i33 = 0; _i33 < _set32.size; ++_i33)
+ {
+ String _elem34; // required
+ _elem34 = iprot.readString();
+ struct.requestorGroupName.add(_elem34);
+ }
+ iprot.readSetEnd();
+ }
+ struct.setRequestorGroupNameIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -532,19 +662,27 @@ public class TDropSentryRoleRequest implements org.apache.thrift.TBase<TDropSent
oprot.writeFieldBegin(PROTOCOL_VERSION_FIELD_DESC);
oprot.writeI32(struct.protocol_version);
oprot.writeFieldEnd();
- if (struct.userName != null) {
- if (struct.isSetUserName()) {
- oprot.writeFieldBegin(USER_NAME_FIELD_DESC);
- oprot.writeString(struct.userName);
- oprot.writeFieldEnd();
- }
+ if (struct.requestorUserName != null) {
+ oprot.writeFieldBegin(REQUESTOR_USER_NAME_FIELD_DESC);
+ oprot.writeString(struct.requestorUserName);
+ oprot.writeFieldEnd();
}
if (struct.roleName != null) {
- if (struct.isSetRoleName()) {
- oprot.writeFieldBegin(ROLE_NAME_FIELD_DESC);
- oprot.writeString(struct.roleName);
- oprot.writeFieldEnd();
+ oprot.writeFieldBegin(ROLE_NAME_FIELD_DESC);
+ oprot.writeString(struct.roleName);
+ oprot.writeFieldEnd();
+ }
+ if (struct.requestorGroupName != null) {
+ oprot.writeFieldBegin(REQUESTOR_GROUP_NAME_FIELD_DESC);
+ {
+ oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, struct.requestorGroupName.size()));
+ for (String _iter35 : struct.requestorGroupName)
+ {
+ oprot.writeString(_iter35);
+ }
+ oprot.writeSetEnd();
}
+ oprot.writeFieldEnd();
}
oprot.writeFieldStop();
oprot.writeStructEnd();
@@ -564,19 +702,14 @@ public class TDropSentryRoleRequest implements org.apache.thrift.TBase<TDropSent
public void write(org.apache.thrift.protocol.TProtocol prot, TDropSentryRoleRequest struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
oprot.writeI32(struct.protocol_version);
- BitSet optionals = new BitSet();
- if (struct.isSetUserName()) {
- optionals.set(0);
- }
- if (struct.isSetRoleName()) {
- optionals.set(1);
- }
- oprot.writeBitSet(optionals, 2);
- if (struct.isSetUserName()) {
- oprot.writeString(struct.userName);
- }
- if (struct.isSetRoleName()) {
- oprot.writeString(struct.roleName);
+ oprot.writeString(struct.requestorUserName);
+ oprot.writeString(struct.roleName);
+ {
+ oprot.writeI32(struct.requestorGroupName.size());
+ for (String _iter36 : struct.requestorGroupName)
+ {
+ oprot.writeString(_iter36);
+ }
}
}
@@ -585,15 +718,21 @@ public class TDropSentryRoleRequest implements org.apache.thrift.TBase<TDropSent
TTupleProtocol iprot = (TTupleProtocol) prot;
struct.protocol_version = iprot.readI32();
struct.setProtocol_versionIsSet(true);
- BitSet incoming = iprot.readBitSet(2);
- if (incoming.get(0)) {
- struct.userName = iprot.readString();
- struct.setUserNameIsSet(true);
- }
- if (incoming.get(1)) {
- struct.roleName = iprot.readString();
- struct.setRoleNameIsSet(true);
+ struct.requestorUserName = iprot.readString();
+ struct.setRequestorUserNameIsSet(true);
+ struct.roleName = iprot.readString();
+ struct.setRoleNameIsSet(true);
+ {
+ org.apache.thrift.protocol.TSet _set37 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.requestorGroupName = new HashSet<String>(2*_set37.size);
+ for (int _i38 = 0; _i38 < _set37.size; ++_i38)
+ {
+ String _elem39; // required
+ _elem39 = iprot.readString();
+ struct.requestorGroupName.add(_elem39);
+ }
}
+ struct.setRequestorGroupNameIsSet(true);
}
}