You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2015/12/01 23:05:24 UTC
[46/51] [partial] storm git commit: Update JStorm to latest release
2.1.0
http://git-wip-us.apache.org/repos/asf/storm/blob/7eaf0651/jstorm-core/src/main/java/backtype/storm/generated/ClusterSummary.java
----------------------------------------------------------------------
diff --git a/jstorm-core/src/main/java/backtype/storm/generated/ClusterSummary.java b/jstorm-core/src/main/java/backtype/storm/generated/ClusterSummary.java
index 1735b8a..273aaf3 100644
--- a/jstorm-core/src/main/java/backtype/storm/generated/ClusterSummary.java
+++ b/jstorm-core/src/main/java/backtype/storm/generated/ClusterSummary.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-20")
public class ClusterSummary implements org.apache.thrift.TBase<ClusterSummary, ClusterSummary._Fields>, java.io.Serializable, Cloneable, Comparable<ClusterSummary> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ClusterSummary");
@@ -450,11 +450,11 @@ public class ClusterSummary implements org.apache.thrift.TBase<ClusterSummary, C
return _Fields.findByThriftId(fieldId);
}
- public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol iprot) throws TException {
schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
- public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot) throws TException {
schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@@ -490,18 +490,18 @@ public class ClusterSummary implements org.apache.thrift.TBase<ClusterSummary, C
return sb.toString();
}
- public void validate() throws org.apache.thrift.TException {
+ public void validate() throws TException {
// check for required fields
if (!is_set_nimbus()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'nimbus' is unset! Struct:" + toString());
+ throw new TProtocolException("Required field 'nimbus' is unset! Struct:" + toString());
}
if (!is_set_supervisors()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'supervisors' is unset! Struct:" + toString());
+ throw new TProtocolException("Required field 'supervisors' is unset! Struct:" + toString());
}
if (!is_set_topologies()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'topologies' is unset! Struct:" + toString());
+ throw new TProtocolException("Required field 'topologies' is unset! Struct:" + toString());
}
// check for sub-struct validity
@@ -513,7 +513,7 @@ public class ClusterSummary implements org.apache.thrift.TBase<ClusterSummary, C
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
try {
write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
- } catch (org.apache.thrift.TException te) {
+ } catch (TException te) {
throw new java.io.IOException(te);
}
}
@@ -521,7 +521,7 @@ public class ClusterSummary implements org.apache.thrift.TBase<ClusterSummary, C
private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
try {
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
- } catch (org.apache.thrift.TException te) {
+ } catch (TException te) {
throw new java.io.IOException(te);
}
}
@@ -534,7 +534,7 @@ public class ClusterSummary implements org.apache.thrift.TBase<ClusterSummary, C
private static class ClusterSummaryStandardScheme extends StandardScheme<ClusterSummary> {
- public void read(org.apache.thrift.protocol.TProtocol iprot, ClusterSummary struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol iprot, ClusterSummary struct) throws TException {
org.apache.thrift.protocol.TField schemeField;
iprot.readStructBegin();
while (true)
@@ -600,7 +600,7 @@ public class ClusterSummary implements org.apache.thrift.TBase<ClusterSummary, C
struct.validate();
}
- public void write(org.apache.thrift.protocol.TProtocol oprot, ClusterSummary struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot, ClusterSummary struct) throws TException {
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
@@ -648,7 +648,7 @@ public class ClusterSummary implements org.apache.thrift.TBase<ClusterSummary, C
private static class ClusterSummaryTupleScheme extends TupleScheme<ClusterSummary> {
@Override
- public void write(org.apache.thrift.protocol.TProtocol prot, ClusterSummary struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol prot, ClusterSummary struct) throws TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
struct.nimbus.write(oprot);
{
@@ -668,7 +668,7 @@ public class ClusterSummary implements org.apache.thrift.TBase<ClusterSummary, C
}
@Override
- public void read(org.apache.thrift.protocol.TProtocol prot, ClusterSummary struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol prot, ClusterSummary struct) throws TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
struct.nimbus = new NimbusSummary();
struct.nimbus.read(iprot);
http://git-wip-us.apache.org/repos/asf/storm/blob/7eaf0651/jstorm-core/src/main/java/backtype/storm/generated/ComponentCommon.java
----------------------------------------------------------------------
diff --git a/jstorm-core/src/main/java/backtype/storm/generated/ComponentCommon.java b/jstorm-core/src/main/java/backtype/storm/generated/ComponentCommon.java
index 0a98a62..715dfa3 100644
--- a/jstorm-core/src/main/java/backtype/storm/generated/ComponentCommon.java
+++ b/jstorm-core/src/main/java/backtype/storm/generated/ComponentCommon.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-20")
public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon, ComponentCommon._Fields>, java.io.Serializable, Cloneable, Comparable<ComponentCommon> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComponentCommon");
@@ -531,11 +531,11 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
return _Fields.findByThriftId(fieldId);
}
- public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol iprot) throws TException {
schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
- public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot) throws TException {
schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@@ -579,14 +579,14 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
return sb.toString();
}
- public void validate() throws org.apache.thrift.TException {
+ public void validate() throws TException {
// check for required fields
if (!is_set_inputs()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'inputs' is unset! Struct:" + toString());
+ throw new TProtocolException("Required field 'inputs' is unset! Struct:" + toString());
}
if (!is_set_streams()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'streams' is unset! Struct:" + toString());
+ throw new TProtocolException("Required field 'streams' is unset! Struct:" + toString());
}
// check for sub-struct validity
@@ -595,7 +595,7 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
try {
write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
- } catch (org.apache.thrift.TException te) {
+ } catch (TException te) {
throw new java.io.IOException(te);
}
}
@@ -605,7 +605,7 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
// it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
__isset_bitfield = 0;
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
- } catch (org.apache.thrift.TException te) {
+ } catch (TException te) {
throw new java.io.IOException(te);
}
}
@@ -618,7 +618,7 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
private static class ComponentCommonStandardScheme extends StandardScheme<ComponentCommon> {
- public void read(org.apache.thrift.protocol.TProtocol iprot, ComponentCommon struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol iprot, ComponentCommon struct) throws TException {
org.apache.thrift.protocol.TField schemeField;
iprot.readStructBegin();
while (true)
@@ -696,7 +696,7 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
struct.validate();
}
- public void write(org.apache.thrift.protocol.TProtocol oprot, ComponentCommon struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot, ComponentCommon struct) throws TException {
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
@@ -753,7 +753,7 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
private static class ComponentCommonTupleScheme extends TupleScheme<ComponentCommon> {
@Override
- public void write(org.apache.thrift.protocol.TProtocol prot, ComponentCommon struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol prot, ComponentCommon struct) throws TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
{
oprot.writeI32(struct.inputs.size());
@@ -788,7 +788,7 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
}
@Override
- public void read(org.apache.thrift.protocol.TProtocol prot, ComponentCommon struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol prot, ComponentCommon struct) throws TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
{
org.apache.thrift.protocol.TMap _map36 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
http://git-wip-us.apache.org/repos/asf/storm/blob/7eaf0651/jstorm-core/src/main/java/backtype/storm/generated/ComponentObject.java
----------------------------------------------------------------------
diff --git a/jstorm-core/src/main/java/backtype/storm/generated/ComponentObject.java b/jstorm-core/src/main/java/backtype/storm/generated/ComponentObject.java
index ab32225..1ff671e 100755
--- a/jstorm-core/src/main/java/backtype/storm/generated/ComponentObject.java
+++ b/jstorm-core/src/main/java/backtype/storm/generated/ComponentObject.java
@@ -181,7 +181,7 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
}
@Override
- protected Object standardSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TField field) throws org.apache.thrift.TException {
+ protected Object standardSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TField field) throws TException {
_Fields setField = _Fields.findByThriftId(field.id);
if (setField != null) {
switch (setField) {
@@ -224,7 +224,7 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
}
@Override
- protected void standardSchemeWriteValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+ protected void standardSchemeWriteValue(org.apache.thrift.protocol.TProtocol oprot) throws TException {
switch (setField_) {
case SERIALIZED_JAVA:
ByteBuffer serialized_java = (ByteBuffer)value_;
@@ -244,7 +244,7 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
}
@Override
- protected Object tupleSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, short fieldID) throws org.apache.thrift.TException {
+ protected Object tupleSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, short fieldID) throws TException {
_Fields setField = _Fields.findByThriftId(fieldID);
if (setField != null) {
switch (setField) {
@@ -271,7 +271,7 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
}
@Override
- protected void tupleSchemeWriteValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+ protected void tupleSchemeWriteValue(org.apache.thrift.protocol.TProtocol oprot) throws TException {
switch (setField_) {
case SERIALIZED_JAVA:
ByteBuffer serialized_java = (ByteBuffer)value_;
@@ -427,7 +427,7 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
try {
write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
- } catch (org.apache.thrift.TException te) {
+ } catch (TException te) {
throw new java.io.IOException(te);
}
}
@@ -436,7 +436,7 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
try {
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
- } catch (org.apache.thrift.TException te) {
+ } catch (TException te) {
throw new java.io.IOException(te);
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/7eaf0651/jstorm-core/src/main/java/backtype/storm/generated/ComponentSummary.java
----------------------------------------------------------------------
diff --git a/jstorm-core/src/main/java/backtype/storm/generated/ComponentSummary.java b/jstorm-core/src/main/java/backtype/storm/generated/ComponentSummary.java
index 8161f72..4bffd3f 100644
--- a/jstorm-core/src/main/java/backtype/storm/generated/ComponentSummary.java
+++ b/jstorm-core/src/main/java/backtype/storm/generated/ComponentSummary.java
@@ -34,14 +34,14 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-20")
public class ComponentSummary implements org.apache.thrift.TBase<ComponentSummary, ComponentSummary._Fields>, java.io.Serializable, Cloneable, Comparable<ComponentSummary> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComponentSummary");
private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)1);
private static final org.apache.thrift.protocol.TField PARALLEL_FIELD_DESC = new org.apache.thrift.protocol.TField("parallel", org.apache.thrift.protocol.TType.I32, (short)2);
private static final org.apache.thrift.protocol.TField TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("type", org.apache.thrift.protocol.TType.STRING, (short)3);
- private static final org.apache.thrift.protocol.TField TASK_IDS_FIELD_DESC = new org.apache.thrift.protocol.TField("task_ids", org.apache.thrift.protocol.TType.LIST, (short)4);
+ private static final org.apache.thrift.protocol.TField TASK_IDS_FIELD_DESC = new org.apache.thrift.protocol.TField("taskIds", org.apache.thrift.protocol.TType.LIST, (short)4);
private static final org.apache.thrift.protocol.TField ERRORS_FIELD_DESC = new org.apache.thrift.protocol.TField("errors", org.apache.thrift.protocol.TType.LIST, (short)5);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
@@ -53,7 +53,7 @@ public class ComponentSummary implements org.apache.thrift.TBase<ComponentSummar
private String name; // required
private int parallel; // required
private String type; // required
- private List<Integer> task_ids; // required
+ private List<Integer> taskIds; // required
private List<ErrorInfo> errors; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -61,7 +61,7 @@ public class ComponentSummary implements org.apache.thrift.TBase<ComponentSummar
NAME((short)1, "name"),
PARALLEL((short)2, "parallel"),
TYPE((short)3, "type"),
- TASK_IDS((short)4, "task_ids"),
+ TASK_IDS((short)4, "taskIds"),
ERRORS((short)5, "errors");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -139,7 +139,7 @@ public class ComponentSummary implements org.apache.thrift.TBase<ComponentSummar
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
tmpMap.put(_Fields.TYPE, new org.apache.thrift.meta_data.FieldMetaData("type", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.TASK_IDS, new org.apache.thrift.meta_data.FieldMetaData("task_ids", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ tmpMap.put(_Fields.TASK_IDS, new org.apache.thrift.meta_data.FieldMetaData("taskIds", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))));
tmpMap.put(_Fields.ERRORS, new org.apache.thrift.meta_data.FieldMetaData("errors", org.apache.thrift.TFieldRequirementType.OPTIONAL,
@@ -156,14 +156,14 @@ public class ComponentSummary implements org.apache.thrift.TBase<ComponentSummar
String name,
int parallel,
String type,
- List<Integer> task_ids)
+ List<Integer> taskIds)
{
this();
this.name = name;
this.parallel = parallel;
set_parallel_isSet(true);
this.type = type;
- this.task_ids = task_ids;
+ this.taskIds = taskIds;
}
/**
@@ -178,9 +178,9 @@ public class ComponentSummary implements org.apache.thrift.TBase<ComponentSummar
if (other.is_set_type()) {
this.type = other.type;
}
- if (other.is_set_task_ids()) {
- List<Integer> __this__task_ids = new ArrayList<Integer>(other.task_ids);
- this.task_ids = __this__task_ids;
+ if (other.is_set_taskIds()) {
+ List<Integer> __this__taskIds = new ArrayList<Integer>(other.taskIds);
+ this.taskIds = __this__taskIds;
}
if (other.is_set_errors()) {
List<ErrorInfo> __this__errors = new ArrayList<ErrorInfo>(other.errors.size());
@@ -201,7 +201,7 @@ public class ComponentSummary implements org.apache.thrift.TBase<ComponentSummar
set_parallel_isSet(false);
this.parallel = 0;
this.type = null;
- this.task_ids = null;
+ this.taskIds = null;
this.errors = null;
}
@@ -273,41 +273,41 @@ public class ComponentSummary implements org.apache.thrift.TBase<ComponentSummar
}
}
- public int get_task_ids_size() {
- return (this.task_ids == null) ? 0 : this.task_ids.size();
+ public int get_taskIds_size() {
+ return (this.taskIds == null) ? 0 : this.taskIds.size();
}
- public java.util.Iterator<Integer> get_task_ids_iterator() {
- return (this.task_ids == null) ? null : this.task_ids.iterator();
+ public java.util.Iterator<Integer> get_taskIds_iterator() {
+ return (this.taskIds == null) ? null : this.taskIds.iterator();
}
- public void add_to_task_ids(int elem) {
- if (this.task_ids == null) {
- this.task_ids = new ArrayList<Integer>();
+ public void add_to_taskIds(int elem) {
+ if (this.taskIds == null) {
+ this.taskIds = new ArrayList<Integer>();
}
- this.task_ids.add(elem);
+ this.taskIds.add(elem);
}
- public List<Integer> get_task_ids() {
- return this.task_ids;
+ public List<Integer> get_taskIds() {
+ return this.taskIds;
}
- public void set_task_ids(List<Integer> task_ids) {
- this.task_ids = task_ids;
+ public void set_taskIds(List<Integer> taskIds) {
+ this.taskIds = taskIds;
}
- public void unset_task_ids() {
- this.task_ids = null;
+ public void unset_taskIds() {
+ this.taskIds = null;
}
- /** Returns true if field task_ids is set (has been assigned a value) and false otherwise */
- public boolean is_set_task_ids() {
- return this.task_ids != null;
+ /** Returns true if field taskIds is set (has been assigned a value) and false otherwise */
+ public boolean is_set_taskIds() {
+ return this.taskIds != null;
}
- public void set_task_ids_isSet(boolean value) {
+ public void set_taskIds_isSet(boolean value) {
if (!value) {
- this.task_ids = null;
+ this.taskIds = null;
}
}
@@ -377,9 +377,9 @@ public class ComponentSummary implements org.apache.thrift.TBase<ComponentSummar
case TASK_IDS:
if (value == null) {
- unset_task_ids();
+ unset_taskIds();
} else {
- set_task_ids((List<Integer>)value);
+ set_taskIds((List<Integer>)value);
}
break;
@@ -406,7 +406,7 @@ public class ComponentSummary implements org.apache.thrift.TBase<ComponentSummar
return get_type();
case TASK_IDS:
- return get_task_ids();
+ return get_taskIds();
case ERRORS:
return get_errors();
@@ -429,7 +429,7 @@ public class ComponentSummary implements org.apache.thrift.TBase<ComponentSummar
case TYPE:
return is_set_type();
case TASK_IDS:
- return is_set_task_ids();
+ return is_set_taskIds();
case ERRORS:
return is_set_errors();
}
@@ -476,12 +476,12 @@ public class ComponentSummary implements org.apache.thrift.TBase<ComponentSummar
return false;
}
- boolean this_present_task_ids = true && this.is_set_task_ids();
- boolean that_present_task_ids = true && that.is_set_task_ids();
- if (this_present_task_ids || that_present_task_ids) {
- if (!(this_present_task_ids && that_present_task_ids))
+ boolean this_present_taskIds = true && this.is_set_taskIds();
+ boolean that_present_taskIds = true && that.is_set_taskIds();
+ if (this_present_taskIds || that_present_taskIds) {
+ if (!(this_present_taskIds && that_present_taskIds))
return false;
- if (!this.task_ids.equals(that.task_ids))
+ if (!this.taskIds.equals(that.taskIds))
return false;
}
@@ -516,10 +516,10 @@ public class ComponentSummary implements org.apache.thrift.TBase<ComponentSummar
if (present_type)
list.add(type);
- boolean present_task_ids = true && (is_set_task_ids());
- list.add(present_task_ids);
- if (present_task_ids)
- list.add(task_ids);
+ boolean present_taskIds = true && (is_set_taskIds());
+ list.add(present_taskIds);
+ if (present_taskIds)
+ list.add(taskIds);
boolean present_errors = true && (is_set_errors());
list.add(present_errors);
@@ -567,12 +567,12 @@ public class ComponentSummary implements org.apache.thrift.TBase<ComponentSummar
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_task_ids()).compareTo(other.is_set_task_ids());
+ lastComparison = Boolean.valueOf(is_set_taskIds()).compareTo(other.is_set_taskIds());
if (lastComparison != 0) {
return lastComparison;
}
- if (is_set_task_ids()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.task_ids, other.task_ids);
+ if (is_set_taskIds()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.taskIds, other.taskIds);
if (lastComparison != 0) {
return lastComparison;
}
@@ -594,11 +594,11 @@ public class ComponentSummary implements org.apache.thrift.TBase<ComponentSummar
return _Fields.findByThriftId(fieldId);
}
- public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol iprot) throws TException {
schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
- public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot) throws TException {
schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@@ -627,11 +627,11 @@ public class ComponentSummary implements org.apache.thrift.TBase<ComponentSummar
}
first = false;
if (!first) sb.append(", ");
- sb.append("task_ids:");
- if (this.task_ids == null) {
+ sb.append("taskIds:");
+ if (this.taskIds == null) {
sb.append("null");
} else {
- sb.append(this.task_ids);
+ sb.append(this.taskIds);
}
first = false;
if (is_set_errors()) {
@@ -648,22 +648,22 @@ public class ComponentSummary implements org.apache.thrift.TBase<ComponentSummar
return sb.toString();
}
- public void validate() throws org.apache.thrift.TException {
+ public void validate() throws TException {
// check for required fields
if (!is_set_name()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'name' is unset! Struct:" + toString());
+ throw new TProtocolException("Required field 'name' is unset! Struct:" + toString());
}
if (!is_set_parallel()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'parallel' is unset! Struct:" + toString());
+ throw new TProtocolException("Required field 'parallel' is unset! Struct:" + toString());
}
if (!is_set_type()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'type' is unset! Struct:" + toString());
+ throw new TProtocolException("Required field 'type' is unset! Struct:" + toString());
}
- if (!is_set_task_ids()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'task_ids' is unset! Struct:" + toString());
+ if (!is_set_taskIds()) {
+ throw new TProtocolException("Required field 'taskIds' is unset! Struct:" + toString());
}
// check for sub-struct validity
@@ -672,7 +672,7 @@ public class ComponentSummary implements org.apache.thrift.TBase<ComponentSummar
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
try {
write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
- } catch (org.apache.thrift.TException te) {
+ } catch (TException te) {
throw new java.io.IOException(te);
}
}
@@ -682,7 +682,7 @@ public class ComponentSummary implements org.apache.thrift.TBase<ComponentSummar
// it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
__isset_bitfield = 0;
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
- } catch (org.apache.thrift.TException te) {
+ } catch (TException te) {
throw new java.io.IOException(te);
}
}
@@ -695,7 +695,7 @@ public class ComponentSummary implements org.apache.thrift.TBase<ComponentSummar
private static class ComponentSummaryStandardScheme extends StandardScheme<ComponentSummary> {
- public void read(org.apache.thrift.protocol.TProtocol iprot, ComponentSummary struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol iprot, ComponentSummary struct) throws TException {
org.apache.thrift.protocol.TField schemeField;
iprot.readStructBegin();
while (true)
@@ -732,17 +732,17 @@ public class ComponentSummary implements org.apache.thrift.TBase<ComponentSummar
case 4: // TASK_IDS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list214 = iprot.readListBegin();
- struct.task_ids = new ArrayList<Integer>(_list214.size);
- int _elem215;
- for (int _i216 = 0; _i216 < _list214.size; ++_i216)
+ org.apache.thrift.protocol.TList _list162 = iprot.readListBegin();
+ struct.taskIds = new ArrayList<Integer>(_list162.size);
+ int _elem163;
+ for (int _i164 = 0; _i164 < _list162.size; ++_i164)
{
- _elem215 = iprot.readI32();
- struct.task_ids.add(_elem215);
+ _elem163 = iprot.readI32();
+ struct.taskIds.add(_elem163);
}
iprot.readListEnd();
}
- struct.set_task_ids_isSet(true);
+ struct.set_taskIds_isSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -750,14 +750,14 @@ public class ComponentSummary implements org.apache.thrift.TBase<ComponentSummar
case 5: // ERRORS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list217 = iprot.readListBegin();
- struct.errors = new ArrayList<ErrorInfo>(_list217.size);
- ErrorInfo _elem218;
- for (int _i219 = 0; _i219 < _list217.size; ++_i219)
+ org.apache.thrift.protocol.TList _list165 = iprot.readListBegin();
+ struct.errors = new ArrayList<ErrorInfo>(_list165.size);
+ ErrorInfo _elem166;
+ for (int _i167 = 0; _i167 < _list165.size; ++_i167)
{
- _elem218 = new ErrorInfo();
- _elem218.read(iprot);
- struct.errors.add(_elem218);
+ _elem166 = new ErrorInfo();
+ _elem166.read(iprot);
+ struct.errors.add(_elem166);
}
iprot.readListEnd();
}
@@ -775,7 +775,7 @@ public class ComponentSummary implements org.apache.thrift.TBase<ComponentSummar
struct.validate();
}
- public void write(org.apache.thrift.protocol.TProtocol oprot, ComponentSummary struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot, ComponentSummary struct) throws TException {
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
@@ -792,13 +792,13 @@ public class ComponentSummary implements org.apache.thrift.TBase<ComponentSummar
oprot.writeString(struct.type);
oprot.writeFieldEnd();
}
- if (struct.task_ids != null) {
+ if (struct.taskIds != null) {
oprot.writeFieldBegin(TASK_IDS_FIELD_DESC);
{
- oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, struct.task_ids.size()));
- for (int _iter220 : struct.task_ids)
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, struct.taskIds.size()));
+ for (int _iter168 : struct.taskIds)
{
- oprot.writeI32(_iter220);
+ oprot.writeI32(_iter168);
}
oprot.writeListEnd();
}
@@ -809,9 +809,9 @@ public class ComponentSummary implements org.apache.thrift.TBase<ComponentSummar
oprot.writeFieldBegin(ERRORS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.errors.size()));
- for (ErrorInfo _iter221 : struct.errors)
+ for (ErrorInfo _iter169 : struct.errors)
{
- _iter221.write(oprot);
+ _iter169.write(oprot);
}
oprot.writeListEnd();
}
@@ -833,16 +833,16 @@ public class ComponentSummary implements org.apache.thrift.TBase<ComponentSummar
private static class ComponentSummaryTupleScheme extends TupleScheme<ComponentSummary> {
@Override
- public void write(org.apache.thrift.protocol.TProtocol prot, ComponentSummary struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol prot, ComponentSummary struct) throws TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
oprot.writeString(struct.name);
oprot.writeI32(struct.parallel);
oprot.writeString(struct.type);
{
- oprot.writeI32(struct.task_ids.size());
- for (int _iter222 : struct.task_ids)
+ oprot.writeI32(struct.taskIds.size());
+ for (int _iter170 : struct.taskIds)
{
- oprot.writeI32(_iter222);
+ oprot.writeI32(_iter170);
}
}
BitSet optionals = new BitSet();
@@ -853,16 +853,16 @@ public class ComponentSummary implements org.apache.thrift.TBase<ComponentSummar
if (struct.is_set_errors()) {
{
oprot.writeI32(struct.errors.size());
- for (ErrorInfo _iter223 : struct.errors)
+ for (ErrorInfo _iter171 : struct.errors)
{
- _iter223.write(oprot);
+ _iter171.write(oprot);
}
}
}
}
@Override
- public void read(org.apache.thrift.protocol.TProtocol prot, ComponentSummary struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol prot, ComponentSummary struct) throws TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
struct.name = iprot.readString();
struct.set_name_isSet(true);
@@ -871,27 +871,27 @@ public class ComponentSummary implements org.apache.thrift.TBase<ComponentSummar
struct.type = iprot.readString();
struct.set_type_isSet(true);
{
- org.apache.thrift.protocol.TList _list224 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32());
- struct.task_ids = new ArrayList<Integer>(_list224.size);
- int _elem225;
- for (int _i226 = 0; _i226 < _list224.size; ++_i226)
+ org.apache.thrift.protocol.TList _list172 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32());
+ struct.taskIds = new ArrayList<Integer>(_list172.size);
+ int _elem173;
+ for (int _i174 = 0; _i174 < _list172.size; ++_i174)
{
- _elem225 = iprot.readI32();
- struct.task_ids.add(_elem225);
+ _elem173 = iprot.readI32();
+ struct.taskIds.add(_elem173);
}
}
- struct.set_task_ids_isSet(true);
+ struct.set_taskIds_isSet(true);
BitSet incoming = iprot.readBitSet(1);
if (incoming.get(0)) {
{
- org.apache.thrift.protocol.TList _list227 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.errors = new ArrayList<ErrorInfo>(_list227.size);
- ErrorInfo _elem228;
- for (int _i229 = 0; _i229 < _list227.size; ++_i229)
+ org.apache.thrift.protocol.TList _list175 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.errors = new ArrayList<ErrorInfo>(_list175.size);
+ ErrorInfo _elem176;
+ for (int _i177 = 0; _i177 < _list175.size; ++_i177)
{
- _elem228 = new ErrorInfo();
- _elem228.read(iprot);
- struct.errors.add(_elem228);
+ _elem176 = new ErrorInfo();
+ _elem176.read(iprot);
+ struct.errors.add(_elem176);
}
}
struct.set_errors_isSet(true);
http://git-wip-us.apache.org/repos/asf/storm/blob/7eaf0651/jstorm-core/src/main/java/backtype/storm/generated/Credentials.java
----------------------------------------------------------------------
diff --git a/jstorm-core/src/main/java/backtype/storm/generated/Credentials.java b/jstorm-core/src/main/java/backtype/storm/generated/Credentials.java
index e2ca92d..2105c7f 100644
--- a/jstorm-core/src/main/java/backtype/storm/generated/Credentials.java
+++ b/jstorm-core/src/main/java/backtype/storm/generated/Credentials.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-20")
public class Credentials implements org.apache.thrift.TBase<Credentials, Credentials._Fields>, java.io.Serializable, Cloneable, Comparable<Credentials> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Credentials");
@@ -278,11 +278,11 @@ public class Credentials implements org.apache.thrift.TBase<Credentials, Credent
return _Fields.findByThriftId(fieldId);
}
- public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol iprot) throws TException {
schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
- public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot) throws TException {
schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@@ -302,10 +302,10 @@ public class Credentials implements org.apache.thrift.TBase<Credentials, Credent
return sb.toString();
}
- public void validate() throws org.apache.thrift.TException {
+ public void validate() throws TException {
// check for required fields
if (!is_set_creds()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'creds' is unset! Struct:" + toString());
+ throw new TProtocolException("Required field 'creds' is unset! Struct:" + toString());
}
// check for sub-struct validity
@@ -314,7 +314,7 @@ public class Credentials implements org.apache.thrift.TBase<Credentials, Credent
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
try {
write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
- } catch (org.apache.thrift.TException te) {
+ } catch (TException te) {
throw new java.io.IOException(te);
}
}
@@ -322,7 +322,7 @@ public class Credentials implements org.apache.thrift.TBase<Credentials, Credent
private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
try {
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
- } catch (org.apache.thrift.TException te) {
+ } catch (TException te) {
throw new java.io.IOException(te);
}
}
@@ -335,7 +335,7 @@ public class Credentials implements org.apache.thrift.TBase<Credentials, Credent
private static class CredentialsStandardScheme extends StandardScheme<Credentials> {
- public void read(org.apache.thrift.protocol.TProtocol iprot, Credentials struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol iprot, Credentials struct) throws TException {
org.apache.thrift.protocol.TField schemeField;
iprot.readStructBegin();
while (true)
@@ -348,15 +348,15 @@ public class Credentials implements org.apache.thrift.TBase<Credentials, Credent
case 1: // CREDS
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map254 = iprot.readMapBegin();
- struct.creds = new HashMap<String,String>(2*_map254.size);
- String _key255;
- String _val256;
- for (int _i257 = 0; _i257 < _map254.size; ++_i257)
+ org.apache.thrift.protocol.TMap _map202 = iprot.readMapBegin();
+ struct.creds = new HashMap<String,String>(2*_map202.size);
+ String _key203;
+ String _val204;
+ for (int _i205 = 0; _i205 < _map202.size; ++_i205)
{
- _key255 = iprot.readString();
- _val256 = iprot.readString();
- struct.creds.put(_key255, _val256);
+ _key203 = iprot.readString();
+ _val204 = iprot.readString();
+ struct.creds.put(_key203, _val204);
}
iprot.readMapEnd();
}
@@ -374,7 +374,7 @@ public class Credentials implements org.apache.thrift.TBase<Credentials, Credent
struct.validate();
}
- public void write(org.apache.thrift.protocol.TProtocol oprot, Credentials struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot, Credentials struct) throws TException {
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
@@ -382,10 +382,10 @@ public class Credentials implements org.apache.thrift.TBase<Credentials, Credent
oprot.writeFieldBegin(CREDS_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.creds.size()));
- for (Map.Entry<String, String> _iter258 : struct.creds.entrySet())
+ for (Map.Entry<String, String> _iter206 : struct.creds.entrySet())
{
- oprot.writeString(_iter258.getKey());
- oprot.writeString(_iter258.getValue());
+ oprot.writeString(_iter206.getKey());
+ oprot.writeString(_iter206.getValue());
}
oprot.writeMapEnd();
}
@@ -406,31 +406,31 @@ public class Credentials implements org.apache.thrift.TBase<Credentials, Credent
private static class CredentialsTupleScheme extends TupleScheme<Credentials> {
@Override
- public void write(org.apache.thrift.protocol.TProtocol prot, Credentials struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol prot, Credentials struct) throws TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
{
oprot.writeI32(struct.creds.size());
- for (Map.Entry<String, String> _iter259 : struct.creds.entrySet())
+ for (Map.Entry<String, String> _iter207 : struct.creds.entrySet())
{
- oprot.writeString(_iter259.getKey());
- oprot.writeString(_iter259.getValue());
+ oprot.writeString(_iter207.getKey());
+ oprot.writeString(_iter207.getValue());
}
}
}
@Override
- public void read(org.apache.thrift.protocol.TProtocol prot, Credentials struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol prot, Credentials struct) throws TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
{
- org.apache.thrift.protocol.TMap _map260 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.creds = new HashMap<String,String>(2*_map260.size);
- String _key261;
- String _val262;
- for (int _i263 = 0; _i263 < _map260.size; ++_i263)
+ org.apache.thrift.protocol.TMap _map208 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.creds = new HashMap<String,String>(2*_map208.size);
+ String _key209;
+ String _val210;
+ for (int _i211 = 0; _i211 < _map208.size; ++_i211)
{
- _key261 = iprot.readString();
- _val262 = iprot.readString();
- struct.creds.put(_key261, _val262);
+ _key209 = iprot.readString();
+ _val210 = iprot.readString();
+ struct.creds.put(_key209, _val210);
}
}
struct.set_creds_isSet(true);
http://git-wip-us.apache.org/repos/asf/storm/blob/7eaf0651/jstorm-core/src/main/java/backtype/storm/generated/DRPCExecutionException.java
----------------------------------------------------------------------
diff --git a/jstorm-core/src/main/java/backtype/storm/generated/DRPCExecutionException.java b/jstorm-core/src/main/java/backtype/storm/generated/DRPCExecutionException.java
index 3d8502f..b6bc34f 100644
--- a/jstorm-core/src/main/java/backtype/storm/generated/DRPCExecutionException.java
+++ b/jstorm-core/src/main/java/backtype/storm/generated/DRPCExecutionException.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-20")
public class DRPCExecutionException extends TException implements org.apache.thrift.TBase<DRPCExecutionException, DRPCExecutionException._Fields>, java.io.Serializable, Cloneable, Comparable<DRPCExecutionException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DRPCExecutionException");
@@ -264,11 +264,11 @@ public class DRPCExecutionException extends TException implements org.apache.thr
return _Fields.findByThriftId(fieldId);
}
- public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol iprot) throws TException {
schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
- public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot) throws TException {
schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@@ -288,10 +288,10 @@ public class DRPCExecutionException extends TException implements org.apache.thr
return sb.toString();
}
- public void validate() throws org.apache.thrift.TException {
+ public void validate() throws TException {
// check for required fields
if (!is_set_msg()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'msg' is unset! Struct:" + toString());
+ throw new TProtocolException("Required field 'msg' is unset! Struct:" + toString());
}
// check for sub-struct validity
@@ -300,7 +300,7 @@ public class DRPCExecutionException extends TException implements org.apache.thr
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
try {
write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
- } catch (org.apache.thrift.TException te) {
+ } catch (TException te) {
throw new java.io.IOException(te);
}
}
@@ -308,7 +308,7 @@ public class DRPCExecutionException extends TException implements org.apache.thr
private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
try {
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
- } catch (org.apache.thrift.TException te) {
+ } catch (TException te) {
throw new java.io.IOException(te);
}
}
@@ -321,7 +321,7 @@ public class DRPCExecutionException extends TException implements org.apache.thr
private static class DRPCExecutionExceptionStandardScheme extends StandardScheme<DRPCExecutionException> {
- public void read(org.apache.thrift.protocol.TProtocol iprot, DRPCExecutionException struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol iprot, DRPCExecutionException struct) throws TException {
org.apache.thrift.protocol.TField schemeField;
iprot.readStructBegin();
while (true)
@@ -348,7 +348,7 @@ public class DRPCExecutionException extends TException implements org.apache.thr
struct.validate();
}
- public void write(org.apache.thrift.protocol.TProtocol oprot, DRPCExecutionException struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot, DRPCExecutionException struct) throws TException {
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
@@ -372,13 +372,13 @@ public class DRPCExecutionException extends TException implements org.apache.thr
private static class DRPCExecutionExceptionTupleScheme extends TupleScheme<DRPCExecutionException> {
@Override
- public void write(org.apache.thrift.protocol.TProtocol prot, DRPCExecutionException struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol prot, DRPCExecutionException struct) throws TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
oprot.writeString(struct.msg);
}
@Override
- public void read(org.apache.thrift.protocol.TProtocol prot, DRPCExecutionException struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol prot, DRPCExecutionException struct) throws TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
struct.msg = iprot.readString();
struct.set_msg_isSet(true);
http://git-wip-us.apache.org/repos/asf/storm/blob/7eaf0651/jstorm-core/src/main/java/backtype/storm/generated/DRPCRequest.java
----------------------------------------------------------------------
diff --git a/jstorm-core/src/main/java/backtype/storm/generated/DRPCRequest.java b/jstorm-core/src/main/java/backtype/storm/generated/DRPCRequest.java
index 00448f5..dd9c307 100644
--- a/jstorm-core/src/main/java/backtype/storm/generated/DRPCRequest.java
+++ b/jstorm-core/src/main/java/backtype/storm/generated/DRPCRequest.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-20")
public class DRPCRequest implements org.apache.thrift.TBase<DRPCRequest, DRPCRequest._Fields>, java.io.Serializable, Cloneable, Comparable<DRPCRequest> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DRPCRequest");
@@ -337,11 +337,11 @@ public class DRPCRequest implements org.apache.thrift.TBase<DRPCRequest, DRPCReq
return _Fields.findByThriftId(fieldId);
}
- public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol iprot) throws TException {
schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
- public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot) throws TException {
schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@@ -369,14 +369,14 @@ public class DRPCRequest implements org.apache.thrift.TBase<DRPCRequest, DRPCReq
return sb.toString();
}
- public void validate() throws org.apache.thrift.TException {
+ public void validate() throws TException {
// check for required fields
if (!is_set_func_args()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'func_args' is unset! Struct:" + toString());
+ throw new TProtocolException("Required field 'func_args' is unset! Struct:" + toString());
}
if (!is_set_request_id()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'request_id' is unset! Struct:" + toString());
+ throw new TProtocolException("Required field 'request_id' is unset! Struct:" + toString());
}
// check for sub-struct validity
@@ -385,7 +385,7 @@ public class DRPCRequest implements org.apache.thrift.TBase<DRPCRequest, DRPCReq
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
try {
write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
- } catch (org.apache.thrift.TException te) {
+ } catch (TException te) {
throw new java.io.IOException(te);
}
}
@@ -393,7 +393,7 @@ public class DRPCRequest implements org.apache.thrift.TBase<DRPCRequest, DRPCReq
private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
try {
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
- } catch (org.apache.thrift.TException te) {
+ } catch (TException te) {
throw new java.io.IOException(te);
}
}
@@ -406,7 +406,7 @@ public class DRPCRequest implements org.apache.thrift.TBase<DRPCRequest, DRPCReq
private static class DRPCRequestStandardScheme extends StandardScheme<DRPCRequest> {
- public void read(org.apache.thrift.protocol.TProtocol iprot, DRPCRequest struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol iprot, DRPCRequest struct) throws TException {
org.apache.thrift.protocol.TField schemeField;
iprot.readStructBegin();
while (true)
@@ -441,7 +441,7 @@ public class DRPCRequest implements org.apache.thrift.TBase<DRPCRequest, DRPCReq
struct.validate();
}
- public void write(org.apache.thrift.protocol.TProtocol oprot, DRPCRequest struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot, DRPCRequest struct) throws TException {
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
@@ -470,14 +470,14 @@ public class DRPCRequest implements org.apache.thrift.TBase<DRPCRequest, DRPCReq
private static class DRPCRequestTupleScheme extends TupleScheme<DRPCRequest> {
@Override
- public void write(org.apache.thrift.protocol.TProtocol prot, DRPCRequest struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol prot, DRPCRequest struct) throws TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
oprot.writeString(struct.func_args);
oprot.writeString(struct.request_id);
}
@Override
- public void read(org.apache.thrift.protocol.TProtocol prot, DRPCRequest struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol prot, DRPCRequest struct) throws TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
struct.func_args = iprot.readString();
struct.set_func_args_isSet(true);
http://git-wip-us.apache.org/repos/asf/storm/blob/7eaf0651/jstorm-core/src/main/java/backtype/storm/generated/DistributedRPC.java
----------------------------------------------------------------------
diff --git a/jstorm-core/src/main/java/backtype/storm/generated/DistributedRPC.java b/jstorm-core/src/main/java/backtype/storm/generated/DistributedRPC.java
index ff3c112..2b1c1cb 100644
--- a/jstorm-core/src/main/java/backtype/storm/generated/DistributedRPC.java
+++ b/jstorm-core/src/main/java/backtype/storm/generated/DistributedRPC.java
@@ -34,18 +34,18 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-20")
public class DistributedRPC {
public interface Iface {
- public String execute(String functionName, String funcArgs) throws DRPCExecutionException, org.apache.thrift.TException;
+ public String execute(String functionName, String funcArgs) throws DRPCExecutionException, AuthorizationException, TException;
}
public interface AsyncIface {
- public void execute(String functionName, String funcArgs, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void execute(String functionName, String funcArgs, AsyncMethodCallback resultHandler) throws TException;
}
@@ -69,13 +69,13 @@ public class DistributedRPC {
super(iprot, oprot);
}
- public String execute(String functionName, String funcArgs) throws DRPCExecutionException, org.apache.thrift.TException
+ public String execute(String functionName, String funcArgs) throws DRPCExecutionException, AuthorizationException, TException
{
send_execute(functionName, funcArgs);
return recv_execute();
}
- public void send_execute(String functionName, String funcArgs) throws org.apache.thrift.TException
+ public void send_execute(String functionName, String funcArgs) throws TException
{
execute_args args = new execute_args();
args.set_functionName(functionName);
@@ -83,7 +83,7 @@ public class DistributedRPC {
sendBase("execute", args);
}
- public String recv_execute() throws DRPCExecutionException, org.apache.thrift.TException
+ public String recv_execute() throws DRPCExecutionException, AuthorizationException, TException
{
execute_result result = new execute_result();
receiveBase(result, "execute");
@@ -93,6 +93,9 @@ public class DistributedRPC {
if (result.e != null) {
throw result.e;
}
+ if (result.aze != null) {
+ throw result.aze;
+ }
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "execute failed: unknown result");
}
@@ -114,7 +117,7 @@ public class DistributedRPC {
super(protocolFactory, clientManager, transport);
}
- public void execute(String functionName, String funcArgs, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void execute(String functionName, String funcArgs, AsyncMethodCallback resultHandler) throws TException {
checkReady();
execute_call method_call = new execute_call(functionName, funcArgs, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -124,13 +127,13 @@ public class DistributedRPC {
public static class execute_call extends org.apache.thrift.async.TAsyncMethodCall {
private String functionName;
private String funcArgs;
- public execute_call(String functionName, String funcArgs, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ public execute_call(String functionName, String funcArgs, AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws TException {
super(client, protocolFactory, transport, resultHandler, false);
this.functionName = functionName;
this.funcArgs = funcArgs;
}
- public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws TException {
prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("execute", org.apache.thrift.protocol.TMessageType.CALL, 0));
execute_args args = new execute_args();
args.set_functionName(functionName);
@@ -139,8 +142,8 @@ public class DistributedRPC {
prot.writeMessageEnd();
}
- public String getResult() throws DRPCExecutionException, org.apache.thrift.TException {
- if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+ public String getResult() throws DRPCExecutionException, AuthorizationException, TException {
+ if (getState() != State.RESPONSE_READ) {
throw new IllegalStateException("Method call not finished!");
}
org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
@@ -179,12 +182,14 @@ public class DistributedRPC {
return false;
}
- public execute_result getResult(I iface, execute_args args) throws org.apache.thrift.TException {
+ public execute_result getResult(I iface, execute_args args) throws TException {
execute_result result = new execute_result();
try {
result.success = iface.execute(args.functionName, args.funcArgs);
} catch (DRPCExecutionException e) {
result.e = e;
+ } catch (AuthorizationException aze) {
+ result.aze = aze;
}
return result;
}
@@ -239,6 +244,11 @@ public class DistributedRPC {
result.set_e_isSet(true);
msg = result;
}
+ else if (e instanceof AuthorizationException) {
+ result.aze = (AuthorizationException) e;
+ result.set_aze_isSet(true);
+ msg = result;
+ }
else
{
msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
@@ -259,7 +269,7 @@ public class DistributedRPC {
return false;
}
- public void start(I iface, execute_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException {
+ public void start(I iface, execute_args args, AsyncMethodCallback<String> resultHandler) throws TException {
iface.execute(args.functionName, args.funcArgs,resultHandler);
}
}
@@ -568,11 +578,11 @@ public class DistributedRPC {
return _Fields.findByThriftId(fieldId);
}
- public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol iprot) throws TException {
schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
- public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot) throws TException {
schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@@ -600,7 +610,7 @@ public class DistributedRPC {
return sb.toString();
}
- public void validate() throws org.apache.thrift.TException {
+ public void validate() throws TException {
// check for required fields
// check for sub-struct validity
}
@@ -608,7 +618,7 @@ public class DistributedRPC {
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
try {
write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
- } catch (org.apache.thrift.TException te) {
+ } catch (TException te) {
throw new java.io.IOException(te);
}
}
@@ -616,7 +626,7 @@ public class DistributedRPC {
private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
try {
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
- } catch (org.apache.thrift.TException te) {
+ } catch (TException te) {
throw new java.io.IOException(te);
}
}
@@ -629,7 +639,7 @@ public class DistributedRPC {
private static class execute_argsStandardScheme extends StandardScheme<execute_args> {
- public void read(org.apache.thrift.protocol.TProtocol iprot, execute_args struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol iprot, execute_args struct) throws TException {
org.apache.thrift.protocol.TField schemeField;
iprot.readStructBegin();
while (true)
@@ -664,7 +674,7 @@ public class DistributedRPC {
struct.validate();
}
- public void write(org.apache.thrift.protocol.TProtocol oprot, execute_args struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot, execute_args struct) throws TException {
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
@@ -693,7 +703,7 @@ public class DistributedRPC {
private static class execute_argsTupleScheme extends TupleScheme<execute_args> {
@Override
- public void write(org.apache.thrift.protocol.TProtocol prot, execute_args struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol prot, execute_args struct) throws TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
BitSet optionals = new BitSet();
if (struct.is_set_functionName()) {
@@ -712,7 +722,7 @@ public class DistributedRPC {
}
@Override
- public void read(org.apache.thrift.protocol.TProtocol prot, execute_args struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol prot, execute_args struct) throws TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
BitSet incoming = iprot.readBitSet(2);
if (incoming.get(0)) {
@@ -733,6 +743,7 @@ public class DistributedRPC {
private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRING, (short)0);
private static final org.apache.thrift.protocol.TField E_FIELD_DESC = new org.apache.thrift.protocol.TField("e", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+ private static final org.apache.thrift.protocol.TField AZE_FIELD_DESC = new org.apache.thrift.protocol.TField("aze", org.apache.thrift.protocol.TType.STRUCT, (short)2);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -742,11 +753,13 @@ public class DistributedRPC {
private String success; // required
private DRPCExecutionException e; // required
+ private AuthorizationException aze; // 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 {
SUCCESS((short)0, "success"),
- E((short)1, "e");
+ E((short)1, "e"),
+ AZE((short)2, "aze");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -765,6 +778,8 @@ public class DistributedRPC {
return SUCCESS;
case 1: // E
return E;
+ case 2: // AZE
+ return AZE;
default:
return null;
}
@@ -812,6 +827,8 @@ public class DistributedRPC {
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.E, new org.apache.thrift.meta_data.FieldMetaData("e", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+ tmpMap.put(_Fields.AZE, new org.apache.thrift.meta_data.FieldMetaData("aze", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(execute_result.class, metaDataMap);
}
@@ -821,11 +838,13 @@ public class DistributedRPC {
public execute_result(
String success,
- DRPCExecutionException e)
+ DRPCExecutionException e,
+ AuthorizationException aze)
{
this();
this.success = success;
this.e = e;
+ this.aze = aze;
}
/**
@@ -838,6 +857,9 @@ public class DistributedRPC {
if (other.is_set_e()) {
this.e = new DRPCExecutionException(other.e);
}
+ if (other.is_set_aze()) {
+ this.aze = new AuthorizationException(other.aze);
+ }
}
public execute_result deepCopy() {
@@ -848,6 +870,7 @@ public class DistributedRPC {
public void clear() {
this.success = null;
this.e = null;
+ this.aze = null;
}
public String get_success() {
@@ -896,6 +919,29 @@ public class DistributedRPC {
}
}
+ public AuthorizationException get_aze() {
+ return this.aze;
+ }
+
+ public void set_aze(AuthorizationException aze) {
+ this.aze = aze;
+ }
+
+ public void unset_aze() {
+ this.aze = null;
+ }
+
+ /** Returns true if field aze is set (has been assigned a value) and false otherwise */
+ public boolean is_set_aze() {
+ return this.aze != null;
+ }
+
+ public void set_aze_isSet(boolean value) {
+ if (!value) {
+ this.aze = null;
+ }
+ }
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case SUCCESS:
@@ -914,6 +960,14 @@ public class DistributedRPC {
}
break;
+ case AZE:
+ if (value == null) {
+ unset_aze();
+ } else {
+ set_aze((AuthorizationException)value);
+ }
+ break;
+
}
}
@@ -925,6 +979,9 @@ public class DistributedRPC {
case E:
return get_e();
+ case AZE:
+ return get_aze();
+
}
throw new IllegalStateException();
}
@@ -940,6 +997,8 @@ public class DistributedRPC {
return is_set_success();
case E:
return is_set_e();
+ case AZE:
+ return is_set_aze();
}
throw new IllegalStateException();
}
@@ -975,6 +1034,15 @@ public class DistributedRPC {
return false;
}
+ boolean this_present_aze = true && this.is_set_aze();
+ boolean that_present_aze = true && that.is_set_aze();
+ if (this_present_aze || that_present_aze) {
+ if (!(this_present_aze && that_present_aze))
+ return false;
+ if (!this.aze.equals(that.aze))
+ return false;
+ }
+
return true;
}
@@ -992,6 +1060,11 @@ public class DistributedRPC {
if (present_e)
list.add(e);
+ boolean present_aze = true && (is_set_aze());
+ list.add(present_aze);
+ if (present_aze)
+ list.add(aze);
+
return list.hashCode();
}
@@ -1023,6 +1096,16 @@ public class DistributedRPC {
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(is_set_aze()).compareTo(other.is_set_aze());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (is_set_aze()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.aze, other.aze);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -1030,11 +1113,11 @@ public class DistributedRPC {
return _Fields.findByThriftId(fieldId);
}
- public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol iprot) throws TException {
schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
- public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot) throws TException {
schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@@ -1058,11 +1141,19 @@ public class DistributedRPC {
sb.append(this.e);
}
first = false;
+ if (!first) sb.append(", ");
+ sb.append("aze:");
+ if (this.aze == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.aze);
+ }
+ first = false;
sb.append(")");
return sb.toString();
}
- public void validate() throws org.apache.thrift.TException {
+ public void validate() throws TException {
// check for required fields
// check for sub-struct validity
}
@@ -1070,7 +1161,7 @@ public class DistributedRPC {
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
try {
write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
- } catch (org.apache.thrift.TException te) {
+ } catch (TException te) {
throw new java.io.IOException(te);
}
}
@@ -1078,7 +1169,7 @@ public class DistributedRPC {
private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
try {
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
- } catch (org.apache.thrift.TException te) {
+ } catch (TException te) {
throw new java.io.IOException(te);
}
}
@@ -1091,7 +1182,7 @@ public class DistributedRPC {
private static class execute_resultStandardScheme extends StandardScheme<execute_result> {
- public void read(org.apache.thrift.protocol.TProtocol iprot, execute_result struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol iprot, execute_result struct) throws TException {
org.apache.thrift.protocol.TField schemeField;
iprot.readStructBegin();
while (true)
@@ -1118,6 +1209,15 @@ public class DistributedRPC {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
+ case 2: // AZE
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+ struct.aze = new AuthorizationException();
+ struct.aze.read(iprot);
+ struct.set_aze_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -1127,7 +1227,7 @@ public class DistributedRPC {
struct.validate();
}
- public void write(org.apache.thrift.protocol.TProtocol oprot, execute_result struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot, execute_result struct) throws TException {
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
@@ -1141,6 +1241,11 @@ public class DistributedRPC {
struct.e.write(oprot);
oprot.writeFieldEnd();
}
+ if (struct.aze != null) {
+ oprot.writeFieldBegin(AZE_FIELD_DESC);
+ struct.aze.write(oprot);
+ oprot.writeFieldEnd();
+ }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -1156,7 +1261,7 @@ public class DistributedRPC {
private static class execute_resultTupleScheme extends TupleScheme<execute_result> {
@Override
- public void write(org.apache.thrift.protocol.TProtocol prot, execute_result struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol prot, execute_result struct) throws TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
BitSet optionals = new BitSet();
if (struct.is_set_success()) {
@@ -1165,19 +1270,25 @@ public class DistributedRPC {
if (struct.is_set_e()) {
optionals.set(1);
}
- oprot.writeBitSet(optionals, 2);
+ if (struct.is_set_aze()) {
+ optionals.set(2);
+ }
+ oprot.writeBitSet(optionals, 3);
if (struct.is_set_success()) {
oprot.writeString(struct.success);
}
if (struct.is_set_e()) {
struct.e.write(oprot);
}
+ if (struct.is_set_aze()) {
+ struct.aze.write(oprot);
+ }
}
@Override
- public void read(org.apache.thrift.protocol.TProtocol prot, execute_result struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol prot, execute_result struct) throws TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
- BitSet incoming = iprot.readBitSet(2);
+ BitSet incoming = iprot.readBitSet(3);
if (incoming.get(0)) {
struct.success = iprot.readString();
struct.set_success_isSet(true);
@@ -1187,6 +1298,11 @@ public class DistributedRPC {
struct.e.read(iprot);
struct.set_e_isSet(true);
}
+ if (incoming.get(2)) {
+ struct.aze = new AuthorizationException();
+ struct.aze.read(iprot);
+ struct.set_aze_isSet(true);
+ }
}
}