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:22 UTC
[44/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/InvalidTopologyException.java
----------------------------------------------------------------------
diff --git a/jstorm-core/src/main/java/backtype/storm/generated/InvalidTopologyException.java b/jstorm-core/src/main/java/backtype/storm/generated/InvalidTopologyException.java
index 3d5424a..4f8ed3d 100644
--- a/jstorm-core/src/main/java/backtype/storm/generated/InvalidTopologyException.java
+++ b/jstorm-core/src/main/java/backtype/storm/generated/InvalidTopologyException.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 InvalidTopologyException extends TException implements org.apache.thrift.TBase<InvalidTopologyException, InvalidTopologyException._Fields>, java.io.Serializable, Cloneable, Comparable<InvalidTopologyException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InvalidTopologyException");
@@ -264,11 +264,11 @@ public class InvalidTopologyException extends TException implements org.apache.t
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 InvalidTopologyException extends TException implements org.apache.t
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 InvalidTopologyException extends TException implements org.apache.t
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 InvalidTopologyException extends TException implements org.apache.t
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 InvalidTopologyException extends TException implements org.apache.t
private static class InvalidTopologyExceptionStandardScheme extends StandardScheme<InvalidTopologyException> {
- public void read(org.apache.thrift.protocol.TProtocol iprot, InvalidTopologyException struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol iprot, InvalidTopologyException struct) throws TException {
org.apache.thrift.protocol.TField schemeField;
iprot.readStructBegin();
while (true)
@@ -348,7 +348,7 @@ public class InvalidTopologyException extends TException implements org.apache.t
struct.validate();
}
- public void write(org.apache.thrift.protocol.TProtocol oprot, InvalidTopologyException struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot, InvalidTopologyException struct) throws TException {
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
@@ -372,13 +372,13 @@ public class InvalidTopologyException extends TException implements org.apache.t
private static class InvalidTopologyExceptionTupleScheme extends TupleScheme<InvalidTopologyException> {
@Override
- public void write(org.apache.thrift.protocol.TProtocol prot, InvalidTopologyException struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol prot, InvalidTopologyException struct) throws TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
oprot.writeString(struct.msg);
}
@Override
- public void read(org.apache.thrift.protocol.TProtocol prot, InvalidTopologyException struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol prot, InvalidTopologyException 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/JavaObject.java
----------------------------------------------------------------------
diff --git a/jstorm-core/src/main/java/backtype/storm/generated/JavaObject.java b/jstorm-core/src/main/java/backtype/storm/generated/JavaObject.java
index 5998993..8739a1a 100644
--- a/jstorm-core/src/main/java/backtype/storm/generated/JavaObject.java
+++ b/jstorm-core/src/main/java/backtype/storm/generated/JavaObject.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 JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObject._Fields>, java.io.Serializable, Cloneable, Comparable<JavaObject> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JavaObject");
@@ -357,11 +357,11 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec
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);
}
@@ -389,14 +389,14 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec
return sb.toString();
}
- public void validate() throws org.apache.thrift.TException {
+ public void validate() throws TException {
// check for required fields
if (!is_set_full_class_name()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'full_class_name' is unset! Struct:" + toString());
+ throw new TProtocolException("Required field 'full_class_name' is unset! Struct:" + toString());
}
if (!is_set_args_list()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'args_list' is unset! Struct:" + toString());
+ throw new TProtocolException("Required field 'args_list' is unset! Struct:" + toString());
}
// check for sub-struct validity
@@ -405,7 +405,7 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec
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);
}
}
@@ -413,7 +413,7 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec
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);
}
}
@@ -426,7 +426,7 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec
private static class JavaObjectStandardScheme extends StandardScheme<JavaObject> {
- public void read(org.apache.thrift.protocol.TProtocol iprot, JavaObject struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol iprot, JavaObject struct) throws TException {
org.apache.thrift.protocol.TField schemeField;
iprot.readStructBegin();
while (true)
@@ -472,7 +472,7 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec
struct.validate();
}
- public void write(org.apache.thrift.protocol.TProtocol oprot, JavaObject struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot, JavaObject struct) throws TException {
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
@@ -508,7 +508,7 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec
private static class JavaObjectTupleScheme extends TupleScheme<JavaObject> {
@Override
- public void write(org.apache.thrift.protocol.TProtocol prot, JavaObject struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol prot, JavaObject struct) throws TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
oprot.writeString(struct.full_class_name);
{
@@ -521,7 +521,7 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec
}
@Override
- public void read(org.apache.thrift.protocol.TProtocol prot, JavaObject struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol prot, JavaObject struct) throws TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
struct.full_class_name = iprot.readString();
struct.set_full_class_name_isSet(true);
http://git-wip-us.apache.org/repos/asf/storm/blob/7eaf0651/jstorm-core/src/main/java/backtype/storm/generated/JavaObjectArg.java
----------------------------------------------------------------------
diff --git a/jstorm-core/src/main/java/backtype/storm/generated/JavaObjectArg.java b/jstorm-core/src/main/java/backtype/storm/generated/JavaObjectArg.java
index 4469306..c883d6e 100755
--- a/jstorm-core/src/main/java/backtype/storm/generated/JavaObjectArg.java
+++ b/jstorm-core/src/main/java/backtype/storm/generated/JavaObjectArg.java
@@ -232,7 +232,7 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO
}
@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) {
@@ -300,7 +300,7 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO
}
@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 INT_ARG:
Integer int_arg = (Integer)value_;
@@ -332,7 +332,7 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO
}
@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) {
@@ -369,7 +369,7 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO
}
@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 INT_ARG:
Integer int_arg = (Integer)value_;
@@ -596,7 +596,7 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO
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 JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO
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/KillOptions.java
----------------------------------------------------------------------
diff --git a/jstorm-core/src/main/java/backtype/storm/generated/KillOptions.java b/jstorm-core/src/main/java/backtype/storm/generated/KillOptions.java
index 7abb762..c80a222 100644
--- a/jstorm-core/src/main/java/backtype/storm/generated/KillOptions.java
+++ b/jstorm-core/src/main/java/backtype/storm/generated/KillOptions.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 KillOptions implements org.apache.thrift.TBase<KillOptions, KillOptions._Fields>, java.io.Serializable, Cloneable, Comparable<KillOptions> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("KillOptions");
@@ -259,11 +259,11 @@ public class KillOptions implements org.apache.thrift.TBase<KillOptions, KillOpt
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);
}
@@ -281,7 +281,7 @@ public class KillOptions implements org.apache.thrift.TBase<KillOptions, KillOpt
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
}
@@ -289,7 +289,7 @@ public class KillOptions implements org.apache.thrift.TBase<KillOptions, KillOpt
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);
}
}
@@ -299,7 +299,7 @@ public class KillOptions implements org.apache.thrift.TBase<KillOptions, KillOpt
// 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);
}
}
@@ -312,7 +312,7 @@ public class KillOptions implements org.apache.thrift.TBase<KillOptions, KillOpt
private static class KillOptionsStandardScheme extends StandardScheme<KillOptions> {
- public void read(org.apache.thrift.protocol.TProtocol iprot, KillOptions struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol iprot, KillOptions struct) throws TException {
org.apache.thrift.protocol.TField schemeField;
iprot.readStructBegin();
while (true)
@@ -339,7 +339,7 @@ public class KillOptions implements org.apache.thrift.TBase<KillOptions, KillOpt
struct.validate();
}
- public void write(org.apache.thrift.protocol.TProtocol oprot, KillOptions struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot, KillOptions struct) throws TException {
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
@@ -363,7 +363,7 @@ public class KillOptions implements org.apache.thrift.TBase<KillOptions, KillOpt
private static class KillOptionsTupleScheme extends TupleScheme<KillOptions> {
@Override
- public void write(org.apache.thrift.protocol.TProtocol prot, KillOptions struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol prot, KillOptions struct) throws TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
BitSet optionals = new BitSet();
if (struct.is_set_wait_secs()) {
@@ -376,7 +376,7 @@ public class KillOptions implements org.apache.thrift.TBase<KillOptions, KillOpt
}
@Override
- public void read(org.apache.thrift.protocol.TProtocol prot, KillOptions struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol prot, KillOptions struct) throws TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
BitSet incoming = iprot.readBitSet(1);
if (incoming.get(0)) {
http://git-wip-us.apache.org/repos/asf/storm/blob/7eaf0651/jstorm-core/src/main/java/backtype/storm/generated/LocalStateData.java
----------------------------------------------------------------------
diff --git a/jstorm-core/src/main/java/backtype/storm/generated/LocalStateData.java b/jstorm-core/src/main/java/backtype/storm/generated/LocalStateData.java
index 2fd49b4..dca9e60 100644
--- a/jstorm-core/src/main/java/backtype/storm/generated/LocalStateData.java
+++ b/jstorm-core/src/main/java/backtype/storm/generated/LocalStateData.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 LocalStateData implements org.apache.thrift.TBase<LocalStateData, LocalStateData._Fields>, java.io.Serializable, Cloneable, Comparable<LocalStateData> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LocalStateData");
@@ -289,11 +289,11 @@ public class LocalStateData implements org.apache.thrift.TBase<LocalStateData, L
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);
}
@@ -313,10 +313,10 @@ public class LocalStateData implements org.apache.thrift.TBase<LocalStateData, L
return sb.toString();
}
- public void validate() throws org.apache.thrift.TException {
+ public void validate() throws TException {
// check for required fields
if (!is_set_serialized_parts()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'serialized_parts' is unset! Struct:" + toString());
+ throw new TProtocolException("Required field 'serialized_parts' is unset! Struct:" + toString());
}
// check for sub-struct validity
@@ -325,7 +325,7 @@ public class LocalStateData implements org.apache.thrift.TBase<LocalStateData, L
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);
}
}
@@ -333,7 +333,7 @@ public class LocalStateData implements org.apache.thrift.TBase<LocalStateData, L
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);
}
}
@@ -346,7 +346,7 @@ public class LocalStateData implements org.apache.thrift.TBase<LocalStateData, L
private static class LocalStateDataStandardScheme extends StandardScheme<LocalStateData> {
- public void read(org.apache.thrift.protocol.TProtocol iprot, LocalStateData struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol iprot, LocalStateData struct) throws TException {
org.apache.thrift.protocol.TField schemeField;
iprot.readStructBegin();
while (true)
@@ -359,16 +359,16 @@ public class LocalStateData implements org.apache.thrift.TBase<LocalStateData, L
case 1: // SERIALIZED_PARTS
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map264 = iprot.readMapBegin();
- struct.serialized_parts = new HashMap<String,ThriftSerializedObject>(2*_map264.size);
- String _key265;
- ThriftSerializedObject _val266;
- for (int _i267 = 0; _i267 < _map264.size; ++_i267)
+ org.apache.thrift.protocol.TMap _map212 = iprot.readMapBegin();
+ struct.serialized_parts = new HashMap<String,ThriftSerializedObject>(2*_map212.size);
+ String _key213;
+ ThriftSerializedObject _val214;
+ for (int _i215 = 0; _i215 < _map212.size; ++_i215)
{
- _key265 = iprot.readString();
- _val266 = new ThriftSerializedObject();
- _val266.read(iprot);
- struct.serialized_parts.put(_key265, _val266);
+ _key213 = iprot.readString();
+ _val214 = new ThriftSerializedObject();
+ _val214.read(iprot);
+ struct.serialized_parts.put(_key213, _val214);
}
iprot.readMapEnd();
}
@@ -386,7 +386,7 @@ public class LocalStateData implements org.apache.thrift.TBase<LocalStateData, L
struct.validate();
}
- public void write(org.apache.thrift.protocol.TProtocol oprot, LocalStateData struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot, LocalStateData struct) throws TException {
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
@@ -394,10 +394,10 @@ public class LocalStateData implements org.apache.thrift.TBase<LocalStateData, L
oprot.writeFieldBegin(SERIALIZED_PARTS_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.serialized_parts.size()));
- for (Map.Entry<String, ThriftSerializedObject> _iter268 : struct.serialized_parts.entrySet())
+ for (Map.Entry<String, ThriftSerializedObject> _iter216 : struct.serialized_parts.entrySet())
{
- oprot.writeString(_iter268.getKey());
- _iter268.getValue().write(oprot);
+ oprot.writeString(_iter216.getKey());
+ _iter216.getValue().write(oprot);
}
oprot.writeMapEnd();
}
@@ -418,32 +418,32 @@ public class LocalStateData implements org.apache.thrift.TBase<LocalStateData, L
private static class LocalStateDataTupleScheme extends TupleScheme<LocalStateData> {
@Override
- public void write(org.apache.thrift.protocol.TProtocol prot, LocalStateData struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol prot, LocalStateData struct) throws TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
{
oprot.writeI32(struct.serialized_parts.size());
- for (Map.Entry<String, ThriftSerializedObject> _iter269 : struct.serialized_parts.entrySet())
+ for (Map.Entry<String, ThriftSerializedObject> _iter217 : struct.serialized_parts.entrySet())
{
- oprot.writeString(_iter269.getKey());
- _iter269.getValue().write(oprot);
+ oprot.writeString(_iter217.getKey());
+ _iter217.getValue().write(oprot);
}
}
}
@Override
- public void read(org.apache.thrift.protocol.TProtocol prot, LocalStateData struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol prot, LocalStateData struct) throws TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
{
- org.apache.thrift.protocol.TMap _map270 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.serialized_parts = new HashMap<String,ThriftSerializedObject>(2*_map270.size);
- String _key271;
- ThriftSerializedObject _val272;
- for (int _i273 = 0; _i273 < _map270.size; ++_i273)
+ org.apache.thrift.protocol.TMap _map218 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.serialized_parts = new HashMap<String,ThriftSerializedObject>(2*_map218.size);
+ String _key219;
+ ThriftSerializedObject _val220;
+ for (int _i221 = 0; _i221 < _map218.size; ++_i221)
{
- _key271 = iprot.readString();
- _val272 = new ThriftSerializedObject();
- _val272.read(iprot);
- struct.serialized_parts.put(_key271, _val272);
+ _key219 = iprot.readString();
+ _val220 = new ThriftSerializedObject();
+ _val220.read(iprot);
+ struct.serialized_parts.put(_key219, _val220);
}
}
struct.set_serialized_parts_isSet(true);
http://git-wip-us.apache.org/repos/asf/storm/blob/7eaf0651/jstorm-core/src/main/java/backtype/storm/generated/MetricInfo.java
----------------------------------------------------------------------
diff --git a/jstorm-core/src/main/java/backtype/storm/generated/MetricInfo.java b/jstorm-core/src/main/java/backtype/storm/generated/MetricInfo.java
index 2703777..c332217 100644
--- a/jstorm-core/src/main/java/backtype/storm/generated/MetricInfo.java
+++ b/jstorm-core/src/main/java/backtype/storm/generated/MetricInfo.java
@@ -34,13 +34,11 @@ 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 MetricInfo implements org.apache.thrift.TBase<MetricInfo, MetricInfo._Fields>, java.io.Serializable, Cloneable, Comparable<MetricInfo> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MetricInfo");
- private static final org.apache.thrift.protocol.TField BASE_METRIC_FIELD_DESC = new org.apache.thrift.protocol.TField("baseMetric", org.apache.thrift.protocol.TType.MAP, (short)1);
- private static final org.apache.thrift.protocol.TField INPUT_METRIC_FIELD_DESC = new org.apache.thrift.protocol.TField("inputMetric", org.apache.thrift.protocol.TType.MAP, (short)2);
- private static final org.apache.thrift.protocol.TField OUTPUT_METRIC_FIELD_DESC = new org.apache.thrift.protocol.TField("outputMetric", org.apache.thrift.protocol.TType.MAP, (short)3);
+ private static final org.apache.thrift.protocol.TField METRICS_FIELD_DESC = new org.apache.thrift.protocol.TField("metrics", org.apache.thrift.protocol.TType.MAP, (short)1);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -48,15 +46,11 @@ public class MetricInfo implements org.apache.thrift.TBase<MetricInfo, MetricInf
schemes.put(TupleScheme.class, new MetricInfoTupleSchemeFactory());
}
- private Map<String,MetricWindow> baseMetric; // required
- private Map<String,Map<String,MetricWindow>> inputMetric; // optional
- private Map<String,Map<String,MetricWindow>> outputMetric; // optional
+ private Map<String,Map<Integer,MetricSnapshot>> metrics; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
- BASE_METRIC((short)1, "baseMetric"),
- INPUT_METRIC((short)2, "inputMetric"),
- OUTPUT_METRIC((short)3, "outputMetric");
+ METRICS((short)1, "metrics");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -71,12 +65,8 @@ public class MetricInfo implements org.apache.thrift.TBase<MetricInfo, MetricInf
*/
public static _Fields findByThriftId(int fieldId) {
switch(fieldId) {
- case 1: // BASE_METRIC
- return BASE_METRIC;
- case 2: // INPUT_METRIC
- return INPUT_METRIC;
- case 3: // OUTPUT_METRIC
- return OUTPUT_METRIC;
+ case 1: // METRICS
+ return METRICS;
default:
return null;
}
@@ -117,26 +107,16 @@ public class MetricInfo implements org.apache.thrift.TBase<MetricInfo, MetricInf
}
// isset id assignments
- private static final _Fields optionals[] = {_Fields.INPUT_METRIC,_Fields.OUTPUT_METRIC};
+ private static final _Fields optionals[] = {_Fields.METRICS};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
- tmpMap.put(_Fields.BASE_METRIC, new org.apache.thrift.meta_data.FieldMetaData("baseMetric", org.apache.thrift.TFieldRequirementType.REQUIRED,
- new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING),
- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, MetricWindow.class))));
- tmpMap.put(_Fields.INPUT_METRIC, new org.apache.thrift.meta_data.FieldMetaData("inputMetric", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING),
- new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING),
- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, MetricWindow.class)))));
- tmpMap.put(_Fields.OUTPUT_METRIC, new org.apache.thrift.meta_data.FieldMetaData("outputMetric", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ tmpMap.put(_Fields.METRICS, new org.apache.thrift.meta_data.FieldMetaData("metrics", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING),
new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING),
- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, MetricWindow.class)))));
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32),
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, MetricSnapshot.class)))));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(MetricInfo.class, metaDataMap);
}
@@ -144,83 +124,35 @@ public class MetricInfo implements org.apache.thrift.TBase<MetricInfo, MetricInf
public MetricInfo() {
}
- public MetricInfo(
- Map<String,MetricWindow> baseMetric)
- {
- this();
- this.baseMetric = baseMetric;
- }
-
/**
* Performs a deep copy on <i>other</i>.
*/
public MetricInfo(MetricInfo other) {
- if (other.is_set_baseMetric()) {
- Map<String,MetricWindow> __this__baseMetric = new HashMap<String,MetricWindow>(other.baseMetric.size());
- for (Map.Entry<String, MetricWindow> other_element : other.baseMetric.entrySet()) {
-
- String other_element_key = other_element.getKey();
- MetricWindow other_element_value = other_element.getValue();
-
- String __this__baseMetric_copy_key = other_element_key;
-
- MetricWindow __this__baseMetric_copy_value = new MetricWindow(other_element_value);
-
- __this__baseMetric.put(__this__baseMetric_copy_key, __this__baseMetric_copy_value);
- }
- this.baseMetric = __this__baseMetric;
- }
- if (other.is_set_inputMetric()) {
- Map<String,Map<String,MetricWindow>> __this__inputMetric = new HashMap<String,Map<String,MetricWindow>>(other.inputMetric.size());
- for (Map.Entry<String, Map<String,MetricWindow>> other_element : other.inputMetric.entrySet()) {
-
- String other_element_key = other_element.getKey();
- Map<String,MetricWindow> other_element_value = other_element.getValue();
-
- String __this__inputMetric_copy_key = other_element_key;
-
- Map<String,MetricWindow> __this__inputMetric_copy_value = new HashMap<String,MetricWindow>(other_element_value.size());
- for (Map.Entry<String, MetricWindow> other_element_value_element : other_element_value.entrySet()) {
-
- String other_element_value_element_key = other_element_value_element.getKey();
- MetricWindow other_element_value_element_value = other_element_value_element.getValue();
-
- String __this__inputMetric_copy_value_copy_key = other_element_value_element_key;
-
- MetricWindow __this__inputMetric_copy_value_copy_value = new MetricWindow(other_element_value_element_value);
-
- __this__inputMetric_copy_value.put(__this__inputMetric_copy_value_copy_key, __this__inputMetric_copy_value_copy_value);
- }
-
- __this__inputMetric.put(__this__inputMetric_copy_key, __this__inputMetric_copy_value);
- }
- this.inputMetric = __this__inputMetric;
- }
- if (other.is_set_outputMetric()) {
- Map<String,Map<String,MetricWindow>> __this__outputMetric = new HashMap<String,Map<String,MetricWindow>>(other.outputMetric.size());
- for (Map.Entry<String, Map<String,MetricWindow>> other_element : other.outputMetric.entrySet()) {
+ if (other.is_set_metrics()) {
+ Map<String,Map<Integer,MetricSnapshot>> __this__metrics = new HashMap<String,Map<Integer,MetricSnapshot>>(other.metrics.size());
+ for (Map.Entry<String, Map<Integer,MetricSnapshot>> other_element : other.metrics.entrySet()) {
String other_element_key = other_element.getKey();
- Map<String,MetricWindow> other_element_value = other_element.getValue();
+ Map<Integer,MetricSnapshot> other_element_value = other_element.getValue();
- String __this__outputMetric_copy_key = other_element_key;
+ String __this__metrics_copy_key = other_element_key;
- Map<String,MetricWindow> __this__outputMetric_copy_value = new HashMap<String,MetricWindow>(other_element_value.size());
- for (Map.Entry<String, MetricWindow> other_element_value_element : other_element_value.entrySet()) {
+ Map<Integer,MetricSnapshot> __this__metrics_copy_value = new HashMap<Integer,MetricSnapshot>(other_element_value.size());
+ for (Map.Entry<Integer, MetricSnapshot> other_element_value_element : other_element_value.entrySet()) {
- String other_element_value_element_key = other_element_value_element.getKey();
- MetricWindow other_element_value_element_value = other_element_value_element.getValue();
+ Integer other_element_value_element_key = other_element_value_element.getKey();
+ MetricSnapshot other_element_value_element_value = other_element_value_element.getValue();
- String __this__outputMetric_copy_value_copy_key = other_element_value_element_key;
+ Integer __this__metrics_copy_value_copy_key = other_element_value_element_key;
- MetricWindow __this__outputMetric_copy_value_copy_value = new MetricWindow(other_element_value_element_value);
+ MetricSnapshot __this__metrics_copy_value_copy_value = new MetricSnapshot(other_element_value_element_value);
- __this__outputMetric_copy_value.put(__this__outputMetric_copy_value_copy_key, __this__outputMetric_copy_value_copy_value);
+ __this__metrics_copy_value.put(__this__metrics_copy_value_copy_key, __this__metrics_copy_value_copy_value);
}
- __this__outputMetric.put(__this__outputMetric_copy_key, __this__outputMetric_copy_value);
+ __this__metrics.put(__this__metrics_copy_key, __this__metrics_copy_value);
}
- this.outputMetric = __this__outputMetric;
+ this.metrics = __this__metrics;
}
}
@@ -230,136 +162,50 @@ public class MetricInfo implements org.apache.thrift.TBase<MetricInfo, MetricInf
@Override
public void clear() {
- this.baseMetric = null;
- this.inputMetric = null;
- this.outputMetric = null;
- }
-
- public int get_baseMetric_size() {
- return (this.baseMetric == null) ? 0 : this.baseMetric.size();
- }
-
- public void put_to_baseMetric(String key, MetricWindow val) {
- if (this.baseMetric == null) {
- this.baseMetric = new HashMap<String,MetricWindow>();
- }
- this.baseMetric.put(key, val);
- }
-
- public Map<String,MetricWindow> get_baseMetric() {
- return this.baseMetric;
+ this.metrics = null;
}
- public void set_baseMetric(Map<String,MetricWindow> baseMetric) {
- this.baseMetric = baseMetric;
+ public int get_metrics_size() {
+ return (this.metrics == null) ? 0 : this.metrics.size();
}
- public void unset_baseMetric() {
- this.baseMetric = null;
- }
-
- /** Returns true if field baseMetric is set (has been assigned a value) and false otherwise */
- public boolean is_set_baseMetric() {
- return this.baseMetric != null;
- }
-
- public void set_baseMetric_isSet(boolean value) {
- if (!value) {
- this.baseMetric = null;
+ public void put_to_metrics(String key, Map<Integer,MetricSnapshot> val) {
+ if (this.metrics == null) {
+ this.metrics = new HashMap<String,Map<Integer,MetricSnapshot>>();
}
+ this.metrics.put(key, val);
}
- public int get_inputMetric_size() {
- return (this.inputMetric == null) ? 0 : this.inputMetric.size();
+ public Map<String,Map<Integer,MetricSnapshot>> get_metrics() {
+ return this.metrics;
}
- public void put_to_inputMetric(String key, Map<String,MetricWindow> val) {
- if (this.inputMetric == null) {
- this.inputMetric = new HashMap<String,Map<String,MetricWindow>>();
- }
- this.inputMetric.put(key, val);
+ public void set_metrics(Map<String,Map<Integer,MetricSnapshot>> metrics) {
+ this.metrics = metrics;
}
- public Map<String,Map<String,MetricWindow>> get_inputMetric() {
- return this.inputMetric;
+ public void unset_metrics() {
+ this.metrics = null;
}
- public void set_inputMetric(Map<String,Map<String,MetricWindow>> inputMetric) {
- this.inputMetric = inputMetric;
+ /** Returns true if field metrics is set (has been assigned a value) and false otherwise */
+ public boolean is_set_metrics() {
+ return this.metrics != null;
}
- public void unset_inputMetric() {
- this.inputMetric = null;
- }
-
- /** Returns true if field inputMetric is set (has been assigned a value) and false otherwise */
- public boolean is_set_inputMetric() {
- return this.inputMetric != null;
- }
-
- public void set_inputMetric_isSet(boolean value) {
+ public void set_metrics_isSet(boolean value) {
if (!value) {
- this.inputMetric = null;
- }
- }
-
- public int get_outputMetric_size() {
- return (this.outputMetric == null) ? 0 : this.outputMetric.size();
- }
-
- public void put_to_outputMetric(String key, Map<String,MetricWindow> val) {
- if (this.outputMetric == null) {
- this.outputMetric = new HashMap<String,Map<String,MetricWindow>>();
- }
- this.outputMetric.put(key, val);
- }
-
- public Map<String,Map<String,MetricWindow>> get_outputMetric() {
- return this.outputMetric;
- }
-
- public void set_outputMetric(Map<String,Map<String,MetricWindow>> outputMetric) {
- this.outputMetric = outputMetric;
- }
-
- public void unset_outputMetric() {
- this.outputMetric = null;
- }
-
- /** Returns true if field outputMetric is set (has been assigned a value) and false otherwise */
- public boolean is_set_outputMetric() {
- return this.outputMetric != null;
- }
-
- public void set_outputMetric_isSet(boolean value) {
- if (!value) {
- this.outputMetric = null;
+ this.metrics = null;
}
}
public void setFieldValue(_Fields field, Object value) {
switch (field) {
- case BASE_METRIC:
+ case METRICS:
if (value == null) {
- unset_baseMetric();
+ unset_metrics();
} else {
- set_baseMetric((Map<String,MetricWindow>)value);
- }
- break;
-
- case INPUT_METRIC:
- if (value == null) {
- unset_inputMetric();
- } else {
- set_inputMetric((Map<String,Map<String,MetricWindow>>)value);
- }
- break;
-
- case OUTPUT_METRIC:
- if (value == null) {
- unset_outputMetric();
- } else {
- set_outputMetric((Map<String,Map<String,MetricWindow>>)value);
+ set_metrics((Map<String,Map<Integer,MetricSnapshot>>)value);
}
break;
@@ -368,14 +214,8 @@ public class MetricInfo implements org.apache.thrift.TBase<MetricInfo, MetricInf
public Object getFieldValue(_Fields field) {
switch (field) {
- case BASE_METRIC:
- return get_baseMetric();
-
- case INPUT_METRIC:
- return get_inputMetric();
-
- case OUTPUT_METRIC:
- return get_outputMetric();
+ case METRICS:
+ return get_metrics();
}
throw new IllegalStateException();
@@ -388,12 +228,8 @@ public class MetricInfo implements org.apache.thrift.TBase<MetricInfo, MetricInf
}
switch (field) {
- case BASE_METRIC:
- return is_set_baseMetric();
- case INPUT_METRIC:
- return is_set_inputMetric();
- case OUTPUT_METRIC:
- return is_set_outputMetric();
+ case METRICS:
+ return is_set_metrics();
}
throw new IllegalStateException();
}
@@ -411,30 +247,12 @@ public class MetricInfo implements org.apache.thrift.TBase<MetricInfo, MetricInf
if (that == null)
return false;
- boolean this_present_baseMetric = true && this.is_set_baseMetric();
- boolean that_present_baseMetric = true && that.is_set_baseMetric();
- if (this_present_baseMetric || that_present_baseMetric) {
- if (!(this_present_baseMetric && that_present_baseMetric))
+ boolean this_present_metrics = true && this.is_set_metrics();
+ boolean that_present_metrics = true && that.is_set_metrics();
+ if (this_present_metrics || that_present_metrics) {
+ if (!(this_present_metrics && that_present_metrics))
return false;
- if (!this.baseMetric.equals(that.baseMetric))
- return false;
- }
-
- boolean this_present_inputMetric = true && this.is_set_inputMetric();
- boolean that_present_inputMetric = true && that.is_set_inputMetric();
- if (this_present_inputMetric || that_present_inputMetric) {
- if (!(this_present_inputMetric && that_present_inputMetric))
- return false;
- if (!this.inputMetric.equals(that.inputMetric))
- return false;
- }
-
- boolean this_present_outputMetric = true && this.is_set_outputMetric();
- boolean that_present_outputMetric = true && that.is_set_outputMetric();
- if (this_present_outputMetric || that_present_outputMetric) {
- if (!(this_present_outputMetric && that_present_outputMetric))
- return false;
- if (!this.outputMetric.equals(that.outputMetric))
+ if (!this.metrics.equals(that.metrics))
return false;
}
@@ -445,20 +263,10 @@ public class MetricInfo implements org.apache.thrift.TBase<MetricInfo, MetricInf
public int hashCode() {
List<Object> list = new ArrayList<Object>();
- boolean present_baseMetric = true && (is_set_baseMetric());
- list.add(present_baseMetric);
- if (present_baseMetric)
- list.add(baseMetric);
-
- boolean present_inputMetric = true && (is_set_inputMetric());
- list.add(present_inputMetric);
- if (present_inputMetric)
- list.add(inputMetric);
-
- boolean present_outputMetric = true && (is_set_outputMetric());
- list.add(present_outputMetric);
- if (present_outputMetric)
- list.add(outputMetric);
+ boolean present_metrics = true && (is_set_metrics());
+ list.add(present_metrics);
+ if (present_metrics)
+ list.add(metrics);
return list.hashCode();
}
@@ -471,32 +279,12 @@ public class MetricInfo implements org.apache.thrift.TBase<MetricInfo, MetricInf
int lastComparison = 0;
- lastComparison = Boolean.valueOf(is_set_baseMetric()).compareTo(other.is_set_baseMetric());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (is_set_baseMetric()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.baseMetric, other.baseMetric);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = Boolean.valueOf(is_set_inputMetric()).compareTo(other.is_set_inputMetric());
+ lastComparison = Boolean.valueOf(is_set_metrics()).compareTo(other.is_set_metrics());
if (lastComparison != 0) {
return lastComparison;
}
- if (is_set_inputMetric()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.inputMetric, other.inputMetric);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = Boolean.valueOf(is_set_outputMetric()).compareTo(other.is_set_outputMetric());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (is_set_outputMetric()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.outputMetric, other.outputMetric);
+ if (is_set_metrics()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.metrics, other.metrics);
if (lastComparison != 0) {
return lastComparison;
}
@@ -508,11 +296,11 @@ public class MetricInfo implements org.apache.thrift.TBase<MetricInfo, MetricInf
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);
}
@@ -521,30 +309,12 @@ public class MetricInfo implements org.apache.thrift.TBase<MetricInfo, MetricInf
StringBuilder sb = new StringBuilder("MetricInfo(");
boolean first = true;
- sb.append("baseMetric:");
- if (this.baseMetric == null) {
- sb.append("null");
- } else {
- sb.append(this.baseMetric);
- }
- first = false;
- if (is_set_inputMetric()) {
- if (!first) sb.append(", ");
- sb.append("inputMetric:");
- if (this.inputMetric == null) {
- sb.append("null");
- } else {
- sb.append(this.inputMetric);
- }
- first = false;
- }
- if (is_set_outputMetric()) {
- if (!first) sb.append(", ");
- sb.append("outputMetric:");
- if (this.outputMetric == null) {
+ if (is_set_metrics()) {
+ sb.append("metrics:");
+ if (this.metrics == null) {
sb.append("null");
} else {
- sb.append(this.outputMetric);
+ sb.append(this.metrics);
}
first = false;
}
@@ -552,19 +322,15 @@ public class MetricInfo implements org.apache.thrift.TBase<MetricInfo, MetricInf
return sb.toString();
}
- public void validate() throws org.apache.thrift.TException {
+ public void validate() throws TException {
// check for required fields
- if (!is_set_baseMetric()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'baseMetric' is unset! Struct:" + toString());
- }
-
// check for sub-struct validity
}
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);
}
}
@@ -572,7 +338,7 @@ public class MetricInfo implements org.apache.thrift.TBase<MetricInfo, MetricInf
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);
}
}
@@ -585,7 +351,7 @@ public class MetricInfo implements org.apache.thrift.TBase<MetricInfo, MetricInf
private static class MetricInfoStandardScheme extends StandardScheme<MetricInfo> {
- public void read(org.apache.thrift.protocol.TProtocol iprot, MetricInfo struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol iprot, MetricInfo struct) throws TException {
org.apache.thrift.protocol.TField schemeField;
iprot.readStructBegin();
while (true)
@@ -595,89 +361,35 @@ public class MetricInfo implements org.apache.thrift.TBase<MetricInfo, MetricInf
break;
}
switch (schemeField.id) {
- case 1: // BASE_METRIC
- if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
- {
- org.apache.thrift.protocol.TMap _map116 = iprot.readMapBegin();
- struct.baseMetric = new HashMap<String,MetricWindow>(2*_map116.size);
- String _key117;
- MetricWindow _val118;
- for (int _i119 = 0; _i119 < _map116.size; ++_i119)
- {
- _key117 = iprot.readString();
- _val118 = new MetricWindow();
- _val118.read(iprot);
- struct.baseMetric.put(_key117, _val118);
- }
- iprot.readMapEnd();
- }
- struct.set_baseMetric_isSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 2: // INPUT_METRIC
- if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
- {
- org.apache.thrift.protocol.TMap _map120 = iprot.readMapBegin();
- struct.inputMetric = new HashMap<String,Map<String,MetricWindow>>(2*_map120.size);
- String _key121;
- Map<String,MetricWindow> _val122;
- for (int _i123 = 0; _i123 < _map120.size; ++_i123)
- {
- _key121 = iprot.readString();
- {
- org.apache.thrift.protocol.TMap _map124 = iprot.readMapBegin();
- _val122 = new HashMap<String,MetricWindow>(2*_map124.size);
- String _key125;
- MetricWindow _val126;
- for (int _i127 = 0; _i127 < _map124.size; ++_i127)
- {
- _key125 = iprot.readString();
- _val126 = new MetricWindow();
- _val126.read(iprot);
- _val122.put(_key125, _val126);
- }
- iprot.readMapEnd();
- }
- struct.inputMetric.put(_key121, _val122);
- }
- iprot.readMapEnd();
- }
- struct.set_inputMetric_isSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 3: // OUTPUT_METRIC
+ case 1: // METRICS
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map128 = iprot.readMapBegin();
- struct.outputMetric = new HashMap<String,Map<String,MetricWindow>>(2*_map128.size);
- String _key129;
- Map<String,MetricWindow> _val130;
- for (int _i131 = 0; _i131 < _map128.size; ++_i131)
+ org.apache.thrift.protocol.TMap _map124 = iprot.readMapBegin();
+ struct.metrics = new HashMap<String,Map<Integer,MetricSnapshot>>(2*_map124.size);
+ String _key125;
+ Map<Integer,MetricSnapshot> _val126;
+ for (int _i127 = 0; _i127 < _map124.size; ++_i127)
{
- _key129 = iprot.readString();
+ _key125 = iprot.readString();
{
- org.apache.thrift.protocol.TMap _map132 = iprot.readMapBegin();
- _val130 = new HashMap<String,MetricWindow>(2*_map132.size);
- String _key133;
- MetricWindow _val134;
- for (int _i135 = 0; _i135 < _map132.size; ++_i135)
+ org.apache.thrift.protocol.TMap _map128 = iprot.readMapBegin();
+ _val126 = new HashMap<Integer,MetricSnapshot>(2*_map128.size);
+ int _key129;
+ MetricSnapshot _val130;
+ for (int _i131 = 0; _i131 < _map128.size; ++_i131)
{
- _key133 = iprot.readString();
- _val134 = new MetricWindow();
- _val134.read(iprot);
- _val130.put(_key133, _val134);
+ _key129 = iprot.readI32();
+ _val130 = new MetricSnapshot();
+ _val130.read(iprot);
+ _val126.put(_key129, _val130);
}
iprot.readMapEnd();
}
- struct.outputMetric.put(_key129, _val130);
+ struct.metrics.put(_key125, _val126);
}
iprot.readMapEnd();
}
- struct.set_outputMetric_isSet(true);
+ struct.set_metrics_isSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -691,60 +403,24 @@ public class MetricInfo implements org.apache.thrift.TBase<MetricInfo, MetricInf
struct.validate();
}
- public void write(org.apache.thrift.protocol.TProtocol oprot, MetricInfo struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot, MetricInfo struct) throws TException {
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
- if (struct.baseMetric != null) {
- oprot.writeFieldBegin(BASE_METRIC_FIELD_DESC);
- {
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.baseMetric.size()));
- for (Map.Entry<String, MetricWindow> _iter136 : struct.baseMetric.entrySet())
+ if (struct.metrics != null) {
+ if (struct.is_set_metrics()) {
+ oprot.writeFieldBegin(METRICS_FIELD_DESC);
{
- oprot.writeString(_iter136.getKey());
- _iter136.getValue().write(oprot);
- }
- oprot.writeMapEnd();
- }
- oprot.writeFieldEnd();
- }
- if (struct.inputMetric != null) {
- if (struct.is_set_inputMetric()) {
- oprot.writeFieldBegin(INPUT_METRIC_FIELD_DESC);
- {
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.inputMetric.size()));
- for (Map.Entry<String, Map<String,MetricWindow>> _iter137 : struct.inputMetric.entrySet())
- {
- oprot.writeString(_iter137.getKey());
- {
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, _iter137.getValue().size()));
- for (Map.Entry<String, MetricWindow> _iter138 : _iter137.getValue().entrySet())
- {
- oprot.writeString(_iter138.getKey());
- _iter138.getValue().write(oprot);
- }
- oprot.writeMapEnd();
- }
- }
- oprot.writeMapEnd();
- }
- oprot.writeFieldEnd();
- }
- }
- if (struct.outputMetric != null) {
- if (struct.is_set_outputMetric()) {
- oprot.writeFieldBegin(OUTPUT_METRIC_FIELD_DESC);
- {
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.outputMetric.size()));
- for (Map.Entry<String, Map<String,MetricWindow>> _iter139 : struct.outputMetric.entrySet())
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.metrics.size()));
+ for (Map.Entry<String, Map<Integer,MetricSnapshot>> _iter132 : struct.metrics.entrySet())
{
- oprot.writeString(_iter139.getKey());
+ oprot.writeString(_iter132.getKey());
{
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, _iter139.getValue().size()));
- for (Map.Entry<String, MetricWindow> _iter140 : _iter139.getValue().entrySet())
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, _iter132.getValue().size()));
+ for (Map.Entry<Integer, MetricSnapshot> _iter133 : _iter132.getValue().entrySet())
{
- oprot.writeString(_iter140.getKey());
- _iter140.getValue().write(oprot);
+ oprot.writeI32(_iter133.getKey());
+ _iter133.getValue().write(oprot);
}
oprot.writeMapEnd();
}
@@ -769,53 +445,25 @@ public class MetricInfo implements org.apache.thrift.TBase<MetricInfo, MetricInf
private static class MetricInfoTupleScheme extends TupleScheme<MetricInfo> {
@Override
- public void write(org.apache.thrift.protocol.TProtocol prot, MetricInfo struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol prot, MetricInfo struct) throws TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
- {
- oprot.writeI32(struct.baseMetric.size());
- for (Map.Entry<String, MetricWindow> _iter141 : struct.baseMetric.entrySet())
- {
- oprot.writeString(_iter141.getKey());
- _iter141.getValue().write(oprot);
- }
- }
BitSet optionals = new BitSet();
- if (struct.is_set_inputMetric()) {
+ if (struct.is_set_metrics()) {
optionals.set(0);
}
- if (struct.is_set_outputMetric()) {
- optionals.set(1);
- }
- oprot.writeBitSet(optionals, 2);
- if (struct.is_set_inputMetric()) {
+ oprot.writeBitSet(optionals, 1);
+ if (struct.is_set_metrics()) {
{
- oprot.writeI32(struct.inputMetric.size());
- for (Map.Entry<String, Map<String,MetricWindow>> _iter142 : struct.inputMetric.entrySet())
+ oprot.writeI32(struct.metrics.size());
+ for (Map.Entry<String, Map<Integer,MetricSnapshot>> _iter134 : struct.metrics.entrySet())
{
- oprot.writeString(_iter142.getKey());
+ oprot.writeString(_iter134.getKey());
{
- oprot.writeI32(_iter142.getValue().size());
- for (Map.Entry<String, MetricWindow> _iter143 : _iter142.getValue().entrySet())
+ oprot.writeI32(_iter134.getValue().size());
+ for (Map.Entry<Integer, MetricSnapshot> _iter135 : _iter134.getValue().entrySet())
{
- oprot.writeString(_iter143.getKey());
- _iter143.getValue().write(oprot);
- }
- }
- }
- }
- }
- if (struct.is_set_outputMetric()) {
- {
- oprot.writeI32(struct.outputMetric.size());
- for (Map.Entry<String, Map<String,MetricWindow>> _iter144 : struct.outputMetric.entrySet())
- {
- oprot.writeString(_iter144.getKey());
- {
- oprot.writeI32(_iter144.getValue().size());
- for (Map.Entry<String, MetricWindow> _iter145 : _iter144.getValue().entrySet())
- {
- oprot.writeString(_iter145.getKey());
- _iter145.getValue().write(oprot);
+ oprot.writeI32(_iter135.getKey());
+ _iter135.getValue().write(oprot);
}
}
}
@@ -824,76 +472,35 @@ public class MetricInfo implements org.apache.thrift.TBase<MetricInfo, MetricInf
}
@Override
- public void read(org.apache.thrift.protocol.TProtocol prot, MetricInfo struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol prot, MetricInfo struct) throws TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
- {
- org.apache.thrift.protocol.TMap _map146 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.baseMetric = new HashMap<String,MetricWindow>(2*_map146.size);
- String _key147;
- MetricWindow _val148;
- for (int _i149 = 0; _i149 < _map146.size; ++_i149)
- {
- _key147 = iprot.readString();
- _val148 = new MetricWindow();
- _val148.read(iprot);
- struct.baseMetric.put(_key147, _val148);
- }
- }
- struct.set_baseMetric_isSet(true);
- BitSet incoming = iprot.readBitSet(2);
+ BitSet incoming = iprot.readBitSet(1);
if (incoming.get(0)) {
{
- org.apache.thrift.protocol.TMap _map150 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
- struct.inputMetric = new HashMap<String,Map<String,MetricWindow>>(2*_map150.size);
- String _key151;
- Map<String,MetricWindow> _val152;
- for (int _i153 = 0; _i153 < _map150.size; ++_i153)
- {
- _key151 = iprot.readString();
- {
- org.apache.thrift.protocol.TMap _map154 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- _val152 = new HashMap<String,MetricWindow>(2*_map154.size);
- String _key155;
- MetricWindow _val156;
- for (int _i157 = 0; _i157 < _map154.size; ++_i157)
- {
- _key155 = iprot.readString();
- _val156 = new MetricWindow();
- _val156.read(iprot);
- _val152.put(_key155, _val156);
- }
- }
- struct.inputMetric.put(_key151, _val152);
- }
- }
- struct.set_inputMetric_isSet(true);
- }
- if (incoming.get(1)) {
- {
- org.apache.thrift.protocol.TMap _map158 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
- struct.outputMetric = new HashMap<String,Map<String,MetricWindow>>(2*_map158.size);
- String _key159;
- Map<String,MetricWindow> _val160;
- for (int _i161 = 0; _i161 < _map158.size; ++_i161)
+ org.apache.thrift.protocol.TMap _map136 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
+ struct.metrics = new HashMap<String,Map<Integer,MetricSnapshot>>(2*_map136.size);
+ String _key137;
+ Map<Integer,MetricSnapshot> _val138;
+ for (int _i139 = 0; _i139 < _map136.size; ++_i139)
{
- _key159 = iprot.readString();
+ _key137 = iprot.readString();
{
- org.apache.thrift.protocol.TMap _map162 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- _val160 = new HashMap<String,MetricWindow>(2*_map162.size);
- String _key163;
- MetricWindow _val164;
- for (int _i165 = 0; _i165 < _map162.size; ++_i165)
+ org.apache.thrift.protocol.TMap _map140 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ _val138 = new HashMap<Integer,MetricSnapshot>(2*_map140.size);
+ int _key141;
+ MetricSnapshot _val142;
+ for (int _i143 = 0; _i143 < _map140.size; ++_i143)
{
- _key163 = iprot.readString();
- _val164 = new MetricWindow();
- _val164.read(iprot);
- _val160.put(_key163, _val164);
+ _key141 = iprot.readI32();
+ _val142 = new MetricSnapshot();
+ _val142.read(iprot);
+ _val138.put(_key141, _val142);
}
}
- struct.outputMetric.put(_key159, _val160);
+ struct.metrics.put(_key137, _val138);
}
}
- struct.set_outputMetric_isSet(true);
+ struct.set_metrics_isSet(true);
}
}
}