Upgrade to thrift-0.9.2
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ef51dbee Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ef51dbee Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ef51dbee Branch: refs/heads/master Commit: ef51dbeeb1a5a748deb7ee4f399ef430df443525 Parents: a115c9d Author: Kishor Patil <[email protected]> Authored: Mon Feb 2 23:44:30 2015 +0000 Committer: Kishor Patil <[email protected]> Committed: Mon Feb 2 23:44:30 2015 +0000 ---------------------------------------------------------------------- pom.xml | 2 +- storm-core/pom.xml | 2 +- .../storm/drpc/DRPCInvocationsClient.java | 6 + .../src/jvm/backtype/storm/drpc/DRPCSpout.java | 14 +- .../jvm/backtype/storm/drpc/ReturnResults.java | 8 +- .../storm/generated/AlreadyAliveException.java | 149 +- .../storm/generated/AuthorizationException.java | 149 +- .../src/jvm/backtype/storm/generated/Bolt.java | 194 +- .../jvm/backtype/storm/generated/BoltStats.java | 908 +- .../storm/generated/ClusterSummary.java | 339 +- .../storm/generated/ComponentCommon.java | 426 +- .../storm/generated/ComponentObject.java | 86 +- .../backtype/storm/generated/Credentials.java | 220 +- .../storm/generated/DRPCExecutionException.java | 149 +- .../backtype/storm/generated/DRPCRequest.java | 185 +- .../storm/generated/DistributedRPC.java | 529 +- .../generated/DistributedRPCInvocations.java | 1199 ++- .../jvm/backtype/storm/generated/ErrorInfo.java | 300 +- .../backtype/storm/generated/ExecutorInfo.java | 198 +- .../storm/generated/ExecutorSpecificStats.java | 72 +- .../backtype/storm/generated/ExecutorStats.java | 486 +- .../storm/generated/ExecutorSummary.java | 371 +- .../storm/generated/GlobalStreamId.java | 185 +- .../jvm/backtype/storm/generated/Grouping.java | 163 +- .../generated/InvalidTopologyException.java | 149 +- .../backtype/storm/generated/JavaObject.java | 239 +- .../backtype/storm/generated/JavaObjectArg.java | 108 +- .../backtype/storm/generated/KillOptions.java | 176 +- .../jvm/backtype/storm/generated/Nimbus.java | 8540 +++++++++++++----- .../storm/generated/NotAliveException.java | 149 +- .../backtype/storm/generated/NullStruct.java | 112 +- .../storm/generated/RebalanceOptions.java | 348 +- .../storm/generated/ShellComponent.java | 202 +- .../jvm/backtype/storm/generated/SpoutSpec.java | 194 +- .../backtype/storm/generated/SpoutStats.java | 614 +- .../storm/generated/StateSpoutSpec.java | 194 +- .../backtype/storm/generated/StormTopology.java | 410 +- .../backtype/storm/generated/StreamInfo.java | 249 +- .../backtype/storm/generated/SubmitOptions.java | 208 +- .../storm/generated/SupervisorSummary.java | 309 +- .../backtype/storm/generated/TopologyInfo.java | 609 +- .../storm/generated/TopologyInitialStatus.java | 3 +- .../storm/generated/TopologySummary.java | 486 +- .../security/auth/SimpleTransportPlugin.java | 2 +- .../trident/drpc/ReturnResultsReducer.java | 4 +- storm-core/src/py/storm/DistributedRPC-remote | 35 +- storm-core/src/py/storm/DistributedRPC.py | 38 +- .../py/storm/DistributedRPCInvocations-remote | 43 +- .../src/py/storm/DistributedRPCInvocations.py | 95 +- storm-core/src/py/storm/Nimbus-remote | 107 +- storm-core/src/py/storm/Nimbus.py | 608 +- storm-core/src/py/storm/constants.py | 6 +- storm-core/src/py/storm/ttypes.py | 412 +- .../backtype/storm/security/auth/auth_test.clj | 4 +- 54 files changed, 14557 insertions(+), 6436 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b0ca857..09e8d81 100644 --- a/pom.xml +++ b/pom.xml @@ -518,7 +518,7 @@ <dependency> <groupId>org.apache.thrift</groupId> <artifactId>libthrift</artifactId> - <version>0.7.0</version> + <version>0.9.2</version> <scope>compile</scope> </dependency> <!-- used by examples/storm-starter --> http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/storm-core/pom.xml ---------------------------------------------------------------------- diff --git a/storm-core/pom.xml b/storm-core/pom.xml index 9f3ed49..a05e3d4 100644 --- a/storm-core/pom.xml +++ b/storm-core/pom.xml @@ -133,7 +133,7 @@ <dependency> <groupId>org.apache.thrift</groupId> <artifactId>libthrift</artifactId> - <version>0.7.0</version> + <version>0.9.2</version> <scope>compile</scope> <exclusions> <exclusion> http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/storm-core/src/jvm/backtype/storm/drpc/DRPCInvocationsClient.java ---------------------------------------------------------------------- diff --git a/storm-core/src/jvm/backtype/storm/drpc/DRPCInvocationsClient.java b/storm-core/src/jvm/backtype/storm/drpc/DRPCInvocationsClient.java index 987cde0..624db3e 100644 --- a/storm-core/src/jvm/backtype/storm/drpc/DRPCInvocationsClient.java +++ b/storm-core/src/jvm/backtype/storm/drpc/DRPCInvocationsClient.java @@ -70,6 +70,8 @@ public class DRPCInvocationsClient extends ThriftClient implements DistributedRP throw new TException("Client is not connected..."); } c.result(id, result); + } catch(AuthorizationException aze) { + throw aze; } catch(TException e) { client.compareAndSet(c, null); throw e; @@ -83,6 +85,8 @@ public class DRPCInvocationsClient extends ThriftClient implements DistributedRP throw new TException("Client is not connected..."); } return c.fetchRequest(func); + } catch(AuthorizationException aze) { + throw aze; } catch(TException e) { client.compareAndSet(c, null); throw e; @@ -96,6 +100,8 @@ public class DRPCInvocationsClient extends ThriftClient implements DistributedRP throw new TException("Client is not connected..."); } c.failRequest(id); + } catch(AuthorizationException aze) { + throw aze; } catch(TException e) { client.compareAndSet(c, null); throw e; http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/storm-core/src/jvm/backtype/storm/drpc/DRPCSpout.java ---------------------------------------------------------------------- diff --git a/storm-core/src/jvm/backtype/storm/drpc/DRPCSpout.java b/storm-core/src/jvm/backtype/storm/drpc/DRPCSpout.java index 82fd6cd..cbfb310 100644 --- a/storm-core/src/jvm/backtype/storm/drpc/DRPCSpout.java +++ b/storm-core/src/jvm/backtype/storm/drpc/DRPCSpout.java @@ -187,12 +187,12 @@ public class DRPCSpout extends BaseRichSpout { _collector.emit(new Values(req.get_func_args(), JSONValue.toJSONString(returnInfo)), new DRPCMessageId(req.get_request_id(), i)); break; } - } catch (TException e) { - reconnect(client); - LOG.error("Failed to fetch DRPC result from DRPC server", e); } catch (AuthorizationException aze) { reconnect(client); LOG.error("Not authorized to fetch DRPC result from DRPC server", aze); + } catch (TException e) { + reconnect(client); + LOG.error("Failed to fetch DRPC result from DRPC server", e); } catch (Exception e) { LOG.error("Failed to fetch DRPC result from DRPC server", e); } @@ -211,10 +211,10 @@ public class DRPCSpout extends BaseRichSpout { gotRequest = true; _collector.emit(new Values(req.get_func_args(), JSONValue.toJSONString(returnInfo)), new DRPCMessageId(req.get_request_id(), 0)); } - } catch (TException e) { - throw new RuntimeException(e); } catch (AuthorizationException aze) { throw new RuntimeException(aze); + } catch (TException e) { + throw new RuntimeException(e); } } } @@ -239,10 +239,10 @@ public class DRPCSpout extends BaseRichSpout { } try { client.failRequest(did.id); - } catch (TException e) { - LOG.error("Failed to fail request", e); } catch (AuthorizationException aze) { LOG.error("Not authorized to failREquest from DRPC server", aze); + } catch (TException e) { + LOG.error("Failed to fail request", e); } } http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/storm-core/src/jvm/backtype/storm/drpc/ReturnResults.java ---------------------------------------------------------------------- diff --git a/storm-core/src/jvm/backtype/storm/drpc/ReturnResults.java b/storm-core/src/jvm/backtype/storm/drpc/ReturnResults.java index 3d50679..b26508d 100644 --- a/storm-core/src/jvm/backtype/storm/drpc/ReturnResults.java +++ b/storm-core/src/jvm/backtype/storm/drpc/ReturnResults.java @@ -86,8 +86,8 @@ public class ReturnResults extends BaseRichBolt { try { client.result(id, result); _collector.ack(input); - } catch(TException e) { - LOG.error("Failed to return results to DRPC server", e); + } catch (AuthorizationException aze) { + LOG.error("Not authorized to return results to DRPC server", aze); _collector.fail(input); if (client instanceof DRPCInvocationsClient) { try { @@ -97,8 +97,8 @@ public class ReturnResults extends BaseRichBolt { throw new RuntimeException(e2); } } - } catch (AuthorizationException aze) { - LOG.error("Not authorized to return results to DRPC server", aze); + } catch(TException e) { + LOG.error("Failed to return results to DRPC server", e); _collector.fail(input); if (client instanceof DRPCInvocationsClient) { try { http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/storm-core/src/jvm/backtype/storm/generated/AlreadyAliveException.java ---------------------------------------------------------------------- diff --git a/storm-core/src/jvm/backtype/storm/generated/AlreadyAliveException.java b/storm-core/src/jvm/backtype/storm/generated/AlreadyAliveException.java index a2672c8..619f944 100644 --- a/storm-core/src/jvm/backtype/storm/generated/AlreadyAliveException.java +++ b/storm-core/src/jvm/backtype/storm/generated/AlreadyAliveException.java @@ -16,13 +16,24 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.7.0) + * Autogenerated by Thrift Compiler (0.9.2) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING + * @generated */ package backtype.storm.generated; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.thrift.scheme.IScheme; +import org.apache.thrift.scheme.SchemeFactory; +import org.apache.thrift.scheme.StandardScheme; + +import org.apache.thrift.scheme.TupleScheme; +import org.apache.thrift.protocol.TTupleProtocol; +import org.apache.thrift.protocol.TProtocolException; +import org.apache.thrift.EncodingUtils; +import org.apache.thrift.TException; +import org.apache.thrift.async.AsyncMethodCallback; +import org.apache.thrift.server.AbstractNonblockingServer.*; import java.util.List; import java.util.ArrayList; import java.util.Map; @@ -35,14 +46,23 @@ import java.util.Collections; import java.util.BitSet; import java.nio.ByteBuffer; import java.util.Arrays; +import javax.annotation.Generated; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class AlreadyAliveException extends Exception implements org.apache.thrift.TBase<AlreadyAliveException, AlreadyAliveException._Fields>, java.io.Serializable, Cloneable { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2") +public class AlreadyAliveException extends TException implements org.apache.thrift.TBase<AlreadyAliveException, AlreadyAliveException._Fields>, java.io.Serializable, Cloneable, Comparable<AlreadyAliveException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AlreadyAliveException"); private static final org.apache.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.thrift.protocol.TField("msg", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); + static { + schemes.put(StandardScheme.class, new AlreadyAliveExceptionStandardSchemeFactory()); + schemes.put(TupleScheme.class, new AlreadyAliveExceptionTupleSchemeFactory()); + } + private String msg; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ @@ -104,7 +124,6 @@ public class AlreadyAliveException extends Exception implements org.apache.thrif } // isset id assignments - 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); @@ -227,30 +246,30 @@ public class AlreadyAliveException extends Exception implements org.apache.thrif @Override public int hashCode() { - HashCodeBuilder builder = new HashCodeBuilder(); + List<Object> list = new ArrayList<Object>(); boolean present_msg = true && (is_set_msg()); - builder.append(present_msg); + list.add(present_msg); if (present_msg) - builder.append(msg); + list.add(msg); - return builder.toHashCode(); + return list.hashCode(); } + @Override public int compareTo(AlreadyAliveException other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - AlreadyAliveException typedOther = (AlreadyAliveException)other; - lastComparison = Boolean.valueOf(is_set_msg()).compareTo(typedOther.is_set_msg()); + lastComparison = Boolean.valueOf(is_set_msg()).compareTo(other.is_set_msg()); if (lastComparison != 0) { return lastComparison; } if (is_set_msg()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.msg, typedOther.msg); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.msg, other.msg); if (lastComparison != 0) { return lastComparison; } @@ -263,42 +282,11 @@ public class AlreadyAliveException extends Exception implements org.apache.thrif } public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; - iprot.readStructBegin(); - while (true) - { - field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { - break; - } - switch (field.id) { - case 1: // MSG - if (field.type == org.apache.thrift.protocol.TType.STRING) { - this.msg = iprot.readString(); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); - } - break; - default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); - } - iprot.readFieldEnd(); - } - iprot.readStructEnd(); - validate(); + schemes.get(iprot.getScheme()).getScheme().read(iprot, this); } public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { - validate(); - - oprot.writeStructBegin(STRUCT_DESC); - if (this.msg != null) { - oprot.writeFieldBegin(MSG_FIELD_DESC); - oprot.writeString(this.msg); - oprot.writeFieldEnd(); - } - oprot.writeFieldStop(); - oprot.writeStructEnd(); + schemes.get(oprot.getScheme()).getScheme().write(oprot, this); } @Override @@ -323,6 +311,7 @@ public class AlreadyAliveException extends Exception implements org.apache.thrif throw new org.apache.thrift.protocol.TProtocolException("Required field 'msg' is unset! Struct:" + toString()); } + // check for sub-struct validity } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -341,5 +330,77 @@ public class AlreadyAliveException extends Exception implements org.apache.thrif } } + private static class AlreadyAliveExceptionStandardSchemeFactory implements SchemeFactory { + public AlreadyAliveExceptionStandardScheme getScheme() { + return new AlreadyAliveExceptionStandardScheme(); + } + } + + private static class AlreadyAliveExceptionStandardScheme extends StandardScheme<AlreadyAliveException> { + + public void read(org.apache.thrift.protocol.TProtocol iprot, AlreadyAliveException struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) + { + schemeField = iprot.readFieldBegin(); + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + break; + } + switch (schemeField.id) { + case 1: // MSG + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.msg = iprot.readString(); + struct.set_msg_isSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + iprot.readFieldEnd(); + } + iprot.readStructEnd(); + struct.validate(); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot, AlreadyAliveException struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + if (struct.msg != null) { + oprot.writeFieldBegin(MSG_FIELD_DESC); + oprot.writeString(struct.msg); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + + private static class AlreadyAliveExceptionTupleSchemeFactory implements SchemeFactory { + public AlreadyAliveExceptionTupleScheme getScheme() { + return new AlreadyAliveExceptionTupleScheme(); + } + } + + private static class AlreadyAliveExceptionTupleScheme extends TupleScheme<AlreadyAliveException> { + + @Override + public void write(org.apache.thrift.protocol.TProtocol prot, AlreadyAliveException struct) throws org.apache.thrift.TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + oprot.writeString(struct.msg); + } + + @Override + public void read(org.apache.thrift.protocol.TProtocol prot, AlreadyAliveException struct) throws org.apache.thrift.TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + struct.msg = iprot.readString(); + struct.set_msg_isSet(true); + } + } + } http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/storm-core/src/jvm/backtype/storm/generated/AuthorizationException.java ---------------------------------------------------------------------- diff --git a/storm-core/src/jvm/backtype/storm/generated/AuthorizationException.java b/storm-core/src/jvm/backtype/storm/generated/AuthorizationException.java index 6f0218e..33fd26b 100644 --- a/storm-core/src/jvm/backtype/storm/generated/AuthorizationException.java +++ b/storm-core/src/jvm/backtype/storm/generated/AuthorizationException.java @@ -16,13 +16,24 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.7.0) + * Autogenerated by Thrift Compiler (0.9.2) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING + * @generated */ package backtype.storm.generated; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.thrift.scheme.IScheme; +import org.apache.thrift.scheme.SchemeFactory; +import org.apache.thrift.scheme.StandardScheme; + +import org.apache.thrift.scheme.TupleScheme; +import org.apache.thrift.protocol.TTupleProtocol; +import org.apache.thrift.protocol.TProtocolException; +import org.apache.thrift.EncodingUtils; +import org.apache.thrift.TException; +import org.apache.thrift.async.AsyncMethodCallback; +import org.apache.thrift.server.AbstractNonblockingServer.*; import java.util.List; import java.util.ArrayList; import java.util.Map; @@ -35,14 +46,23 @@ import java.util.Collections; import java.util.BitSet; import java.nio.ByteBuffer; import java.util.Arrays; +import javax.annotation.Generated; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class AuthorizationException extends Exception implements org.apache.thrift.TBase<AuthorizationException, AuthorizationException._Fields>, java.io.Serializable, Cloneable { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2") +public class AuthorizationException extends TException implements org.apache.thrift.TBase<AuthorizationException, AuthorizationException._Fields>, java.io.Serializable, Cloneable, Comparable<AuthorizationException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AuthorizationException"); private static final org.apache.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.thrift.protocol.TField("msg", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); + static { + schemes.put(StandardScheme.class, new AuthorizationExceptionStandardSchemeFactory()); + schemes.put(TupleScheme.class, new AuthorizationExceptionTupleSchemeFactory()); + } + private String msg; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ @@ -104,7 +124,6 @@ public class AuthorizationException extends Exception implements org.apache.thri } // isset id assignments - 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); @@ -227,30 +246,30 @@ public class AuthorizationException extends Exception implements org.apache.thri @Override public int hashCode() { - HashCodeBuilder builder = new HashCodeBuilder(); + List<Object> list = new ArrayList<Object>(); boolean present_msg = true && (is_set_msg()); - builder.append(present_msg); + list.add(present_msg); if (present_msg) - builder.append(msg); + list.add(msg); - return builder.toHashCode(); + return list.hashCode(); } + @Override public int compareTo(AuthorizationException other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - AuthorizationException typedOther = (AuthorizationException)other; - lastComparison = Boolean.valueOf(is_set_msg()).compareTo(typedOther.is_set_msg()); + lastComparison = Boolean.valueOf(is_set_msg()).compareTo(other.is_set_msg()); if (lastComparison != 0) { return lastComparison; } if (is_set_msg()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.msg, typedOther.msg); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.msg, other.msg); if (lastComparison != 0) { return lastComparison; } @@ -263,42 +282,11 @@ public class AuthorizationException extends Exception implements org.apache.thri } public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; - iprot.readStructBegin(); - while (true) - { - field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { - break; - } - switch (field.id) { - case 1: // MSG - if (field.type == org.apache.thrift.protocol.TType.STRING) { - this.msg = iprot.readString(); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); - } - break; - default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); - } - iprot.readFieldEnd(); - } - iprot.readStructEnd(); - validate(); + schemes.get(iprot.getScheme()).getScheme().read(iprot, this); } public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { - validate(); - - oprot.writeStructBegin(STRUCT_DESC); - if (this.msg != null) { - oprot.writeFieldBegin(MSG_FIELD_DESC); - oprot.writeString(this.msg); - oprot.writeFieldEnd(); - } - oprot.writeFieldStop(); - oprot.writeStructEnd(); + schemes.get(oprot.getScheme()).getScheme().write(oprot, this); } @Override @@ -323,6 +311,7 @@ public class AuthorizationException extends Exception implements org.apache.thri throw new org.apache.thrift.protocol.TProtocolException("Required field 'msg' is unset! Struct:" + toString()); } + // check for sub-struct validity } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -341,5 +330,77 @@ public class AuthorizationException extends Exception implements org.apache.thri } } + private static class AuthorizationExceptionStandardSchemeFactory implements SchemeFactory { + public AuthorizationExceptionStandardScheme getScheme() { + return new AuthorizationExceptionStandardScheme(); + } + } + + private static class AuthorizationExceptionStandardScheme extends StandardScheme<AuthorizationException> { + + public void read(org.apache.thrift.protocol.TProtocol iprot, AuthorizationException struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) + { + schemeField = iprot.readFieldBegin(); + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + break; + } + switch (schemeField.id) { + case 1: // MSG + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.msg = iprot.readString(); + struct.set_msg_isSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + iprot.readFieldEnd(); + } + iprot.readStructEnd(); + struct.validate(); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot, AuthorizationException struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + if (struct.msg != null) { + oprot.writeFieldBegin(MSG_FIELD_DESC); + oprot.writeString(struct.msg); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + + private static class AuthorizationExceptionTupleSchemeFactory implements SchemeFactory { + public AuthorizationExceptionTupleScheme getScheme() { + return new AuthorizationExceptionTupleScheme(); + } + } + + private static class AuthorizationExceptionTupleScheme extends TupleScheme<AuthorizationException> { + + @Override + public void write(org.apache.thrift.protocol.TProtocol prot, AuthorizationException struct) throws org.apache.thrift.TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + oprot.writeString(struct.msg); + } + + @Override + public void read(org.apache.thrift.protocol.TProtocol prot, AuthorizationException struct) throws org.apache.thrift.TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + struct.msg = iprot.readString(); + struct.set_msg_isSet(true); + } + } + } http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/storm-core/src/jvm/backtype/storm/generated/Bolt.java ---------------------------------------------------------------------- diff --git a/storm-core/src/jvm/backtype/storm/generated/Bolt.java b/storm-core/src/jvm/backtype/storm/generated/Bolt.java index 63c7147..cd65ccd 100644 --- a/storm-core/src/jvm/backtype/storm/generated/Bolt.java +++ b/storm-core/src/jvm/backtype/storm/generated/Bolt.java @@ -16,13 +16,24 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.7.0) + * Autogenerated by Thrift Compiler (0.9.2) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING + * @generated */ package backtype.storm.generated; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.thrift.scheme.IScheme; +import org.apache.thrift.scheme.SchemeFactory; +import org.apache.thrift.scheme.StandardScheme; + +import org.apache.thrift.scheme.TupleScheme; +import org.apache.thrift.protocol.TTupleProtocol; +import org.apache.thrift.protocol.TProtocolException; +import org.apache.thrift.EncodingUtils; +import org.apache.thrift.TException; +import org.apache.thrift.async.AsyncMethodCallback; +import org.apache.thrift.server.AbstractNonblockingServer.*; import java.util.List; import java.util.ArrayList; import java.util.Map; @@ -35,15 +46,24 @@ import java.util.Collections; import java.util.BitSet; import java.nio.ByteBuffer; import java.util.Arrays; +import javax.annotation.Generated; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class Bolt implements org.apache.thrift.TBase<Bolt, Bolt._Fields>, java.io.Serializable, Cloneable { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2") +public class Bolt implements org.apache.thrift.TBase<Bolt, Bolt._Fields>, java.io.Serializable, Cloneable, Comparable<Bolt> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Bolt"); private static final org.apache.thrift.protocol.TField BOLT_OBJECT_FIELD_DESC = new org.apache.thrift.protocol.TField("bolt_object", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField COMMON_FIELD_DESC = new org.apache.thrift.protocol.TField("common", org.apache.thrift.protocol.TType.STRUCT, (short)2); + private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); + static { + schemes.put(StandardScheme.class, new BoltStandardSchemeFactory()); + schemes.put(TupleScheme.class, new BoltTupleSchemeFactory()); + } + private ComponentObject bolt_object; // required private ComponentCommon common; // required @@ -109,7 +129,6 @@ public class Bolt implements org.apache.thrift.TBase<Bolt, Bolt._Fields>, java.i } // isset id assignments - 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); @@ -285,45 +304,45 @@ public class Bolt implements org.apache.thrift.TBase<Bolt, Bolt._Fields>, java.i @Override public int hashCode() { - HashCodeBuilder builder = new HashCodeBuilder(); + List<Object> list = new ArrayList<Object>(); boolean present_bolt_object = true && (is_set_bolt_object()); - builder.append(present_bolt_object); + list.add(present_bolt_object); if (present_bolt_object) - builder.append(bolt_object); + list.add(bolt_object); boolean present_common = true && (is_set_common()); - builder.append(present_common); + list.add(present_common); if (present_common) - builder.append(common); + list.add(common); - return builder.toHashCode(); + return list.hashCode(); } + @Override public int compareTo(Bolt other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - Bolt typedOther = (Bolt)other; - lastComparison = Boolean.valueOf(is_set_bolt_object()).compareTo(typedOther.is_set_bolt_object()); + lastComparison = Boolean.valueOf(is_set_bolt_object()).compareTo(other.is_set_bolt_object()); if (lastComparison != 0) { return lastComparison; } if (is_set_bolt_object()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.bolt_object, typedOther.bolt_object); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.bolt_object, other.bolt_object); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(is_set_common()).compareTo(typedOther.is_set_common()); + lastComparison = Boolean.valueOf(is_set_common()).compareTo(other.is_set_common()); if (lastComparison != 0) { return lastComparison; } if (is_set_common()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.common, typedOther.common); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.common, other.common); if (lastComparison != 0) { return lastComparison; } @@ -336,56 +355,11 @@ public class Bolt implements org.apache.thrift.TBase<Bolt, Bolt._Fields>, java.i } public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; - iprot.readStructBegin(); - while (true) - { - field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { - break; - } - switch (field.id) { - case 1: // BOLT_OBJECT - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { - this.bolt_object = new ComponentObject(); - this.bolt_object.read(iprot); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); - } - break; - case 2: // COMMON - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { - this.common = new ComponentCommon(); - this.common.read(iprot); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); - } - break; - default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); - } - iprot.readFieldEnd(); - } - iprot.readStructEnd(); - validate(); + schemes.get(iprot.getScheme()).getScheme().read(iprot, this); } public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { - validate(); - - oprot.writeStructBegin(STRUCT_DESC); - if (this.bolt_object != null) { - oprot.writeFieldBegin(BOLT_OBJECT_FIELD_DESC); - this.bolt_object.write(oprot); - oprot.writeFieldEnd(); - } - if (this.common != null) { - oprot.writeFieldBegin(COMMON_FIELD_DESC); - this.common.write(oprot); - oprot.writeFieldEnd(); - } - oprot.writeFieldStop(); - oprot.writeStructEnd(); + schemes.get(oprot.getScheme()).getScheme().write(oprot, this); } @Override @@ -422,6 +396,10 @@ public class Bolt implements org.apache.thrift.TBase<Bolt, Bolt._Fields>, java.i throw new org.apache.thrift.protocol.TProtocolException("Required field 'common' is unset! Struct:" + toString()); } + // check for sub-struct validity + if (common != null) { + common.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -440,5 +418,97 @@ public class Bolt implements org.apache.thrift.TBase<Bolt, Bolt._Fields>, java.i } } + private static class BoltStandardSchemeFactory implements SchemeFactory { + public BoltStandardScheme getScheme() { + return new BoltStandardScheme(); + } + } + + private static class BoltStandardScheme extends StandardScheme<Bolt> { + + public void read(org.apache.thrift.protocol.TProtocol iprot, Bolt struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) + { + schemeField = iprot.readFieldBegin(); + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + break; + } + switch (schemeField.id) { + case 1: // BOLT_OBJECT + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.bolt_object = new ComponentObject(); + struct.bolt_object.read(iprot); + struct.set_bolt_object_isSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 2: // COMMON + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.common = new ComponentCommon(); + struct.common.read(iprot); + struct.set_common_isSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + iprot.readFieldEnd(); + } + iprot.readStructEnd(); + struct.validate(); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot, Bolt struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + if (struct.bolt_object != null) { + oprot.writeFieldBegin(BOLT_OBJECT_FIELD_DESC); + struct.bolt_object.write(oprot); + oprot.writeFieldEnd(); + } + if (struct.common != null) { + oprot.writeFieldBegin(COMMON_FIELD_DESC); + struct.common.write(oprot); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + + private static class BoltTupleSchemeFactory implements SchemeFactory { + public BoltTupleScheme getScheme() { + return new BoltTupleScheme(); + } + } + + private static class BoltTupleScheme extends TupleScheme<Bolt> { + + @Override + public void write(org.apache.thrift.protocol.TProtocol prot, Bolt struct) throws org.apache.thrift.TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + struct.bolt_object.write(oprot); + struct.common.write(oprot); + } + + @Override + public void read(org.apache.thrift.protocol.TProtocol prot, Bolt struct) throws org.apache.thrift.TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + struct.bolt_object = new ComponentObject(); + struct.bolt_object.read(iprot); + struct.set_bolt_object_isSet(true); + struct.common = new ComponentCommon(); + struct.common.read(iprot); + struct.set_common_isSet(true); + } + } + }
