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/05/15 20:02:43 UTC
[01/13] storm git commit: STORM-750: Set Config Serialization
Repository: storm
Updated Branches:
refs/heads/0.10.x-branch d82504194 -> 22fe79712
STORM-750: Set Config Serialization
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/5cbdca55
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/5cbdca55
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/5cbdca55
Branch: refs/heads/0.10.x-branch
Commit: 5cbdca55a63dbe9e1adf43b43915b6bc1a9c426d
Parents: d825041
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Mon Apr 6 12:13:35 2015 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri May 15 12:54:42 2015 -0400
----------------------------------------------------------------------
storm-core/src/jvm/backtype/storm/Config.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/5cbdca55/storm-core/src/jvm/backtype/storm/Config.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/Config.java b/storm-core/src/jvm/backtype/storm/Config.java
index 9cddb2e..876aa5c 100644
--- a/storm-core/src/jvm/backtype/storm/Config.java
+++ b/storm-core/src/jvm/backtype/storm/Config.java
@@ -42,6 +42,9 @@ import java.util.Map;
* Spouts.</p>
*/
public class Config extends HashMap<String, Object> {
+ //DO NOT CHANGE UNLESS WE ADD IN STATE NOTE STORED IN THE PARENT CLASS
+ private static final long serialVersionUID = -1550278723792864455L;
+
/**
* This is part of a temporary workaround to a ZK bug, it is the 'scheme:acl' for
* the user Nimbus and Supervisors use to authenticate with ZK.
[13/13] storm git commit: update changelog
Posted by pt...@apache.org.
update changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/22fe7971
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/22fe7971
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/22fe7971
Branch: refs/heads/0.10.x-branch
Commit: 22fe79712a2c342063063c7e4ae17f3b86677841
Parents: 7570a43
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Fri May 15 14:02:28 2015 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri May 15 14:02:28 2015 -0400
----------------------------------------------------------------------
CHANGELOG.md | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/22fe7971/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 54b406d..456b69b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,9 @@
## 0.10.0
+ * STORM-764: Have option to compress thrift heartbeat
+ * JIRA STORM-766 (Include version info in the service page)
+ * STORM-765: Thrift serialization for local state.
+ * STORM-762: uptime for worker heartbeats is lost when converted to thrift
+ * STORM-750: Set Config serialVersionUID
* STORM-714: Make CSS more consistent with self, prev release
* STORM-796: Add support for "error" command in ShellSpout
* STORM-745: fix storm.cmd to evaluate 'shift' correctly with 'storm jar'
[12/13] storm git commit: Addressed review comments
Posted by pt...@apache.org.
Addressed review comments
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7570a43a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7570a43a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7570a43a
Branch: refs/heads/0.10.x-branch
Commit: 7570a43a92088bc3c106e0c26a77f864f12b2d2e
Parents: c9bd0eb
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Thu Apr 9 14:34:54 2015 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri May 15 13:52:31 2015 -0400
----------------------------------------------------------------------
conf/defaults.yaml | 2 +-
.../serialization/GzipBridgeThriftSerializationDelegate.java | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/7570a43a/conf/defaults.yaml
----------------------------------------------------------------------
diff --git a/conf/defaults.yaml b/conf/defaults.yaml
index 78e89bb..4f7376b 100644
--- a/conf/defaults.yaml
+++ b/conf/defaults.yaml
@@ -47,7 +47,7 @@ storm.auth.simple-white-list.users: []
storm.auth.simple-acl.users: []
storm.auth.simple-acl.users.commands: []
storm.auth.simple-acl.admins: []
-storm.meta.serialization.delegate: "backtype.storm.serialization.ThriftSerializationDelegate"
+storm.meta.serialization.delegate: "backtype.storm.serialization.GzipThriftSerializationDelegate"
### nimbus.* configs are for the master
nimbus.host: "localhost"
http://git-wip-us.apache.org/repos/asf/storm/blob/7570a43a/storm-core/src/jvm/backtype/storm/serialization/GzipBridgeThriftSerializationDelegate.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/serialization/GzipBridgeThriftSerializationDelegate.java b/storm-core/src/jvm/backtype/storm/serialization/GzipBridgeThriftSerializationDelegate.java
index bb3ad7e..e5e77c3 100644
--- a/storm-core/src/jvm/backtype/storm/serialization/GzipBridgeThriftSerializationDelegate.java
+++ b/storm-core/src/jvm/backtype/storm/serialization/GzipBridgeThriftSerializationDelegate.java
@@ -22,10 +22,9 @@ import java.util.zip.GZIPInputStream;
/**
* Always writes gzip out, but tests incoming to see if it's gzipped. If it is, deserializes with gzip. If not, uses
- * {@link backtype.storm.serialization.DefaultSerializationDelegate} to deserialize. Any logic needing to be enabled
+ * {@link backtype.storm.serialization.ThriftSerializationDelegate} to deserialize. Any logic needing to be enabled
* via {@link #prepare(java.util.Map)} is passed through to both delegates.
*/
-@Deprecated
public class GzipBridgeThriftSerializationDelegate implements SerializationDelegate {
private ThriftSerializationDelegate defaultDelegate = new ThriftSerializationDelegate();
[10/13] storm git commit: fix merge conflict
Posted by pt...@apache.org.
fix merge conflict
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/155e52ad
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/155e52ad
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/155e52ad
Branch: refs/heads/0.10.x-branch
Commit: 155e52ad11f041788fb9718f2c767dfdd14a9b2d
Parents: 765354c
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Fri May 15 13:42:58 2015 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri May 15 13:42:58 2015 -0400
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/supervisor.clj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/155e52ad/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
index 7dc3085..9ff0c65 100644
--- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
@@ -512,7 +512,7 @@
(.getMetadata isupervisor)
(conf SUPERVISOR-SCHEDULER-META)
((:uptime supervisor))
- ((:version supervisor))))]
+ (:version supervisor))))]
(heartbeat-fn)
[09/13] storm git commit: Included the default version info
"VERSION_NOT_FOUND" tag in the thrift file. Made the version "optional" in
the thrift file Accordingly modified the nimbus.clj file as per the above
specifications.
Posted by pt...@apache.org.
Included the default version info "VERSION_NOT_FOUND" tag in the thrift file. Made the version "optional" in the thrift file
Accordingly modified the nimbus.clj file as per the above specifications.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/765354cc
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/765354cc
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/765354cc
Branch: refs/heads/0.10.x-branch
Commit: 765354ccc2976533fee57d2ce4330957f8302e64
Parents: a13c465
Author: sanket <sc...@yahoo-inc.com>
Authored: Mon Apr 20 12:41:44 2015 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri May 15 13:42:11 2015 -0400
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/converter.clj | 3 +-
.../src/clj/backtype/storm/daemon/nimbus.clj | 9 +--
.../storm/generated/SupervisorInfo.java | 2 +-
.../storm/generated/SupervisorSummary.java | 60 ++++++++++++--------
storm-core/src/storm.thrift | 2 +-
5 files changed, 44 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/765354cc/storm-core/src/clj/backtype/storm/converter.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/converter.clj b/storm-core/src/clj/backtype/storm/converter.clj
index 3b79751..45e3033 100644
--- a/storm-core/src/clj/backtype/storm/converter.clj
+++ b/storm-core/src/clj/backtype/storm/converter.clj
@@ -26,8 +26,7 @@
(if (.get_meta supervisor-info) (into [] (.get_meta supervisor-info)))
(if (.get_scheduler_meta supervisor-info) (into {} (.get_scheduler_meta supervisor-info)))
(.get_uptime_secs supervisor-info)
- (.get_version supervisor-info);;log
- )))
+ (.get_version supervisor-info))))
(defn thriftify-assignment [assignment]
(doto (Assignment.)
http://git-wip-us.apache.org/repos/asf/storm/blob/765354cc/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
index 5d0a0f2..dc03e07 100644
--- a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
@@ -1246,13 +1246,14 @@
;; in standalone just look at metadata, otherwise just say N/A?
supervisor-summaries (dofor [[id info] supervisor-infos]
(let [ports (set (:meta info)) ;;TODO: this is only true for standalone
- ]
- (SupervisorSummary. (:hostname info)
+
+ sup-sum (SupervisorSummary. (:hostname info)
(:uptime-secs info)
(count ports)
(count (:used-ports info))
- id
- (:version info))
+ id) ]
+ (when-let [version (:version info)] (.set_version sup-sum version))
+ sup-sum
))
nimbus-uptime ((:uptime nimbus))
bases (topology-bases storm-cluster-state)
http://git-wip-us.apache.org/repos/asf/storm/blob/765354cc/storm-core/src/jvm/backtype/storm/generated/SupervisorInfo.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/SupervisorInfo.java b/storm-core/src/jvm/backtype/storm/generated/SupervisorInfo.java
index 6272e56..9083b0d 100644
--- a/storm-core/src/jvm/backtype/storm/generated/SupervisorInfo.java
+++ b/storm-core/src/jvm/backtype/storm/generated/SupervisorInfo.java
@@ -51,7 +51,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-4-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-20")
public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, SupervisorInfo._Fields>, java.io.Serializable, Cloneable, Comparable<SupervisorInfo> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SupervisorInfo");
http://git-wip-us.apache.org/repos/asf/storm/blob/765354cc/storm-core/src/jvm/backtype/storm/generated/SupervisorSummary.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/SupervisorSummary.java b/storm-core/src/jvm/backtype/storm/generated/SupervisorSummary.java
index b267cf1..9bdf9f7 100644
--- a/storm-core/src/jvm/backtype/storm/generated/SupervisorSummary.java
+++ b/storm-core/src/jvm/backtype/storm/generated/SupervisorSummary.java
@@ -51,7 +51,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-4-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-20")
public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSummary, SupervisorSummary._Fields>, java.io.Serializable, Cloneable, Comparable<SupervisorSummary> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SupervisorSummary");
@@ -73,7 +73,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
private int num_workers; // required
private int num_used_workers; // required
private String supervisor_id; // required
- private String version; // required
+ private String version; // 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 {
@@ -153,6 +153,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
private static final int __NUM_WORKERS_ISSET_ID = 1;
private static final int __NUM_USED_WORKERS_ISSET_ID = 2;
private byte __isset_bitfield = 0;
+ private static final _Fields optionals[] = {_Fields.VERSION};
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);
@@ -166,13 +167,15 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
tmpMap.put(_Fields.SUPERVISOR_ID, new org.apache.thrift.meta_data.FieldMetaData("supervisor_id", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.VERSION, new org.apache.thrift.meta_data.FieldMetaData("version", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ tmpMap.put(_Fields.VERSION, new org.apache.thrift.meta_data.FieldMetaData("version", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SupervisorSummary.class, metaDataMap);
}
public SupervisorSummary() {
+ this.version = "VERSION_NOT_PROVIDED";
+
}
public SupervisorSummary(
@@ -180,8 +183,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
int uptime_secs,
int num_workers,
int num_used_workers,
- String supervisor_id,
- String version)
+ String supervisor_id)
{
this();
this.host = host;
@@ -192,7 +194,6 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
this.num_used_workers = num_used_workers;
set_num_used_workers_isSet(true);
this.supervisor_id = supervisor_id;
- this.version = version;
}
/**
@@ -228,7 +229,8 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
set_num_used_workers_isSet(false);
this.num_used_workers = 0;
this.supervisor_id = null;
- this.version = null;
+ this.version = "VERSION_NOT_PROVIDED";
+
}
public String get_host() {
@@ -688,14 +690,16 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
sb.append(this.supervisor_id);
}
first = false;
- if (!first) sb.append(", ");
- sb.append("version:");
- if (this.version == null) {
- sb.append("null");
- } else {
- sb.append(this.version);
+ if (is_set_version()) {
+ if (!first) sb.append(", ");
+ sb.append("version:");
+ if (this.version == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.version);
+ }
+ first = false;
}
- first = false;
sb.append(")");
return sb.toString();
}
@@ -722,10 +726,6 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
throw new org.apache.thrift.protocol.TProtocolException("Required field 'supervisor_id' is unset! Struct:" + toString());
}
- if (!is_set_version()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'version' is unset! Struct:" + toString());
- }
-
// check for sub-struct validity
}
@@ -846,9 +846,11 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
oprot.writeFieldEnd();
}
if (struct.version != null) {
- oprot.writeFieldBegin(VERSION_FIELD_DESC);
- oprot.writeString(struct.version);
- oprot.writeFieldEnd();
+ if (struct.is_set_version()) {
+ oprot.writeFieldBegin(VERSION_FIELD_DESC);
+ oprot.writeString(struct.version);
+ oprot.writeFieldEnd();
+ }
}
oprot.writeFieldStop();
oprot.writeStructEnd();
@@ -872,7 +874,14 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
oprot.writeI32(struct.num_workers);
oprot.writeI32(struct.num_used_workers);
oprot.writeString(struct.supervisor_id);
- oprot.writeString(struct.version);
+ BitSet optionals = new BitSet();
+ if (struct.is_set_version()) {
+ optionals.set(0);
+ }
+ oprot.writeBitSet(optionals, 1);
+ if (struct.is_set_version()) {
+ oprot.writeString(struct.version);
+ }
}
@Override
@@ -888,8 +897,11 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
struct.set_num_used_workers_isSet(true);
struct.supervisor_id = iprot.readString();
struct.set_supervisor_id_isSet(true);
- struct.version = iprot.readString();
- struct.set_version_isSet(true);
+ BitSet incoming = iprot.readBitSet(1);
+ if (incoming.get(0)) {
+ struct.version = iprot.readString();
+ struct.set_version_isSet(true);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/765354cc/storm-core/src/storm.thrift
----------------------------------------------------------------------
diff --git a/storm-core/src/storm.thrift b/storm-core/src/storm.thrift
index 3248e3f..2640433 100644
--- a/storm-core/src/storm.thrift
+++ b/storm-core/src/storm.thrift
@@ -153,7 +153,7 @@ struct SupervisorSummary {
3: required i32 num_workers;
4: required i32 num_used_workers;
5: required string supervisor_id;
- 6: required string version;
+ 6: optional string version = "VERSION_NOT_PROVIDED";
}
struct ClusterSummary {
[08/13] storm git commit: reverted back the unmodified thrift java
classes timestamps
Posted by pt...@apache.org.
reverted back the unmodified thrift java classes timestamps
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a13c465d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a13c465d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a13c465d
Branch: refs/heads/0.10.x-branch
Commit: a13c465db6bf69f9b287a0375809d75a0c6c4f36
Parents: 670d93e
Author: sanket <sc...@yahoo-inc.com>
Authored: Sun Apr 19 10:19:17 2015 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri May 15 13:42:10 2015 -0400
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/converter.clj | 3 +--
.../src/jvm/backtype/storm/generated/AlreadyAliveException.java | 2 +-
storm-core/src/jvm/backtype/storm/generated/Assignment.java | 2 +-
.../src/jvm/backtype/storm/generated/AuthorizationException.java | 2 +-
storm-core/src/jvm/backtype/storm/generated/Bolt.java | 2 +-
storm-core/src/jvm/backtype/storm/generated/BoltStats.java | 2 +-
storm-core/src/jvm/backtype/storm/generated/ClusterSummary.java | 2 +-
storm-core/src/jvm/backtype/storm/generated/ComponentCommon.java | 2 +-
storm-core/src/jvm/backtype/storm/generated/Credentials.java | 2 +-
.../src/jvm/backtype/storm/generated/DRPCExecutionException.java | 2 +-
storm-core/src/jvm/backtype/storm/generated/DRPCRequest.java | 2 +-
storm-core/src/jvm/backtype/storm/generated/DistributedRPC.java | 2 +-
.../jvm/backtype/storm/generated/DistributedRPCInvocations.java | 2 +-
storm-core/src/jvm/backtype/storm/generated/ErrorInfo.java | 2 +-
storm-core/src/jvm/backtype/storm/generated/ExecutorInfo.java | 2 +-
storm-core/src/jvm/backtype/storm/generated/ExecutorStats.java | 2 +-
storm-core/src/jvm/backtype/storm/generated/ExecutorSummary.java | 2 +-
storm-core/src/jvm/backtype/storm/generated/GetInfoOptions.java | 2 +-
storm-core/src/jvm/backtype/storm/generated/GlobalStreamId.java | 2 +-
.../jvm/backtype/storm/generated/InvalidTopologyException.java | 2 +-
storm-core/src/jvm/backtype/storm/generated/JavaObject.java | 2 +-
storm-core/src/jvm/backtype/storm/generated/KillOptions.java | 2 +-
storm-core/src/jvm/backtype/storm/generated/Nimbus.java | 2 +-
storm-core/src/jvm/backtype/storm/generated/NodeInfo.java | 2 +-
.../src/jvm/backtype/storm/generated/NotAliveException.java | 2 +-
storm-core/src/jvm/backtype/storm/generated/NullStruct.java | 2 +-
storm-core/src/jvm/backtype/storm/generated/RebalanceOptions.java | 2 +-
storm-core/src/jvm/backtype/storm/generated/ShellComponent.java | 2 +-
storm-core/src/jvm/backtype/storm/generated/SpoutSpec.java | 2 +-
storm-core/src/jvm/backtype/storm/generated/SpoutStats.java | 2 +-
storm-core/src/jvm/backtype/storm/generated/StateSpoutSpec.java | 2 +-
storm-core/src/jvm/backtype/storm/generated/StormBase.java | 2 +-
storm-core/src/jvm/backtype/storm/generated/StormTopology.java | 2 +-
storm-core/src/jvm/backtype/storm/generated/StreamInfo.java | 2 +-
storm-core/src/jvm/backtype/storm/generated/SubmitOptions.java | 2 +-
storm-core/src/jvm/backtype/storm/generated/TopologyInfo.java | 2 +-
36 files changed, 36 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/a13c465d/storm-core/src/clj/backtype/storm/converter.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/converter.clj b/storm-core/src/clj/backtype/storm/converter.clj
index c908cc3..3b79751 100644
--- a/storm-core/src/clj/backtype/storm/converter.clj
+++ b/storm-core/src/clj/backtype/storm/converter.clj
@@ -5,8 +5,7 @@
(:require [backtype.storm.daemon [common :as common]]))
(defn thriftify-supervisor-info [supervisor-info]
- (log-message "supervisor-version " (:version supervisor-info))
- (doto (SupervisorInfo.);;log
+ (doto (SupervisorInfo.)
(.set_time_secs (long (:time-secs supervisor-info)))
(.set_hostname (:hostname supervisor-info))
(.set_assignment_id (:assignment-id supervisor-info))
http://git-wip-us.apache.org/repos/asf/storm/blob/a13c465d/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 0550bb6..62647c3 100644
--- a/storm-core/src/jvm/backtype/storm/generated/AlreadyAliveException.java
+++ b/storm-core/src/jvm/backtype/storm/generated/AlreadyAliveException.java
@@ -51,7 +51,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-4-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
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");
http://git-wip-us.apache.org/repos/asf/storm/blob/a13c465d/storm-core/src/jvm/backtype/storm/generated/Assignment.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/Assignment.java b/storm-core/src/jvm/backtype/storm/generated/Assignment.java
index e1de28d..2e6e8a3 100644
--- a/storm-core/src/jvm/backtype/storm/generated/Assignment.java
+++ b/storm-core/src/jvm/backtype/storm/generated/Assignment.java
@@ -51,7 +51,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-4-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-3-5")
public class Assignment implements org.apache.thrift.TBase<Assignment, Assignment._Fields>, java.io.Serializable, Cloneable, Comparable<Assignment> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Assignment");
http://git-wip-us.apache.org/repos/asf/storm/blob/a13c465d/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 ac38dcf..a179751 100644
--- a/storm-core/src/jvm/backtype/storm/generated/AuthorizationException.java
+++ b/storm-core/src/jvm/backtype/storm/generated/AuthorizationException.java
@@ -51,7 +51,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-4-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
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");
http://git-wip-us.apache.org/repos/asf/storm/blob/a13c465d/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 7d3846b..861226c 100644
--- a/storm-core/src/jvm/backtype/storm/generated/Bolt.java
+++ b/storm-core/src/jvm/backtype/storm/generated/Bolt.java
@@ -51,7 +51,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-4-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
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");
http://git-wip-us.apache.org/repos/asf/storm/blob/a13c465d/storm-core/src/jvm/backtype/storm/generated/BoltStats.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/BoltStats.java b/storm-core/src/jvm/backtype/storm/generated/BoltStats.java
index ce1d9c2..1f8a989 100644
--- a/storm-core/src/jvm/backtype/storm/generated/BoltStats.java
+++ b/storm-core/src/jvm/backtype/storm/generated/BoltStats.java
@@ -51,7 +51,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-4-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._Fields>, java.io.Serializable, Cloneable, Comparable<BoltStats> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("BoltStats");
http://git-wip-us.apache.org/repos/asf/storm/blob/a13c465d/storm-core/src/jvm/backtype/storm/generated/ClusterSummary.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/ClusterSummary.java b/storm-core/src/jvm/backtype/storm/generated/ClusterSummary.java
index fdf3e69..ee25ac8 100644
--- a/storm-core/src/jvm/backtype/storm/generated/ClusterSummary.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ClusterSummary.java
@@ -51,7 +51,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-4-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
public class ClusterSummary implements org.apache.thrift.TBase<ClusterSummary, ClusterSummary._Fields>, java.io.Serializable, Cloneable, Comparable<ClusterSummary> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ClusterSummary");
http://git-wip-us.apache.org/repos/asf/storm/blob/a13c465d/storm-core/src/jvm/backtype/storm/generated/ComponentCommon.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/ComponentCommon.java b/storm-core/src/jvm/backtype/storm/generated/ComponentCommon.java
index e13c7a3..6868603 100644
--- a/storm-core/src/jvm/backtype/storm/generated/ComponentCommon.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ComponentCommon.java
@@ -51,7 +51,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-4-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon, ComponentCommon._Fields>, java.io.Serializable, Cloneable, Comparable<ComponentCommon> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComponentCommon");
http://git-wip-us.apache.org/repos/asf/storm/blob/a13c465d/storm-core/src/jvm/backtype/storm/generated/Credentials.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/Credentials.java b/storm-core/src/jvm/backtype/storm/generated/Credentials.java
index 73c27e5..c1ef293 100644
--- a/storm-core/src/jvm/backtype/storm/generated/Credentials.java
+++ b/storm-core/src/jvm/backtype/storm/generated/Credentials.java
@@ -51,7 +51,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-4-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
public class Credentials implements org.apache.thrift.TBase<Credentials, Credentials._Fields>, java.io.Serializable, Cloneable, Comparable<Credentials> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Credentials");
http://git-wip-us.apache.org/repos/asf/storm/blob/a13c465d/storm-core/src/jvm/backtype/storm/generated/DRPCExecutionException.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/DRPCExecutionException.java b/storm-core/src/jvm/backtype/storm/generated/DRPCExecutionException.java
index be7fb4c..f61ffa1 100644
--- a/storm-core/src/jvm/backtype/storm/generated/DRPCExecutionException.java
+++ b/storm-core/src/jvm/backtype/storm/generated/DRPCExecutionException.java
@@ -51,7 +51,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-4-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
public class DRPCExecutionException extends TException implements org.apache.thrift.TBase<DRPCExecutionException, DRPCExecutionException._Fields>, java.io.Serializable, Cloneable, Comparable<DRPCExecutionException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DRPCExecutionException");
http://git-wip-us.apache.org/repos/asf/storm/blob/a13c465d/storm-core/src/jvm/backtype/storm/generated/DRPCRequest.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/DRPCRequest.java b/storm-core/src/jvm/backtype/storm/generated/DRPCRequest.java
index 24e934c..b97fa25 100644
--- a/storm-core/src/jvm/backtype/storm/generated/DRPCRequest.java
+++ b/storm-core/src/jvm/backtype/storm/generated/DRPCRequest.java
@@ -51,7 +51,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-4-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
public class DRPCRequest implements org.apache.thrift.TBase<DRPCRequest, DRPCRequest._Fields>, java.io.Serializable, Cloneable, Comparable<DRPCRequest> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DRPCRequest");
http://git-wip-us.apache.org/repos/asf/storm/blob/a13c465d/storm-core/src/jvm/backtype/storm/generated/DistributedRPC.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/DistributedRPC.java b/storm-core/src/jvm/backtype/storm/generated/DistributedRPC.java
index 2478904..c4f25ec 100644
--- a/storm-core/src/jvm/backtype/storm/generated/DistributedRPC.java
+++ b/storm-core/src/jvm/backtype/storm/generated/DistributedRPC.java
@@ -51,7 +51,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-4-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
public class DistributedRPC {
public interface Iface {
http://git-wip-us.apache.org/repos/asf/storm/blob/a13c465d/storm-core/src/jvm/backtype/storm/generated/DistributedRPCInvocations.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/DistributedRPCInvocations.java b/storm-core/src/jvm/backtype/storm/generated/DistributedRPCInvocations.java
index 409079c..94b799b 100644
--- a/storm-core/src/jvm/backtype/storm/generated/DistributedRPCInvocations.java
+++ b/storm-core/src/jvm/backtype/storm/generated/DistributedRPCInvocations.java
@@ -51,7 +51,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-4-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
public class DistributedRPCInvocations {
public interface Iface {
http://git-wip-us.apache.org/repos/asf/storm/blob/a13c465d/storm-core/src/jvm/backtype/storm/generated/ErrorInfo.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/ErrorInfo.java b/storm-core/src/jvm/backtype/storm/generated/ErrorInfo.java
index 91d2341..32495c7 100644
--- a/storm-core/src/jvm/backtype/storm/generated/ErrorInfo.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ErrorInfo.java
@@ -51,7 +51,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-4-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._Fields>, java.io.Serializable, Cloneable, Comparable<ErrorInfo> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ErrorInfo");
http://git-wip-us.apache.org/repos/asf/storm/blob/a13c465d/storm-core/src/jvm/backtype/storm/generated/ExecutorInfo.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/ExecutorInfo.java b/storm-core/src/jvm/backtype/storm/generated/ExecutorInfo.java
index 2441220..44415ce 100644
--- a/storm-core/src/jvm/backtype/storm/generated/ExecutorInfo.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ExecutorInfo.java
@@ -51,7 +51,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-4-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
public class ExecutorInfo implements org.apache.thrift.TBase<ExecutorInfo, ExecutorInfo._Fields>, java.io.Serializable, Cloneable, Comparable<ExecutorInfo> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExecutorInfo");
http://git-wip-us.apache.org/repos/asf/storm/blob/a13c465d/storm-core/src/jvm/backtype/storm/generated/ExecutorStats.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/ExecutorStats.java b/storm-core/src/jvm/backtype/storm/generated/ExecutorStats.java
index cf95731..001fcff 100644
--- a/storm-core/src/jvm/backtype/storm/generated/ExecutorStats.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ExecutorStats.java
@@ -51,7 +51,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-4-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-3-5")
public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, ExecutorStats._Fields>, java.io.Serializable, Cloneable, Comparable<ExecutorStats> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExecutorStats");
http://git-wip-us.apache.org/repos/asf/storm/blob/a13c465d/storm-core/src/jvm/backtype/storm/generated/ExecutorSummary.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/ExecutorSummary.java b/storm-core/src/jvm/backtype/storm/generated/ExecutorSummary.java
index 1e2b14f..649342d 100644
--- a/storm-core/src/jvm/backtype/storm/generated/ExecutorSummary.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ExecutorSummary.java
@@ -51,7 +51,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-4-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
public class ExecutorSummary implements org.apache.thrift.TBase<ExecutorSummary, ExecutorSummary._Fields>, java.io.Serializable, Cloneable, Comparable<ExecutorSummary> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExecutorSummary");
http://git-wip-us.apache.org/repos/asf/storm/blob/a13c465d/storm-core/src/jvm/backtype/storm/generated/GetInfoOptions.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/GetInfoOptions.java b/storm-core/src/jvm/backtype/storm/generated/GetInfoOptions.java
index 3628ca7..2d5defc 100644
--- a/storm-core/src/jvm/backtype/storm/generated/GetInfoOptions.java
+++ b/storm-core/src/jvm/backtype/storm/generated/GetInfoOptions.java
@@ -51,7 +51,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-4-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
public class GetInfoOptions implements org.apache.thrift.TBase<GetInfoOptions, GetInfoOptions._Fields>, java.io.Serializable, Cloneable, Comparable<GetInfoOptions> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetInfoOptions");
http://git-wip-us.apache.org/repos/asf/storm/blob/a13c465d/storm-core/src/jvm/backtype/storm/generated/GlobalStreamId.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/GlobalStreamId.java b/storm-core/src/jvm/backtype/storm/generated/GlobalStreamId.java
index 0c27daa..017ad4f 100644
--- a/storm-core/src/jvm/backtype/storm/generated/GlobalStreamId.java
+++ b/storm-core/src/jvm/backtype/storm/generated/GlobalStreamId.java
@@ -51,7 +51,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-4-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
public class GlobalStreamId implements org.apache.thrift.TBase<GlobalStreamId, GlobalStreamId._Fields>, java.io.Serializable, Cloneable, Comparable<GlobalStreamId> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GlobalStreamId");
http://git-wip-us.apache.org/repos/asf/storm/blob/a13c465d/storm-core/src/jvm/backtype/storm/generated/InvalidTopologyException.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/InvalidTopologyException.java b/storm-core/src/jvm/backtype/storm/generated/InvalidTopologyException.java
index dafb107..5a98418 100644
--- a/storm-core/src/jvm/backtype/storm/generated/InvalidTopologyException.java
+++ b/storm-core/src/jvm/backtype/storm/generated/InvalidTopologyException.java
@@ -51,7 +51,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-4-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
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");
http://git-wip-us.apache.org/repos/asf/storm/blob/a13c465d/storm-core/src/jvm/backtype/storm/generated/JavaObject.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/JavaObject.java b/storm-core/src/jvm/backtype/storm/generated/JavaObject.java
index 39c9f70..fde0082 100644
--- a/storm-core/src/jvm/backtype/storm/generated/JavaObject.java
+++ b/storm-core/src/jvm/backtype/storm/generated/JavaObject.java
@@ -51,7 +51,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-4-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
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");
http://git-wip-us.apache.org/repos/asf/storm/blob/a13c465d/storm-core/src/jvm/backtype/storm/generated/KillOptions.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/KillOptions.java b/storm-core/src/jvm/backtype/storm/generated/KillOptions.java
index d038ba3..f173395 100644
--- a/storm-core/src/jvm/backtype/storm/generated/KillOptions.java
+++ b/storm-core/src/jvm/backtype/storm/generated/KillOptions.java
@@ -51,7 +51,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-4-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
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");
http://git-wip-us.apache.org/repos/asf/storm/blob/a13c465d/storm-core/src/jvm/backtype/storm/generated/Nimbus.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/Nimbus.java b/storm-core/src/jvm/backtype/storm/generated/Nimbus.java
index 573413b..048379a 100644
--- a/storm-core/src/jvm/backtype/storm/generated/Nimbus.java
+++ b/storm-core/src/jvm/backtype/storm/generated/Nimbus.java
@@ -51,7 +51,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-4-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
public class Nimbus {
public interface Iface {
http://git-wip-us.apache.org/repos/asf/storm/blob/a13c465d/storm-core/src/jvm/backtype/storm/generated/NodeInfo.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/NodeInfo.java b/storm-core/src/jvm/backtype/storm/generated/NodeInfo.java
index e5cd464..a71d1b4 100644
--- a/storm-core/src/jvm/backtype/storm/generated/NodeInfo.java
+++ b/storm-core/src/jvm/backtype/storm/generated/NodeInfo.java
@@ -51,7 +51,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-4-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-3-5")
public class NodeInfo implements org.apache.thrift.TBase<NodeInfo, NodeInfo._Fields>, java.io.Serializable, Cloneable, Comparable<NodeInfo> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NodeInfo");
http://git-wip-us.apache.org/repos/asf/storm/blob/a13c465d/storm-core/src/jvm/backtype/storm/generated/NotAliveException.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/NotAliveException.java b/storm-core/src/jvm/backtype/storm/generated/NotAliveException.java
index 84ce8ef..100da84 100644
--- a/storm-core/src/jvm/backtype/storm/generated/NotAliveException.java
+++ b/storm-core/src/jvm/backtype/storm/generated/NotAliveException.java
@@ -51,7 +51,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-4-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
public class NotAliveException extends TException implements org.apache.thrift.TBase<NotAliveException, NotAliveException._Fields>, java.io.Serializable, Cloneable, Comparable<NotAliveException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NotAliveException");
http://git-wip-us.apache.org/repos/asf/storm/blob/a13c465d/storm-core/src/jvm/backtype/storm/generated/NullStruct.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/NullStruct.java b/storm-core/src/jvm/backtype/storm/generated/NullStruct.java
index d2590a3..f44bccd 100644
--- a/storm-core/src/jvm/backtype/storm/generated/NullStruct.java
+++ b/storm-core/src/jvm/backtype/storm/generated/NullStruct.java
@@ -51,7 +51,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-4-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
public class NullStruct implements org.apache.thrift.TBase<NullStruct, NullStruct._Fields>, java.io.Serializable, Cloneable, Comparable<NullStruct> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NullStruct");
http://git-wip-us.apache.org/repos/asf/storm/blob/a13c465d/storm-core/src/jvm/backtype/storm/generated/RebalanceOptions.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/RebalanceOptions.java b/storm-core/src/jvm/backtype/storm/generated/RebalanceOptions.java
index 959418c..f973ffc 100644
--- a/storm-core/src/jvm/backtype/storm/generated/RebalanceOptions.java
+++ b/storm-core/src/jvm/backtype/storm/generated/RebalanceOptions.java
@@ -51,7 +51,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-4-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOptions, RebalanceOptions._Fields>, java.io.Serializable, Cloneable, Comparable<RebalanceOptions> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RebalanceOptions");
http://git-wip-us.apache.org/repos/asf/storm/blob/a13c465d/storm-core/src/jvm/backtype/storm/generated/ShellComponent.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/ShellComponent.java b/storm-core/src/jvm/backtype/storm/generated/ShellComponent.java
index 67f5b5d..27303f1 100644
--- a/storm-core/src/jvm/backtype/storm/generated/ShellComponent.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ShellComponent.java
@@ -51,7 +51,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-4-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
public class ShellComponent implements org.apache.thrift.TBase<ShellComponent, ShellComponent._Fields>, java.io.Serializable, Cloneable, Comparable<ShellComponent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ShellComponent");
http://git-wip-us.apache.org/repos/asf/storm/blob/a13c465d/storm-core/src/jvm/backtype/storm/generated/SpoutSpec.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/SpoutSpec.java b/storm-core/src/jvm/backtype/storm/generated/SpoutSpec.java
index 5ba4e1b..42fd37b 100644
--- a/storm-core/src/jvm/backtype/storm/generated/SpoutSpec.java
+++ b/storm-core/src/jvm/backtype/storm/generated/SpoutSpec.java
@@ -51,7 +51,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-4-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
public class SpoutSpec implements org.apache.thrift.TBase<SpoutSpec, SpoutSpec._Fields>, java.io.Serializable, Cloneable, Comparable<SpoutSpec> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SpoutSpec");
http://git-wip-us.apache.org/repos/asf/storm/blob/a13c465d/storm-core/src/jvm/backtype/storm/generated/SpoutStats.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/SpoutStats.java b/storm-core/src/jvm/backtype/storm/generated/SpoutStats.java
index 01a9e01..7826fe4 100644
--- a/storm-core/src/jvm/backtype/storm/generated/SpoutStats.java
+++ b/storm-core/src/jvm/backtype/storm/generated/SpoutStats.java
@@ -51,7 +51,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-4-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStats._Fields>, java.io.Serializable, Cloneable, Comparable<SpoutStats> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SpoutStats");
http://git-wip-us.apache.org/repos/asf/storm/blob/a13c465d/storm-core/src/jvm/backtype/storm/generated/StateSpoutSpec.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/StateSpoutSpec.java b/storm-core/src/jvm/backtype/storm/generated/StateSpoutSpec.java
index c21f095..15d34ae 100644
--- a/storm-core/src/jvm/backtype/storm/generated/StateSpoutSpec.java
+++ b/storm-core/src/jvm/backtype/storm/generated/StateSpoutSpec.java
@@ -51,7 +51,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-4-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
public class StateSpoutSpec implements org.apache.thrift.TBase<StateSpoutSpec, StateSpoutSpec._Fields>, java.io.Serializable, Cloneable, Comparable<StateSpoutSpec> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StateSpoutSpec");
http://git-wip-us.apache.org/repos/asf/storm/blob/a13c465d/storm-core/src/jvm/backtype/storm/generated/StormBase.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/StormBase.java b/storm-core/src/jvm/backtype/storm/generated/StormBase.java
index 8a50005..b00f072 100644
--- a/storm-core/src/jvm/backtype/storm/generated/StormBase.java
+++ b/storm-core/src/jvm/backtype/storm/generated/StormBase.java
@@ -51,7 +51,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-4-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-3-5")
public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._Fields>, java.io.Serializable, Cloneable, Comparable<StormBase> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StormBase");
http://git-wip-us.apache.org/repos/asf/storm/blob/a13c465d/storm-core/src/jvm/backtype/storm/generated/StormTopology.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/StormTopology.java b/storm-core/src/jvm/backtype/storm/generated/StormTopology.java
index f405fac..d022e95 100644
--- a/storm-core/src/jvm/backtype/storm/generated/StormTopology.java
+++ b/storm-core/src/jvm/backtype/storm/generated/StormTopology.java
@@ -51,7 +51,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-4-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
public class StormTopology implements org.apache.thrift.TBase<StormTopology, StormTopology._Fields>, java.io.Serializable, Cloneable, Comparable<StormTopology> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StormTopology");
http://git-wip-us.apache.org/repos/asf/storm/blob/a13c465d/storm-core/src/jvm/backtype/storm/generated/StreamInfo.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/StreamInfo.java b/storm-core/src/jvm/backtype/storm/generated/StreamInfo.java
index 12cb33b..b9bc75d 100644
--- a/storm-core/src/jvm/backtype/storm/generated/StreamInfo.java
+++ b/storm-core/src/jvm/backtype/storm/generated/StreamInfo.java
@@ -51,7 +51,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-4-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
public class StreamInfo implements org.apache.thrift.TBase<StreamInfo, StreamInfo._Fields>, java.io.Serializable, Cloneable, Comparable<StreamInfo> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StreamInfo");
http://git-wip-us.apache.org/repos/asf/storm/blob/a13c465d/storm-core/src/jvm/backtype/storm/generated/SubmitOptions.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/SubmitOptions.java b/storm-core/src/jvm/backtype/storm/generated/SubmitOptions.java
index b9b5763..2a68c3b 100644
--- a/storm-core/src/jvm/backtype/storm/generated/SubmitOptions.java
+++ b/storm-core/src/jvm/backtype/storm/generated/SubmitOptions.java
@@ -51,7 +51,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-4-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, SubmitOptions._Fields>, java.io.Serializable, Cloneable, Comparable<SubmitOptions> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SubmitOptions");
http://git-wip-us.apache.org/repos/asf/storm/blob/a13c465d/storm-core/src/jvm/backtype/storm/generated/TopologyInfo.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/TopologyInfo.java b/storm-core/src/jvm/backtype/storm/generated/TopologyInfo.java
index d204878..6e1a503 100644
--- a/storm-core/src/jvm/backtype/storm/generated/TopologyInfo.java
+++ b/storm-core/src/jvm/backtype/storm/generated/TopologyInfo.java
@@ -51,7 +51,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-4-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, TopologyInfo._Fields>, java.io.Serializable, Cloneable, Comparable<TopologyInfo> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TopologyInfo");
[06/13] storm git commit: made changes for adding the supervisor-info
version
Posted by pt...@apache.org.
made changes for adding the supervisor-info version
Conflicts:
storm-core/src/clj/backtype/storm/daemon/supervisor.clj
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ebb9634a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ebb9634a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ebb9634a
Branch: refs/heads/0.10.x-branch
Commit: ebb9634ad5f324929c3ca254aa544a3d15269c39
Parents: b1dc422
Author: sanket <sc...@yahoo-inc.com>
Authored: Fri Apr 17 12:33:13 2015 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri May 15 13:41:55 2015 -0400
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/converter.clj | 11 +-
.../src/clj/backtype/storm/daemon/common.clj | 2 +-
.../src/clj/backtype/storm/daemon/nimbus.clj | 4 +-
.../clj/backtype/storm/daemon/supervisor.clj | 21 ++--
storm-core/src/clj/backtype/storm/ui/core.clj | 3 +-
.../storm/generated/AlreadyAliveException.java | 2 +-
.../backtype/storm/generated/Assignment.java | 2 +-
.../storm/generated/AuthorizationException.java | 2 +-
.../src/jvm/backtype/storm/generated/Bolt.java | 2 +-
.../jvm/backtype/storm/generated/BoltStats.java | 2 +-
.../storm/generated/ClusterSummary.java | 2 +-
.../storm/generated/ClusterWorkerHeartbeat.java | 1 +
.../storm/generated/ComponentCommon.java | 2 +-
.../backtype/storm/generated/Credentials.java | 2 +-
.../storm/generated/DRPCExecutionException.java | 2 +-
.../backtype/storm/generated/DRPCRequest.java | 2 +-
.../storm/generated/DistributedRPC.java | 2 +-
.../generated/DistributedRPCInvocations.java | 2 +-
.../jvm/backtype/storm/generated/ErrorInfo.java | 2 +-
.../backtype/storm/generated/ExecutorInfo.java | 2 +-
.../backtype/storm/generated/ExecutorStats.java | 2 +-
.../storm/generated/ExecutorSummary.java | 2 +-
.../storm/generated/GetInfoOptions.java | 2 +-
.../storm/generated/GlobalStreamId.java | 2 +-
.../generated/InvalidTopologyException.java | 2 +-
.../backtype/storm/generated/JavaObject.java | 2 +-
.../backtype/storm/generated/KillOptions.java | 2 +-
.../jvm/backtype/storm/generated/Nimbus.java | 2 +-
.../jvm/backtype/storm/generated/NodeInfo.java | 2 +-
.../storm/generated/NotAliveException.java | 2 +-
.../backtype/storm/generated/NullStruct.java | 2 +-
.../storm/generated/RebalanceOptions.java | 2 +-
.../storm/generated/ShellComponent.java | 2 +-
.../jvm/backtype/storm/generated/SpoutSpec.java | 2 +-
.../backtype/storm/generated/SpoutStats.java | 2 +-
.../storm/generated/StateSpoutSpec.java | 2 +-
.../jvm/backtype/storm/generated/StormBase.java | 2 +-
.../backtype/storm/generated/StormTopology.java | 2 +-
.../backtype/storm/generated/StreamInfo.java | 2 +-
.../backtype/storm/generated/SubmitOptions.java | 2 +-
.../storm/generated/SupervisorInfo.java | 116 ++++++++++++++++++-
.../storm/generated/SupervisorSummary.java | 107 ++++++++++++++++-
.../backtype/storm/generated/TopologyInfo.java | 2 +-
.../storm/generated/TopologySummary.java | 2 +-
storm-core/src/py/storm/ttypes.py | 32 ++++-
storm-core/src/storm.thrift | 3 +
.../public/templates/index-page-template.html | 6 +
.../test/clj/backtype/storm/cluster_test.clj | 4 +-
48 files changed, 320 insertions(+), 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/src/clj/backtype/storm/converter.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/converter.clj b/storm-core/src/clj/backtype/storm/converter.clj
index ae66fa5..c908cc3 100644
--- a/storm-core/src/clj/backtype/storm/converter.clj
+++ b/storm-core/src/clj/backtype/storm/converter.clj
@@ -5,14 +5,17 @@
(:require [backtype.storm.daemon [common :as common]]))
(defn thriftify-supervisor-info [supervisor-info]
- (doto (SupervisorInfo.)
+ (log-message "supervisor-version " (:version supervisor-info))
+ (doto (SupervisorInfo.);;log
(.set_time_secs (long (:time-secs supervisor-info)))
(.set_hostname (:hostname supervisor-info))
(.set_assignment_id (:assignment-id supervisor-info))
(.set_used_ports (map long (:used-ports supervisor-info)))
(.set_meta (map long (:meta supervisor-info)))
(.set_scheduler_meta (:scheduler-meta supervisor-info))
- (.set_uptime_secs (long (:uptime-secs supervisor-info)))))
+ (.set_uptime_secs (long (:uptime-secs supervisor-info)))
+ (.set_version (:version supervisor-info))
+ ))
(defn clojurify-supervisor-info [^SupervisorInfo supervisor-info]
(if supervisor-info
@@ -23,7 +26,9 @@
(if (.get_used_ports supervisor-info) (into [] (.get_used_ports supervisor-info)))
(if (.get_meta supervisor-info) (into [] (.get_meta supervisor-info)))
(if (.get_scheduler_meta supervisor-info) (into {} (.get_scheduler_meta supervisor-info)))
- (.get_uptime_secs supervisor-info))))
+ (.get_uptime_secs supervisor-info)
+ (.get_version supervisor-info);;log
+ )))
(defn thriftify-assignment [assignment]
(doto (Assignment.)
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/src/clj/backtype/storm/daemon/common.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/common.clj b/storm-core/src/clj/backtype/storm/daemon/common.clj
index 65482f3..a5da665 100644
--- a/storm-core/src/clj/backtype/storm/daemon/common.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/common.clj
@@ -53,7 +53,7 @@
;; component->executors is a map from spout/bolt id to number of executors for that component
(defrecord StormBase [storm-name launch-time-secs status num-workers component->executors owner topology-action-options prev-status])
-(defrecord SupervisorInfo [time-secs hostname assignment-id used-ports meta scheduler-meta uptime-secs])
+(defrecord SupervisorInfo [time-secs hostname assignment-id used-ports meta scheduler-meta uptime-secs version-info])
(defprotocol DaemonCommon
(waiting? [this]))
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
index d1a1a59..4bad1ee 100644
--- a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
@@ -1251,7 +1251,9 @@
(:uptime-secs info)
(count ports)
(count (:used-ports info))
- id )
+ id
+ (:version info))
+ (log-message "supervisor-version " :version info)
))
nimbus-uptime ((:uptime nimbus))
bases (topology-bases storm-cluster-state)
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
index 7801690..7dc3085 100644
--- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
@@ -25,6 +25,7 @@
[org.apache.commons.io FileUtils]
[java.io File])
(:use [backtype.storm config util log timer local-state])
+ (:import [backtype.storm.utils VersionInfo])
(:use [backtype.storm.daemon common])
(:require [backtype.storm.daemon [worker :as worker]]
[backtype.storm [process-simulator :as psim] [cluster :as cluster] [event :as event]]
@@ -289,6 +290,7 @@
:isupervisor isupervisor
:active (atom true)
:uptime (uptime-computer)
+ :version (str (VersionInfo/getVersion))
:worker-thread-pids-atom (atom {})
:storm-cluster-state (cluster/mk-storm-cluster-state conf :acls (when
(Utils/isZkAuthenticationConfiguredStormServer
@@ -502,15 +504,18 @@
heartbeat-fn (fn [] (.supervisor-heartbeat!
(:storm-cluster-state supervisor)
(:supervisor-id supervisor)
- (SupervisorInfo. (current-time-secs)
- (:my-hostname supervisor)
- (:assignment-id supervisor)
- (keys @(:curr-assignment supervisor))
- ;; used ports
- (.getMetadata isupervisor)
- (conf SUPERVISOR-SCHEDULER-META)
- ((:uptime supervisor)))))]
+ (->SupervisorInfo (current-time-secs)
+ (:my-hostname supervisor)
+ (:assignment-id supervisor)
+ (keys @(:curr-assignment supervisor))
+ ;; used ports
+ (.getMetadata isupervisor)
+ (conf SUPERVISOR-SCHEDULER-META)
+ ((:uptime supervisor))
+ ((:version supervisor))))]
+
(heartbeat-fn)
+
;; should synchronize supervisor so it doesn't launch anything after being down (optimization)
(schedule-recurring (:heartbeat-timer supervisor)
0
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/src/clj/backtype/storm/ui/core.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/ui/core.clj b/storm-core/src/clj/backtype/storm/ui/core.clj
index 7a475ad..38597ed 100644
--- a/storm-core/src/clj/backtype/storm/ui/core.clj
+++ b/storm-core/src/clj/backtype/storm/ui/core.clj
@@ -545,7 +545,8 @@
"host" (.get_host s)
"uptime" (pretty-uptime-sec (.get_uptime_secs s))
"slotsTotal" (.get_num_workers s)
- "slotsUsed" (.get_num_used_workers s)})}))
+ "slotsUsed" (.get_num_used_workers s)
+ "version" (.get_version s)})}))
(defn all-topologies-summary
([]
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/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 62647c3..0550bb6 100644
--- a/storm-core/src/jvm/backtype/storm/generated/AlreadyAliveException.java
+++ b/storm-core/src/jvm/backtype/storm/generated/AlreadyAliveException.java
@@ -51,7 +51,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-2-6")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-17")
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");
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/src/jvm/backtype/storm/generated/Assignment.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/Assignment.java b/storm-core/src/jvm/backtype/storm/generated/Assignment.java
index 2e6e8a3..e1de28d 100644
--- a/storm-core/src/jvm/backtype/storm/generated/Assignment.java
+++ b/storm-core/src/jvm/backtype/storm/generated/Assignment.java
@@ -51,7 +51,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-3-5")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-17")
public class Assignment implements org.apache.thrift.TBase<Assignment, Assignment._Fields>, java.io.Serializable, Cloneable, Comparable<Assignment> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Assignment");
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/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 a179751..ac38dcf 100644
--- a/storm-core/src/jvm/backtype/storm/generated/AuthorizationException.java
+++ b/storm-core/src/jvm/backtype/storm/generated/AuthorizationException.java
@@ -51,7 +51,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-2-6")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-17")
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");
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/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 861226c..7d3846b 100644
--- a/storm-core/src/jvm/backtype/storm/generated/Bolt.java
+++ b/storm-core/src/jvm/backtype/storm/generated/Bolt.java
@@ -51,7 +51,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-2-6")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-17")
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");
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/src/jvm/backtype/storm/generated/BoltStats.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/BoltStats.java b/storm-core/src/jvm/backtype/storm/generated/BoltStats.java
index 1f8a989..ce1d9c2 100644
--- a/storm-core/src/jvm/backtype/storm/generated/BoltStats.java
+++ b/storm-core/src/jvm/backtype/storm/generated/BoltStats.java
@@ -51,7 +51,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-2-6")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-17")
public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._Fields>, java.io.Serializable, Cloneable, Comparable<BoltStats> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("BoltStats");
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/src/jvm/backtype/storm/generated/ClusterSummary.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/ClusterSummary.java b/storm-core/src/jvm/backtype/storm/generated/ClusterSummary.java
index ee25ac8..fdf3e69 100644
--- a/storm-core/src/jvm/backtype/storm/generated/ClusterSummary.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ClusterSummary.java
@@ -51,7 +51,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-2-6")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-17")
public class ClusterSummary implements org.apache.thrift.TBase<ClusterSummary, ClusterSummary._Fields>, java.io.Serializable, Cloneable, Comparable<ClusterSummary> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ClusterSummary");
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/src/jvm/backtype/storm/generated/ClusterWorkerHeartbeat.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/ClusterWorkerHeartbeat.java b/storm-core/src/jvm/backtype/storm/generated/ClusterWorkerHeartbeat.java
index 30a99b3..f60540b 100644
--- a/storm-core/src/jvm/backtype/storm/generated/ClusterWorkerHeartbeat.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ClusterWorkerHeartbeat.java
@@ -52,6 +52,7 @@ import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-8")
+
public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWorkerHeartbeat, ClusterWorkerHeartbeat._Fields>, java.io.Serializable, Cloneable, Comparable<ClusterWorkerHeartbeat> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ClusterWorkerHeartbeat");
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/src/jvm/backtype/storm/generated/ComponentCommon.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/ComponentCommon.java b/storm-core/src/jvm/backtype/storm/generated/ComponentCommon.java
index 6868603..e13c7a3 100644
--- a/storm-core/src/jvm/backtype/storm/generated/ComponentCommon.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ComponentCommon.java
@@ -51,7 +51,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-2-6")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-17")
public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon, ComponentCommon._Fields>, java.io.Serializable, Cloneable, Comparable<ComponentCommon> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComponentCommon");
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/src/jvm/backtype/storm/generated/Credentials.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/Credentials.java b/storm-core/src/jvm/backtype/storm/generated/Credentials.java
index c1ef293..73c27e5 100644
--- a/storm-core/src/jvm/backtype/storm/generated/Credentials.java
+++ b/storm-core/src/jvm/backtype/storm/generated/Credentials.java
@@ -51,7 +51,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-2-6")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-17")
public class Credentials implements org.apache.thrift.TBase<Credentials, Credentials._Fields>, java.io.Serializable, Cloneable, Comparable<Credentials> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Credentials");
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/src/jvm/backtype/storm/generated/DRPCExecutionException.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/DRPCExecutionException.java b/storm-core/src/jvm/backtype/storm/generated/DRPCExecutionException.java
index f61ffa1..be7fb4c 100644
--- a/storm-core/src/jvm/backtype/storm/generated/DRPCExecutionException.java
+++ b/storm-core/src/jvm/backtype/storm/generated/DRPCExecutionException.java
@@ -51,7 +51,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-2-6")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-17")
public class DRPCExecutionException extends TException implements org.apache.thrift.TBase<DRPCExecutionException, DRPCExecutionException._Fields>, java.io.Serializable, Cloneable, Comparable<DRPCExecutionException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DRPCExecutionException");
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/src/jvm/backtype/storm/generated/DRPCRequest.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/DRPCRequest.java b/storm-core/src/jvm/backtype/storm/generated/DRPCRequest.java
index b97fa25..24e934c 100644
--- a/storm-core/src/jvm/backtype/storm/generated/DRPCRequest.java
+++ b/storm-core/src/jvm/backtype/storm/generated/DRPCRequest.java
@@ -51,7 +51,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-2-6")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-17")
public class DRPCRequest implements org.apache.thrift.TBase<DRPCRequest, DRPCRequest._Fields>, java.io.Serializable, Cloneable, Comparable<DRPCRequest> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DRPCRequest");
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/src/jvm/backtype/storm/generated/DistributedRPC.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/DistributedRPC.java b/storm-core/src/jvm/backtype/storm/generated/DistributedRPC.java
index c4f25ec..2478904 100644
--- a/storm-core/src/jvm/backtype/storm/generated/DistributedRPC.java
+++ b/storm-core/src/jvm/backtype/storm/generated/DistributedRPC.java
@@ -51,7 +51,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-2-6")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-17")
public class DistributedRPC {
public interface Iface {
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/src/jvm/backtype/storm/generated/DistributedRPCInvocations.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/DistributedRPCInvocations.java b/storm-core/src/jvm/backtype/storm/generated/DistributedRPCInvocations.java
index 94b799b..409079c 100644
--- a/storm-core/src/jvm/backtype/storm/generated/DistributedRPCInvocations.java
+++ b/storm-core/src/jvm/backtype/storm/generated/DistributedRPCInvocations.java
@@ -51,7 +51,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-2-6")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-17")
public class DistributedRPCInvocations {
public interface Iface {
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/src/jvm/backtype/storm/generated/ErrorInfo.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/ErrorInfo.java b/storm-core/src/jvm/backtype/storm/generated/ErrorInfo.java
index 32495c7..91d2341 100644
--- a/storm-core/src/jvm/backtype/storm/generated/ErrorInfo.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ErrorInfo.java
@@ -51,7 +51,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-2-6")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-17")
public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._Fields>, java.io.Serializable, Cloneable, Comparable<ErrorInfo> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ErrorInfo");
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/src/jvm/backtype/storm/generated/ExecutorInfo.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/ExecutorInfo.java b/storm-core/src/jvm/backtype/storm/generated/ExecutorInfo.java
index 44415ce..2441220 100644
--- a/storm-core/src/jvm/backtype/storm/generated/ExecutorInfo.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ExecutorInfo.java
@@ -51,7 +51,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-2-6")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-17")
public class ExecutorInfo implements org.apache.thrift.TBase<ExecutorInfo, ExecutorInfo._Fields>, java.io.Serializable, Cloneable, Comparable<ExecutorInfo> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExecutorInfo");
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/src/jvm/backtype/storm/generated/ExecutorStats.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/ExecutorStats.java b/storm-core/src/jvm/backtype/storm/generated/ExecutorStats.java
index 001fcff..cf95731 100644
--- a/storm-core/src/jvm/backtype/storm/generated/ExecutorStats.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ExecutorStats.java
@@ -51,7 +51,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-3-5")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-17")
public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, ExecutorStats._Fields>, java.io.Serializable, Cloneable, Comparable<ExecutorStats> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExecutorStats");
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/src/jvm/backtype/storm/generated/ExecutorSummary.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/ExecutorSummary.java b/storm-core/src/jvm/backtype/storm/generated/ExecutorSummary.java
index 649342d..1e2b14f 100644
--- a/storm-core/src/jvm/backtype/storm/generated/ExecutorSummary.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ExecutorSummary.java
@@ -51,7 +51,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-2-6")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-17")
public class ExecutorSummary implements org.apache.thrift.TBase<ExecutorSummary, ExecutorSummary._Fields>, java.io.Serializable, Cloneable, Comparable<ExecutorSummary> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExecutorSummary");
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/src/jvm/backtype/storm/generated/GetInfoOptions.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/GetInfoOptions.java b/storm-core/src/jvm/backtype/storm/generated/GetInfoOptions.java
index 2d5defc..3628ca7 100644
--- a/storm-core/src/jvm/backtype/storm/generated/GetInfoOptions.java
+++ b/storm-core/src/jvm/backtype/storm/generated/GetInfoOptions.java
@@ -51,7 +51,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-2-6")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-17")
public class GetInfoOptions implements org.apache.thrift.TBase<GetInfoOptions, GetInfoOptions._Fields>, java.io.Serializable, Cloneable, Comparable<GetInfoOptions> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetInfoOptions");
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/src/jvm/backtype/storm/generated/GlobalStreamId.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/GlobalStreamId.java b/storm-core/src/jvm/backtype/storm/generated/GlobalStreamId.java
index 017ad4f..0c27daa 100644
--- a/storm-core/src/jvm/backtype/storm/generated/GlobalStreamId.java
+++ b/storm-core/src/jvm/backtype/storm/generated/GlobalStreamId.java
@@ -51,7 +51,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-2-6")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-17")
public class GlobalStreamId implements org.apache.thrift.TBase<GlobalStreamId, GlobalStreamId._Fields>, java.io.Serializable, Cloneable, Comparable<GlobalStreamId> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GlobalStreamId");
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/src/jvm/backtype/storm/generated/InvalidTopologyException.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/InvalidTopologyException.java b/storm-core/src/jvm/backtype/storm/generated/InvalidTopologyException.java
index 5a98418..dafb107 100644
--- a/storm-core/src/jvm/backtype/storm/generated/InvalidTopologyException.java
+++ b/storm-core/src/jvm/backtype/storm/generated/InvalidTopologyException.java
@@ -51,7 +51,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-2-6")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-17")
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");
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/src/jvm/backtype/storm/generated/JavaObject.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/JavaObject.java b/storm-core/src/jvm/backtype/storm/generated/JavaObject.java
index fde0082..39c9f70 100644
--- a/storm-core/src/jvm/backtype/storm/generated/JavaObject.java
+++ b/storm-core/src/jvm/backtype/storm/generated/JavaObject.java
@@ -51,7 +51,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-2-6")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-17")
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");
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/src/jvm/backtype/storm/generated/KillOptions.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/KillOptions.java b/storm-core/src/jvm/backtype/storm/generated/KillOptions.java
index f173395..d038ba3 100644
--- a/storm-core/src/jvm/backtype/storm/generated/KillOptions.java
+++ b/storm-core/src/jvm/backtype/storm/generated/KillOptions.java
@@ -51,7 +51,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-2-6")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-17")
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");
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/src/jvm/backtype/storm/generated/Nimbus.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/Nimbus.java b/storm-core/src/jvm/backtype/storm/generated/Nimbus.java
index 048379a..573413b 100644
--- a/storm-core/src/jvm/backtype/storm/generated/Nimbus.java
+++ b/storm-core/src/jvm/backtype/storm/generated/Nimbus.java
@@ -51,7 +51,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-2-6")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-17")
public class Nimbus {
public interface Iface {
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/src/jvm/backtype/storm/generated/NodeInfo.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/NodeInfo.java b/storm-core/src/jvm/backtype/storm/generated/NodeInfo.java
index a71d1b4..e5cd464 100644
--- a/storm-core/src/jvm/backtype/storm/generated/NodeInfo.java
+++ b/storm-core/src/jvm/backtype/storm/generated/NodeInfo.java
@@ -51,7 +51,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-3-5")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-17")
public class NodeInfo implements org.apache.thrift.TBase<NodeInfo, NodeInfo._Fields>, java.io.Serializable, Cloneable, Comparable<NodeInfo> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NodeInfo");
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/src/jvm/backtype/storm/generated/NotAliveException.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/NotAliveException.java b/storm-core/src/jvm/backtype/storm/generated/NotAliveException.java
index 100da84..84ce8ef 100644
--- a/storm-core/src/jvm/backtype/storm/generated/NotAliveException.java
+++ b/storm-core/src/jvm/backtype/storm/generated/NotAliveException.java
@@ -51,7 +51,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-2-6")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-17")
public class NotAliveException extends TException implements org.apache.thrift.TBase<NotAliveException, NotAliveException._Fields>, java.io.Serializable, Cloneable, Comparable<NotAliveException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NotAliveException");
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/src/jvm/backtype/storm/generated/NullStruct.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/NullStruct.java b/storm-core/src/jvm/backtype/storm/generated/NullStruct.java
index f44bccd..d2590a3 100644
--- a/storm-core/src/jvm/backtype/storm/generated/NullStruct.java
+++ b/storm-core/src/jvm/backtype/storm/generated/NullStruct.java
@@ -51,7 +51,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-2-6")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-17")
public class NullStruct implements org.apache.thrift.TBase<NullStruct, NullStruct._Fields>, java.io.Serializable, Cloneable, Comparable<NullStruct> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NullStruct");
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/src/jvm/backtype/storm/generated/RebalanceOptions.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/RebalanceOptions.java b/storm-core/src/jvm/backtype/storm/generated/RebalanceOptions.java
index f973ffc..959418c 100644
--- a/storm-core/src/jvm/backtype/storm/generated/RebalanceOptions.java
+++ b/storm-core/src/jvm/backtype/storm/generated/RebalanceOptions.java
@@ -51,7 +51,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-2-6")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-17")
public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOptions, RebalanceOptions._Fields>, java.io.Serializable, Cloneable, Comparable<RebalanceOptions> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RebalanceOptions");
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/src/jvm/backtype/storm/generated/ShellComponent.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/ShellComponent.java b/storm-core/src/jvm/backtype/storm/generated/ShellComponent.java
index 27303f1..67f5b5d 100644
--- a/storm-core/src/jvm/backtype/storm/generated/ShellComponent.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ShellComponent.java
@@ -51,7 +51,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-2-6")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-17")
public class ShellComponent implements org.apache.thrift.TBase<ShellComponent, ShellComponent._Fields>, java.io.Serializable, Cloneable, Comparable<ShellComponent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ShellComponent");
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/src/jvm/backtype/storm/generated/SpoutSpec.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/SpoutSpec.java b/storm-core/src/jvm/backtype/storm/generated/SpoutSpec.java
index 42fd37b..5ba4e1b 100644
--- a/storm-core/src/jvm/backtype/storm/generated/SpoutSpec.java
+++ b/storm-core/src/jvm/backtype/storm/generated/SpoutSpec.java
@@ -51,7 +51,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-2-6")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-17")
public class SpoutSpec implements org.apache.thrift.TBase<SpoutSpec, SpoutSpec._Fields>, java.io.Serializable, Cloneable, Comparable<SpoutSpec> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SpoutSpec");
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/src/jvm/backtype/storm/generated/SpoutStats.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/SpoutStats.java b/storm-core/src/jvm/backtype/storm/generated/SpoutStats.java
index 7826fe4..01a9e01 100644
--- a/storm-core/src/jvm/backtype/storm/generated/SpoutStats.java
+++ b/storm-core/src/jvm/backtype/storm/generated/SpoutStats.java
@@ -51,7 +51,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-2-6")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-17")
public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStats._Fields>, java.io.Serializable, Cloneable, Comparable<SpoutStats> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SpoutStats");
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/src/jvm/backtype/storm/generated/StateSpoutSpec.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/StateSpoutSpec.java b/storm-core/src/jvm/backtype/storm/generated/StateSpoutSpec.java
index 15d34ae..c21f095 100644
--- a/storm-core/src/jvm/backtype/storm/generated/StateSpoutSpec.java
+++ b/storm-core/src/jvm/backtype/storm/generated/StateSpoutSpec.java
@@ -51,7 +51,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-2-6")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-17")
public class StateSpoutSpec implements org.apache.thrift.TBase<StateSpoutSpec, StateSpoutSpec._Fields>, java.io.Serializable, Cloneable, Comparable<StateSpoutSpec> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StateSpoutSpec");
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/src/jvm/backtype/storm/generated/StormBase.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/StormBase.java b/storm-core/src/jvm/backtype/storm/generated/StormBase.java
index b00f072..8a50005 100644
--- a/storm-core/src/jvm/backtype/storm/generated/StormBase.java
+++ b/storm-core/src/jvm/backtype/storm/generated/StormBase.java
@@ -51,7 +51,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-3-5")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-17")
public class StormBase implements org.apache.thrift.TBase<StormBase, StormBase._Fields>, java.io.Serializable, Cloneable, Comparable<StormBase> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StormBase");
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/src/jvm/backtype/storm/generated/StormTopology.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/StormTopology.java b/storm-core/src/jvm/backtype/storm/generated/StormTopology.java
index d022e95..f405fac 100644
--- a/storm-core/src/jvm/backtype/storm/generated/StormTopology.java
+++ b/storm-core/src/jvm/backtype/storm/generated/StormTopology.java
@@ -51,7 +51,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-2-6")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-17")
public class StormTopology implements org.apache.thrift.TBase<StormTopology, StormTopology._Fields>, java.io.Serializable, Cloneable, Comparable<StormTopology> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StormTopology");
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/src/jvm/backtype/storm/generated/StreamInfo.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/StreamInfo.java b/storm-core/src/jvm/backtype/storm/generated/StreamInfo.java
index b9bc75d..12cb33b 100644
--- a/storm-core/src/jvm/backtype/storm/generated/StreamInfo.java
+++ b/storm-core/src/jvm/backtype/storm/generated/StreamInfo.java
@@ -51,7 +51,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-2-6")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-17")
public class StreamInfo implements org.apache.thrift.TBase<StreamInfo, StreamInfo._Fields>, java.io.Serializable, Cloneable, Comparable<StreamInfo> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StreamInfo");
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/src/jvm/backtype/storm/generated/SubmitOptions.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/SubmitOptions.java b/storm-core/src/jvm/backtype/storm/generated/SubmitOptions.java
index 2a68c3b..b9b5763 100644
--- a/storm-core/src/jvm/backtype/storm/generated/SubmitOptions.java
+++ b/storm-core/src/jvm/backtype/storm/generated/SubmitOptions.java
@@ -51,7 +51,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-2-6")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-17")
public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, SubmitOptions._Fields>, java.io.Serializable, Cloneable, Comparable<SubmitOptions> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SubmitOptions");
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/src/jvm/backtype/storm/generated/SupervisorInfo.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/SupervisorInfo.java b/storm-core/src/jvm/backtype/storm/generated/SupervisorInfo.java
index 924d12f..6272e56 100644
--- a/storm-core/src/jvm/backtype/storm/generated/SupervisorInfo.java
+++ b/storm-core/src/jvm/backtype/storm/generated/SupervisorInfo.java
@@ -51,7 +51,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-3-5")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-17")
public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, SupervisorInfo._Fields>, java.io.Serializable, Cloneable, Comparable<SupervisorInfo> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SupervisorInfo");
@@ -62,6 +62,7 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
private static final org.apache.thrift.protocol.TField META_FIELD_DESC = new org.apache.thrift.protocol.TField("meta", org.apache.thrift.protocol.TType.LIST, (short)5);
private static final org.apache.thrift.protocol.TField SCHEDULER_META_FIELD_DESC = new org.apache.thrift.protocol.TField("scheduler_meta", org.apache.thrift.protocol.TType.MAP, (short)6);
private static final org.apache.thrift.protocol.TField UPTIME_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("uptime_secs", org.apache.thrift.protocol.TType.I64, (short)7);
+ private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.STRING, (short)8);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -76,6 +77,7 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
private List<Long> meta; // optional
private Map<String,String> scheduler_meta; // optional
private long uptime_secs; // optional
+ private String version; // 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 {
@@ -85,7 +87,8 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
USED_PORTS((short)4, "used_ports"),
META((short)5, "meta"),
SCHEDULER_META((short)6, "scheduler_meta"),
- UPTIME_SECS((short)7, "uptime_secs");
+ UPTIME_SECS((short)7, "uptime_secs"),
+ VERSION((short)8, "version");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -114,6 +117,8 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
return SCHEDULER_META;
case 7: // UPTIME_SECS
return UPTIME_SECS;
+ case 8: // VERSION
+ return VERSION;
default:
return null;
}
@@ -157,7 +162,7 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
private static final int __TIME_SECS_ISSET_ID = 0;
private static final int __UPTIME_SECS_ISSET_ID = 1;
private byte __isset_bitfield = 0;
- private static final _Fields optionals[] = {_Fields.ASSIGNMENT_ID,_Fields.USED_PORTS,_Fields.META,_Fields.SCHEDULER_META,_Fields.UPTIME_SECS};
+ private static final _Fields optionals[] = {_Fields.ASSIGNMENT_ID,_Fields.USED_PORTS,_Fields.META,_Fields.SCHEDULER_META,_Fields.UPTIME_SECS,_Fields.VERSION};
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);
@@ -179,6 +184,8 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
tmpMap.put(_Fields.UPTIME_SECS, new org.apache.thrift.meta_data.FieldMetaData("uptime_secs", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+ tmpMap.put(_Fields.VERSION, new org.apache.thrift.meta_data.FieldMetaData("version", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SupervisorInfo.class, metaDataMap);
}
@@ -221,6 +228,9 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
this.scheduler_meta = __this__scheduler_meta;
}
this.uptime_secs = other.uptime_secs;
+ if (other.is_set_version()) {
+ this.version = other.version;
+ }
}
public SupervisorInfo deepCopy() {
@@ -238,6 +248,7 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
this.scheduler_meta = null;
set_uptime_secs_isSet(false);
this.uptime_secs = 0;
+ this.version = null;
}
public long get_time_secs() {
@@ -440,6 +451,29 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
__isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID, value);
}
+ public String get_version() {
+ return this.version;
+ }
+
+ public void set_version(String version) {
+ this.version = version;
+ }
+
+ public void unset_version() {
+ this.version = null;
+ }
+
+ /** Returns true if field version is set (has been assigned a value) and false otherwise */
+ public boolean is_set_version() {
+ return this.version != null;
+ }
+
+ public void set_version_isSet(boolean value) {
+ if (!value) {
+ this.version = null;
+ }
+ }
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case TIME_SECS:
@@ -498,6 +532,14 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
}
break;
+ case VERSION:
+ if (value == null) {
+ unset_version();
+ } else {
+ set_version((String)value);
+ }
+ break;
+
}
}
@@ -524,6 +566,9 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
case UPTIME_SECS:
return Long.valueOf(get_uptime_secs());
+ case VERSION:
+ return get_version();
+
}
throw new IllegalStateException();
}
@@ -549,6 +594,8 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
return is_set_scheduler_meta();
case UPTIME_SECS:
return is_set_uptime_secs();
+ case VERSION:
+ return is_set_version();
}
throw new IllegalStateException();
}
@@ -629,6 +676,15 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
return false;
}
+ boolean this_present_version = true && this.is_set_version();
+ boolean that_present_version = true && that.is_set_version();
+ if (this_present_version || that_present_version) {
+ if (!(this_present_version && that_present_version))
+ return false;
+ if (!this.version.equals(that.version))
+ return false;
+ }
+
return true;
}
@@ -671,6 +727,11 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
if (present_uptime_secs)
list.add(uptime_secs);
+ boolean present_version = true && (is_set_version());
+ list.add(present_version);
+ if (present_version)
+ list.add(version);
+
return list.hashCode();
}
@@ -752,6 +813,16 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(is_set_version()).compareTo(other.is_set_version());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (is_set_version()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.version, other.version);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -829,6 +900,16 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
sb.append(this.uptime_secs);
first = false;
}
+ if (is_set_version()) {
+ if (!first) sb.append(", ");
+ sb.append("version:");
+ if (this.version == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.version);
+ }
+ first = false;
+ }
sb.append(")");
return sb.toString();
}
@@ -970,6 +1051,14 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
+ case 8: // VERSION
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.version = iprot.readString();
+ struct.set_version_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -1046,6 +1135,13 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
oprot.writeI64(struct.uptime_secs);
oprot.writeFieldEnd();
}
+ if (struct.version != null) {
+ if (struct.is_set_version()) {
+ oprot.writeFieldBegin(VERSION_FIELD_DESC);
+ oprot.writeString(struct.version);
+ oprot.writeFieldEnd();
+ }
+ }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -1081,7 +1177,10 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
if (struct.is_set_uptime_secs()) {
optionals.set(4);
}
- oprot.writeBitSet(optionals, 5);
+ if (struct.is_set_version()) {
+ optionals.set(5);
+ }
+ oprot.writeBitSet(optionals, 6);
if (struct.is_set_assignment_id()) {
oprot.writeString(struct.assignment_id);
}
@@ -1116,6 +1215,9 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
if (struct.is_set_uptime_secs()) {
oprot.writeI64(struct.uptime_secs);
}
+ if (struct.is_set_version()) {
+ oprot.writeString(struct.version);
+ }
}
@Override
@@ -1125,7 +1227,7 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
struct.set_time_secs_isSet(true);
struct.hostname = iprot.readString();
struct.set_hostname_isSet(true);
- BitSet incoming = iprot.readBitSet(5);
+ BitSet incoming = iprot.readBitSet(6);
if (incoming.get(0)) {
struct.assignment_id = iprot.readString();
struct.set_assignment_id_isSet(true);
@@ -1175,6 +1277,10 @@ public class SupervisorInfo implements org.apache.thrift.TBase<SupervisorInfo, S
struct.uptime_secs = iprot.readI64();
struct.set_uptime_secs_isSet(true);
}
+ if (incoming.get(5)) {
+ struct.version = iprot.readString();
+ struct.set_version_isSet(true);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/src/jvm/backtype/storm/generated/SupervisorSummary.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/SupervisorSummary.java b/storm-core/src/jvm/backtype/storm/generated/SupervisorSummary.java
index bc81586..b267cf1 100644
--- a/storm-core/src/jvm/backtype/storm/generated/SupervisorSummary.java
+++ b/storm-core/src/jvm/backtype/storm/generated/SupervisorSummary.java
@@ -51,7 +51,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-2-6")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-17")
public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSummary, SupervisorSummary._Fields>, java.io.Serializable, Cloneable, Comparable<SupervisorSummary> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SupervisorSummary");
@@ -60,6 +60,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
private static final org.apache.thrift.protocol.TField NUM_WORKERS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_workers", org.apache.thrift.protocol.TType.I32, (short)3);
private static final org.apache.thrift.protocol.TField NUM_USED_WORKERS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_used_workers", org.apache.thrift.protocol.TType.I32, (short)4);
private static final org.apache.thrift.protocol.TField SUPERVISOR_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("supervisor_id", org.apache.thrift.protocol.TType.STRING, (short)5);
+ private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.STRING, (short)6);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -72,6 +73,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
private int num_workers; // required
private int num_used_workers; // required
private String supervisor_id; // required
+ private String version; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -79,7 +81,8 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
UPTIME_SECS((short)2, "uptime_secs"),
NUM_WORKERS((short)3, "num_workers"),
NUM_USED_WORKERS((short)4, "num_used_workers"),
- SUPERVISOR_ID((short)5, "supervisor_id");
+ SUPERVISOR_ID((short)5, "supervisor_id"),
+ VERSION((short)6, "version");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -104,6 +107,8 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
return NUM_USED_WORKERS;
case 5: // SUPERVISOR_ID
return SUPERVISOR_ID;
+ case 6: // VERSION
+ return VERSION;
default:
return null;
}
@@ -161,6 +166,8 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
tmpMap.put(_Fields.SUPERVISOR_ID, new org.apache.thrift.meta_data.FieldMetaData("supervisor_id", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.VERSION, new org.apache.thrift.meta_data.FieldMetaData("version", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SupervisorSummary.class, metaDataMap);
}
@@ -173,7 +180,8 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
int uptime_secs,
int num_workers,
int num_used_workers,
- String supervisor_id)
+ String supervisor_id,
+ String version)
{
this();
this.host = host;
@@ -184,6 +192,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
this.num_used_workers = num_used_workers;
set_num_used_workers_isSet(true);
this.supervisor_id = supervisor_id;
+ this.version = version;
}
/**
@@ -200,6 +209,9 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
if (other.is_set_supervisor_id()) {
this.supervisor_id = other.supervisor_id;
}
+ if (other.is_set_version()) {
+ this.version = other.version;
+ }
}
public SupervisorSummary deepCopy() {
@@ -216,6 +228,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
set_num_used_workers_isSet(false);
this.num_used_workers = 0;
this.supervisor_id = null;
+ this.version = null;
}
public String get_host() {
@@ -330,6 +343,29 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
}
}
+ public String get_version() {
+ return this.version;
+ }
+
+ public void set_version(String version) {
+ this.version = version;
+ }
+
+ public void unset_version() {
+ this.version = null;
+ }
+
+ /** Returns true if field version is set (has been assigned a value) and false otherwise */
+ public boolean is_set_version() {
+ return this.version != null;
+ }
+
+ public void set_version_isSet(boolean value) {
+ if (!value) {
+ this.version = null;
+ }
+ }
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case HOST:
@@ -372,6 +408,14 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
}
break;
+ case VERSION:
+ if (value == null) {
+ unset_version();
+ } else {
+ set_version((String)value);
+ }
+ break;
+
}
}
@@ -392,6 +436,9 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
case SUPERVISOR_ID:
return get_supervisor_id();
+ case VERSION:
+ return get_version();
+
}
throw new IllegalStateException();
}
@@ -413,6 +460,8 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
return is_set_num_used_workers();
case SUPERVISOR_ID:
return is_set_supervisor_id();
+ case VERSION:
+ return is_set_version();
}
throw new IllegalStateException();
}
@@ -475,6 +524,15 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
return false;
}
+ boolean this_present_version = true && this.is_set_version();
+ boolean that_present_version = true && that.is_set_version();
+ if (this_present_version || that_present_version) {
+ if (!(this_present_version && that_present_version))
+ return false;
+ if (!this.version.equals(that.version))
+ return false;
+ }
+
return true;
}
@@ -507,6 +565,11 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
if (present_supervisor_id)
list.add(supervisor_id);
+ boolean present_version = true && (is_set_version());
+ list.add(present_version);
+ if (present_version)
+ list.add(version);
+
return list.hashCode();
}
@@ -568,6 +631,16 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(is_set_version()).compareTo(other.is_set_version());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (is_set_version()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.version, other.version);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -615,6 +688,14 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
sb.append(this.supervisor_id);
}
first = false;
+ if (!first) sb.append(", ");
+ sb.append("version:");
+ if (this.version == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.version);
+ }
+ first = false;
sb.append(")");
return sb.toString();
}
@@ -641,6 +722,10 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
throw new org.apache.thrift.protocol.TProtocolException("Required field 'supervisor_id' is unset! Struct:" + toString());
}
+ if (!is_set_version()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'version' is unset! Struct:" + toString());
+ }
+
// check for sub-struct validity
}
@@ -720,6 +805,14 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
+ case 6: // VERSION
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.version = iprot.readString();
+ struct.set_version_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -752,6 +845,11 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
oprot.writeString(struct.supervisor_id);
oprot.writeFieldEnd();
}
+ if (struct.version != null) {
+ oprot.writeFieldBegin(VERSION_FIELD_DESC);
+ oprot.writeString(struct.version);
+ oprot.writeFieldEnd();
+ }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -774,6 +872,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
oprot.writeI32(struct.num_workers);
oprot.writeI32(struct.num_used_workers);
oprot.writeString(struct.supervisor_id);
+ oprot.writeString(struct.version);
}
@Override
@@ -789,6 +888,8 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
struct.set_num_used_workers_isSet(true);
struct.supervisor_id = iprot.readString();
struct.set_supervisor_id_isSet(true);
+ struct.version = iprot.readString();
+ struct.set_version_isSet(true);
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/src/jvm/backtype/storm/generated/TopologyInfo.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/TopologyInfo.java b/storm-core/src/jvm/backtype/storm/generated/TopologyInfo.java
index 6e1a503..d204878 100644
--- a/storm-core/src/jvm/backtype/storm/generated/TopologyInfo.java
+++ b/storm-core/src/jvm/backtype/storm/generated/TopologyInfo.java
@@ -51,7 +51,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-2-6")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-17")
public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, TopologyInfo._Fields>, java.io.Serializable, Cloneable, Comparable<TopologyInfo> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TopologyInfo");
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/src/jvm/backtype/storm/generated/TopologySummary.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/TopologySummary.java b/storm-core/src/jvm/backtype/storm/generated/TopologySummary.java
index bd8f90e..386c8ce 100644
--- a/storm-core/src/jvm/backtype/storm/generated/TopologySummary.java
+++ b/storm-core/src/jvm/backtype/storm/generated/TopologySummary.java
@@ -51,7 +51,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-2-6")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-17")
public class TopologySummary implements org.apache.thrift.TBase<TopologySummary, TopologySummary._Fields>, java.io.Serializable, Cloneable, Comparable<TopologySummary> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TopologySummary");
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/src/py/storm/ttypes.py
----------------------------------------------------------------------
diff --git a/storm-core/src/py/storm/ttypes.py b/storm-core/src/py/storm/ttypes.py
index 0d4dd93..a06af92 100644
--- a/storm-core/src/py/storm/ttypes.py
+++ b/storm-core/src/py/storm/ttypes.py
@@ -2355,6 +2355,7 @@ class SupervisorSummary:
- num_workers
- num_used_workers
- supervisor_id
+ - version
"""
thrift_spec = (
@@ -2364,14 +2365,16 @@ class SupervisorSummary:
(3, TType.I32, 'num_workers', None, None, ), # 3
(4, TType.I32, 'num_used_workers', None, None, ), # 4
(5, TType.STRING, 'supervisor_id', None, None, ), # 5
+ (6, TType.STRING, 'version', None, None, ), # 6
)
- def __init__(self, host=None, uptime_secs=None, num_workers=None, num_used_workers=None, supervisor_id=None,):
+ def __init__(self, host=None, uptime_secs=None, num_workers=None, num_used_workers=None, supervisor_id=None, version=None,):
self.host = host
self.uptime_secs = uptime_secs
self.num_workers = num_workers
self.num_used_workers = num_used_workers
self.supervisor_id = supervisor_id
+ self.version = version
def read(self, iprot):
if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -2407,6 +2410,11 @@ class SupervisorSummary:
self.supervisor_id = iprot.readString().decode('utf-8')
else:
iprot.skip(ftype)
+ elif fid == 6:
+ if ftype == TType.STRING:
+ self.version = iprot.readString().decode('utf-8')
+ else:
+ iprot.skip(ftype)
else:
iprot.skip(ftype)
iprot.readFieldEnd()
@@ -2437,6 +2445,10 @@ class SupervisorSummary:
oprot.writeFieldBegin('supervisor_id', TType.STRING, 5)
oprot.writeString(self.supervisor_id.encode('utf-8'))
oprot.writeFieldEnd()
+ if self.version is not None:
+ oprot.writeFieldBegin('version', TType.STRING, 6)
+ oprot.writeString(self.version.encode('utf-8'))
+ oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -2451,6 +2463,8 @@ class SupervisorSummary:
raise TProtocol.TProtocolException(message='Required field num_used_workers is unset!')
if self.supervisor_id is None:
raise TProtocol.TProtocolException(message='Required field supervisor_id is unset!')
+ if self.version is None:
+ raise TProtocol.TProtocolException(message='Required field version is unset!')
return
@@ -2461,6 +2475,7 @@ class SupervisorSummary:
value = (value * 31) ^ hash(self.num_workers)
value = (value * 31) ^ hash(self.num_used_workers)
value = (value * 31) ^ hash(self.supervisor_id)
+ value = (value * 31) ^ hash(self.version)
return value
def __repr__(self):
@@ -4580,6 +4595,7 @@ class SupervisorInfo:
- meta
- scheduler_meta
- uptime_secs
+ - version
"""
thrift_spec = (
@@ -4591,9 +4607,10 @@ class SupervisorInfo:
(5, TType.LIST, 'meta', (TType.I64,None), None, ), # 5
(6, TType.MAP, 'scheduler_meta', (TType.STRING,None,TType.STRING,None), None, ), # 6
(7, TType.I64, 'uptime_secs', None, None, ), # 7
+ (8, TType.STRING, 'version', None, None, ), # 8
)
- def __init__(self, time_secs=None, hostname=None, assignment_id=None, used_ports=None, meta=None, scheduler_meta=None, uptime_secs=None,):
+ def __init__(self, time_secs=None, hostname=None, assignment_id=None, used_ports=None, meta=None, scheduler_meta=None, uptime_secs=None, version=None,):
self.time_secs = time_secs
self.hostname = hostname
self.assignment_id = assignment_id
@@ -4601,6 +4618,7 @@ class SupervisorInfo:
self.meta = meta
self.scheduler_meta = scheduler_meta
self.uptime_secs = uptime_secs
+ self.version = version
def read(self, iprot):
if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -4662,6 +4680,11 @@ class SupervisorInfo:
self.uptime_secs = iprot.readI64();
else:
iprot.skip(ftype)
+ elif fid == 8:
+ if ftype == TType.STRING:
+ self.version = iprot.readString().decode('utf-8')
+ else:
+ iprot.skip(ftype)
else:
iprot.skip(ftype)
iprot.readFieldEnd()
@@ -4710,6 +4733,10 @@ class SupervisorInfo:
oprot.writeFieldBegin('uptime_secs', TType.I64, 7)
oprot.writeI64(self.uptime_secs)
oprot.writeFieldEnd()
+ if self.version is not None:
+ oprot.writeFieldBegin('version', TType.STRING, 8)
+ oprot.writeString(self.version.encode('utf-8'))
+ oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -4730,6 +4757,7 @@ class SupervisorInfo:
value = (value * 31) ^ hash(self.meta)
value = (value * 31) ^ hash(self.scheduler_meta)
value = (value * 31) ^ hash(self.uptime_secs)
+ value = (value * 31) ^ hash(self.version)
return value
def __repr__(self):
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/src/storm.thrift
----------------------------------------------------------------------
diff --git a/storm-core/src/storm.thrift b/storm-core/src/storm.thrift
index b502181..3248e3f 100644
--- a/storm-core/src/storm.thrift
+++ b/storm-core/src/storm.thrift
@@ -153,6 +153,7 @@ struct SupervisorSummary {
3: required i32 num_workers;
4: required i32 num_used_workers;
5: required string supervisor_id;
+ 6: required string version;
}
struct ClusterSummary {
@@ -252,7 +253,9 @@ struct SupervisorInfo {
5: optional list<i64> meta;
6: optional map<string, string> scheduler_meta;
7: optional i64 uptime_secs;
+ 8: optional string version;
}
+
struct NodeInfo {
1: required string node;
2: required set<i64> port;
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/src/ui/public/templates/index-page-template.html
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/templates/index-page-template.html b/storm-core/src/ui/public/templates/index-page-template.html
index 298dfff..df6debb 100644
--- a/storm-core/src/ui/public/templates/index-page-template.html
+++ b/storm-core/src/ui/public/templates/index-page-template.html
@@ -171,6 +171,11 @@
Used slots
</span>
</th>
+ <th>
+ <span data-toggle="tooltip" data-placement="left" title="Version">
+ Version
+ </span>
+ </th>
</tr>
</thead>
<tbody>
@@ -181,6 +186,7 @@
<td>{{uptime}}</td>
<td>{{slotsTotal}}</td>
<td>{{slotsUsed}}</td>
+ <td>{{version}}</td>
</tr>
{{/supervisors}}
</tbody>
http://git-wip-us.apache.org/repos/asf/storm/blob/ebb9634a/storm-core/test/clj/backtype/storm/cluster_test.clj
----------------------------------------------------------------------
diff --git a/storm-core/test/clj/backtype/storm/cluster_test.clj b/storm-core/test/clj/backtype/storm/cluster_test.clj
index 98eae68..881c0d2 100644
--- a/storm-core/test/clj/backtype/storm/cluster_test.clj
+++ b/storm-core/test/clj/backtype/storm/cluster_test.clj
@@ -243,8 +243,8 @@
(with-inprocess-zookeeper zk-port
(let [state1 (mk-storm-state zk-port)
state2 (mk-storm-state zk-port)
- supervisor-info1 (SupervisorInfo. 10 "hostname-1" "id1" [1 2] [] {} 1000 )
- supervisor-info2 (SupervisorInfo. 10 "hostname-2" "id2" [1 2] [] {} 1000 )
+ supervisor-info1 (SupervisorInfo. 10 "hostname-1" "id1" [1 2] [] {} 1000 "0.9.2")
+ supervisor-info2 (SupervisorInfo. 10 "hostname-2" "id2" [1 2] [] {} 1000 "0.9.2")
]
(is (= [] (.supervisors state1 nil)))
(.supervisor-heartbeat! state2 "2" supervisor-info2)
[02/13] storm git commit: Spelling fix
Posted by pt...@apache.org.
Spelling fix
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/00853197
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/00853197
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/00853197
Branch: refs/heads/0.10.x-branch
Commit: 00853197ea0a134e0dc709e2a2d9ead8df5e9ed7
Parents: 5cbdca5
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Mon Apr 6 12:15:52 2015 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri May 15 12:54:57 2015 -0400
----------------------------------------------------------------------
storm-core/src/jvm/backtype/storm/Config.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/00853197/storm-core/src/jvm/backtype/storm/Config.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/Config.java b/storm-core/src/jvm/backtype/storm/Config.java
index 876aa5c..a167ed1 100644
--- a/storm-core/src/jvm/backtype/storm/Config.java
+++ b/storm-core/src/jvm/backtype/storm/Config.java
@@ -42,7 +42,7 @@ import java.util.Map;
* Spouts.</p>
*/
public class Config extends HashMap<String, Object> {
- //DO NOT CHANGE UNLESS WE ADD IN STATE NOTE STORED IN THE PARENT CLASS
+ //DO NOT CHANGE UNLESS WE ADD IN STATE NOT STORED IN THE PARENT CLASS
private static final long serialVersionUID = -1550278723792864455L;
/**
[04/13] storm git commit: STORM-765: Thrift serialization for local
state.
Posted by pt...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/b1dc422b/storm-core/src/jvm/backtype/storm/generated/LocalAssignment.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/LocalAssignment.java b/storm-core/src/jvm/backtype/storm/generated/LocalAssignment.java
new file mode 100644
index 0000000..3c34891
--- /dev/null
+++ b/storm-core/src/jvm/backtype/storm/generated/LocalAssignment.java
@@ -0,0 +1,561 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * 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.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;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+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;
+
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-10")
+public class LocalAssignment implements org.apache.thrift.TBase<LocalAssignment, LocalAssignment._Fields>, java.io.Serializable, Cloneable, Comparable<LocalAssignment> {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LocalAssignment");
+
+ private static final org.apache.thrift.protocol.TField TOPOLOGY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("topology_id", org.apache.thrift.protocol.TType.STRING, (short)1);
+ private static final org.apache.thrift.protocol.TField EXECUTORS_FIELD_DESC = new org.apache.thrift.protocol.TField("executors", org.apache.thrift.protocol.TType.LIST, (short)2);
+
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new LocalAssignmentStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new LocalAssignmentTupleSchemeFactory());
+ }
+
+ private String topology_id; // required
+ private List<ExecutorInfo> executors; // required
+
+ /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ TOPOLOGY_ID((short)1, "topology_id"),
+ EXECUTORS((short)2, "executors");
+
+ private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+ static {
+ for (_Fields field : EnumSet.allOf(_Fields.class)) {
+ byName.put(field.getFieldName(), field);
+ }
+ }
+
+ /**
+ * Find the _Fields constant that matches fieldId, or null if its not found.
+ */
+ public static _Fields findByThriftId(int fieldId) {
+ switch(fieldId) {
+ case 1: // TOPOLOGY_ID
+ return TOPOLOGY_ID;
+ case 2: // EXECUTORS
+ return EXECUTORS;
+ default:
+ return null;
+ }
+ }
+
+ /**
+ * Find the _Fields constant that matches fieldId, throwing an exception
+ * if it is not found.
+ */
+ public static _Fields findByThriftIdOrThrow(int fieldId) {
+ _Fields fields = findByThriftId(fieldId);
+ if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+ return fields;
+ }
+
+ /**
+ * Find the _Fields constant that matches name, or null if its not found.
+ */
+ public static _Fields findByName(String name) {
+ return byName.get(name);
+ }
+
+ private final short _thriftId;
+ private final String _fieldName;
+
+ _Fields(short thriftId, String fieldName) {
+ _thriftId = thriftId;
+ _fieldName = fieldName;
+ }
+
+ public short getThriftFieldId() {
+ return _thriftId;
+ }
+
+ public String getFieldName() {
+ return _fieldName;
+ }
+ }
+
+ // 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);
+ tmpMap.put(_Fields.TOPOLOGY_ID, new org.apache.thrift.meta_data.FieldMetaData("topology_id", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.EXECUTORS, new org.apache.thrift.meta_data.FieldMetaData("executors", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ExecutorInfo.class))));
+ metaDataMap = Collections.unmodifiableMap(tmpMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LocalAssignment.class, metaDataMap);
+ }
+
+ public LocalAssignment() {
+ }
+
+ public LocalAssignment(
+ String topology_id,
+ List<ExecutorInfo> executors)
+ {
+ this();
+ this.topology_id = topology_id;
+ this.executors = executors;
+ }
+
+ /**
+ * Performs a deep copy on <i>other</i>.
+ */
+ public LocalAssignment(LocalAssignment other) {
+ if (other.is_set_topology_id()) {
+ this.topology_id = other.topology_id;
+ }
+ if (other.is_set_executors()) {
+ List<ExecutorInfo> __this__executors = new ArrayList<ExecutorInfo>(other.executors.size());
+ for (ExecutorInfo other_element : other.executors) {
+ __this__executors.add(new ExecutorInfo(other_element));
+ }
+ this.executors = __this__executors;
+ }
+ }
+
+ public LocalAssignment deepCopy() {
+ return new LocalAssignment(this);
+ }
+
+ @Override
+ public void clear() {
+ this.topology_id = null;
+ this.executors = null;
+ }
+
+ public String get_topology_id() {
+ return this.topology_id;
+ }
+
+ public void set_topology_id(String topology_id) {
+ this.topology_id = topology_id;
+ }
+
+ public void unset_topology_id() {
+ this.topology_id = null;
+ }
+
+ /** Returns true if field topology_id is set (has been assigned a value) and false otherwise */
+ public boolean is_set_topology_id() {
+ return this.topology_id != null;
+ }
+
+ public void set_topology_id_isSet(boolean value) {
+ if (!value) {
+ this.topology_id = null;
+ }
+ }
+
+ public int get_executors_size() {
+ return (this.executors == null) ? 0 : this.executors.size();
+ }
+
+ public java.util.Iterator<ExecutorInfo> get_executors_iterator() {
+ return (this.executors == null) ? null : this.executors.iterator();
+ }
+
+ public void add_to_executors(ExecutorInfo elem) {
+ if (this.executors == null) {
+ this.executors = new ArrayList<ExecutorInfo>();
+ }
+ this.executors.add(elem);
+ }
+
+ public List<ExecutorInfo> get_executors() {
+ return this.executors;
+ }
+
+ public void set_executors(List<ExecutorInfo> executors) {
+ this.executors = executors;
+ }
+
+ public void unset_executors() {
+ this.executors = null;
+ }
+
+ /** Returns true if field executors is set (has been assigned a value) and false otherwise */
+ public boolean is_set_executors() {
+ return this.executors != null;
+ }
+
+ public void set_executors_isSet(boolean value) {
+ if (!value) {
+ this.executors = null;
+ }
+ }
+
+ public void setFieldValue(_Fields field, Object value) {
+ switch (field) {
+ case TOPOLOGY_ID:
+ if (value == null) {
+ unset_topology_id();
+ } else {
+ set_topology_id((String)value);
+ }
+ break;
+
+ case EXECUTORS:
+ if (value == null) {
+ unset_executors();
+ } else {
+ set_executors((List<ExecutorInfo>)value);
+ }
+ break;
+
+ }
+ }
+
+ public Object getFieldValue(_Fields field) {
+ switch (field) {
+ case TOPOLOGY_ID:
+ return get_topology_id();
+
+ case EXECUTORS:
+ return get_executors();
+
+ }
+ throw new IllegalStateException();
+ }
+
+ /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+ public boolean isSet(_Fields field) {
+ if (field == null) {
+ throw new IllegalArgumentException();
+ }
+
+ switch (field) {
+ case TOPOLOGY_ID:
+ return is_set_topology_id();
+ case EXECUTORS:
+ return is_set_executors();
+ }
+ throw new IllegalStateException();
+ }
+
+ @Override
+ public boolean equals(Object that) {
+ if (that == null)
+ return false;
+ if (that instanceof LocalAssignment)
+ return this.equals((LocalAssignment)that);
+ return false;
+ }
+
+ public boolean equals(LocalAssignment that) {
+ if (that == null)
+ return false;
+
+ boolean this_present_topology_id = true && this.is_set_topology_id();
+ boolean that_present_topology_id = true && that.is_set_topology_id();
+ if (this_present_topology_id || that_present_topology_id) {
+ if (!(this_present_topology_id && that_present_topology_id))
+ return false;
+ if (!this.topology_id.equals(that.topology_id))
+ return false;
+ }
+
+ boolean this_present_executors = true && this.is_set_executors();
+ boolean that_present_executors = true && that.is_set_executors();
+ if (this_present_executors || that_present_executors) {
+ if (!(this_present_executors && that_present_executors))
+ return false;
+ if (!this.executors.equals(that.executors))
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ List<Object> list = new ArrayList<Object>();
+
+ boolean present_topology_id = true && (is_set_topology_id());
+ list.add(present_topology_id);
+ if (present_topology_id)
+ list.add(topology_id);
+
+ boolean present_executors = true && (is_set_executors());
+ list.add(present_executors);
+ if (present_executors)
+ list.add(executors);
+
+ return list.hashCode();
+ }
+
+ @Override
+ public int compareTo(LocalAssignment other) {
+ if (!getClass().equals(other.getClass())) {
+ return getClass().getName().compareTo(other.getClass().getName());
+ }
+
+ int lastComparison = 0;
+
+ lastComparison = Boolean.valueOf(is_set_topology_id()).compareTo(other.is_set_topology_id());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (is_set_topology_id()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.topology_id, other.topology_id);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(is_set_executors()).compareTo(other.is_set_executors());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (is_set_executors()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.executors, other.executors);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ return 0;
+ }
+
+ public _Fields fieldForId(int fieldId) {
+ return _Fields.findByThriftId(fieldId);
+ }
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder("LocalAssignment(");
+ boolean first = true;
+
+ sb.append("topology_id:");
+ if (this.topology_id == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.topology_id);
+ }
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("executors:");
+ if (this.executors == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.executors);
+ }
+ first = false;
+ sb.append(")");
+ return sb.toString();
+ }
+
+ public void validate() throws org.apache.thrift.TException {
+ // check for required fields
+ if (!is_set_topology_id()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'topology_id' is unset! Struct:" + toString());
+ }
+
+ if (!is_set_executors()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'executors' 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) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ 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) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ private static class LocalAssignmentStandardSchemeFactory implements SchemeFactory {
+ public LocalAssignmentStandardScheme getScheme() {
+ return new LocalAssignmentStandardScheme();
+ }
+ }
+
+ private static class LocalAssignmentStandardScheme extends StandardScheme<LocalAssignment> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, LocalAssignment 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: // TOPOLOGY_ID
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.topology_id = iprot.readString();
+ struct.set_topology_id_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // EXECUTORS
+ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+ {
+ org.apache.thrift.protocol.TList _list446 = iprot.readListBegin();
+ struct.executors = new ArrayList<ExecutorInfo>(_list446.size);
+ ExecutorInfo _elem447;
+ for (int _i448 = 0; _i448 < _list446.size; ++_i448)
+ {
+ _elem447 = new ExecutorInfo();
+ _elem447.read(iprot);
+ struct.executors.add(_elem447);
+ }
+ iprot.readListEnd();
+ }
+ struct.set_executors_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, LocalAssignment struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.topology_id != null) {
+ oprot.writeFieldBegin(TOPOLOGY_ID_FIELD_DESC);
+ oprot.writeString(struct.topology_id);
+ oprot.writeFieldEnd();
+ }
+ if (struct.executors != null) {
+ oprot.writeFieldBegin(EXECUTORS_FIELD_DESC);
+ {
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.executors.size()));
+ for (ExecutorInfo _iter449 : struct.executors)
+ {
+ _iter449.write(oprot);
+ }
+ oprot.writeListEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class LocalAssignmentTupleSchemeFactory implements SchemeFactory {
+ public LocalAssignmentTupleScheme getScheme() {
+ return new LocalAssignmentTupleScheme();
+ }
+ }
+
+ private static class LocalAssignmentTupleScheme extends TupleScheme<LocalAssignment> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, LocalAssignment struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ oprot.writeString(struct.topology_id);
+ {
+ oprot.writeI32(struct.executors.size());
+ for (ExecutorInfo _iter450 : struct.executors)
+ {
+ _iter450.write(oprot);
+ }
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, LocalAssignment struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ struct.topology_id = iprot.readString();
+ struct.set_topology_id_isSet(true);
+ {
+ org.apache.thrift.protocol.TList _list451 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.executors = new ArrayList<ExecutorInfo>(_list451.size);
+ ExecutorInfo _elem452;
+ for (int _i453 = 0; _i453 < _list451.size; ++_i453)
+ {
+ _elem452 = new ExecutorInfo();
+ _elem452.read(iprot);
+ struct.executors.add(_elem452);
+ }
+ }
+ struct.set_executors_isSet(true);
+ }
+ }
+
+}
+
http://git-wip-us.apache.org/repos/asf/storm/blob/b1dc422b/storm-core/src/jvm/backtype/storm/generated/LocalStateData.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/LocalStateData.java b/storm-core/src/jvm/backtype/storm/generated/LocalStateData.java
new file mode 100644
index 0000000..448711d
--- /dev/null
+++ b/storm-core/src/jvm/backtype/storm/generated/LocalStateData.java
@@ -0,0 +1,471 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * 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.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;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+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;
+
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-10")
+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");
+
+ private static final org.apache.thrift.protocol.TField SERIALIZED_PARTS_FIELD_DESC = new org.apache.thrift.protocol.TField("serialized_parts", org.apache.thrift.protocol.TType.MAP, (short)1);
+
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new LocalStateDataStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new LocalStateDataTupleSchemeFactory());
+ }
+
+ private Map<String,ThriftSerializedObject> serialized_parts; // required
+
+ /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ SERIALIZED_PARTS((short)1, "serialized_parts");
+
+ private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+ static {
+ for (_Fields field : EnumSet.allOf(_Fields.class)) {
+ byName.put(field.getFieldName(), field);
+ }
+ }
+
+ /**
+ * Find the _Fields constant that matches fieldId, or null if its not found.
+ */
+ public static _Fields findByThriftId(int fieldId) {
+ switch(fieldId) {
+ case 1: // SERIALIZED_PARTS
+ return SERIALIZED_PARTS;
+ default:
+ return null;
+ }
+ }
+
+ /**
+ * Find the _Fields constant that matches fieldId, throwing an exception
+ * if it is not found.
+ */
+ public static _Fields findByThriftIdOrThrow(int fieldId) {
+ _Fields fields = findByThriftId(fieldId);
+ if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+ return fields;
+ }
+
+ /**
+ * Find the _Fields constant that matches name, or null if its not found.
+ */
+ public static _Fields findByName(String name) {
+ return byName.get(name);
+ }
+
+ private final short _thriftId;
+ private final String _fieldName;
+
+ _Fields(short thriftId, String fieldName) {
+ _thriftId = thriftId;
+ _fieldName = fieldName;
+ }
+
+ public short getThriftFieldId() {
+ return _thriftId;
+ }
+
+ public String getFieldName() {
+ return _fieldName;
+ }
+ }
+
+ // 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);
+ tmpMap.put(_Fields.SERIALIZED_PARTS, new org.apache.thrift.meta_data.FieldMetaData("serialized_parts", 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, ThriftSerializedObject.class))));
+ metaDataMap = Collections.unmodifiableMap(tmpMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LocalStateData.class, metaDataMap);
+ }
+
+ public LocalStateData() {
+ }
+
+ public LocalStateData(
+ Map<String,ThriftSerializedObject> serialized_parts)
+ {
+ this();
+ this.serialized_parts = serialized_parts;
+ }
+
+ /**
+ * Performs a deep copy on <i>other</i>.
+ */
+ public LocalStateData(LocalStateData other) {
+ if (other.is_set_serialized_parts()) {
+ Map<String,ThriftSerializedObject> __this__serialized_parts = new HashMap<String,ThriftSerializedObject>(other.serialized_parts.size());
+ for (Map.Entry<String, ThriftSerializedObject> other_element : other.serialized_parts.entrySet()) {
+
+ String other_element_key = other_element.getKey();
+ ThriftSerializedObject other_element_value = other_element.getValue();
+
+ String __this__serialized_parts_copy_key = other_element_key;
+
+ ThriftSerializedObject __this__serialized_parts_copy_value = new ThriftSerializedObject(other_element_value);
+
+ __this__serialized_parts.put(__this__serialized_parts_copy_key, __this__serialized_parts_copy_value);
+ }
+ this.serialized_parts = __this__serialized_parts;
+ }
+ }
+
+ public LocalStateData deepCopy() {
+ return new LocalStateData(this);
+ }
+
+ @Override
+ public void clear() {
+ this.serialized_parts = null;
+ }
+
+ public int get_serialized_parts_size() {
+ return (this.serialized_parts == null) ? 0 : this.serialized_parts.size();
+ }
+
+ public void put_to_serialized_parts(String key, ThriftSerializedObject val) {
+ if (this.serialized_parts == null) {
+ this.serialized_parts = new HashMap<String,ThriftSerializedObject>();
+ }
+ this.serialized_parts.put(key, val);
+ }
+
+ public Map<String,ThriftSerializedObject> get_serialized_parts() {
+ return this.serialized_parts;
+ }
+
+ public void set_serialized_parts(Map<String,ThriftSerializedObject> serialized_parts) {
+ this.serialized_parts = serialized_parts;
+ }
+
+ public void unset_serialized_parts() {
+ this.serialized_parts = null;
+ }
+
+ /** Returns true if field serialized_parts is set (has been assigned a value) and false otherwise */
+ public boolean is_set_serialized_parts() {
+ return this.serialized_parts != null;
+ }
+
+ public void set_serialized_parts_isSet(boolean value) {
+ if (!value) {
+ this.serialized_parts = null;
+ }
+ }
+
+ public void setFieldValue(_Fields field, Object value) {
+ switch (field) {
+ case SERIALIZED_PARTS:
+ if (value == null) {
+ unset_serialized_parts();
+ } else {
+ set_serialized_parts((Map<String,ThriftSerializedObject>)value);
+ }
+ break;
+
+ }
+ }
+
+ public Object getFieldValue(_Fields field) {
+ switch (field) {
+ case SERIALIZED_PARTS:
+ return get_serialized_parts();
+
+ }
+ throw new IllegalStateException();
+ }
+
+ /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+ public boolean isSet(_Fields field) {
+ if (field == null) {
+ throw new IllegalArgumentException();
+ }
+
+ switch (field) {
+ case SERIALIZED_PARTS:
+ return is_set_serialized_parts();
+ }
+ throw new IllegalStateException();
+ }
+
+ @Override
+ public boolean equals(Object that) {
+ if (that == null)
+ return false;
+ if (that instanceof LocalStateData)
+ return this.equals((LocalStateData)that);
+ return false;
+ }
+
+ public boolean equals(LocalStateData that) {
+ if (that == null)
+ return false;
+
+ boolean this_present_serialized_parts = true && this.is_set_serialized_parts();
+ boolean that_present_serialized_parts = true && that.is_set_serialized_parts();
+ if (this_present_serialized_parts || that_present_serialized_parts) {
+ if (!(this_present_serialized_parts && that_present_serialized_parts))
+ return false;
+ if (!this.serialized_parts.equals(that.serialized_parts))
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ List<Object> list = new ArrayList<Object>();
+
+ boolean present_serialized_parts = true && (is_set_serialized_parts());
+ list.add(present_serialized_parts);
+ if (present_serialized_parts)
+ list.add(serialized_parts);
+
+ return list.hashCode();
+ }
+
+ @Override
+ public int compareTo(LocalStateData other) {
+ if (!getClass().equals(other.getClass())) {
+ return getClass().getName().compareTo(other.getClass().getName());
+ }
+
+ int lastComparison = 0;
+
+ lastComparison = Boolean.valueOf(is_set_serialized_parts()).compareTo(other.is_set_serialized_parts());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (is_set_serialized_parts()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serialized_parts, other.serialized_parts);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ return 0;
+ }
+
+ public _Fields fieldForId(int fieldId) {
+ return _Fields.findByThriftId(fieldId);
+ }
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder("LocalStateData(");
+ boolean first = true;
+
+ sb.append("serialized_parts:");
+ if (this.serialized_parts == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.serialized_parts);
+ }
+ first = false;
+ sb.append(")");
+ return sb.toString();
+ }
+
+ public void validate() throws org.apache.thrift.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());
+ }
+
+ // 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) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ 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) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ private static class LocalStateDataStandardSchemeFactory implements SchemeFactory {
+ public LocalStateDataStandardScheme getScheme() {
+ return new LocalStateDataStandardScheme();
+ }
+ }
+
+ private static class LocalStateDataStandardScheme extends StandardScheme<LocalStateData> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, LocalStateData 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: // SERIALIZED_PARTS
+ if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+ {
+ org.apache.thrift.protocol.TMap _map436 = iprot.readMapBegin();
+ struct.serialized_parts = new HashMap<String,ThriftSerializedObject>(2*_map436.size);
+ String _key437;
+ ThriftSerializedObject _val438;
+ for (int _i439 = 0; _i439 < _map436.size; ++_i439)
+ {
+ _key437 = iprot.readString();
+ _val438 = new ThriftSerializedObject();
+ _val438.read(iprot);
+ struct.serialized_parts.put(_key437, _val438);
+ }
+ iprot.readMapEnd();
+ }
+ struct.set_serialized_parts_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, LocalStateData struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.serialized_parts != null) {
+ 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> _iter440 : struct.serialized_parts.entrySet())
+ {
+ oprot.writeString(_iter440.getKey());
+ _iter440.getValue().write(oprot);
+ }
+ oprot.writeMapEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class LocalStateDataTupleSchemeFactory implements SchemeFactory {
+ public LocalStateDataTupleScheme getScheme() {
+ return new LocalStateDataTupleScheme();
+ }
+ }
+
+ private static class LocalStateDataTupleScheme extends TupleScheme<LocalStateData> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, LocalStateData struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ {
+ oprot.writeI32(struct.serialized_parts.size());
+ for (Map.Entry<String, ThriftSerializedObject> _iter441 : struct.serialized_parts.entrySet())
+ {
+ oprot.writeString(_iter441.getKey());
+ _iter441.getValue().write(oprot);
+ }
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, LocalStateData struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ {
+ org.apache.thrift.protocol.TMap _map442 = 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*_map442.size);
+ String _key443;
+ ThriftSerializedObject _val444;
+ for (int _i445 = 0; _i445 < _map442.size; ++_i445)
+ {
+ _key443 = iprot.readString();
+ _val444 = new ThriftSerializedObject();
+ _val444.read(iprot);
+ struct.serialized_parts.put(_key443, _val444);
+ }
+ }
+ struct.set_serialized_parts_isSet(true);
+ }
+ }
+
+}
+
http://git-wip-us.apache.org/repos/asf/storm/blob/b1dc422b/storm-core/src/jvm/backtype/storm/generated/ThriftSerializedObject.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/ThriftSerializedObject.java b/storm-core/src/jvm/backtype/storm/generated/ThriftSerializedObject.java
new file mode 100644
index 0000000..6810669
--- /dev/null
+++ b/storm-core/src/jvm/backtype/storm/generated/ThriftSerializedObject.java
@@ -0,0 +1,516 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * 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.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;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+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;
+
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-10")
+public class ThriftSerializedObject implements org.apache.thrift.TBase<ThriftSerializedObject, ThriftSerializedObject._Fields>, java.io.Serializable, Cloneable, Comparable<ThriftSerializedObject> {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ThriftSerializedObject");
+
+ private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)1);
+ private static final org.apache.thrift.protocol.TField BITS_FIELD_DESC = new org.apache.thrift.protocol.TField("bits", org.apache.thrift.protocol.TType.STRING, (short)2);
+
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new ThriftSerializedObjectStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new ThriftSerializedObjectTupleSchemeFactory());
+ }
+
+ private String name; // required
+ private ByteBuffer bits; // required
+
+ /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ NAME((short)1, "name"),
+ BITS((short)2, "bits");
+
+ private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+ static {
+ for (_Fields field : EnumSet.allOf(_Fields.class)) {
+ byName.put(field.getFieldName(), field);
+ }
+ }
+
+ /**
+ * Find the _Fields constant that matches fieldId, or null if its not found.
+ */
+ public static _Fields findByThriftId(int fieldId) {
+ switch(fieldId) {
+ case 1: // NAME
+ return NAME;
+ case 2: // BITS
+ return BITS;
+ default:
+ return null;
+ }
+ }
+
+ /**
+ * Find the _Fields constant that matches fieldId, throwing an exception
+ * if it is not found.
+ */
+ public static _Fields findByThriftIdOrThrow(int fieldId) {
+ _Fields fields = findByThriftId(fieldId);
+ if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+ return fields;
+ }
+
+ /**
+ * Find the _Fields constant that matches name, or null if its not found.
+ */
+ public static _Fields findByName(String name) {
+ return byName.get(name);
+ }
+
+ private final short _thriftId;
+ private final String _fieldName;
+
+ _Fields(short thriftId, String fieldName) {
+ _thriftId = thriftId;
+ _fieldName = fieldName;
+ }
+
+ public short getThriftFieldId() {
+ return _thriftId;
+ }
+
+ public String getFieldName() {
+ return _fieldName;
+ }
+ }
+
+ // 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);
+ tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.BITS, new org.apache.thrift.meta_data.FieldMetaData("bits", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true)));
+ metaDataMap = Collections.unmodifiableMap(tmpMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ThriftSerializedObject.class, metaDataMap);
+ }
+
+ public ThriftSerializedObject() {
+ }
+
+ public ThriftSerializedObject(
+ String name,
+ ByteBuffer bits)
+ {
+ this();
+ this.name = name;
+ this.bits = org.apache.thrift.TBaseHelper.copyBinary(bits);
+ }
+
+ /**
+ * Performs a deep copy on <i>other</i>.
+ */
+ public ThriftSerializedObject(ThriftSerializedObject other) {
+ if (other.is_set_name()) {
+ this.name = other.name;
+ }
+ if (other.is_set_bits()) {
+ this.bits = org.apache.thrift.TBaseHelper.copyBinary(other.bits);
+ }
+ }
+
+ public ThriftSerializedObject deepCopy() {
+ return new ThriftSerializedObject(this);
+ }
+
+ @Override
+ public void clear() {
+ this.name = null;
+ this.bits = null;
+ }
+
+ public String get_name() {
+ return this.name;
+ }
+
+ public void set_name(String name) {
+ this.name = name;
+ }
+
+ public void unset_name() {
+ this.name = null;
+ }
+
+ /** Returns true if field name is set (has been assigned a value) and false otherwise */
+ public boolean is_set_name() {
+ return this.name != null;
+ }
+
+ public void set_name_isSet(boolean value) {
+ if (!value) {
+ this.name = null;
+ }
+ }
+
+ public byte[] get_bits() {
+ set_bits(org.apache.thrift.TBaseHelper.rightSize(bits));
+ return bits == null ? null : bits.array();
+ }
+
+ public ByteBuffer buffer_for_bits() {
+ return org.apache.thrift.TBaseHelper.copyBinary(bits);
+ }
+
+ public void set_bits(byte[] bits) {
+ this.bits = bits == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(bits, bits.length));
+ }
+
+ public void set_bits(ByteBuffer bits) {
+ this.bits = org.apache.thrift.TBaseHelper.copyBinary(bits);
+ }
+
+ public void unset_bits() {
+ this.bits = null;
+ }
+
+ /** Returns true if field bits is set (has been assigned a value) and false otherwise */
+ public boolean is_set_bits() {
+ return this.bits != null;
+ }
+
+ public void set_bits_isSet(boolean value) {
+ if (!value) {
+ this.bits = null;
+ }
+ }
+
+ public void setFieldValue(_Fields field, Object value) {
+ switch (field) {
+ case NAME:
+ if (value == null) {
+ unset_name();
+ } else {
+ set_name((String)value);
+ }
+ break;
+
+ case BITS:
+ if (value == null) {
+ unset_bits();
+ } else {
+ set_bits((ByteBuffer)value);
+ }
+ break;
+
+ }
+ }
+
+ public Object getFieldValue(_Fields field) {
+ switch (field) {
+ case NAME:
+ return get_name();
+
+ case BITS:
+ return get_bits();
+
+ }
+ throw new IllegalStateException();
+ }
+
+ /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+ public boolean isSet(_Fields field) {
+ if (field == null) {
+ throw new IllegalArgumentException();
+ }
+
+ switch (field) {
+ case NAME:
+ return is_set_name();
+ case BITS:
+ return is_set_bits();
+ }
+ throw new IllegalStateException();
+ }
+
+ @Override
+ public boolean equals(Object that) {
+ if (that == null)
+ return false;
+ if (that instanceof ThriftSerializedObject)
+ return this.equals((ThriftSerializedObject)that);
+ return false;
+ }
+
+ public boolean equals(ThriftSerializedObject that) {
+ if (that == null)
+ return false;
+
+ boolean this_present_name = true && this.is_set_name();
+ boolean that_present_name = true && that.is_set_name();
+ if (this_present_name || that_present_name) {
+ if (!(this_present_name && that_present_name))
+ return false;
+ if (!this.name.equals(that.name))
+ return false;
+ }
+
+ boolean this_present_bits = true && this.is_set_bits();
+ boolean that_present_bits = true && that.is_set_bits();
+ if (this_present_bits || that_present_bits) {
+ if (!(this_present_bits && that_present_bits))
+ return false;
+ if (!this.bits.equals(that.bits))
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ List<Object> list = new ArrayList<Object>();
+
+ boolean present_name = true && (is_set_name());
+ list.add(present_name);
+ if (present_name)
+ list.add(name);
+
+ boolean present_bits = true && (is_set_bits());
+ list.add(present_bits);
+ if (present_bits)
+ list.add(bits);
+
+ return list.hashCode();
+ }
+
+ @Override
+ public int compareTo(ThriftSerializedObject other) {
+ if (!getClass().equals(other.getClass())) {
+ return getClass().getName().compareTo(other.getClass().getName());
+ }
+
+ int lastComparison = 0;
+
+ lastComparison = Boolean.valueOf(is_set_name()).compareTo(other.is_set_name());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (is_set_name()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, other.name);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(is_set_bits()).compareTo(other.is_set_bits());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (is_set_bits()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.bits, other.bits);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ return 0;
+ }
+
+ public _Fields fieldForId(int fieldId) {
+ return _Fields.findByThriftId(fieldId);
+ }
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder("ThriftSerializedObject(");
+ boolean first = true;
+
+ sb.append("name:");
+ if (this.name == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.name);
+ }
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("bits:");
+ if (this.bits == null) {
+ sb.append("null");
+ } else {
+ org.apache.thrift.TBaseHelper.toString(this.bits, sb);
+ }
+ first = false;
+ sb.append(")");
+ return sb.toString();
+ }
+
+ public void validate() throws org.apache.thrift.TException {
+ // check for required fields
+ if (!is_set_name()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'name' is unset! Struct:" + toString());
+ }
+
+ if (!is_set_bits()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'bits' 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) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ 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) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ private static class ThriftSerializedObjectStandardSchemeFactory implements SchemeFactory {
+ public ThriftSerializedObjectStandardScheme getScheme() {
+ return new ThriftSerializedObjectStandardScheme();
+ }
+ }
+
+ private static class ThriftSerializedObjectStandardScheme extends StandardScheme<ThriftSerializedObject> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, ThriftSerializedObject 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: // NAME
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.name = iprot.readString();
+ struct.set_name_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // BITS
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.bits = iprot.readBinary();
+ struct.set_bits_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, ThriftSerializedObject struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.name != null) {
+ oprot.writeFieldBegin(NAME_FIELD_DESC);
+ oprot.writeString(struct.name);
+ oprot.writeFieldEnd();
+ }
+ if (struct.bits != null) {
+ oprot.writeFieldBegin(BITS_FIELD_DESC);
+ oprot.writeBinary(struct.bits);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class ThriftSerializedObjectTupleSchemeFactory implements SchemeFactory {
+ public ThriftSerializedObjectTupleScheme getScheme() {
+ return new ThriftSerializedObjectTupleScheme();
+ }
+ }
+
+ private static class ThriftSerializedObjectTupleScheme extends TupleScheme<ThriftSerializedObject> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, ThriftSerializedObject struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ oprot.writeString(struct.name);
+ oprot.writeBinary(struct.bits);
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, ThriftSerializedObject struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ struct.name = iprot.readString();
+ struct.set_name_isSet(true);
+ struct.bits = iprot.readBinary();
+ struct.set_bits_isSet(true);
+ }
+ }
+
+}
+
http://git-wip-us.apache.org/repos/asf/storm/blob/b1dc422b/storm-core/src/jvm/backtype/storm/utils/LocalState.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/utils/LocalState.java b/storm-core/src/jvm/backtype/storm/utils/LocalState.java
index 65f2152..b6ecba2 100644
--- a/storm-core/src/jvm/backtype/storm/utils/LocalState.java
+++ b/storm-core/src/jvm/backtype/storm/utils/LocalState.java
@@ -22,19 +22,27 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
+import java.nio.ByteBuffer;
import java.util.Map;
import java.util.HashMap;
import java.io.IOException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.thrift.TBase;
+import org.apache.thrift.TDeserializer;
+import org.apache.thrift.TException;
+import org.apache.thrift.TSerializer;
+
+import backtype.storm.generated.LocalStateData;
+import backtype.storm.generated.ThriftSerializedObject;
+
/**
* A simple, durable, atomic K/V database. *Very inefficient*, should only be used for occasional reads/writes.
* Every read/write hits disk.
*/
public class LocalState {
public static Logger LOG = LoggerFactory.getLogger(LocalState.class);
-
private VersionedStore _vs;
public LocalState(String backingDir) throws IOException {
@@ -42,73 +50,154 @@ public class LocalState {
_vs = new VersionedStore(backingDir);
}
- public synchronized Map<Object, Object> snapshot() throws IOException {
+ public synchronized Map<String, TBase> snapshot() {
int attempts = 0;
while(true) {
try {
return deserializeLatestVersion();
- } catch (IOException e) {
+ } catch (Exception e) {
attempts++;
if (attempts >= 10) {
- throw e;
+ throw new RuntimeException(e);
}
}
}
}
- private Map<Object, Object> deserializeLatestVersion() throws IOException {
- String latestPath = _vs.mostRecentVersionPath();
- Map<Object, Object> result = new HashMap<Object, Object>();
- if (latestPath != null) {
- byte[] serialized = FileUtils.readFileToByteArray(new File(latestPath));
- if (serialized.length == 0) {
- LOG.warn("LocalState file '{}' contained no data, resetting state", latestPath);
- } else {
- result = Utils.javaDeserialize(serialized, Map.class);
- }
+ private Map<String, TBase> deserializeLatestVersion() throws IOException {
+ Map<String, TBase> result = new HashMap<String, TBase>();
+ TDeserializer td = new TDeserializer();
+ for (Map.Entry<String, ThriftSerializedObject> ent: partialDeserializeLatestVersion(td).entrySet()) {
+ result.put(ent.getKey(), deserialize(ent.getValue(), td));
}
return result;
}
- public Object get(Object key) throws IOException {
- return snapshot().get(key);
+ private TBase deserialize(ThriftSerializedObject obj, TDeserializer td) {
+ try {
+ Class<?> clazz = Class.forName(obj.get_name());
+ TBase instance = (TBase) clazz.newInstance();
+ td.deserialize(instance, obj.get_bits());
+ return instance;
+ } catch(Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ private Map<String, ThriftSerializedObject> partialDeserializeLatestVersion(TDeserializer td) {
+ try {
+ String latestPath = _vs.mostRecentVersionPath();
+ Map<String, ThriftSerializedObject> result = new HashMap<String, ThriftSerializedObject>();
+ if (latestPath != null) {
+ byte[] serialized = FileUtils.readFileToByteArray(new File(latestPath));
+ if (serialized.length == 0) {
+ LOG.warn("LocalState file '{}' contained no data, resetting state", latestPath);
+ } else {
+ if (td == null) {
+ td = new TDeserializer();
+ }
+ LocalStateData data = new LocalStateData();
+ td.deserialize(data, serialized);
+ result = data.get_serialized_parts();
+ }
+ }
+ return result;
+ } catch(Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ private synchronized Map<String, ThriftSerializedObject> partialSnapshot(TDeserializer td) {
+ int attempts = 0;
+ while(true) {
+ try {
+ return partialDeserializeLatestVersion(td);
+ } catch (Exception e) {
+ attempts++;
+ if (attempts >= 10) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+ }
+
+ public TBase get(String key) {
+ TDeserializer td = new TDeserializer();
+ Map<String, ThriftSerializedObject> partial = partialSnapshot(td);
+ ThriftSerializedObject tso = partial.get(key);
+ TBase ret = null;
+ if (tso != null) {
+ ret = deserialize(tso, td);
+ }
+ return ret;
}
- public synchronized void put(Object key, Object val) throws IOException {
+ public void put(String key, TBase val) {
put(key, val, true);
}
- public synchronized void put(Object key, Object val, boolean cleanup) throws IOException {
- Map<Object, Object> curr = snapshot();
- curr.put(key, val);
- persist(curr, cleanup);
+ public synchronized void put(String key, TBase val, boolean cleanup) {
+ Map<String, ThriftSerializedObject> curr = partialSnapshot(null);
+ TSerializer ser = new TSerializer();
+ curr.put(key, serialize(val, ser));
+ persistInternal(curr, ser, cleanup);
}
- public synchronized void remove(Object key) throws IOException {
+ public void remove(String key) {
remove(key, true);
}
- public synchronized void remove(Object key, boolean cleanup) throws IOException {
- Map<Object, Object> curr = snapshot();
+ public synchronized void remove(String key, boolean cleanup) {
+ Map<String, ThriftSerializedObject> curr = partialSnapshot(null);
curr.remove(key);
- persist(curr, cleanup);
+ persistInternal(curr, null, cleanup);
}
public synchronized void cleanup(int keepVersions) throws IOException {
_vs.cleanup(keepVersions);
}
-
- private void persist(Map<Object, Object> val, boolean cleanup) throws IOException {
- byte[] toWrite = Utils.javaSerialize(val);
- String newPath = _vs.createVersion();
- File file = new File(newPath);
- FileUtils.writeByteArrayToFile(file, toWrite);
- if (toWrite.length != file.length()) {
- throw new IOException("Tried to serialize " + toWrite.length +
- " bytes to " + file.getCanonicalPath() + ", but " +
- file.length() + " bytes were written.");
+
+ private void persistInternal(Map<String, ThriftSerializedObject> serialized, TSerializer ser, boolean cleanup) {
+ try {
+ if (ser == null) {
+ ser = new TSerializer();
+ }
+ byte[] toWrite = ser.serialize(new LocalStateData(serialized));
+
+ String newPath = _vs.createVersion();
+ File file = new File(newPath);
+ FileUtils.writeByteArrayToFile(file, toWrite);
+ if (toWrite.length != file.length()) {
+ throw new IOException("Tried to serialize " + toWrite.length +
+ " bytes to " + file.getCanonicalPath() + ", but " +
+ file.length() + " bytes were written.");
+ }
+ _vs.succeedVersion(newPath);
+ if(cleanup) _vs.cleanup(4);
+ } catch(Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ private ThriftSerializedObject serialize(TBase o, TSerializer ser) {
+ try {
+ return new ThriftSerializedObject(o.getClass().getName(), ByteBuffer.wrap(ser.serialize((TBase)o)));
+ } catch(Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ private void persist(Map<String, TBase> val, boolean cleanup) {
+ try {
+ TSerializer ser = new TSerializer();
+ Map<String, ThriftSerializedObject> serialized = new HashMap<String, ThriftSerializedObject>();
+ for (Map.Entry<String, TBase> ent: val.entrySet()) {
+ Object o = ent.getValue();
+ serialized.put(ent.getKey(), serialize(ent.getValue(), ser));
+ }
+ persistInternal(serialized, ser, cleanup);
+ } catch(Exception e) {
+ throw new RuntimeException(e);
}
- _vs.succeedVersion(newPath);
- if(cleanup) _vs.cleanup(4);
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/b1dc422b/storm-core/src/py/storm/ttypes.py
----------------------------------------------------------------------
diff --git a/storm-core/src/py/storm/ttypes.py b/storm-core/src/py/storm/ttypes.py
index 512e666..0d4dd93 100644
--- a/storm-core/src/py/storm/ttypes.py
+++ b/storm-core/src/py/storm/ttypes.py
@@ -5375,6 +5375,600 @@ class ClusterWorkerHeartbeat:
def __ne__(self, other):
return not (self == other)
+class ThriftSerializedObject:
+ """
+ Attributes:
+ - name
+ - bits
+ """
+
+ thrift_spec = (
+ None, # 0
+ (1, TType.STRING, 'name', None, None, ), # 1
+ (2, TType.STRING, 'bits', None, None, ), # 2
+ )
+
+ def __init__(self, name=None, bits=None,):
+ self.name = name
+ self.bits = bits
+
+ def read(self, iprot):
+ if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+ fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ if fid == 1:
+ if ftype == TType.STRING:
+ self.name = iprot.readString().decode('utf-8')
+ else:
+ iprot.skip(ftype)
+ elif fid == 2:
+ if ftype == TType.STRING:
+ self.bits = iprot.readString();
+ else:
+ iprot.skip(ftype)
+ else:
+ iprot.skip(ftype)
+ iprot.readFieldEnd()
+ iprot.readStructEnd()
+
+ def write(self, oprot):
+ if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+ oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+ return
+ oprot.writeStructBegin('ThriftSerializedObject')
+ if self.name is not None:
+ oprot.writeFieldBegin('name', TType.STRING, 1)
+ oprot.writeString(self.name.encode('utf-8'))
+ oprot.writeFieldEnd()
+ if self.bits is not None:
+ oprot.writeFieldBegin('bits', TType.STRING, 2)
+ oprot.writeString(self.bits)
+ oprot.writeFieldEnd()
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def validate(self):
+ if self.name is None:
+ raise TProtocol.TProtocolException(message='Required field name is unset!')
+ if self.bits is None:
+ raise TProtocol.TProtocolException(message='Required field bits is unset!')
+ return
+
+
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.name)
+ value = (value * 31) ^ hash(self.bits)
+ return value
+
+ def __repr__(self):
+ L = ['%s=%r' % (key, value)
+ for key, value in self.__dict__.iteritems()]
+ return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+ def __eq__(self, other):
+ return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+ def __ne__(self, other):
+ return not (self == other)
+
+class LocalStateData:
+ """
+ Attributes:
+ - serialized_parts
+ """
+
+ thrift_spec = (
+ None, # 0
+ (1, TType.MAP, 'serialized_parts', (TType.STRING,None,TType.STRUCT,(ThriftSerializedObject, ThriftSerializedObject.thrift_spec)), None, ), # 1
+ )
+
+ def __init__(self, serialized_parts=None,):
+ self.serialized_parts = serialized_parts
+
+ def read(self, iprot):
+ if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+ fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ if fid == 1:
+ if ftype == TType.MAP:
+ self.serialized_parts = {}
+ (_ktype391, _vtype392, _size390 ) = iprot.readMapBegin()
+ for _i394 in xrange(_size390):
+ _key395 = iprot.readString().decode('utf-8')
+ _val396 = ThriftSerializedObject()
+ _val396.read(iprot)
+ self.serialized_parts[_key395] = _val396
+ iprot.readMapEnd()
+ else:
+ iprot.skip(ftype)
+ else:
+ iprot.skip(ftype)
+ iprot.readFieldEnd()
+ iprot.readStructEnd()
+
+ def write(self, oprot):
+ if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+ oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+ return
+ oprot.writeStructBegin('LocalStateData')
+ if self.serialized_parts is not None:
+ oprot.writeFieldBegin('serialized_parts', TType.MAP, 1)
+ oprot.writeMapBegin(TType.STRING, TType.STRUCT, len(self.serialized_parts))
+ for kiter397,viter398 in self.serialized_parts.items():
+ oprot.writeString(kiter397.encode('utf-8'))
+ viter398.write(oprot)
+ oprot.writeMapEnd()
+ oprot.writeFieldEnd()
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def validate(self):
+ if self.serialized_parts is None:
+ raise TProtocol.TProtocolException(message='Required field serialized_parts is unset!')
+ return
+
+
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.serialized_parts)
+ return value
+
+ def __repr__(self):
+ L = ['%s=%r' % (key, value)
+ for key, value in self.__dict__.iteritems()]
+ return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+ def __eq__(self, other):
+ return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+ def __ne__(self, other):
+ return not (self == other)
+
+class LocalAssignment:
+ """
+ Attributes:
+ - topology_id
+ - executors
+ """
+
+ thrift_spec = (
+ None, # 0
+ (1, TType.STRING, 'topology_id', None, None, ), # 1
+ (2, TType.LIST, 'executors', (TType.STRUCT,(ExecutorInfo, ExecutorInfo.thrift_spec)), None, ), # 2
+ )
+
+ def __init__(self, topology_id=None, executors=None,):
+ self.topology_id = topology_id
+ self.executors = executors
+
+ def read(self, iprot):
+ if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+ fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ if fid == 1:
+ if ftype == TType.STRING:
+ self.topology_id = iprot.readString().decode('utf-8')
+ else:
+ iprot.skip(ftype)
+ elif fid == 2:
+ if ftype == TType.LIST:
+ self.executors = []
+ (_etype402, _size399) = iprot.readListBegin()
+ for _i403 in xrange(_size399):
+ _elem404 = ExecutorInfo()
+ _elem404.read(iprot)
+ self.executors.append(_elem404)
+ iprot.readListEnd()
+ else:
+ iprot.skip(ftype)
+ else:
+ iprot.skip(ftype)
+ iprot.readFieldEnd()
+ iprot.readStructEnd()
+
+ def write(self, oprot):
+ if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+ oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+ return
+ oprot.writeStructBegin('LocalAssignment')
+ if self.topology_id is not None:
+ oprot.writeFieldBegin('topology_id', TType.STRING, 1)
+ oprot.writeString(self.topology_id.encode('utf-8'))
+ oprot.writeFieldEnd()
+ if self.executors is not None:
+ oprot.writeFieldBegin('executors', TType.LIST, 2)
+ oprot.writeListBegin(TType.STRUCT, len(self.executors))
+ for iter405 in self.executors:
+ iter405.write(oprot)
+ oprot.writeListEnd()
+ oprot.writeFieldEnd()
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def validate(self):
+ if self.topology_id is None:
+ raise TProtocol.TProtocolException(message='Required field topology_id is unset!')
+ if self.executors is None:
+ raise TProtocol.TProtocolException(message='Required field executors is unset!')
+ return
+
+
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.topology_id)
+ value = (value * 31) ^ hash(self.executors)
+ return value
+
+ def __repr__(self):
+ L = ['%s=%r' % (key, value)
+ for key, value in self.__dict__.iteritems()]
+ return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+ def __eq__(self, other):
+ return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+ def __ne__(self, other):
+ return not (self == other)
+
+class LSSupervisorId:
+ """
+ Attributes:
+ - supervisor_id
+ """
+
+ thrift_spec = (
+ None, # 0
+ (1, TType.STRING, 'supervisor_id', None, None, ), # 1
+ )
+
+ def __init__(self, supervisor_id=None,):
+ self.supervisor_id = supervisor_id
+
+ def read(self, iprot):
+ if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+ fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ if fid == 1:
+ if ftype == TType.STRING:
+ self.supervisor_id = iprot.readString().decode('utf-8')
+ else:
+ iprot.skip(ftype)
+ else:
+ iprot.skip(ftype)
+ iprot.readFieldEnd()
+ iprot.readStructEnd()
+
+ def write(self, oprot):
+ if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+ oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+ return
+ oprot.writeStructBegin('LSSupervisorId')
+ if self.supervisor_id is not None:
+ oprot.writeFieldBegin('supervisor_id', TType.STRING, 1)
+ oprot.writeString(self.supervisor_id.encode('utf-8'))
+ oprot.writeFieldEnd()
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def validate(self):
+ if self.supervisor_id is None:
+ raise TProtocol.TProtocolException(message='Required field supervisor_id is unset!')
+ return
+
+
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.supervisor_id)
+ return value
+
+ def __repr__(self):
+ L = ['%s=%r' % (key, value)
+ for key, value in self.__dict__.iteritems()]
+ return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+ def __eq__(self, other):
+ return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+ def __ne__(self, other):
+ return not (self == other)
+
+class LSApprovedWorkers:
+ """
+ Attributes:
+ - approved_workers
+ """
+
+ thrift_spec = (
+ None, # 0
+ (1, TType.MAP, 'approved_workers', (TType.STRING,None,TType.I32,None), None, ), # 1
+ )
+
+ def __init__(self, approved_workers=None,):
+ self.approved_workers = approved_workers
+
+ def read(self, iprot):
+ if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+ fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ if fid == 1:
+ if ftype == TType.MAP:
+ self.approved_workers = {}
+ (_ktype407, _vtype408, _size406 ) = iprot.readMapBegin()
+ for _i410 in xrange(_size406):
+ _key411 = iprot.readString().decode('utf-8')
+ _val412 = iprot.readI32();
+ self.approved_workers[_key411] = _val412
+ iprot.readMapEnd()
+ else:
+ iprot.skip(ftype)
+ else:
+ iprot.skip(ftype)
+ iprot.readFieldEnd()
+ iprot.readStructEnd()
+
+ def write(self, oprot):
+ if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+ oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+ return
+ oprot.writeStructBegin('LSApprovedWorkers')
+ if self.approved_workers is not None:
+ oprot.writeFieldBegin('approved_workers', TType.MAP, 1)
+ oprot.writeMapBegin(TType.STRING, TType.I32, len(self.approved_workers))
+ for kiter413,viter414 in self.approved_workers.items():
+ oprot.writeString(kiter413.encode('utf-8'))
+ oprot.writeI32(viter414)
+ oprot.writeMapEnd()
+ oprot.writeFieldEnd()
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def validate(self):
+ if self.approved_workers is None:
+ raise TProtocol.TProtocolException(message='Required field approved_workers is unset!')
+ return
+
+
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.approved_workers)
+ return value
+
+ def __repr__(self):
+ L = ['%s=%r' % (key, value)
+ for key, value in self.__dict__.iteritems()]
+ return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+ def __eq__(self, other):
+ return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+ def __ne__(self, other):
+ return not (self == other)
+
+class LSSupervisorAssignments:
+ """
+ Attributes:
+ - assignments
+ """
+
+ thrift_spec = (
+ None, # 0
+ (1, TType.MAP, 'assignments', (TType.I32,None,TType.STRUCT,(LocalAssignment, LocalAssignment.thrift_spec)), None, ), # 1
+ )
+
+ def __init__(self, assignments=None,):
+ self.assignments = assignments
+
+ def read(self, iprot):
+ if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+ fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ if fid == 1:
+ if ftype == TType.MAP:
+ self.assignments = {}
+ (_ktype416, _vtype417, _size415 ) = iprot.readMapBegin()
+ for _i419 in xrange(_size415):
+ _key420 = iprot.readI32();
+ _val421 = LocalAssignment()
+ _val421.read(iprot)
+ self.assignments[_key420] = _val421
+ iprot.readMapEnd()
+ else:
+ iprot.skip(ftype)
+ else:
+ iprot.skip(ftype)
+ iprot.readFieldEnd()
+ iprot.readStructEnd()
+
+ def write(self, oprot):
+ if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+ oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+ return
+ oprot.writeStructBegin('LSSupervisorAssignments')
+ if self.assignments is not None:
+ oprot.writeFieldBegin('assignments', TType.MAP, 1)
+ oprot.writeMapBegin(TType.I32, TType.STRUCT, len(self.assignments))
+ for kiter422,viter423 in self.assignments.items():
+ oprot.writeI32(kiter422)
+ viter423.write(oprot)
+ oprot.writeMapEnd()
+ oprot.writeFieldEnd()
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def validate(self):
+ if self.assignments is None:
+ raise TProtocol.TProtocolException(message='Required field assignments is unset!')
+ return
+
+
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.assignments)
+ return value
+
+ def __repr__(self):
+ L = ['%s=%r' % (key, value)
+ for key, value in self.__dict__.iteritems()]
+ return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+ def __eq__(self, other):
+ return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+ def __ne__(self, other):
+ return not (self == other)
+
+class LSWorkerHeartbeat:
+ """
+ Attributes:
+ - time_secs
+ - topology_id
+ - executors
+ - port
+ """
+
+ thrift_spec = (
+ None, # 0
+ (1, TType.I32, 'time_secs', None, None, ), # 1
+ (2, TType.STRING, 'topology_id', None, None, ), # 2
+ (3, TType.LIST, 'executors', (TType.STRUCT,(ExecutorInfo, ExecutorInfo.thrift_spec)), None, ), # 3
+ (4, TType.I32, 'port', None, None, ), # 4
+ )
+
+ def __init__(self, time_secs=None, topology_id=None, executors=None, port=None,):
+ self.time_secs = time_secs
+ self.topology_id = topology_id
+ self.executors = executors
+ self.port = port
+
+ def read(self, iprot):
+ if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+ fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ if fid == 1:
+ if ftype == TType.I32:
+ self.time_secs = iprot.readI32();
+ else:
+ iprot.skip(ftype)
+ elif fid == 2:
+ if ftype == TType.STRING:
+ self.topology_id = iprot.readString().decode('utf-8')
+ else:
+ iprot.skip(ftype)
+ elif fid == 3:
+ if ftype == TType.LIST:
+ self.executors = []
+ (_etype427, _size424) = iprot.readListBegin()
+ for _i428 in xrange(_size424):
+ _elem429 = ExecutorInfo()
+ _elem429.read(iprot)
+ self.executors.append(_elem429)
+ iprot.readListEnd()
+ else:
+ iprot.skip(ftype)
+ elif fid == 4:
+ if ftype == TType.I32:
+ self.port = iprot.readI32();
+ else:
+ iprot.skip(ftype)
+ else:
+ iprot.skip(ftype)
+ iprot.readFieldEnd()
+ iprot.readStructEnd()
+
+ def write(self, oprot):
+ if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+ oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+ return
+ oprot.writeStructBegin('LSWorkerHeartbeat')
+ if self.time_secs is not None:
+ oprot.writeFieldBegin('time_secs', TType.I32, 1)
+ oprot.writeI32(self.time_secs)
+ oprot.writeFieldEnd()
+ if self.topology_id is not None:
+ oprot.writeFieldBegin('topology_id', TType.STRING, 2)
+ oprot.writeString(self.topology_id.encode('utf-8'))
+ oprot.writeFieldEnd()
+ if self.executors is not None:
+ oprot.writeFieldBegin('executors', TType.LIST, 3)
+ oprot.writeListBegin(TType.STRUCT, len(self.executors))
+ for iter430 in self.executors:
+ iter430.write(oprot)
+ oprot.writeListEnd()
+ oprot.writeFieldEnd()
+ if self.port is not None:
+ oprot.writeFieldBegin('port', TType.I32, 4)
+ oprot.writeI32(self.port)
+ oprot.writeFieldEnd()
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def validate(self):
+ if self.time_secs is None:
+ raise TProtocol.TProtocolException(message='Required field time_secs is unset!')
+ if self.topology_id is None:
+ raise TProtocol.TProtocolException(message='Required field topology_id is unset!')
+ if self.executors is None:
+ raise TProtocol.TProtocolException(message='Required field executors is unset!')
+ if self.port is None:
+ raise TProtocol.TProtocolException(message='Required field port is unset!')
+ return
+
+
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.time_secs)
+ value = (value * 31) ^ hash(self.topology_id)
+ value = (value * 31) ^ hash(self.executors)
+ value = (value * 31) ^ hash(self.port)
+ return value
+
+ def __repr__(self):
+ L = ['%s=%r' % (key, value)
+ for key, value in self.__dict__.iteritems()]
+ return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+ def __eq__(self, other):
+ return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+ def __ne__(self, other):
+ return not (self == other)
+
class GetInfoOptions:
"""
Attributes:
http://git-wip-us.apache.org/repos/asf/storm/blob/b1dc422b/storm-core/src/storm.thrift
----------------------------------------------------------------------
diff --git a/storm-core/src/storm.thrift b/storm-core/src/storm.thrift
index 3971a43..b502181 100644
--- a/storm-core/src/storm.thrift
+++ b/storm-core/src/storm.thrift
@@ -295,6 +295,39 @@ struct ClusterWorkerHeartbeat {
4: required i32 uptime_secs;
}
+struct ThriftSerializedObject {
+ 1: required string name;
+ 2: required binary bits;
+}
+
+struct LocalStateData {
+ 1: required map<string, ThriftSerializedObject> serialized_parts;
+}
+
+struct LocalAssignment {
+ 1: required string topology_id;
+ 2: required list<ExecutorInfo> executors;
+}
+
+struct LSSupervisorId {
+ 1: required string supervisor_id;
+}
+
+struct LSApprovedWorkers {
+ 1: required map<string, i32> approved_workers;
+}
+
+struct LSSupervisorAssignments {
+ 1: required map<i32, LocalAssignment> assignments;
+}
+
+struct LSWorkerHeartbeat {
+ 1: required i32 time_secs;
+ 2: required string topology_id;
+ 3: required list<ExecutorInfo> executors
+ 4: required i32 port;
+}
+
enum NumErrorsChoice {
ALL,
NONE,
http://git-wip-us.apache.org/repos/asf/storm/blob/b1dc422b/storm-core/test/clj/backtype/storm/local_state_test.clj
----------------------------------------------------------------------
diff --git a/storm-core/test/clj/backtype/storm/local_state_test.clj b/storm-core/test/clj/backtype/storm/local_state_test.clj
index 4bd58ec..1364319 100644
--- a/storm-core/test/clj/backtype/storm/local_state_test.clj
+++ b/storm-core/test/clj/backtype/storm/local_state_test.clj
@@ -17,39 +17,39 @@
(:use [clojure test])
(:use [backtype.storm testing])
(:import [backtype.storm.utils LocalState]
+ [backtype.storm.generated GlobalStreamId]
[org.apache.commons.io FileUtils]
[java.io File]))
(deftest test-local-state
(with-local-tmp [dir1 dir2]
- (let [ls1 (LocalState. dir1)
+ (let [gs-a (GlobalStreamId. "a" "a")
+ gs-b (GlobalStreamId. "b" "b")
+ gs-c (GlobalStreamId. "c" "c")
+ gs-d (GlobalStreamId. "d" "d")
+ ls1 (LocalState. dir1)
ls2 (LocalState. dir2)]
(is (= {} (.snapshot ls1)))
- (.put ls1 "a" 1)
- (.put ls1 "b" 2)
- (is (= {"a" 1 "b" 2} (.snapshot ls1)))
+ (.put ls1 "a" gs-a)
+ (.put ls1 "b" gs-b)
+ (is (= {"a" gs-a "b" gs-b} (.snapshot ls1)))
(is (= {} (.snapshot ls2)))
- (is (= 1 (.get ls1 "a")))
+ (is (= gs-a (.get ls1 "a")))
(is (= nil (.get ls1 "c")))
- (is (= 2 (.get ls1 "b")))
- (is (= {"a" 1 "b" 2} (.snapshot (LocalState. dir1))))
- (.put ls2 "b" 1)
- (.put ls2 "b" 2)
- (.put ls2 "b" 3)
- (.put ls2 "b" 4)
- (.put ls2 "b" 5)
- (.put ls2 "b" 6)
- (.put ls2 "b" 7)
- (.put ls2 "b" 8)
- (is (= 8 (.get ls2 "b")))
- )))
+ (is (= gs-b (.get ls1 "b")))
+ (is (= {"a" gs-a "b" gs-b} (.snapshot (LocalState. dir1))))
+ (.put ls2 "b" gs-a)
+ (.put ls2 "b" gs-b)
+ (.put ls2 "b" gs-c)
+ (.put ls2 "b" gs-d)
+ (is (= gs-d (.get ls2 "b"))))))
(deftest empty-state
(with-local-tmp [dir]
(let [ls (LocalState. dir)
+ gs-a (GlobalStreamId. "a" "a")
data (FileUtils/openOutputStream (File. dir "12345"))
version (FileUtils/openOutputStream (File. dir "12345.version"))]
(is (= nil (.get ls "c")))
- (.put ls "a" 1)
- (is (= 1 (.get ls "a")))
- )))
+ (.put ls "a" gs-a)
+ (is (= gs-a (.get ls "a"))))))
[03/13] storm git commit: STORM-762: uptime for worker heartbeats is
lost when converted to thrift
Posted by pt...@apache.org.
STORM-762: uptime for worker heartbeats is lost when converted to thrift
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/24e3b988
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/24e3b988
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/24e3b988
Branch: refs/heads/0.10.x-branch
Commit: 24e3b98820c78be4ae03f52c66a9b36bb04ea0dc
Parents: 0085319
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Apr 8 08:46:32 2015 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri May 15 12:56:59 2015 -0400
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/converter.clj | 3 +-
.../storm/generated/ClusterWorkerHeartbeat.java | 101 ++++++++++++++++++-
storm-core/src/py/__init__.py | 2 +
storm-core/src/py/storm/DistributedRPC.py | 2 +
.../src/py/storm/DistributedRPCInvocations.py | 2 +
storm-core/src/py/storm/Nimbus.py | 2 +
storm-core/src/py/storm/__init__.py | 2 +
storm-core/src/py/storm/constants.py | 2 +
storm-core/src/py/storm/ttypes.py | 19 +++-
storm-core/src/storm.thrift | 1 +
10 files changed, 131 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/24e3b988/storm-core/src/clj/backtype/storm/converter.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/converter.clj b/storm-core/src/clj/backtype/storm/converter.clj
index 6102ced..ae66fa5 100644
--- a/storm-core/src/clj/backtype/storm/converter.clj
+++ b/storm-core/src/clj/backtype/storm/converter.clj
@@ -162,7 +162,7 @@
(if worker-hb
{:storm-id (.get_storm_id worker-hb)
:executor-stats (clojurify-stats (into {} (.get_executor_stats worker-hb)))
- :uptime (time-delta (.get_time_secs worker-hb))
+ :uptime (.get_uptime_secs worker-hb)
:time-secs (.get_time_secs worker-hb)
}
{}))
@@ -170,6 +170,7 @@
(defn thriftify-zk-worker-hb [worker-hb]
(if (not-empty (filter second (:executor-stats worker-hb)))
(doto (ClusterWorkerHeartbeat.)
+ (.set_uptime_secs (:uptime worker-hb))
(.set_storm_id (:storm-id worker-hb))
(.set_executor_stats (thriftify-stats (filter second (:executor-stats worker-hb))))
(.set_time_secs (:time-secs worker-hb)))))
http://git-wip-us.apache.org/repos/asf/storm/blob/24e3b988/storm-core/src/jvm/backtype/storm/generated/ClusterWorkerHeartbeat.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/ClusterWorkerHeartbeat.java b/storm-core/src/jvm/backtype/storm/generated/ClusterWorkerHeartbeat.java
index fb04e3a..30a99b3 100644
--- a/storm-core/src/jvm/backtype/storm/generated/ClusterWorkerHeartbeat.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ClusterWorkerHeartbeat.java
@@ -51,13 +51,14 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-3-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-8")
public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWorkerHeartbeat, ClusterWorkerHeartbeat._Fields>, java.io.Serializable, Cloneable, Comparable<ClusterWorkerHeartbeat> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ClusterWorkerHeartbeat");
private static final org.apache.thrift.protocol.TField STORM_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("storm_id", org.apache.thrift.protocol.TType.STRING, (short)1);
private static final org.apache.thrift.protocol.TField EXECUTOR_STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("executor_stats", org.apache.thrift.protocol.TType.MAP, (short)2);
private static final org.apache.thrift.protocol.TField TIME_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("time_secs", org.apache.thrift.protocol.TType.I32, (short)3);
+ private static final org.apache.thrift.protocol.TField UPTIME_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("uptime_secs", org.apache.thrift.protocol.TType.I32, (short)4);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -68,12 +69,14 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo
private String storm_id; // required
private Map<ExecutorInfo,ExecutorStats> executor_stats; // required
private int time_secs; // required
+ private int uptime_secs; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
STORM_ID((short)1, "storm_id"),
EXECUTOR_STATS((short)2, "executor_stats"),
- TIME_SECS((short)3, "time_secs");
+ TIME_SECS((short)3, "time_secs"),
+ UPTIME_SECS((short)4, "uptime_secs");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -94,6 +97,8 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo
return EXECUTOR_STATS;
case 3: // TIME_SECS
return TIME_SECS;
+ case 4: // UPTIME_SECS
+ return UPTIME_SECS;
default:
return null;
}
@@ -135,6 +140,7 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo
// isset id assignments
private static final int __TIME_SECS_ISSET_ID = 0;
+ private static final int __UPTIME_SECS_ISSET_ID = 1;
private byte __isset_bitfield = 0;
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
@@ -147,6 +153,8 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ExecutorStats.class))));
tmpMap.put(_Fields.TIME_SECS, new org.apache.thrift.meta_data.FieldMetaData("time_secs", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+ tmpMap.put(_Fields.UPTIME_SECS, new org.apache.thrift.meta_data.FieldMetaData("uptime_secs", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ClusterWorkerHeartbeat.class, metaDataMap);
}
@@ -157,13 +165,16 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo
public ClusterWorkerHeartbeat(
String storm_id,
Map<ExecutorInfo,ExecutorStats> executor_stats,
- int time_secs)
+ int time_secs,
+ int uptime_secs)
{
this();
this.storm_id = storm_id;
this.executor_stats = executor_stats;
this.time_secs = time_secs;
set_time_secs_isSet(true);
+ this.uptime_secs = uptime_secs;
+ set_uptime_secs_isSet(true);
}
/**
@@ -190,6 +201,7 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo
this.executor_stats = __this__executor_stats;
}
this.time_secs = other.time_secs;
+ this.uptime_secs = other.uptime_secs;
}
public ClusterWorkerHeartbeat deepCopy() {
@@ -202,6 +214,8 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo
this.executor_stats = null;
set_time_secs_isSet(false);
this.time_secs = 0;
+ set_uptime_secs_isSet(false);
+ this.uptime_secs = 0;
}
public String get_storm_id() {
@@ -283,6 +297,28 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo
__isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __TIME_SECS_ISSET_ID, value);
}
+ public int get_uptime_secs() {
+ return this.uptime_secs;
+ }
+
+ public void set_uptime_secs(int uptime_secs) {
+ this.uptime_secs = uptime_secs;
+ set_uptime_secs_isSet(true);
+ }
+
+ public void unset_uptime_secs() {
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
+ }
+
+ /** Returns true if field uptime_secs is set (has been assigned a value) and false otherwise */
+ public boolean is_set_uptime_secs() {
+ return EncodingUtils.testBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
+ }
+
+ public void set_uptime_secs_isSet(boolean value) {
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID, value);
+ }
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case STORM_ID:
@@ -309,6 +345,14 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo
}
break;
+ case UPTIME_SECS:
+ if (value == null) {
+ unset_uptime_secs();
+ } else {
+ set_uptime_secs((Integer)value);
+ }
+ break;
+
}
}
@@ -323,6 +367,9 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo
case TIME_SECS:
return Integer.valueOf(get_time_secs());
+ case UPTIME_SECS:
+ return Integer.valueOf(get_uptime_secs());
+
}
throw new IllegalStateException();
}
@@ -340,6 +387,8 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo
return is_set_executor_stats();
case TIME_SECS:
return is_set_time_secs();
+ case UPTIME_SECS:
+ return is_set_uptime_secs();
}
throw new IllegalStateException();
}
@@ -384,6 +433,15 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo
return false;
}
+ boolean this_present_uptime_secs = true;
+ boolean that_present_uptime_secs = true;
+ if (this_present_uptime_secs || that_present_uptime_secs) {
+ if (!(this_present_uptime_secs && that_present_uptime_secs))
+ return false;
+ if (this.uptime_secs != that.uptime_secs)
+ return false;
+ }
+
return true;
}
@@ -406,6 +464,11 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo
if (present_time_secs)
list.add(time_secs);
+ boolean present_uptime_secs = true;
+ list.add(present_uptime_secs);
+ if (present_uptime_secs)
+ list.add(uptime_secs);
+
return list.hashCode();
}
@@ -447,6 +510,16 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(is_set_uptime_secs()).compareTo(other.is_set_uptime_secs());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (is_set_uptime_secs()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uptime_secs, other.uptime_secs);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -486,6 +559,10 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo
sb.append("time_secs:");
sb.append(this.time_secs);
first = false;
+ if (!first) sb.append(", ");
+ sb.append("uptime_secs:");
+ sb.append(this.uptime_secs);
+ first = false;
sb.append(")");
return sb.toString();
}
@@ -504,6 +581,10 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo
throw new org.apache.thrift.protocol.TProtocolException("Required field 'time_secs' is unset! Struct:" + toString());
}
+ if (!is_set_uptime_secs()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'uptime_secs' is unset! Struct:" + toString());
+ }
+
// check for sub-struct validity
}
@@ -581,6 +662,14 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
+ case 4: // UPTIME_SECS
+ if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ struct.uptime_secs = iprot.readI32();
+ struct.set_uptime_secs_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -615,6 +704,9 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo
oprot.writeFieldBegin(TIME_SECS_FIELD_DESC);
oprot.writeI32(struct.time_secs);
oprot.writeFieldEnd();
+ oprot.writeFieldBegin(UPTIME_SECS_FIELD_DESC);
+ oprot.writeI32(struct.uptime_secs);
+ oprot.writeFieldEnd();
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -642,6 +734,7 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo
}
}
oprot.writeI32(struct.time_secs);
+ oprot.writeI32(struct.uptime_secs);
}
@Override
@@ -666,6 +759,8 @@ public class ClusterWorkerHeartbeat implements org.apache.thrift.TBase<ClusterWo
struct.set_executor_stats_isSet(true);
struct.time_secs = iprot.readI32();
struct.set_time_secs_isSet(true);
+ struct.uptime_secs = iprot.readI32();
+ struct.set_uptime_secs_isSet(true);
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/24e3b988/storm-core/src/py/__init__.py
----------------------------------------------------------------------
diff --git a/storm-core/src/py/__init__.py b/storm-core/src/py/__init__.py
index 59dd060..0896fcd 100644
--- a/storm-core/src/py/__init__.py
+++ b/storm-core/src/py/__init__.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/storm/blob/24e3b988/storm-core/src/py/storm/DistributedRPC.py
----------------------------------------------------------------------
diff --git a/storm-core/src/py/storm/DistributedRPC.py b/storm-core/src/py/storm/DistributedRPC.py
index 1728434..330499c 100644
--- a/storm-core/src/py/storm/DistributedRPC.py
+++ b/storm-core/src/py/storm/DistributedRPC.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/storm/blob/24e3b988/storm-core/src/py/storm/DistributedRPCInvocations.py
----------------------------------------------------------------------
diff --git a/storm-core/src/py/storm/DistributedRPCInvocations.py b/storm-core/src/py/storm/DistributedRPCInvocations.py
index fddbbe5..493fcc7 100644
--- a/storm-core/src/py/storm/DistributedRPCInvocations.py
+++ b/storm-core/src/py/storm/DistributedRPCInvocations.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/storm/blob/24e3b988/storm-core/src/py/storm/Nimbus.py
----------------------------------------------------------------------
diff --git a/storm-core/src/py/storm/Nimbus.py b/storm-core/src/py/storm/Nimbus.py
index 38e137d..b952e3c 100644
--- a/storm-core/src/py/storm/Nimbus.py
+++ b/storm-core/src/py/storm/Nimbus.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/storm/blob/24e3b988/storm-core/src/py/storm/__init__.py
----------------------------------------------------------------------
diff --git a/storm-core/src/py/storm/__init__.py b/storm-core/src/py/storm/__init__.py
index 3692381..9ecdc2b 100644
--- a/storm-core/src/py/storm/__init__.py
+++ b/storm-core/src/py/storm/__init__.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/storm/blob/24e3b988/storm-core/src/py/storm/constants.py
----------------------------------------------------------------------
diff --git a/storm-core/src/py/storm/constants.py b/storm-core/src/py/storm/constants.py
index 8f77f7c..3f0c64a 100644
--- a/storm-core/src/py/storm/constants.py
+++ b/storm-core/src/py/storm/constants.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/storm/blob/24e3b988/storm-core/src/py/storm/ttypes.py
----------------------------------------------------------------------
diff --git a/storm-core/src/py/storm/ttypes.py b/storm-core/src/py/storm/ttypes.py
index f683dfe..512e666 100644
--- a/storm-core/src/py/storm/ttypes.py
+++ b/storm-core/src/py/storm/ttypes.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -5255,6 +5257,7 @@ class ClusterWorkerHeartbeat:
- storm_id
- executor_stats
- time_secs
+ - uptime_secs
"""
thrift_spec = (
@@ -5262,12 +5265,14 @@ class ClusterWorkerHeartbeat:
(1, TType.STRING, 'storm_id', None, None, ), # 1
(2, TType.MAP, 'executor_stats', (TType.STRUCT,(ExecutorInfo, ExecutorInfo.thrift_spec),TType.STRUCT,(ExecutorStats, ExecutorStats.thrift_spec)), None, ), # 2
(3, TType.I32, 'time_secs', None, None, ), # 3
+ (4, TType.I32, 'uptime_secs', None, None, ), # 4
)
- def __init__(self, storm_id=None, executor_stats=None, time_secs=None,):
+ def __init__(self, storm_id=None, executor_stats=None, time_secs=None, uptime_secs=None,):
self.storm_id = storm_id
self.executor_stats = executor_stats
self.time_secs = time_secs
+ self.uptime_secs = uptime_secs
def read(self, iprot):
if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -5301,6 +5306,11 @@ class ClusterWorkerHeartbeat:
self.time_secs = iprot.readI32();
else:
iprot.skip(ftype)
+ elif fid == 4:
+ if ftype == TType.I32:
+ self.uptime_secs = iprot.readI32();
+ else:
+ iprot.skip(ftype)
else:
iprot.skip(ftype)
iprot.readFieldEnd()
@@ -5327,6 +5337,10 @@ class ClusterWorkerHeartbeat:
oprot.writeFieldBegin('time_secs', TType.I32, 3)
oprot.writeI32(self.time_secs)
oprot.writeFieldEnd()
+ if self.uptime_secs is not None:
+ oprot.writeFieldBegin('uptime_secs', TType.I32, 4)
+ oprot.writeI32(self.uptime_secs)
+ oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -5337,6 +5351,8 @@ class ClusterWorkerHeartbeat:
raise TProtocol.TProtocolException(message='Required field executor_stats is unset!')
if self.time_secs is None:
raise TProtocol.TProtocolException(message='Required field time_secs is unset!')
+ if self.uptime_secs is None:
+ raise TProtocol.TProtocolException(message='Required field uptime_secs is unset!')
return
@@ -5345,6 +5361,7 @@ class ClusterWorkerHeartbeat:
value = (value * 31) ^ hash(self.storm_id)
value = (value * 31) ^ hash(self.executor_stats)
value = (value * 31) ^ hash(self.time_secs)
+ value = (value * 31) ^ hash(self.uptime_secs)
return value
def __repr__(self):
http://git-wip-us.apache.org/repos/asf/storm/blob/24e3b988/storm-core/src/storm.thrift
----------------------------------------------------------------------
diff --git a/storm-core/src/storm.thrift b/storm-core/src/storm.thrift
index db4a7b3..3971a43 100644
--- a/storm-core/src/storm.thrift
+++ b/storm-core/src/storm.thrift
@@ -292,6 +292,7 @@ struct ClusterWorkerHeartbeat {
1: required string storm_id;
2: required map<ExecutorInfo,ExecutorStats> executor_stats;
3: required i32 time_secs;
+ 4: required i32 uptime_secs;
}
enum NumErrorsChoice {
[11/13] storm git commit: STORM-764: Have option to compress thrift
heartbeat
Posted by pt...@apache.org.
STORM-764: Have option to compress thrift heartbeat
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c9bd0eb0
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c9bd0eb0
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c9bd0eb0
Branch: refs/heads/0.10.x-branch
Commit: c9bd0eb01b97fce7e2b9325ef4639973c9d3cbd4
Parents: 155e52a
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Apr 8 14:03:56 2015 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri May 15 13:52:21 2015 -0400
----------------------------------------------------------------------
.../GzipBridgeThriftSerializationDelegate.java | 65 ++++++++++++++++++
.../GzipThriftSerializationDelegate.java | 57 ++++++++++++++++
.../src/jvm/backtype/storm/utils/Utils.java | 32 +++++++++
...ipBridgeThriftSerializationDelegateTest.java | 71 ++++++++++++++++++++
4 files changed, 225 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/c9bd0eb0/storm-core/src/jvm/backtype/storm/serialization/GzipBridgeThriftSerializationDelegate.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/serialization/GzipBridgeThriftSerializationDelegate.java b/storm-core/src/jvm/backtype/storm/serialization/GzipBridgeThriftSerializationDelegate.java
new file mode 100644
index 0000000..bb3ad7e
--- /dev/null
+++ b/storm-core/src/jvm/backtype/storm/serialization/GzipBridgeThriftSerializationDelegate.java
@@ -0,0 +1,65 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package backtype.storm.serialization;
+
+import java.util.Map;
+import java.util.zip.GZIPInputStream;
+
+/**
+ * Always writes gzip out, but tests incoming to see if it's gzipped. If it is, deserializes with gzip. If not, uses
+ * {@link backtype.storm.serialization.DefaultSerializationDelegate} to deserialize. Any logic needing to be enabled
+ * via {@link #prepare(java.util.Map)} is passed through to both delegates.
+ */
+@Deprecated
+public class GzipBridgeThriftSerializationDelegate implements SerializationDelegate {
+
+ private ThriftSerializationDelegate defaultDelegate = new ThriftSerializationDelegate();
+ private GzipThriftSerializationDelegate gzipDelegate = new GzipThriftSerializationDelegate();
+
+ @Override
+ public void prepare(Map stormConf) {
+ defaultDelegate.prepare(stormConf);
+ gzipDelegate.prepare(stormConf);
+ }
+
+ @Override
+ public byte[] serialize(Object object) {
+ return gzipDelegate.serialize(object);
+ }
+
+ @Override
+ public <T> T deserialize(byte[] bytes, Class<T> clazz) {
+ if (isGzipped(bytes)) {
+ return gzipDelegate.deserialize(bytes, clazz);
+ } else {
+ return defaultDelegate.deserialize(bytes,clazz);
+ }
+ }
+
+ // Split up GZIP_MAGIC into readable bytes
+ private static final byte GZIP_MAGIC_FIRST_BYTE = (byte) GZIPInputStream.GZIP_MAGIC;
+ private static final byte GZIP_MAGIC_SECOND_BYTE = (byte) (GZIPInputStream.GZIP_MAGIC >> 8);
+
+ /**
+ * Looks ahead to see if the GZIP magic constant is heading {@code bytes}
+ */
+ private boolean isGzipped(byte[] bytes) {
+ return (bytes.length > 1) && (bytes[0] == GZIP_MAGIC_FIRST_BYTE)
+ && (bytes[1] == GZIP_MAGIC_SECOND_BYTE);
+ }
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/c9bd0eb0/storm-core/src/jvm/backtype/storm/serialization/GzipThriftSerializationDelegate.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/serialization/GzipThriftSerializationDelegate.java b/storm-core/src/jvm/backtype/storm/serialization/GzipThriftSerializationDelegate.java
new file mode 100644
index 0000000..933a125
--- /dev/null
+++ b/storm-core/src/jvm/backtype/storm/serialization/GzipThriftSerializationDelegate.java
@@ -0,0 +1,57 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package backtype.storm.serialization;
+
+import java.io.IOException;
+import java.util.Map;
+import backtype.storm.utils.Utils;
+import org.apache.thrift.TBase;
+import org.apache.thrift.TDeserializer;
+import org.apache.thrift.TException;
+import org.apache.thrift.TSerializer;
+
+/**
+ * Note, this assumes it's deserializing a gzip byte stream, and will err if it encounters any other serialization.
+ */
+public class GzipThriftSerializationDelegate implements SerializationDelegate {
+
+ @Override
+ public void prepare(Map stormConf) {
+ // No-op
+ }
+
+ @Override
+ public byte[] serialize(Object object) {
+ try {
+ return Utils.gzip(new TSerializer().serialize((TBase) object));
+ } catch (TException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Override
+ public <T> T deserialize(byte[] bytes, Class<T> clazz) {
+ try {
+ TBase instance = (TBase) clazz.newInstance();
+ new TDeserializer().deserialize(instance, Utils.gunzip(bytes));
+ return (T)instance;
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/c9bd0eb0/storm-core/src/jvm/backtype/storm/utils/Utils.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/utils/Utils.java b/storm-core/src/jvm/backtype/storm/utils/Utils.java
index 4123f73..d0046a9 100644
--- a/storm-core/src/jvm/backtype/storm/utils/Utils.java
+++ b/storm-core/src/jvm/backtype/storm/utils/Utils.java
@@ -46,6 +46,8 @@ import java.nio.ByteBuffer;
import java.nio.channels.Channels;
import java.nio.channels.WritableByteChannel;
import java.util.*;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
public class Utils {
private static final Logger LOG = LoggerFactory.getLogger(Utils.class);
@@ -101,6 +103,36 @@ public class Utils {
}
}
+ public static byte[] gzip(byte[] data) {
+ try {
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ GZIPOutputStream out = new GZIPOutputStream(bos);
+ out.write(data);
+ out.close();
+ return bos.toByteArray();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public static byte[] gunzip(byte[] data) {
+ try {
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ ByteArrayInputStream bis = new ByteArrayInputStream(data);
+ GZIPInputStream in = new GZIPInputStream(bis);
+ byte[] buffer = new byte[1024];
+ int len = 0;
+ while ((len = in.read(buffer)) >= 0) {
+ bos.write(buffer, 0, len);
+ }
+ in.close();
+ bos.close();
+ return bos.toByteArray();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
public static <T> String join(Iterable<T> coll, String sep) {
Iterator<T> it = coll.iterator();
String ret = "";
http://git-wip-us.apache.org/repos/asf/storm/blob/c9bd0eb0/storm-core/test/jvm/backtype/storm/serialization/GzipBridgeThriftSerializationDelegateTest.java
----------------------------------------------------------------------
diff --git a/storm-core/test/jvm/backtype/storm/serialization/GzipBridgeThriftSerializationDelegateTest.java b/storm-core/test/jvm/backtype/storm/serialization/GzipBridgeThriftSerializationDelegateTest.java
new file mode 100644
index 0000000..53bdab6
--- /dev/null
+++ b/storm-core/test/jvm/backtype/storm/serialization/GzipBridgeThriftSerializationDelegateTest.java
@@ -0,0 +1,71 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package backtype.storm.serialization;
+
+import static org.junit.Assert.*;
+
+import java.io.Serializable;
+import org.junit.Test;
+import org.junit.Before;
+import backtype.storm.generated.GlobalStreamId;
+
+
+public class GzipBridgeThriftSerializationDelegateTest {
+ SerializationDelegate testDelegate;
+
+ @Before
+ public void setUp() throws Exception {
+ testDelegate = new GzipBridgeThriftSerializationDelegate();
+ }
+
+ @Test
+ public void testDeserialize_readingFromGzip() throws Exception {
+ GlobalStreamId id = new GlobalStreamId("first", "second");
+
+ byte[] serialized = new GzipThriftSerializationDelegate().serialize(id);
+
+ GlobalStreamId id2 = testDelegate.deserialize(serialized, GlobalStreamId.class);
+
+ assertEquals(id2.get_componentId(), id.get_componentId());
+ assertEquals(id2.get_streamId(), id.get_streamId());
+ }
+
+ @Test
+ public void testDeserialize_readingFromGzipBridge() throws Exception {
+ GlobalStreamId id = new GlobalStreamId("first", "second");
+
+ byte[] serialized = new GzipBridgeThriftSerializationDelegate().serialize(id);
+
+ GlobalStreamId id2 = testDelegate.deserialize(serialized, GlobalStreamId.class);
+
+ assertEquals(id2.get_componentId(), id.get_componentId());
+ assertEquals(id2.get_streamId(), id.get_streamId());
+ }
+
+ @Test
+ public void testDeserialize_readingFromDefault() throws Exception {
+ GlobalStreamId id = new GlobalStreamId("A", "B");
+
+ byte[] serialized = new ThriftSerializationDelegate().serialize(id);
+
+ GlobalStreamId id2 = testDelegate.deserialize(serialized, GlobalStreamId.class);
+
+ assertEquals(id2.get_componentId(), id.get_componentId());
+ assertEquals(id2.get_streamId(), id.get_streamId());
+ }
+}
[05/13] storm git commit: STORM-765: Thrift serialization for local
state.
Posted by pt...@apache.org.
STORM-765: Thrift serialization for local state.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b1dc422b
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b1dc422b
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b1dc422b
Branch: refs/heads/0.10.x-branch
Commit: b1dc422bd502ad031d027ba0c026c3e666abe42f
Parents: 24e3b98
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Mon Apr 13 13:51:09 2015 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri May 15 12:58:02 2015 -0400
----------------------------------------------------------------------
.../src/clj/backtype/storm/daemon/common.clj | 13 -
.../clj/backtype/storm/daemon/supervisor.clj | 34 +-
.../src/clj/backtype/storm/daemon/worker.clj | 14 +-
.../src/clj/backtype/storm/local_state.clj | 99 +++
storm-core/src/clj/backtype/storm/testing.clj | 6 +-
.../storm/generated/LSApprovedWorkers.java | 458 +++++++++++
.../generated/LSSupervisorAssignments.java | 471 ++++++++++++
.../storm/generated/LSSupervisorId.java | 406 ++++++++++
.../storm/generated/LSWorkerHeartbeat.java | 755 +++++++++++++++++++
.../storm/generated/LocalAssignment.java | 561 ++++++++++++++
.../storm/generated/LocalStateData.java | 471 ++++++++++++
.../storm/generated/ThriftSerializedObject.java | 516 +++++++++++++
.../jvm/backtype/storm/utils/LocalState.java | 163 +++-
storm-core/src/py/storm/ttypes.py | 594 +++++++++++++++
storm-core/src/storm.thrift | 33 +
.../clj/backtype/storm/local_state_test.clj | 40 +-
16 files changed, 4530 insertions(+), 104 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/b1dc422b/storm-core/src/clj/backtype/storm/daemon/common.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/common.clj b/storm-core/src/clj/backtype/storm/daemon/common.clj
index c33609d..65482f3 100644
--- a/storm-core/src/clj/backtype/storm/daemon/common.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/common.clj
@@ -58,19 +58,6 @@
(defprotocol DaemonCommon
(waiting? [this]))
-(def LS-WORKER-HEARTBEAT "worker-heartbeat")
-
-;; LocalState constants
-(def LS-ID "supervisor-id")
-(def LS-LOCAL-ASSIGNMENTS "local-assignments")
-(def LS-APPROVED-WORKERS "approved-workers")
-
-(defn mk-local-worker-heartbeat [time-secs storm-id executors port]
- {:time-secs time-secs
- :storm-id storm-id
- :executors executors
- :port port})
-
(defrecord ExecutorStats [^long processed
^long acked
^long emitted
http://git-wip-us.apache.org/repos/asf/storm/blob/b1dc422b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
index bc8b999..7801690 100644
--- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
@@ -24,7 +24,7 @@
[java.net URI]
[org.apache.commons.io FileUtils]
[java.io File])
- (:use [backtype.storm config util log timer])
+ (:use [backtype.storm config util log timer local-state])
(:use [backtype.storm.daemon common])
(:require [backtype.storm.daemon [worker :as worker]]
[backtype.storm [process-simulator :as psim] [cluster :as cluster] [event :as event]]
@@ -38,9 +38,6 @@
(defmulti download-storm-code cluster-mode)
(defmulti launch-worker (fn [supervisor & _] (cluster-mode (:conf supervisor))))
-;; used as part of a map from port to this
-(defrecord LocalAssignment [storm-id executors])
-
(defprotocol SupervisorDaemon
(get-id [this])
(get-conf [this])
@@ -76,7 +73,7 @@
(into {} (for [[port executors] port-executors]
;; need to cast to int b/c it might be a long (due to how yaml parses things)
;; doall is to avoid serialization/deserialization problems with lazy seqs
- [(Integer. port) (LocalAssignment. storm-id (doall executors))]
+ [(Integer. port) (mk-local-assignment storm-id (doall executors))]
))))
(defn- read-assignments
@@ -104,8 +101,8 @@
(defn read-worker-heartbeat [conf id]
(let [local-state (worker-state conf id)]
(try
- (.get local-state LS-WORKER-HEARTBEAT)
- (catch IOException e
+ (ls-worker-heartbeat local-state)
+ (catch Exception e
(log-warn e "Failed to read local heartbeat for workerId : " id ",Ignoring exception.")
nil))))
@@ -148,7 +145,7 @@
(let [conf (:conf supervisor)
^LocalState local-state (:local-state supervisor)
id->heartbeat (read-worker-heartbeats conf)
- approved-ids (set (keys (.get local-state LS-APPROVED-WORKERS)))]
+ approved-ids (set (keys (ls-approved-workers local-state)))]
(into
{}
(dofor [[id hb] id->heartbeat]
@@ -174,7 +171,7 @@
(defn- wait-for-worker-launch [conf id start-time]
(let [state (worker-state conf id)]
(loop []
- (let [hb (.get state LS-WORKER-HEARTBEAT)]
+ (let [hb (ls-worker-heartbeat state)]
(when (and
(not hb)
(<
@@ -185,7 +182,7 @@
(Time/sleep 500)
(recur)
)))
- (when-not (.get state LS-WORKER-HEARTBEAT)
+ (when-not (ls-worker-heartbeat state)
(log-message "Worker " id " failed to start")
)))
@@ -320,7 +317,7 @@
download-lock (:download-lock supervisor)
^LocalState local-state (:local-state supervisor)
storm-cluster-state (:storm-cluster-state supervisor)
- assigned-executors (defaulted (.get local-state LS-LOCAL-ASSIGNMENTS) {})
+ assigned-executors (defaulted (ls-local-assignments local-state) {})
now (current-time-secs)
allocated (read-allocated-workers supervisor assigned-executors now)
keepers (filter-val
@@ -358,9 +355,9 @@
(doseq [id (vals new-worker-ids)]
(local-mkdirs (worker-pids-root conf id))
(local-mkdirs (worker-heartbeats-root conf id)))
- (.put local-state LS-APPROVED-WORKERS
+ (ls-approved-workers! local-state
(merge
- (select-keys (.get local-state LS-APPROVED-WORKERS)
+ (select-keys (ls-approved-workers local-state)
(keys keepers))
(zipmap (vals new-worker-ids) (keys new-worker-ids))
))
@@ -416,7 +413,7 @@
(defn shutdown-disallowed-workers [supervisor]
(let [conf (:conf supervisor)
^LocalState local-state (:local-state supervisor)
- assigned-executors (defaulted (.get local-state LS-LOCAL-ASSIGNMENTS) {})
+ assigned-executors (defaulted (ls-local-assignments local-state) {})
now (current-time-secs)
allocated (read-allocated-workers supervisor assigned-executors now)
disallowed (keys (filter-val
@@ -442,7 +439,7 @@
assignment-versions)
storm-code-map (read-storm-code-locations assignments-snapshot)
downloaded-storm-ids (set (read-downloaded-storm-ids conf))
- existing-assignment (.get local-state LS-LOCAL-ASSIGNMENTS)
+ existing-assignment (ls-local-assignments local-state)
all-assignment (read-assignments assignments-snapshot
(:assignment-id supervisor)
existing-assignment
@@ -472,8 +469,7 @@
(set (keys new-assignment)))]
(.killedWorker isupervisor (int p)))
(.assigned isupervisor (keys new-assignment))
- (.put local-state
- LS-LOCAL-ASSIGNMENTS
+ (ls-local-assignments! local-state
new-assignment)
(reset! (:assignment-versions supervisor) versions)
(reset! (:curr-assignment supervisor) new-assignment)
@@ -780,10 +776,10 @@
(prepare [this conf local-dir]
(reset! conf-atom conf)
(let [state (LocalState. local-dir)
- curr-id (if-let [id (.get state LS-ID)]
+ curr-id (if-let [id (ls-supervisor-id state)]
id
(generate-supervisor-id))]
- (.put state LS-ID curr-id)
+ (ls-supervisor-id! state curr-id)
(reset! id-atom curr-id))
)
(confirmAssigned [this port]
http://git-wip-us.apache.org/repos/asf/storm/blob/b1dc422b/storm-core/src/clj/backtype/storm/daemon/worker.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/worker.clj b/storm-core/src/clj/backtype/storm/daemon/worker.clj
index e0263d6..978ea16 100644
--- a/storm-core/src/clj/backtype/storm/daemon/worker.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/worker.clj
@@ -15,7 +15,7 @@
;; limitations under the License.
(ns backtype.storm.daemon.worker
(:use [backtype.storm.daemon common])
- (:use [backtype.storm config log util timer])
+ (:use [backtype.storm config log util timer local-state])
(:require [backtype.storm.daemon [executor :as executor]])
(:require [backtype.storm [disruptor :as disruptor] [cluster :as cluster]])
(:require [clojure.set :as set])
@@ -68,19 +68,9 @@
(defn do-heartbeat [worker]
(let [conf (:conf worker)
- hb (mk-local-worker-heartbeat
- (current-time-secs)
- (:storm-id worker)
- (:executors worker)
- (:port worker))
state (worker-state conf (:worker-id worker))]
- (log-debug "Doing heartbeat " (pr-str hb))
;; do the local-file-system heartbeat.
- (.put state
- LS-WORKER-HEARTBEAT
- hb
- false
- )
+ (ls-worker-heartbeat! state (current-time-secs) (:storm-id worker) (:executors worker) (:port worker))
(.cleanup state 60) ; this is just in case supervisor is down so that disk doesn't fill up.
; it shouldn't take supervisor 120 seconds between listing dir and reading it
http://git-wip-us.apache.org/repos/asf/storm/blob/b1dc422b/storm-core/src/clj/backtype/storm/local_state.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/local_state.clj b/storm-core/src/clj/backtype/storm/local_state.clj
new file mode 100644
index 0000000..41e3675
--- /dev/null
+++ b/storm-core/src/clj/backtype/storm/local_state.clj
@@ -0,0 +1,99 @@
+;; Licensed to the Apache Software Foundation (ASF) under one
+;; or more contributor license agreements. See the NOTICE file
+;; distributed with this work for additional information
+;; regarding copyright ownership. The ASF licenses this file
+;; to you under the Apache License, Version 2.0 (the
+;; "License"); you may not use this file except in compliance
+;; with the License. You may obtain a copy of the License at
+;;
+;; http://www.apache.org/licenses/LICENSE-2.0
+;;
+;; Unless required by applicable law or agreed to in writing, software
+;; distributed under the License is distributed on an "AS IS" BASIS,
+;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+;; See the License for the specific language governing permissions and
+;; limitations under the License.
+(ns backtype.storm.local-state
+ (:use [backtype.storm log util])
+ (:import [backtype.storm.generated StormTopology
+ InvalidTopologyException GlobalStreamId
+ LSSupervisorId LSApprovedWorkers
+ LSSupervisorAssignments LocalAssignment
+ ExecutorInfo LSWorkerHeartbeat])
+ (:import [backtype.storm.utils LocalState]))
+
+(def LS-WORKER-HEARTBEAT "worker-heartbeat")
+(def LS-ID "supervisor-id")
+(def LS-LOCAL-ASSIGNMENTS "local-assignments")
+(def LS-APPROVED-WORKERS "approved-workers")
+
+(defn ls-supervisor-id!
+ [^LocalState local-state ^String id]
+ (.put local-state LS-ID (LSSupervisorId. id)))
+
+(defn ls-supervisor-id
+ [^LocalState local-state]
+ (if-let [super-id (.get local-state LS-ID)]
+ (.get_supervisor_id super-id)))
+
+(defn ls-approved-workers!
+ [^LocalState local-state workers]
+ (.put local-state LS-APPROVED-WORKERS (LSApprovedWorkers. workers)))
+
+(defn ls-approved-workers
+ [^LocalState local-state]
+ (if-let [tmp (.get local-state LS-APPROVED-WORKERS)]
+ (into {} (.get_approved_workers tmp))))
+
+(defn ->ExecutorInfo
+ [[low high]] (ExecutorInfo. low high))
+
+(defn ->ExecutorInfo-list
+ [executors]
+ (map ->ExecutorInfo executors))
+
+(defn ->executor-list
+ [executors]
+ (into []
+ (for [exec-info executors]
+ [(.get_task_start exec-info) (.get_task_end exec-info)])))
+
+(defn ->LocalAssignment
+ [{storm-id :storm-id executors :executors}]
+ (LocalAssignment. storm-id (->ExecutorInfo-list executors)))
+
+(defn mk-local-assignment
+ [storm-id executors]
+ {:storm-id storm-id :executors executors})
+
+(defn ->local-assignment
+ [^LocalAssignment thrift-local-assignment]
+ (mk-local-assignment
+ (.get_topology_id thrift-local-assignment)
+ (->executor-list (.get_executors thrift-local-assignment))))
+
+(defn ls-local-assignments!
+ [^LocalState local-state assignments]
+ (let [local-assignment-map (map-val ->LocalAssignment assignments)]
+ (.put local-state LS-LOCAL-ASSIGNMENTS
+ (LSSupervisorAssignments. local-assignment-map))))
+
+(defn ls-local-assignments
+ [^LocalState local-state]
+ (if-let [thrift-local-assignments (.get local-state LS-LOCAL-ASSIGNMENTS)]
+ (map-val
+ ->local-assignment
+ (.get_assignments thrift-local-assignments))))
+
+(defn ls-worker-heartbeat!
+ [^LocalState local-state time-secs storm-id executors port]
+ (.put local-state LS-WORKER-HEARTBEAT (LSWorkerHeartbeat. time-secs storm-id (->ExecutorInfo-list executors) port) false))
+
+(defn ls-worker-heartbeat
+ [^LocalState local-state]
+ (if-let [worker-hb (.get local-state LS-WORKER-HEARTBEAT)]
+ {:time-secs (.get_time_secs worker-hb)
+ :storm-id (.get_topology_id worker-hb)
+ :executors (->executor-list (.get_executors worker-hb))
+ :port (.get_port worker-hb)}))
+
http://git-wip-us.apache.org/repos/asf/storm/blob/b1dc422b/storm-core/src/clj/backtype/storm/testing.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/testing.clj b/storm-core/src/clj/backtype/storm/testing.clj
index 02bf13d..eccb46a 100644
--- a/storm-core/src/clj/backtype/storm/testing.clj
+++ b/storm-core/src/clj/backtype/storm/testing.clj
@@ -42,7 +42,7 @@
(:require [backtype.storm [zookeeper :as zk]])
(:require [backtype.storm.messaging.loader :as msg-loader])
(:require [backtype.storm.daemon.acker :as acker])
- (:use [backtype.storm cluster util thrift config log]))
+ (:use [backtype.storm cluster util thrift config log local-state]))
(defn feeder-spout
[fields]
@@ -302,13 +302,13 @@
(defn find-worker-id
[supervisor-conf port]
(let [supervisor-state (supervisor-state supervisor-conf)
- worker->port (.get supervisor-state common/LS-APPROVED-WORKERS)]
+ worker->port (ls-approved-workers supervisor-state)]
(first ((reverse-map worker->port) port))))
(defn find-worker-port
[supervisor-conf worker-id]
(let [supervisor-state (supervisor-state supervisor-conf)
- worker->port (.get supervisor-state common/LS-APPROVED-WORKERS)]
+ worker->port (ls-approved-workers supervisor-state)]
(worker->port worker-id)))
(defn mk-capture-shutdown-fn
http://git-wip-us.apache.org/repos/asf/storm/blob/b1dc422b/storm-core/src/jvm/backtype/storm/generated/LSApprovedWorkers.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/LSApprovedWorkers.java b/storm-core/src/jvm/backtype/storm/generated/LSApprovedWorkers.java
new file mode 100644
index 0000000..1d97dca
--- /dev/null
+++ b/storm-core/src/jvm/backtype/storm/generated/LSApprovedWorkers.java
@@ -0,0 +1,458 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * 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.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;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+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;
+
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-10")
+public class LSApprovedWorkers implements org.apache.thrift.TBase<LSApprovedWorkers, LSApprovedWorkers._Fields>, java.io.Serializable, Cloneable, Comparable<LSApprovedWorkers> {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LSApprovedWorkers");
+
+ private static final org.apache.thrift.protocol.TField APPROVED_WORKERS_FIELD_DESC = new org.apache.thrift.protocol.TField("approved_workers", org.apache.thrift.protocol.TType.MAP, (short)1);
+
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new LSApprovedWorkersStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new LSApprovedWorkersTupleSchemeFactory());
+ }
+
+ private Map<String,Integer> approved_workers; // required
+
+ /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ APPROVED_WORKERS((short)1, "approved_workers");
+
+ private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+ static {
+ for (_Fields field : EnumSet.allOf(_Fields.class)) {
+ byName.put(field.getFieldName(), field);
+ }
+ }
+
+ /**
+ * Find the _Fields constant that matches fieldId, or null if its not found.
+ */
+ public static _Fields findByThriftId(int fieldId) {
+ switch(fieldId) {
+ case 1: // APPROVED_WORKERS
+ return APPROVED_WORKERS;
+ default:
+ return null;
+ }
+ }
+
+ /**
+ * Find the _Fields constant that matches fieldId, throwing an exception
+ * if it is not found.
+ */
+ public static _Fields findByThriftIdOrThrow(int fieldId) {
+ _Fields fields = findByThriftId(fieldId);
+ if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+ return fields;
+ }
+
+ /**
+ * Find the _Fields constant that matches name, or null if its not found.
+ */
+ public static _Fields findByName(String name) {
+ return byName.get(name);
+ }
+
+ private final short _thriftId;
+ private final String _fieldName;
+
+ _Fields(short thriftId, String fieldName) {
+ _thriftId = thriftId;
+ _fieldName = fieldName;
+ }
+
+ public short getThriftFieldId() {
+ return _thriftId;
+ }
+
+ public String getFieldName() {
+ return _fieldName;
+ }
+ }
+
+ // 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);
+ tmpMap.put(_Fields.APPROVED_WORKERS, new org.apache.thrift.meta_data.FieldMetaData("approved_workers", 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.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))));
+ metaDataMap = Collections.unmodifiableMap(tmpMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LSApprovedWorkers.class, metaDataMap);
+ }
+
+ public LSApprovedWorkers() {
+ }
+
+ public LSApprovedWorkers(
+ Map<String,Integer> approved_workers)
+ {
+ this();
+ this.approved_workers = approved_workers;
+ }
+
+ /**
+ * Performs a deep copy on <i>other</i>.
+ */
+ public LSApprovedWorkers(LSApprovedWorkers other) {
+ if (other.is_set_approved_workers()) {
+ Map<String,Integer> __this__approved_workers = new HashMap<String,Integer>(other.approved_workers);
+ this.approved_workers = __this__approved_workers;
+ }
+ }
+
+ public LSApprovedWorkers deepCopy() {
+ return new LSApprovedWorkers(this);
+ }
+
+ @Override
+ public void clear() {
+ this.approved_workers = null;
+ }
+
+ public int get_approved_workers_size() {
+ return (this.approved_workers == null) ? 0 : this.approved_workers.size();
+ }
+
+ public void put_to_approved_workers(String key, int val) {
+ if (this.approved_workers == null) {
+ this.approved_workers = new HashMap<String,Integer>();
+ }
+ this.approved_workers.put(key, val);
+ }
+
+ public Map<String,Integer> get_approved_workers() {
+ return this.approved_workers;
+ }
+
+ public void set_approved_workers(Map<String,Integer> approved_workers) {
+ this.approved_workers = approved_workers;
+ }
+
+ public void unset_approved_workers() {
+ this.approved_workers = null;
+ }
+
+ /** Returns true if field approved_workers is set (has been assigned a value) and false otherwise */
+ public boolean is_set_approved_workers() {
+ return this.approved_workers != null;
+ }
+
+ public void set_approved_workers_isSet(boolean value) {
+ if (!value) {
+ this.approved_workers = null;
+ }
+ }
+
+ public void setFieldValue(_Fields field, Object value) {
+ switch (field) {
+ case APPROVED_WORKERS:
+ if (value == null) {
+ unset_approved_workers();
+ } else {
+ set_approved_workers((Map<String,Integer>)value);
+ }
+ break;
+
+ }
+ }
+
+ public Object getFieldValue(_Fields field) {
+ switch (field) {
+ case APPROVED_WORKERS:
+ return get_approved_workers();
+
+ }
+ throw new IllegalStateException();
+ }
+
+ /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+ public boolean isSet(_Fields field) {
+ if (field == null) {
+ throw new IllegalArgumentException();
+ }
+
+ switch (field) {
+ case APPROVED_WORKERS:
+ return is_set_approved_workers();
+ }
+ throw new IllegalStateException();
+ }
+
+ @Override
+ public boolean equals(Object that) {
+ if (that == null)
+ return false;
+ if (that instanceof LSApprovedWorkers)
+ return this.equals((LSApprovedWorkers)that);
+ return false;
+ }
+
+ public boolean equals(LSApprovedWorkers that) {
+ if (that == null)
+ return false;
+
+ boolean this_present_approved_workers = true && this.is_set_approved_workers();
+ boolean that_present_approved_workers = true && that.is_set_approved_workers();
+ if (this_present_approved_workers || that_present_approved_workers) {
+ if (!(this_present_approved_workers && that_present_approved_workers))
+ return false;
+ if (!this.approved_workers.equals(that.approved_workers))
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ List<Object> list = new ArrayList<Object>();
+
+ boolean present_approved_workers = true && (is_set_approved_workers());
+ list.add(present_approved_workers);
+ if (present_approved_workers)
+ list.add(approved_workers);
+
+ return list.hashCode();
+ }
+
+ @Override
+ public int compareTo(LSApprovedWorkers other) {
+ if (!getClass().equals(other.getClass())) {
+ return getClass().getName().compareTo(other.getClass().getName());
+ }
+
+ int lastComparison = 0;
+
+ lastComparison = Boolean.valueOf(is_set_approved_workers()).compareTo(other.is_set_approved_workers());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (is_set_approved_workers()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.approved_workers, other.approved_workers);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ return 0;
+ }
+
+ public _Fields fieldForId(int fieldId) {
+ return _Fields.findByThriftId(fieldId);
+ }
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder("LSApprovedWorkers(");
+ boolean first = true;
+
+ sb.append("approved_workers:");
+ if (this.approved_workers == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.approved_workers);
+ }
+ first = false;
+ sb.append(")");
+ return sb.toString();
+ }
+
+ public void validate() throws org.apache.thrift.TException {
+ // check for required fields
+ if (!is_set_approved_workers()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'approved_workers' 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) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ 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) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ private static class LSApprovedWorkersStandardSchemeFactory implements SchemeFactory {
+ public LSApprovedWorkersStandardScheme getScheme() {
+ return new LSApprovedWorkersStandardScheme();
+ }
+ }
+
+ private static class LSApprovedWorkersStandardScheme extends StandardScheme<LSApprovedWorkers> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, LSApprovedWorkers 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: // APPROVED_WORKERS
+ if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+ {
+ org.apache.thrift.protocol.TMap _map454 = iprot.readMapBegin();
+ struct.approved_workers = new HashMap<String,Integer>(2*_map454.size);
+ String _key455;
+ int _val456;
+ for (int _i457 = 0; _i457 < _map454.size; ++_i457)
+ {
+ _key455 = iprot.readString();
+ _val456 = iprot.readI32();
+ struct.approved_workers.put(_key455, _val456);
+ }
+ iprot.readMapEnd();
+ }
+ struct.set_approved_workers_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, LSApprovedWorkers struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.approved_workers != null) {
+ oprot.writeFieldBegin(APPROVED_WORKERS_FIELD_DESC);
+ {
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, struct.approved_workers.size()));
+ for (Map.Entry<String, Integer> _iter458 : struct.approved_workers.entrySet())
+ {
+ oprot.writeString(_iter458.getKey());
+ oprot.writeI32(_iter458.getValue());
+ }
+ oprot.writeMapEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class LSApprovedWorkersTupleSchemeFactory implements SchemeFactory {
+ public LSApprovedWorkersTupleScheme getScheme() {
+ return new LSApprovedWorkersTupleScheme();
+ }
+ }
+
+ private static class LSApprovedWorkersTupleScheme extends TupleScheme<LSApprovedWorkers> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, LSApprovedWorkers struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ {
+ oprot.writeI32(struct.approved_workers.size());
+ for (Map.Entry<String, Integer> _iter459 : struct.approved_workers.entrySet())
+ {
+ oprot.writeString(_iter459.getKey());
+ oprot.writeI32(_iter459.getValue());
+ }
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, LSApprovedWorkers struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ {
+ org.apache.thrift.protocol.TMap _map460 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, iprot.readI32());
+ struct.approved_workers = new HashMap<String,Integer>(2*_map460.size);
+ String _key461;
+ int _val462;
+ for (int _i463 = 0; _i463 < _map460.size; ++_i463)
+ {
+ _key461 = iprot.readString();
+ _val462 = iprot.readI32();
+ struct.approved_workers.put(_key461, _val462);
+ }
+ }
+ struct.set_approved_workers_isSet(true);
+ }
+ }
+
+}
+
http://git-wip-us.apache.org/repos/asf/storm/blob/b1dc422b/storm-core/src/jvm/backtype/storm/generated/LSSupervisorAssignments.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/LSSupervisorAssignments.java b/storm-core/src/jvm/backtype/storm/generated/LSSupervisorAssignments.java
new file mode 100644
index 0000000..4667287
--- /dev/null
+++ b/storm-core/src/jvm/backtype/storm/generated/LSSupervisorAssignments.java
@@ -0,0 +1,471 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * 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.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;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+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;
+
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-10")
+public class LSSupervisorAssignments implements org.apache.thrift.TBase<LSSupervisorAssignments, LSSupervisorAssignments._Fields>, java.io.Serializable, Cloneable, Comparable<LSSupervisorAssignments> {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LSSupervisorAssignments");
+
+ private static final org.apache.thrift.protocol.TField ASSIGNMENTS_FIELD_DESC = new org.apache.thrift.protocol.TField("assignments", org.apache.thrift.protocol.TType.MAP, (short)1);
+
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new LSSupervisorAssignmentsStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new LSSupervisorAssignmentsTupleSchemeFactory());
+ }
+
+ private Map<Integer,LocalAssignment> assignments; // required
+
+ /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ ASSIGNMENTS((short)1, "assignments");
+
+ private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+ static {
+ for (_Fields field : EnumSet.allOf(_Fields.class)) {
+ byName.put(field.getFieldName(), field);
+ }
+ }
+
+ /**
+ * Find the _Fields constant that matches fieldId, or null if its not found.
+ */
+ public static _Fields findByThriftId(int fieldId) {
+ switch(fieldId) {
+ case 1: // ASSIGNMENTS
+ return ASSIGNMENTS;
+ default:
+ return null;
+ }
+ }
+
+ /**
+ * Find the _Fields constant that matches fieldId, throwing an exception
+ * if it is not found.
+ */
+ public static _Fields findByThriftIdOrThrow(int fieldId) {
+ _Fields fields = findByThriftId(fieldId);
+ if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+ return fields;
+ }
+
+ /**
+ * Find the _Fields constant that matches name, or null if its not found.
+ */
+ public static _Fields findByName(String name) {
+ return byName.get(name);
+ }
+
+ private final short _thriftId;
+ private final String _fieldName;
+
+ _Fields(short thriftId, String fieldName) {
+ _thriftId = thriftId;
+ _fieldName = fieldName;
+ }
+
+ public short getThriftFieldId() {
+ return _thriftId;
+ }
+
+ public String getFieldName() {
+ return _fieldName;
+ }
+ }
+
+ // 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);
+ tmpMap.put(_Fields.ASSIGNMENTS, new org.apache.thrift.meta_data.FieldMetaData("assignments", 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.I32),
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, LocalAssignment.class))));
+ metaDataMap = Collections.unmodifiableMap(tmpMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LSSupervisorAssignments.class, metaDataMap);
+ }
+
+ public LSSupervisorAssignments() {
+ }
+
+ public LSSupervisorAssignments(
+ Map<Integer,LocalAssignment> assignments)
+ {
+ this();
+ this.assignments = assignments;
+ }
+
+ /**
+ * Performs a deep copy on <i>other</i>.
+ */
+ public LSSupervisorAssignments(LSSupervisorAssignments other) {
+ if (other.is_set_assignments()) {
+ Map<Integer,LocalAssignment> __this__assignments = new HashMap<Integer,LocalAssignment>(other.assignments.size());
+ for (Map.Entry<Integer, LocalAssignment> other_element : other.assignments.entrySet()) {
+
+ Integer other_element_key = other_element.getKey();
+ LocalAssignment other_element_value = other_element.getValue();
+
+ Integer __this__assignments_copy_key = other_element_key;
+
+ LocalAssignment __this__assignments_copy_value = new LocalAssignment(other_element_value);
+
+ __this__assignments.put(__this__assignments_copy_key, __this__assignments_copy_value);
+ }
+ this.assignments = __this__assignments;
+ }
+ }
+
+ public LSSupervisorAssignments deepCopy() {
+ return new LSSupervisorAssignments(this);
+ }
+
+ @Override
+ public void clear() {
+ this.assignments = null;
+ }
+
+ public int get_assignments_size() {
+ return (this.assignments == null) ? 0 : this.assignments.size();
+ }
+
+ public void put_to_assignments(int key, LocalAssignment val) {
+ if (this.assignments == null) {
+ this.assignments = new HashMap<Integer,LocalAssignment>();
+ }
+ this.assignments.put(key, val);
+ }
+
+ public Map<Integer,LocalAssignment> get_assignments() {
+ return this.assignments;
+ }
+
+ public void set_assignments(Map<Integer,LocalAssignment> assignments) {
+ this.assignments = assignments;
+ }
+
+ public void unset_assignments() {
+ this.assignments = null;
+ }
+
+ /** Returns true if field assignments is set (has been assigned a value) and false otherwise */
+ public boolean is_set_assignments() {
+ return this.assignments != null;
+ }
+
+ public void set_assignments_isSet(boolean value) {
+ if (!value) {
+ this.assignments = null;
+ }
+ }
+
+ public void setFieldValue(_Fields field, Object value) {
+ switch (field) {
+ case ASSIGNMENTS:
+ if (value == null) {
+ unset_assignments();
+ } else {
+ set_assignments((Map<Integer,LocalAssignment>)value);
+ }
+ break;
+
+ }
+ }
+
+ public Object getFieldValue(_Fields field) {
+ switch (field) {
+ case ASSIGNMENTS:
+ return get_assignments();
+
+ }
+ throw new IllegalStateException();
+ }
+
+ /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+ public boolean isSet(_Fields field) {
+ if (field == null) {
+ throw new IllegalArgumentException();
+ }
+
+ switch (field) {
+ case ASSIGNMENTS:
+ return is_set_assignments();
+ }
+ throw new IllegalStateException();
+ }
+
+ @Override
+ public boolean equals(Object that) {
+ if (that == null)
+ return false;
+ if (that instanceof LSSupervisorAssignments)
+ return this.equals((LSSupervisorAssignments)that);
+ return false;
+ }
+
+ public boolean equals(LSSupervisorAssignments that) {
+ if (that == null)
+ return false;
+
+ boolean this_present_assignments = true && this.is_set_assignments();
+ boolean that_present_assignments = true && that.is_set_assignments();
+ if (this_present_assignments || that_present_assignments) {
+ if (!(this_present_assignments && that_present_assignments))
+ return false;
+ if (!this.assignments.equals(that.assignments))
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ List<Object> list = new ArrayList<Object>();
+
+ boolean present_assignments = true && (is_set_assignments());
+ list.add(present_assignments);
+ if (present_assignments)
+ list.add(assignments);
+
+ return list.hashCode();
+ }
+
+ @Override
+ public int compareTo(LSSupervisorAssignments other) {
+ if (!getClass().equals(other.getClass())) {
+ return getClass().getName().compareTo(other.getClass().getName());
+ }
+
+ int lastComparison = 0;
+
+ lastComparison = Boolean.valueOf(is_set_assignments()).compareTo(other.is_set_assignments());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (is_set_assignments()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.assignments, other.assignments);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ return 0;
+ }
+
+ public _Fields fieldForId(int fieldId) {
+ return _Fields.findByThriftId(fieldId);
+ }
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder("LSSupervisorAssignments(");
+ boolean first = true;
+
+ sb.append("assignments:");
+ if (this.assignments == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.assignments);
+ }
+ first = false;
+ sb.append(")");
+ return sb.toString();
+ }
+
+ public void validate() throws org.apache.thrift.TException {
+ // check for required fields
+ if (!is_set_assignments()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'assignments' 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) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ 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) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ private static class LSSupervisorAssignmentsStandardSchemeFactory implements SchemeFactory {
+ public LSSupervisorAssignmentsStandardScheme getScheme() {
+ return new LSSupervisorAssignmentsStandardScheme();
+ }
+ }
+
+ private static class LSSupervisorAssignmentsStandardScheme extends StandardScheme<LSSupervisorAssignments> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, LSSupervisorAssignments 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: // ASSIGNMENTS
+ if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+ {
+ org.apache.thrift.protocol.TMap _map464 = iprot.readMapBegin();
+ struct.assignments = new HashMap<Integer,LocalAssignment>(2*_map464.size);
+ int _key465;
+ LocalAssignment _val466;
+ for (int _i467 = 0; _i467 < _map464.size; ++_i467)
+ {
+ _key465 = iprot.readI32();
+ _val466 = new LocalAssignment();
+ _val466.read(iprot);
+ struct.assignments.put(_key465, _val466);
+ }
+ iprot.readMapEnd();
+ }
+ struct.set_assignments_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, LSSupervisorAssignments struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.assignments != null) {
+ oprot.writeFieldBegin(ASSIGNMENTS_FIELD_DESC);
+ {
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, struct.assignments.size()));
+ for (Map.Entry<Integer, LocalAssignment> _iter468 : struct.assignments.entrySet())
+ {
+ oprot.writeI32(_iter468.getKey());
+ _iter468.getValue().write(oprot);
+ }
+ oprot.writeMapEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class LSSupervisorAssignmentsTupleSchemeFactory implements SchemeFactory {
+ public LSSupervisorAssignmentsTupleScheme getScheme() {
+ return new LSSupervisorAssignmentsTupleScheme();
+ }
+ }
+
+ private static class LSSupervisorAssignmentsTupleScheme extends TupleScheme<LSSupervisorAssignments> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, LSSupervisorAssignments struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ {
+ oprot.writeI32(struct.assignments.size());
+ for (Map.Entry<Integer, LocalAssignment> _iter469 : struct.assignments.entrySet())
+ {
+ oprot.writeI32(_iter469.getKey());
+ _iter469.getValue().write(oprot);
+ }
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, LSSupervisorAssignments struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ {
+ org.apache.thrift.protocol.TMap _map470 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.assignments = new HashMap<Integer,LocalAssignment>(2*_map470.size);
+ int _key471;
+ LocalAssignment _val472;
+ for (int _i473 = 0; _i473 < _map470.size; ++_i473)
+ {
+ _key471 = iprot.readI32();
+ _val472 = new LocalAssignment();
+ _val472.read(iprot);
+ struct.assignments.put(_key471, _val472);
+ }
+ }
+ struct.set_assignments_isSet(true);
+ }
+ }
+
+}
+
http://git-wip-us.apache.org/repos/asf/storm/blob/b1dc422b/storm-core/src/jvm/backtype/storm/generated/LSSupervisorId.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/LSSupervisorId.java b/storm-core/src/jvm/backtype/storm/generated/LSSupervisorId.java
new file mode 100644
index 0000000..6ee4dad
--- /dev/null
+++ b/storm-core/src/jvm/backtype/storm/generated/LSSupervisorId.java
@@ -0,0 +1,406 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * 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.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;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+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;
+
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-10")
+public class LSSupervisorId implements org.apache.thrift.TBase<LSSupervisorId, LSSupervisorId._Fields>, java.io.Serializable, Cloneable, Comparable<LSSupervisorId> {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LSSupervisorId");
+
+ private static final org.apache.thrift.protocol.TField SUPERVISOR_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("supervisor_id", 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 LSSupervisorIdStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new LSSupervisorIdTupleSchemeFactory());
+ }
+
+ private String supervisor_id; // required
+
+ /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ SUPERVISOR_ID((short)1, "supervisor_id");
+
+ private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+ static {
+ for (_Fields field : EnumSet.allOf(_Fields.class)) {
+ byName.put(field.getFieldName(), field);
+ }
+ }
+
+ /**
+ * Find the _Fields constant that matches fieldId, or null if its not found.
+ */
+ public static _Fields findByThriftId(int fieldId) {
+ switch(fieldId) {
+ case 1: // SUPERVISOR_ID
+ return SUPERVISOR_ID;
+ default:
+ return null;
+ }
+ }
+
+ /**
+ * Find the _Fields constant that matches fieldId, throwing an exception
+ * if it is not found.
+ */
+ public static _Fields findByThriftIdOrThrow(int fieldId) {
+ _Fields fields = findByThriftId(fieldId);
+ if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+ return fields;
+ }
+
+ /**
+ * Find the _Fields constant that matches name, or null if its not found.
+ */
+ public static _Fields findByName(String name) {
+ return byName.get(name);
+ }
+
+ private final short _thriftId;
+ private final String _fieldName;
+
+ _Fields(short thriftId, String fieldName) {
+ _thriftId = thriftId;
+ _fieldName = fieldName;
+ }
+
+ public short getThriftFieldId() {
+ return _thriftId;
+ }
+
+ public String getFieldName() {
+ return _fieldName;
+ }
+ }
+
+ // 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);
+ tmpMap.put(_Fields.SUPERVISOR_ID, new org.apache.thrift.meta_data.FieldMetaData("supervisor_id", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ metaDataMap = Collections.unmodifiableMap(tmpMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LSSupervisorId.class, metaDataMap);
+ }
+
+ public LSSupervisorId() {
+ }
+
+ public LSSupervisorId(
+ String supervisor_id)
+ {
+ this();
+ this.supervisor_id = supervisor_id;
+ }
+
+ /**
+ * Performs a deep copy on <i>other</i>.
+ */
+ public LSSupervisorId(LSSupervisorId other) {
+ if (other.is_set_supervisor_id()) {
+ this.supervisor_id = other.supervisor_id;
+ }
+ }
+
+ public LSSupervisorId deepCopy() {
+ return new LSSupervisorId(this);
+ }
+
+ @Override
+ public void clear() {
+ this.supervisor_id = null;
+ }
+
+ public String get_supervisor_id() {
+ return this.supervisor_id;
+ }
+
+ public void set_supervisor_id(String supervisor_id) {
+ this.supervisor_id = supervisor_id;
+ }
+
+ public void unset_supervisor_id() {
+ this.supervisor_id = null;
+ }
+
+ /** Returns true if field supervisor_id is set (has been assigned a value) and false otherwise */
+ public boolean is_set_supervisor_id() {
+ return this.supervisor_id != null;
+ }
+
+ public void set_supervisor_id_isSet(boolean value) {
+ if (!value) {
+ this.supervisor_id = null;
+ }
+ }
+
+ public void setFieldValue(_Fields field, Object value) {
+ switch (field) {
+ case SUPERVISOR_ID:
+ if (value == null) {
+ unset_supervisor_id();
+ } else {
+ set_supervisor_id((String)value);
+ }
+ break;
+
+ }
+ }
+
+ public Object getFieldValue(_Fields field) {
+ switch (field) {
+ case SUPERVISOR_ID:
+ return get_supervisor_id();
+
+ }
+ throw new IllegalStateException();
+ }
+
+ /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+ public boolean isSet(_Fields field) {
+ if (field == null) {
+ throw new IllegalArgumentException();
+ }
+
+ switch (field) {
+ case SUPERVISOR_ID:
+ return is_set_supervisor_id();
+ }
+ throw new IllegalStateException();
+ }
+
+ @Override
+ public boolean equals(Object that) {
+ if (that == null)
+ return false;
+ if (that instanceof LSSupervisorId)
+ return this.equals((LSSupervisorId)that);
+ return false;
+ }
+
+ public boolean equals(LSSupervisorId that) {
+ if (that == null)
+ return false;
+
+ boolean this_present_supervisor_id = true && this.is_set_supervisor_id();
+ boolean that_present_supervisor_id = true && that.is_set_supervisor_id();
+ if (this_present_supervisor_id || that_present_supervisor_id) {
+ if (!(this_present_supervisor_id && that_present_supervisor_id))
+ return false;
+ if (!this.supervisor_id.equals(that.supervisor_id))
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ List<Object> list = new ArrayList<Object>();
+
+ boolean present_supervisor_id = true && (is_set_supervisor_id());
+ list.add(present_supervisor_id);
+ if (present_supervisor_id)
+ list.add(supervisor_id);
+
+ return list.hashCode();
+ }
+
+ @Override
+ public int compareTo(LSSupervisorId other) {
+ if (!getClass().equals(other.getClass())) {
+ return getClass().getName().compareTo(other.getClass().getName());
+ }
+
+ int lastComparison = 0;
+
+ lastComparison = Boolean.valueOf(is_set_supervisor_id()).compareTo(other.is_set_supervisor_id());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (is_set_supervisor_id()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.supervisor_id, other.supervisor_id);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ return 0;
+ }
+
+ public _Fields fieldForId(int fieldId) {
+ return _Fields.findByThriftId(fieldId);
+ }
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder("LSSupervisorId(");
+ boolean first = true;
+
+ sb.append("supervisor_id:");
+ if (this.supervisor_id == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.supervisor_id);
+ }
+ first = false;
+ sb.append(")");
+ return sb.toString();
+ }
+
+ public void validate() throws org.apache.thrift.TException {
+ // check for required fields
+ if (!is_set_supervisor_id()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'supervisor_id' 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) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ 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) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ private static class LSSupervisorIdStandardSchemeFactory implements SchemeFactory {
+ public LSSupervisorIdStandardScheme getScheme() {
+ return new LSSupervisorIdStandardScheme();
+ }
+ }
+
+ private static class LSSupervisorIdStandardScheme extends StandardScheme<LSSupervisorId> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, LSSupervisorId 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: // SUPERVISOR_ID
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.supervisor_id = iprot.readString();
+ struct.set_supervisor_id_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, LSSupervisorId struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.supervisor_id != null) {
+ oprot.writeFieldBegin(SUPERVISOR_ID_FIELD_DESC);
+ oprot.writeString(struct.supervisor_id);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class LSSupervisorIdTupleSchemeFactory implements SchemeFactory {
+ public LSSupervisorIdTupleScheme getScheme() {
+ return new LSSupervisorIdTupleScheme();
+ }
+ }
+
+ private static class LSSupervisorIdTupleScheme extends TupleScheme<LSSupervisorId> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, LSSupervisorId struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ oprot.writeString(struct.supervisor_id);
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, LSSupervisorId struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ struct.supervisor_id = iprot.readString();
+ struct.set_supervisor_id_isSet(true);
+ }
+ }
+
+}
+
http://git-wip-us.apache.org/repos/asf/storm/blob/b1dc422b/storm-core/src/jvm/backtype/storm/generated/LSWorkerHeartbeat.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/LSWorkerHeartbeat.java b/storm-core/src/jvm/backtype/storm/generated/LSWorkerHeartbeat.java
new file mode 100644
index 0000000..80f917b
--- /dev/null
+++ b/storm-core/src/jvm/backtype/storm/generated/LSWorkerHeartbeat.java
@@ -0,0 +1,755 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * 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.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;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+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;
+
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-4-10")
+public class LSWorkerHeartbeat implements org.apache.thrift.TBase<LSWorkerHeartbeat, LSWorkerHeartbeat._Fields>, java.io.Serializable, Cloneable, Comparable<LSWorkerHeartbeat> {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LSWorkerHeartbeat");
+
+ private static final org.apache.thrift.protocol.TField TIME_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("time_secs", org.apache.thrift.protocol.TType.I32, (short)1);
+ private static final org.apache.thrift.protocol.TField TOPOLOGY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("topology_id", org.apache.thrift.protocol.TType.STRING, (short)2);
+ private static final org.apache.thrift.protocol.TField EXECUTORS_FIELD_DESC = new org.apache.thrift.protocol.TField("executors", org.apache.thrift.protocol.TType.LIST, (short)3);
+ private static final org.apache.thrift.protocol.TField PORT_FIELD_DESC = new org.apache.thrift.protocol.TField("port", org.apache.thrift.protocol.TType.I32, (short)4);
+
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new LSWorkerHeartbeatStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new LSWorkerHeartbeatTupleSchemeFactory());
+ }
+
+ private int time_secs; // required
+ private String topology_id; // required
+ private List<ExecutorInfo> executors; // required
+ private int port; // required
+
+ /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ TIME_SECS((short)1, "time_secs"),
+ TOPOLOGY_ID((short)2, "topology_id"),
+ EXECUTORS((short)3, "executors"),
+ PORT((short)4, "port");
+
+ private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+ static {
+ for (_Fields field : EnumSet.allOf(_Fields.class)) {
+ byName.put(field.getFieldName(), field);
+ }
+ }
+
+ /**
+ * Find the _Fields constant that matches fieldId, or null if its not found.
+ */
+ public static _Fields findByThriftId(int fieldId) {
+ switch(fieldId) {
+ case 1: // TIME_SECS
+ return TIME_SECS;
+ case 2: // TOPOLOGY_ID
+ return TOPOLOGY_ID;
+ case 3: // EXECUTORS
+ return EXECUTORS;
+ case 4: // PORT
+ return PORT;
+ default:
+ return null;
+ }
+ }
+
+ /**
+ * Find the _Fields constant that matches fieldId, throwing an exception
+ * if it is not found.
+ */
+ public static _Fields findByThriftIdOrThrow(int fieldId) {
+ _Fields fields = findByThriftId(fieldId);
+ if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+ return fields;
+ }
+
+ /**
+ * Find the _Fields constant that matches name, or null if its not found.
+ */
+ public static _Fields findByName(String name) {
+ return byName.get(name);
+ }
+
+ private final short _thriftId;
+ private final String _fieldName;
+
+ _Fields(short thriftId, String fieldName) {
+ _thriftId = thriftId;
+ _fieldName = fieldName;
+ }
+
+ public short getThriftFieldId() {
+ return _thriftId;
+ }
+
+ public String getFieldName() {
+ return _fieldName;
+ }
+ }
+
+ // isset id assignments
+ private static final int __TIME_SECS_ISSET_ID = 0;
+ private static final int __PORT_ISSET_ID = 1;
+ private byte __isset_bitfield = 0;
+ 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.TIME_SECS, new org.apache.thrift.meta_data.FieldMetaData("time_secs", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+ tmpMap.put(_Fields.TOPOLOGY_ID, new org.apache.thrift.meta_data.FieldMetaData("topology_id", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.EXECUTORS, new org.apache.thrift.meta_data.FieldMetaData("executors", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ExecutorInfo.class))));
+ tmpMap.put(_Fields.PORT, new org.apache.thrift.meta_data.FieldMetaData("port", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+ metaDataMap = Collections.unmodifiableMap(tmpMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LSWorkerHeartbeat.class, metaDataMap);
+ }
+
+ public LSWorkerHeartbeat() {
+ }
+
+ public LSWorkerHeartbeat(
+ int time_secs,
+ String topology_id,
+ List<ExecutorInfo> executors,
+ int port)
+ {
+ this();
+ this.time_secs = time_secs;
+ set_time_secs_isSet(true);
+ this.topology_id = topology_id;
+ this.executors = executors;
+ this.port = port;
+ set_port_isSet(true);
+ }
+
+ /**
+ * Performs a deep copy on <i>other</i>.
+ */
+ public LSWorkerHeartbeat(LSWorkerHeartbeat other) {
+ __isset_bitfield = other.__isset_bitfield;
+ this.time_secs = other.time_secs;
+ if (other.is_set_topology_id()) {
+ this.topology_id = other.topology_id;
+ }
+ if (other.is_set_executors()) {
+ List<ExecutorInfo> __this__executors = new ArrayList<ExecutorInfo>(other.executors.size());
+ for (ExecutorInfo other_element : other.executors) {
+ __this__executors.add(new ExecutorInfo(other_element));
+ }
+ this.executors = __this__executors;
+ }
+ this.port = other.port;
+ }
+
+ public LSWorkerHeartbeat deepCopy() {
+ return new LSWorkerHeartbeat(this);
+ }
+
+ @Override
+ public void clear() {
+ set_time_secs_isSet(false);
+ this.time_secs = 0;
+ this.topology_id = null;
+ this.executors = null;
+ set_port_isSet(false);
+ this.port = 0;
+ }
+
+ public int get_time_secs() {
+ return this.time_secs;
+ }
+
+ public void set_time_secs(int time_secs) {
+ this.time_secs = time_secs;
+ set_time_secs_isSet(true);
+ }
+
+ public void unset_time_secs() {
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __TIME_SECS_ISSET_ID);
+ }
+
+ /** Returns true if field time_secs is set (has been assigned a value) and false otherwise */
+ public boolean is_set_time_secs() {
+ return EncodingUtils.testBit(__isset_bitfield, __TIME_SECS_ISSET_ID);
+ }
+
+ public void set_time_secs_isSet(boolean value) {
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __TIME_SECS_ISSET_ID, value);
+ }
+
+ public String get_topology_id() {
+ return this.topology_id;
+ }
+
+ public void set_topology_id(String topology_id) {
+ this.topology_id = topology_id;
+ }
+
+ public void unset_topology_id() {
+ this.topology_id = null;
+ }
+
+ /** Returns true if field topology_id is set (has been assigned a value) and false otherwise */
+ public boolean is_set_topology_id() {
+ return this.topology_id != null;
+ }
+
+ public void set_topology_id_isSet(boolean value) {
+ if (!value) {
+ this.topology_id = null;
+ }
+ }
+
+ public int get_executors_size() {
+ return (this.executors == null) ? 0 : this.executors.size();
+ }
+
+ public java.util.Iterator<ExecutorInfo> get_executors_iterator() {
+ return (this.executors == null) ? null : this.executors.iterator();
+ }
+
+ public void add_to_executors(ExecutorInfo elem) {
+ if (this.executors == null) {
+ this.executors = new ArrayList<ExecutorInfo>();
+ }
+ this.executors.add(elem);
+ }
+
+ public List<ExecutorInfo> get_executors() {
+ return this.executors;
+ }
+
+ public void set_executors(List<ExecutorInfo> executors) {
+ this.executors = executors;
+ }
+
+ public void unset_executors() {
+ this.executors = null;
+ }
+
+ /** Returns true if field executors is set (has been assigned a value) and false otherwise */
+ public boolean is_set_executors() {
+ return this.executors != null;
+ }
+
+ public void set_executors_isSet(boolean value) {
+ if (!value) {
+ this.executors = null;
+ }
+ }
+
+ public int get_port() {
+ return this.port;
+ }
+
+ public void set_port(int port) {
+ this.port = port;
+ set_port_isSet(true);
+ }
+
+ public void unset_port() {
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __PORT_ISSET_ID);
+ }
+
+ /** Returns true if field port is set (has been assigned a value) and false otherwise */
+ public boolean is_set_port() {
+ return EncodingUtils.testBit(__isset_bitfield, __PORT_ISSET_ID);
+ }
+
+ public void set_port_isSet(boolean value) {
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PORT_ISSET_ID, value);
+ }
+
+ public void setFieldValue(_Fields field, Object value) {
+ switch (field) {
+ case TIME_SECS:
+ if (value == null) {
+ unset_time_secs();
+ } else {
+ set_time_secs((Integer)value);
+ }
+ break;
+
+ case TOPOLOGY_ID:
+ if (value == null) {
+ unset_topology_id();
+ } else {
+ set_topology_id((String)value);
+ }
+ break;
+
+ case EXECUTORS:
+ if (value == null) {
+ unset_executors();
+ } else {
+ set_executors((List<ExecutorInfo>)value);
+ }
+ break;
+
+ case PORT:
+ if (value == null) {
+ unset_port();
+ } else {
+ set_port((Integer)value);
+ }
+ break;
+
+ }
+ }
+
+ public Object getFieldValue(_Fields field) {
+ switch (field) {
+ case TIME_SECS:
+ return Integer.valueOf(get_time_secs());
+
+ case TOPOLOGY_ID:
+ return get_topology_id();
+
+ case EXECUTORS:
+ return get_executors();
+
+ case PORT:
+ return Integer.valueOf(get_port());
+
+ }
+ throw new IllegalStateException();
+ }
+
+ /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+ public boolean isSet(_Fields field) {
+ if (field == null) {
+ throw new IllegalArgumentException();
+ }
+
+ switch (field) {
+ case TIME_SECS:
+ return is_set_time_secs();
+ case TOPOLOGY_ID:
+ return is_set_topology_id();
+ case EXECUTORS:
+ return is_set_executors();
+ case PORT:
+ return is_set_port();
+ }
+ throw new IllegalStateException();
+ }
+
+ @Override
+ public boolean equals(Object that) {
+ if (that == null)
+ return false;
+ if (that instanceof LSWorkerHeartbeat)
+ return this.equals((LSWorkerHeartbeat)that);
+ return false;
+ }
+
+ public boolean equals(LSWorkerHeartbeat that) {
+ if (that == null)
+ return false;
+
+ boolean this_present_time_secs = true;
+ boolean that_present_time_secs = true;
+ if (this_present_time_secs || that_present_time_secs) {
+ if (!(this_present_time_secs && that_present_time_secs))
+ return false;
+ if (this.time_secs != that.time_secs)
+ return false;
+ }
+
+ boolean this_present_topology_id = true && this.is_set_topology_id();
+ boolean that_present_topology_id = true && that.is_set_topology_id();
+ if (this_present_topology_id || that_present_topology_id) {
+ if (!(this_present_topology_id && that_present_topology_id))
+ return false;
+ if (!this.topology_id.equals(that.topology_id))
+ return false;
+ }
+
+ boolean this_present_executors = true && this.is_set_executors();
+ boolean that_present_executors = true && that.is_set_executors();
+ if (this_present_executors || that_present_executors) {
+ if (!(this_present_executors && that_present_executors))
+ return false;
+ if (!this.executors.equals(that.executors))
+ return false;
+ }
+
+ boolean this_present_port = true;
+ boolean that_present_port = true;
+ if (this_present_port || that_present_port) {
+ if (!(this_present_port && that_present_port))
+ return false;
+ if (this.port != that.port)
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ List<Object> list = new ArrayList<Object>();
+
+ boolean present_time_secs = true;
+ list.add(present_time_secs);
+ if (present_time_secs)
+ list.add(time_secs);
+
+ boolean present_topology_id = true && (is_set_topology_id());
+ list.add(present_topology_id);
+ if (present_topology_id)
+ list.add(topology_id);
+
+ boolean present_executors = true && (is_set_executors());
+ list.add(present_executors);
+ if (present_executors)
+ list.add(executors);
+
+ boolean present_port = true;
+ list.add(present_port);
+ if (present_port)
+ list.add(port);
+
+ return list.hashCode();
+ }
+
+ @Override
+ public int compareTo(LSWorkerHeartbeat other) {
+ if (!getClass().equals(other.getClass())) {
+ return getClass().getName().compareTo(other.getClass().getName());
+ }
+
+ int lastComparison = 0;
+
+ lastComparison = Boolean.valueOf(is_set_time_secs()).compareTo(other.is_set_time_secs());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (is_set_time_secs()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.time_secs, other.time_secs);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(is_set_topology_id()).compareTo(other.is_set_topology_id());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (is_set_topology_id()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.topology_id, other.topology_id);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(is_set_executors()).compareTo(other.is_set_executors());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (is_set_executors()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.executors, other.executors);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(is_set_port()).compareTo(other.is_set_port());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (is_set_port()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.port, other.port);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ return 0;
+ }
+
+ public _Fields fieldForId(int fieldId) {
+ return _Fields.findByThriftId(fieldId);
+ }
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder("LSWorkerHeartbeat(");
+ boolean first = true;
+
+ sb.append("time_secs:");
+ sb.append(this.time_secs);
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("topology_id:");
+ if (this.topology_id == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.topology_id);
+ }
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("executors:");
+ if (this.executors == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.executors);
+ }
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("port:");
+ sb.append(this.port);
+ first = false;
+ sb.append(")");
+ return sb.toString();
+ }
+
+ public void validate() throws org.apache.thrift.TException {
+ // check for required fields
+ if (!is_set_time_secs()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'time_secs' is unset! Struct:" + toString());
+ }
+
+ if (!is_set_topology_id()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'topology_id' is unset! Struct:" + toString());
+ }
+
+ if (!is_set_executors()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'executors' is unset! Struct:" + toString());
+ }
+
+ if (!is_set_port()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'port' 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) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+ try {
+ // 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) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ private static class LSWorkerHeartbeatStandardSchemeFactory implements SchemeFactory {
+ public LSWorkerHeartbeatStandardScheme getScheme() {
+ return new LSWorkerHeartbeatStandardScheme();
+ }
+ }
+
+ private static class LSWorkerHeartbeatStandardScheme extends StandardScheme<LSWorkerHeartbeat> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, LSWorkerHeartbeat 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: // TIME_SECS
+ if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ struct.time_secs = iprot.readI32();
+ struct.set_time_secs_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // TOPOLOGY_ID
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.topology_id = iprot.readString();
+ struct.set_topology_id_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 3: // EXECUTORS
+ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+ {
+ org.apache.thrift.protocol.TList _list474 = iprot.readListBegin();
+ struct.executors = new ArrayList<ExecutorInfo>(_list474.size);
+ ExecutorInfo _elem475;
+ for (int _i476 = 0; _i476 < _list474.size; ++_i476)
+ {
+ _elem475 = new ExecutorInfo();
+ _elem475.read(iprot);
+ struct.executors.add(_elem475);
+ }
+ iprot.readListEnd();
+ }
+ struct.set_executors_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 4: // PORT
+ if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ struct.port = iprot.readI32();
+ struct.set_port_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, LSWorkerHeartbeat struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ oprot.writeFieldBegin(TIME_SECS_FIELD_DESC);
+ oprot.writeI32(struct.time_secs);
+ oprot.writeFieldEnd();
+ if (struct.topology_id != null) {
+ oprot.writeFieldBegin(TOPOLOGY_ID_FIELD_DESC);
+ oprot.writeString(struct.topology_id);
+ oprot.writeFieldEnd();
+ }
+ if (struct.executors != null) {
+ oprot.writeFieldBegin(EXECUTORS_FIELD_DESC);
+ {
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.executors.size()));
+ for (ExecutorInfo _iter477 : struct.executors)
+ {
+ _iter477.write(oprot);
+ }
+ oprot.writeListEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldBegin(PORT_FIELD_DESC);
+ oprot.writeI32(struct.port);
+ oprot.writeFieldEnd();
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class LSWorkerHeartbeatTupleSchemeFactory implements SchemeFactory {
+ public LSWorkerHeartbeatTupleScheme getScheme() {
+ return new LSWorkerHeartbeatTupleScheme();
+ }
+ }
+
+ private static class LSWorkerHeartbeatTupleScheme extends TupleScheme<LSWorkerHeartbeat> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, LSWorkerHeartbeat struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ oprot.writeI32(struct.time_secs);
+ oprot.writeString(struct.topology_id);
+ {
+ oprot.writeI32(struct.executors.size());
+ for (ExecutorInfo _iter478 : struct.executors)
+ {
+ _iter478.write(oprot);
+ }
+ }
+ oprot.writeI32(struct.port);
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, LSWorkerHeartbeat struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ struct.time_secs = iprot.readI32();
+ struct.set_time_secs_isSet(true);
+ struct.topology_id = iprot.readString();
+ struct.set_topology_id_isSet(true);
+ {
+ org.apache.thrift.protocol.TList _list479 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.executors = new ArrayList<ExecutorInfo>(_list479.size);
+ ExecutorInfo _elem480;
+ for (int _i481 = 0; _i481 < _list479.size; ++_i481)
+ {
+ _elem480 = new ExecutorInfo();
+ _elem480.read(iprot);
+ struct.executors.add(_elem480);
+ }
+ }
+ struct.set_executors_isSet(true);
+ struct.port = iprot.readI32();
+ struct.set_port_isSet(true);
+ }
+ }
+
+}
+
[07/13] storm git commit: made changes for adding the supervisor-info
version
Posted by pt...@apache.org.
made changes for adding the supervisor-info version
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/670d93e9
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/670d93e9
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/670d93e9
Branch: refs/heads/0.10.x-branch
Commit: 670d93e98ef66ecff342c44f31a1df7f2709c13b
Parents: ebb9634
Author: sanket <sc...@yahoo-inc.com>
Authored: Fri Apr 17 15:34:05 2015 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri May 15 13:42:10 2015 -0400
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/common.clj | 2 +-
storm-core/src/clj/backtype/storm/daemon/nimbus.clj | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/670d93e9/storm-core/src/clj/backtype/storm/daemon/common.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/common.clj b/storm-core/src/clj/backtype/storm/daemon/common.clj
index a5da665..e3a10ef 100644
--- a/storm-core/src/clj/backtype/storm/daemon/common.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/common.clj
@@ -53,7 +53,7 @@
;; component->executors is a map from spout/bolt id to number of executors for that component
(defrecord StormBase [storm-name launch-time-secs status num-workers component->executors owner topology-action-options prev-status])
-(defrecord SupervisorInfo [time-secs hostname assignment-id used-ports meta scheduler-meta uptime-secs version-info])
+(defrecord SupervisorInfo [time-secs hostname assignment-id used-ports meta scheduler-meta uptime-secs version])
(defprotocol DaemonCommon
(waiting? [this]))
http://git-wip-us.apache.org/repos/asf/storm/blob/670d93e9/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
index 4bad1ee..5d0a0f2 100644
--- a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
@@ -1253,7 +1253,6 @@
(count (:used-ports info))
id
(:version info))
- (log-message "supervisor-version " :version info)
))
nimbus-uptime ((:uptime nimbus))
bases (topology-bases storm-cluster-state)