You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by kn...@apache.org on 2015/02/17 18:11:10 UTC
[01/18] storm git commit: Upgrade to thrift-0.9.2
Repository: storm
Updated Branches:
refs/heads/master e790828ba -> fc6d6dd86
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/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 a2ee892..6159ad7 100644
--- a/storm-core/src/py/storm/Nimbus.py
+++ b/storm-core/src/py/storm/Nimbus.py
@@ -15,12 +15,14 @@
# limitations under the License.
#
-# Autogenerated by Thrift Compiler (0.7.0)
+# Autogenerated by Thrift Compiler (0.9.2)
#
# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
#
+# options string: py:utf8strings
+#
-from thrift.Thrift import *
+from thrift.Thrift import TType, TMessageType, TException, TApplicationException
from ttypes import *
from thrift.Thrift import TProcessor
from thrift.transport import TTransport
@@ -98,7 +100,7 @@ class Iface:
"""
pass
- def beginFileUpload(self, ):
+ def beginFileUpload(self):
pass
def uploadChunk(self, location, chunk):
@@ -130,10 +132,10 @@ class Iface:
"""
pass
- def getNimbusConf(self, ):
+ def getNimbusConf(self):
pass
- def getClusterInfo(self, ):
+ def getClusterInfo(self):
pass
def getTopologyInfo(self, id):
@@ -194,16 +196,17 @@ class Client(Iface):
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
- def recv_submitTopology(self, ):
- (fname, mtype, rseqid) = self._iprot.readMessageBegin()
+ def recv_submitTopology(self):
+ iprot = self._iprot
+ (fname, mtype, rseqid) = iprot.readMessageBegin()
if mtype == TMessageType.EXCEPTION:
x = TApplicationException()
- x.read(self._iprot)
- self._iprot.readMessageEnd()
+ x.read(iprot)
+ iprot.readMessageEnd()
raise x
result = submitTopology_result()
- result.read(self._iprot)
- self._iprot.readMessageEnd()
+ result.read(iprot)
+ iprot.readMessageEnd()
if result.e is not None:
raise result.e
if result.ite is not None:
@@ -236,16 +239,17 @@ class Client(Iface):
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
- def recv_submitTopologyWithOpts(self, ):
- (fname, mtype, rseqid) = self._iprot.readMessageBegin()
+ def recv_submitTopologyWithOpts(self):
+ iprot = self._iprot
+ (fname, mtype, rseqid) = iprot.readMessageBegin()
if mtype == TMessageType.EXCEPTION:
x = TApplicationException()
- x.read(self._iprot)
- self._iprot.readMessageEnd()
+ x.read(iprot)
+ iprot.readMessageEnd()
raise x
result = submitTopologyWithOpts_result()
- result.read(self._iprot)
- self._iprot.readMessageEnd()
+ result.read(iprot)
+ iprot.readMessageEnd()
if result.e is not None:
raise result.e
if result.ite is not None:
@@ -270,16 +274,17 @@ class Client(Iface):
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
- def recv_killTopology(self, ):
- (fname, mtype, rseqid) = self._iprot.readMessageBegin()
+ def recv_killTopology(self):
+ iprot = self._iprot
+ (fname, mtype, rseqid) = iprot.readMessageBegin()
if mtype == TMessageType.EXCEPTION:
x = TApplicationException()
- x.read(self._iprot)
- self._iprot.readMessageEnd()
+ x.read(iprot)
+ iprot.readMessageEnd()
raise x
result = killTopology_result()
- result.read(self._iprot)
- self._iprot.readMessageEnd()
+ result.read(iprot)
+ iprot.readMessageEnd()
if result.e is not None:
raise result.e
if result.aze is not None:
@@ -304,16 +309,17 @@ class Client(Iface):
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
- def recv_killTopologyWithOpts(self, ):
- (fname, mtype, rseqid) = self._iprot.readMessageBegin()
+ def recv_killTopologyWithOpts(self):
+ iprot = self._iprot
+ (fname, mtype, rseqid) = iprot.readMessageBegin()
if mtype == TMessageType.EXCEPTION:
x = TApplicationException()
- x.read(self._iprot)
- self._iprot.readMessageEnd()
+ x.read(iprot)
+ iprot.readMessageEnd()
raise x
result = killTopologyWithOpts_result()
- result.read(self._iprot)
- self._iprot.readMessageEnd()
+ result.read(iprot)
+ iprot.readMessageEnd()
if result.e is not None:
raise result.e
if result.aze is not None:
@@ -336,16 +342,17 @@ class Client(Iface):
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
- def recv_activate(self, ):
- (fname, mtype, rseqid) = self._iprot.readMessageBegin()
+ def recv_activate(self):
+ iprot = self._iprot
+ (fname, mtype, rseqid) = iprot.readMessageBegin()
if mtype == TMessageType.EXCEPTION:
x = TApplicationException()
- x.read(self._iprot)
- self._iprot.readMessageEnd()
+ x.read(iprot)
+ iprot.readMessageEnd()
raise x
result = activate_result()
- result.read(self._iprot)
- self._iprot.readMessageEnd()
+ result.read(iprot)
+ iprot.readMessageEnd()
if result.e is not None:
raise result.e
if result.aze is not None:
@@ -368,16 +375,17 @@ class Client(Iface):
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
- def recv_deactivate(self, ):
- (fname, mtype, rseqid) = self._iprot.readMessageBegin()
+ def recv_deactivate(self):
+ iprot = self._iprot
+ (fname, mtype, rseqid) = iprot.readMessageBegin()
if mtype == TMessageType.EXCEPTION:
x = TApplicationException()
- x.read(self._iprot)
- self._iprot.readMessageEnd()
+ x.read(iprot)
+ iprot.readMessageEnd()
raise x
result = deactivate_result()
- result.read(self._iprot)
- self._iprot.readMessageEnd()
+ result.read(iprot)
+ iprot.readMessageEnd()
if result.e is not None:
raise result.e
if result.aze is not None:
@@ -402,16 +410,17 @@ class Client(Iface):
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
- def recv_rebalance(self, ):
- (fname, mtype, rseqid) = self._iprot.readMessageBegin()
+ def recv_rebalance(self):
+ iprot = self._iprot
+ (fname, mtype, rseqid) = iprot.readMessageBegin()
if mtype == TMessageType.EXCEPTION:
x = TApplicationException()
- x.read(self._iprot)
- self._iprot.readMessageEnd()
+ x.read(iprot)
+ iprot.readMessageEnd()
raise x
result = rebalance_result()
- result.read(self._iprot)
- self._iprot.readMessageEnd()
+ result.read(iprot)
+ iprot.readMessageEnd()
if result.e is not None:
raise result.e
if result.ite is not None:
@@ -438,16 +447,17 @@ class Client(Iface):
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
- def recv_uploadNewCredentials(self, ):
- (fname, mtype, rseqid) = self._iprot.readMessageBegin()
+ def recv_uploadNewCredentials(self):
+ iprot = self._iprot
+ (fname, mtype, rseqid) = iprot.readMessageBegin()
if mtype == TMessageType.EXCEPTION:
x = TApplicationException()
- x.read(self._iprot)
- self._iprot.readMessageEnd()
+ x.read(iprot)
+ iprot.readMessageEnd()
raise x
result = uploadNewCredentials_result()
- result.read(self._iprot)
- self._iprot.readMessageEnd()
+ result.read(iprot)
+ iprot.readMessageEnd()
if result.e is not None:
raise result.e
if result.ite is not None:
@@ -456,27 +466,28 @@ class Client(Iface):
raise result.aze
return
- def beginFileUpload(self, ):
+ def beginFileUpload(self):
self.send_beginFileUpload()
return self.recv_beginFileUpload()
- def send_beginFileUpload(self, ):
+ def send_beginFileUpload(self):
self._oprot.writeMessageBegin('beginFileUpload', TMessageType.CALL, self._seqid)
args = beginFileUpload_args()
args.write(self._oprot)
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
- def recv_beginFileUpload(self, ):
- (fname, mtype, rseqid) = self._iprot.readMessageBegin()
+ def recv_beginFileUpload(self):
+ iprot = self._iprot
+ (fname, mtype, rseqid) = iprot.readMessageBegin()
if mtype == TMessageType.EXCEPTION:
x = TApplicationException()
- x.read(self._iprot)
- self._iprot.readMessageEnd()
+ x.read(iprot)
+ iprot.readMessageEnd()
raise x
result = beginFileUpload_result()
- result.read(self._iprot)
- self._iprot.readMessageEnd()
+ result.read(iprot)
+ iprot.readMessageEnd()
if result.success is not None:
return result.success
if result.aze is not None:
@@ -501,16 +512,17 @@ class Client(Iface):
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
- def recv_uploadChunk(self, ):
- (fname, mtype, rseqid) = self._iprot.readMessageBegin()
+ def recv_uploadChunk(self):
+ iprot = self._iprot
+ (fname, mtype, rseqid) = iprot.readMessageBegin()
if mtype == TMessageType.EXCEPTION:
x = TApplicationException()
- x.read(self._iprot)
- self._iprot.readMessageEnd()
+ x.read(iprot)
+ iprot.readMessageEnd()
raise x
result = uploadChunk_result()
- result.read(self._iprot)
- self._iprot.readMessageEnd()
+ result.read(iprot)
+ iprot.readMessageEnd()
if result.aze is not None:
raise result.aze
return
@@ -531,16 +543,17 @@ class Client(Iface):
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
- def recv_finishFileUpload(self, ):
- (fname, mtype, rseqid) = self._iprot.readMessageBegin()
+ def recv_finishFileUpload(self):
+ iprot = self._iprot
+ (fname, mtype, rseqid) = iprot.readMessageBegin()
if mtype == TMessageType.EXCEPTION:
x = TApplicationException()
- x.read(self._iprot)
- self._iprot.readMessageEnd()
+ x.read(iprot)
+ iprot.readMessageEnd()
raise x
result = finishFileUpload_result()
- result.read(self._iprot)
- self._iprot.readMessageEnd()
+ result.read(iprot)
+ iprot.readMessageEnd()
if result.aze is not None:
raise result.aze
return
@@ -561,16 +574,17 @@ class Client(Iface):
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
- def recv_beginFileDownload(self, ):
- (fname, mtype, rseqid) = self._iprot.readMessageBegin()
+ def recv_beginFileDownload(self):
+ iprot = self._iprot
+ (fname, mtype, rseqid) = iprot.readMessageBegin()
if mtype == TMessageType.EXCEPTION:
x = TApplicationException()
- x.read(self._iprot)
- self._iprot.readMessageEnd()
+ x.read(iprot)
+ iprot.readMessageEnd()
raise x
result = beginFileDownload_result()
- result.read(self._iprot)
- self._iprot.readMessageEnd()
+ result.read(iprot)
+ iprot.readMessageEnd()
if result.success is not None:
return result.success
if result.aze is not None:
@@ -593,70 +607,73 @@ class Client(Iface):
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
- def recv_downloadChunk(self, ):
- (fname, mtype, rseqid) = self._iprot.readMessageBegin()
+ def recv_downloadChunk(self):
+ iprot = self._iprot
+ (fname, mtype, rseqid) = iprot.readMessageBegin()
if mtype == TMessageType.EXCEPTION:
x = TApplicationException()
- x.read(self._iprot)
- self._iprot.readMessageEnd()
+ x.read(iprot)
+ iprot.readMessageEnd()
raise x
result = downloadChunk_result()
- result.read(self._iprot)
- self._iprot.readMessageEnd()
+ result.read(iprot)
+ iprot.readMessageEnd()
if result.success is not None:
return result.success
if result.aze is not None:
raise result.aze
raise TApplicationException(TApplicationException.MISSING_RESULT, "downloadChunk failed: unknown result");
- def getNimbusConf(self, ):
+ def getNimbusConf(self):
self.send_getNimbusConf()
return self.recv_getNimbusConf()
- def send_getNimbusConf(self, ):
+ def send_getNimbusConf(self):
self._oprot.writeMessageBegin('getNimbusConf', TMessageType.CALL, self._seqid)
args = getNimbusConf_args()
args.write(self._oprot)
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
- def recv_getNimbusConf(self, ):
- (fname, mtype, rseqid) = self._iprot.readMessageBegin()
+ def recv_getNimbusConf(self):
+ iprot = self._iprot
+ (fname, mtype, rseqid) = iprot.readMessageBegin()
if mtype == TMessageType.EXCEPTION:
x = TApplicationException()
- x.read(self._iprot)
- self._iprot.readMessageEnd()
+ x.read(iprot)
+ iprot.readMessageEnd()
raise x
result = getNimbusConf_result()
- result.read(self._iprot)
- self._iprot.readMessageEnd()
+ result.read(iprot)
+ iprot.readMessageEnd()
if result.success is not None:
return result.success
if result.aze is not None:
raise result.aze
raise TApplicationException(TApplicationException.MISSING_RESULT, "getNimbusConf failed: unknown result");
- def getClusterInfo(self, ):
+ def getClusterInfo(self):
self.send_getClusterInfo()
return self.recv_getClusterInfo()
- def send_getClusterInfo(self, ):
+ def send_getClusterInfo(self):
self._oprot.writeMessageBegin('getClusterInfo', TMessageType.CALL, self._seqid)
args = getClusterInfo_args()
args.write(self._oprot)
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
- def recv_getClusterInfo(self, ):
- (fname, mtype, rseqid) = self._iprot.readMessageBegin()
+ def recv_getClusterInfo(self):
+ iprot = self._iprot
+ (fname, mtype, rseqid) = iprot.readMessageBegin()
if mtype == TMessageType.EXCEPTION:
x = TApplicationException()
- x.read(self._iprot)
- self._iprot.readMessageEnd()
+ x.read(iprot)
+ iprot.readMessageEnd()
raise x
result = getClusterInfo_result()
- result.read(self._iprot)
- self._iprot.readMessageEnd()
+ result.read(iprot)
+ iprot.readMessageEnd()
if result.success is not None:
return result.success
if result.aze is not None:
@@ -679,16 +696,17 @@ class Client(Iface):
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
- def recv_getTopologyInfo(self, ):
- (fname, mtype, rseqid) = self._iprot.readMessageBegin()
+ def recv_getTopologyInfo(self):
+ iprot = self._iprot
+ (fname, mtype, rseqid) = iprot.readMessageBegin()
if mtype == TMessageType.EXCEPTION:
x = TApplicationException()
- x.read(self._iprot)
- self._iprot.readMessageEnd()
+ x.read(iprot)
+ iprot.readMessageEnd()
raise x
result = getTopologyInfo_result()
- result.read(self._iprot)
- self._iprot.readMessageEnd()
+ result.read(iprot)
+ iprot.readMessageEnd()
if result.success is not None:
return result.success
if result.e is not None:
@@ -713,16 +731,17 @@ class Client(Iface):
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
- def recv_getTopologyConf(self, ):
- (fname, mtype, rseqid) = self._iprot.readMessageBegin()
+ def recv_getTopologyConf(self):
+ iprot = self._iprot
+ (fname, mtype, rseqid) = iprot.readMessageBegin()
if mtype == TMessageType.EXCEPTION:
x = TApplicationException()
- x.read(self._iprot)
- self._iprot.readMessageEnd()
+ x.read(iprot)
+ iprot.readMessageEnd()
raise x
result = getTopologyConf_result()
- result.read(self._iprot)
- self._iprot.readMessageEnd()
+ result.read(iprot)
+ iprot.readMessageEnd()
if result.success is not None:
return result.success
if result.e is not None:
@@ -747,16 +766,17 @@ class Client(Iface):
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
- def recv_getTopology(self, ):
- (fname, mtype, rseqid) = self._iprot.readMessageBegin()
+ def recv_getTopology(self):
+ iprot = self._iprot
+ (fname, mtype, rseqid) = iprot.readMessageBegin()
if mtype == TMessageType.EXCEPTION:
x = TApplicationException()
- x.read(self._iprot)
- self._iprot.readMessageEnd()
+ x.read(iprot)
+ iprot.readMessageEnd()
raise x
result = getTopology_result()
- result.read(self._iprot)
- self._iprot.readMessageEnd()
+ result.read(iprot)
+ iprot.readMessageEnd()
if result.success is not None:
return result.success
if result.e is not None:
@@ -781,16 +801,17 @@ class Client(Iface):
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
- def recv_getUserTopology(self, ):
- (fname, mtype, rseqid) = self._iprot.readMessageBegin()
+ def recv_getUserTopology(self):
+ iprot = self._iprot
+ (fname, mtype, rseqid) = iprot.readMessageBegin()
if mtype == TMessageType.EXCEPTION:
x = TApplicationException()
- x.read(self._iprot)
- self._iprot.readMessageEnd()
+ x.read(iprot)
+ iprot.readMessageEnd()
raise x
result = getUserTopology_result()
- result.read(self._iprot)
- self._iprot.readMessageEnd()
+ result.read(iprot)
+ iprot.readMessageEnd()
if result.success is not None:
return result.success
if result.e is not None:
@@ -1157,9 +1178,6 @@ class submitTopology_args:
(4, TType.STRUCT, 'topology', (StormTopology, StormTopology.thrift_spec), None, ), # 4
)
- def __hash__(self):
- return 0 + hash(self.name) + hash(self.uploadedJarLocation) + hash(self.jsonConf) + hash(self.topology)
-
def __init__(self, name=None, uploadedJarLocation=None, jsonConf=None, topology=None,):
self.name = name
self.uploadedJarLocation = uploadedJarLocation
@@ -1229,6 +1247,14 @@ class submitTopology_args:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.name)
+ value = (value * 31) ^ hash(self.uploadedJarLocation)
+ value = (value * 31) ^ hash(self.jsonConf)
+ value = (value * 31) ^ hash(self.topology)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -1255,9 +1281,6 @@ class submitTopology_result:
(3, TType.STRUCT, 'aze', (AuthorizationException, AuthorizationException.thrift_spec), None, ), # 3
)
- def __hash__(self):
- return 0 + hash(self.e) + hash(self.ite) + hash(self.aze)
-
def __init__(self, e=None, ite=None, aze=None,):
self.e = e
self.ite = ite
@@ -1319,6 +1342,13 @@ class submitTopology_result:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.e)
+ value = (value * 31) ^ hash(self.ite)
+ value = (value * 31) ^ hash(self.aze)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -1349,9 +1379,6 @@ class submitTopologyWithOpts_args:
(5, TType.STRUCT, 'options', (SubmitOptions, SubmitOptions.thrift_spec), None, ), # 5
)
- def __hash__(self):
- return 0 + hash(self.name) + hash(self.uploadedJarLocation) + hash(self.jsonConf) + hash(self.topology) + hash(self.options)
-
def __init__(self, name=None, uploadedJarLocation=None, jsonConf=None, topology=None, options=None,):
self.name = name
self.uploadedJarLocation = uploadedJarLocation
@@ -1432,6 +1459,15 @@ class submitTopologyWithOpts_args:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.name)
+ value = (value * 31) ^ hash(self.uploadedJarLocation)
+ value = (value * 31) ^ hash(self.jsonConf)
+ value = (value * 31) ^ hash(self.topology)
+ value = (value * 31) ^ hash(self.options)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -1458,9 +1494,6 @@ class submitTopologyWithOpts_result:
(3, TType.STRUCT, 'aze', (AuthorizationException, AuthorizationException.thrift_spec), None, ), # 3
)
- def __hash__(self):
- return 0 + hash(self.e) + hash(self.ite) + hash(self.aze)
-
def __init__(self, e=None, ite=None, aze=None,):
self.e = e
self.ite = ite
@@ -1522,6 +1555,13 @@ class submitTopologyWithOpts_result:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.e)
+ value = (value * 31) ^ hash(self.ite)
+ value = (value * 31) ^ hash(self.aze)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -1544,9 +1584,6 @@ class killTopology_args:
(1, TType.STRING, 'name', None, None, ), # 1
)
- def __hash__(self):
- return 0 + hash(self.name)
-
def __init__(self, name=None,):
self.name = name
@@ -1585,6 +1622,11 @@ class killTopology_args:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.name)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -1609,9 +1651,6 @@ class killTopology_result:
(2, TType.STRUCT, 'aze', (AuthorizationException, AuthorizationException.thrift_spec), None, ), # 2
)
- def __hash__(self):
- return 0 + hash(self.e) + hash(self.aze)
-
def __init__(self, e=None, aze=None,):
self.e = e
self.aze = aze
@@ -1662,6 +1701,12 @@ class killTopology_result:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.e)
+ value = (value * 31) ^ hash(self.aze)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -1686,9 +1731,6 @@ class killTopologyWithOpts_args:
(2, TType.STRUCT, 'options', (KillOptions, KillOptions.thrift_spec), None, ), # 2
)
- def __hash__(self):
- return 0 + hash(self.name) + hash(self.options)
-
def __init__(self, name=None, options=None,):
self.name = name
self.options = options
@@ -1738,6 +1780,12 @@ class killTopologyWithOpts_args:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.name)
+ value = (value * 31) ^ hash(self.options)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -1762,9 +1810,6 @@ class killTopologyWithOpts_result:
(2, TType.STRUCT, 'aze', (AuthorizationException, AuthorizationException.thrift_spec), None, ), # 2
)
- def __hash__(self):
- return 0 + hash(self.e) + hash(self.aze)
-
def __init__(self, e=None, aze=None,):
self.e = e
self.aze = aze
@@ -1815,6 +1860,12 @@ class killTopologyWithOpts_result:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.e)
+ value = (value * 31) ^ hash(self.aze)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -1837,9 +1888,6 @@ class activate_args:
(1, TType.STRING, 'name', None, None, ), # 1
)
- def __hash__(self):
- return 0 + hash(self.name)
-
def __init__(self, name=None,):
self.name = name
@@ -1878,6 +1926,11 @@ class activate_args:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.name)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -1902,9 +1955,6 @@ class activate_result:
(2, TType.STRUCT, 'aze', (AuthorizationException, AuthorizationException.thrift_spec), None, ), # 2
)
- def __hash__(self):
- return 0 + hash(self.e) + hash(self.aze)
-
def __init__(self, e=None, aze=None,):
self.e = e
self.aze = aze
@@ -1955,6 +2005,12 @@ class activate_result:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.e)
+ value = (value * 31) ^ hash(self.aze)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -1977,9 +2033,6 @@ class deactivate_args:
(1, TType.STRING, 'name', None, None, ), # 1
)
- def __hash__(self):
- return 0 + hash(self.name)
-
def __init__(self, name=None,):
self.name = name
@@ -2018,6 +2071,11 @@ class deactivate_args:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.name)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -2042,9 +2100,6 @@ class deactivate_result:
(2, TType.STRUCT, 'aze', (AuthorizationException, AuthorizationException.thrift_spec), None, ), # 2
)
- def __hash__(self):
- return 0 + hash(self.e) + hash(self.aze)
-
def __init__(self, e=None, aze=None,):
self.e = e
self.aze = aze
@@ -2095,6 +2150,12 @@ class deactivate_result:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.e)
+ value = (value * 31) ^ hash(self.aze)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -2119,9 +2180,6 @@ class rebalance_args:
(2, TType.STRUCT, 'options', (RebalanceOptions, RebalanceOptions.thrift_spec), None, ), # 2
)
- def __hash__(self):
- return 0 + hash(self.name) + hash(self.options)
-
def __init__(self, name=None, options=None,):
self.name = name
self.options = options
@@ -2171,6 +2229,12 @@ class rebalance_args:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.name)
+ value = (value * 31) ^ hash(self.options)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -2197,9 +2261,6 @@ class rebalance_result:
(3, TType.STRUCT, 'aze', (AuthorizationException, AuthorizationException.thrift_spec), None, ), # 3
)
- def __hash__(self):
- return 0 + hash(self.e) + hash(self.ite) + hash(self.aze)
-
def __init__(self, e=None, ite=None, aze=None,):
self.e = e
self.ite = ite
@@ -2261,6 +2322,13 @@ class rebalance_result:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.e)
+ value = (value * 31) ^ hash(self.ite)
+ value = (value * 31) ^ hash(self.aze)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -2285,9 +2353,6 @@ class uploadNewCredentials_args:
(2, TType.STRUCT, 'creds', (Credentials, Credentials.thrift_spec), None, ), # 2
)
- def __hash__(self):
- return 0 + hash(self.name) + hash(self.creds)
-
def __init__(self, name=None, creds=None,):
self.name = name
self.creds = creds
@@ -2337,6 +2402,12 @@ class uploadNewCredentials_args:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.name)
+ value = (value * 31) ^ hash(self.creds)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -2363,9 +2434,6 @@ class uploadNewCredentials_result:
(3, TType.STRUCT, 'aze', (AuthorizationException, AuthorizationException.thrift_spec), None, ), # 3
)
- def __hash__(self):
- return 0 + hash(self.e) + hash(self.ite) + hash(self.aze)
-
def __init__(self, e=None, ite=None, aze=None,):
self.e = e
self.ite = ite
@@ -2427,6 +2495,13 @@ class uploadNewCredentials_result:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.e)
+ value = (value * 31) ^ hash(self.ite)
+ value = (value * 31) ^ hash(self.aze)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -2443,9 +2518,6 @@ class beginFileUpload_args:
thrift_spec = (
)
- def __hash__(self):
- return 0
-
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))
@@ -2472,6 +2544,10 @@ class beginFileUpload_args:
return
+ def __hash__(self):
+ value = 17
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -2495,9 +2571,6 @@ class beginFileUpload_result:
(1, TType.STRUCT, 'aze', (AuthorizationException, AuthorizationException.thrift_spec), None, ), # 1
)
- def __hash__(self):
- return 0 + hash(self.success) + hash(self.aze)
-
def __init__(self, success=None, aze=None,):
self.success = success
self.aze = aze
@@ -2547,6 +2620,12 @@ class beginFileUpload_result:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.success)
+ value = (value * 31) ^ hash(self.aze)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -2571,9 +2650,6 @@ class uploadChunk_args:
(2, TType.STRING, 'chunk', None, None, ), # 2
)
- def __hash__(self):
- return 0 + hash(self.location) + hash(self.chunk)
-
def __init__(self, location=None, chunk=None,):
self.location = location
self.chunk = chunk
@@ -2622,6 +2698,12 @@ class uploadChunk_args:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.location)
+ value = (value * 31) ^ hash(self.chunk)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -2644,9 +2726,6 @@ class uploadChunk_result:
(1, TType.STRUCT, 'aze', (AuthorizationException, AuthorizationException.thrift_spec), None, ), # 1
)
- def __hash__(self):
- return 0 + hash(self.aze)
-
def __init__(self, aze=None,):
self.aze = aze
@@ -2686,6 +2765,11 @@ class uploadChunk_result:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.aze)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -2708,9 +2792,6 @@ class finishFileUpload_args:
(1, TType.STRING, 'location', None, None, ), # 1
)
- def __hash__(self):
- return 0 + hash(self.location)
-
def __init__(self, location=None,):
self.location = location
@@ -2749,6 +2830,11 @@ class finishFileUpload_args:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.location)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -2771,9 +2857,6 @@ class finishFileUpload_result:
(1, TType.STRUCT, 'aze', (AuthorizationException, AuthorizationException.thrift_spec), None, ), # 1
)
- def __hash__(self):
- return 0 + hash(self.aze)
-
def __init__(self, aze=None,):
self.aze = aze
@@ -2813,6 +2896,11 @@ class finishFileUpload_result:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.aze)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -2835,9 +2923,6 @@ class beginFileDownload_args:
(1, TType.STRING, 'file', None, None, ), # 1
)
- def __hash__(self):
- return 0 + hash(self.file)
-
def __init__(self, file=None,):
self.file = file
@@ -2876,6 +2961,11 @@ class beginFileDownload_args:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.file)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -2899,9 +2989,6 @@ class beginFileDownload_result:
(1, TType.STRUCT, 'aze', (AuthorizationException, AuthorizationException.thrift_spec), None, ), # 1
)
- def __hash__(self):
- return 0 + hash(self.success) + hash(self.aze)
-
def __init__(self, success=None, aze=None,):
self.success = success
self.aze = aze
@@ -2951,6 +3038,12 @@ class beginFileDownload_result:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.success)
+ value = (value * 31) ^ hash(self.aze)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -2973,9 +3066,6 @@ class downloadChunk_args:
(1, TType.STRING, 'id', None, None, ), # 1
)
- def __hash__(self):
- return 0 + hash(self.id)
-
def __init__(self, id=None,):
self.id = id
@@ -3014,6 +3104,11 @@ class downloadChunk_args:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.id)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -3037,9 +3132,6 @@ class downloadChunk_result:
(1, TType.STRUCT, 'aze', (AuthorizationException, AuthorizationException.thrift_spec), None, ), # 1
)
- def __hash__(self):
- return 0 + hash(self.success) + hash(self.aze)
-
def __init__(self, success=None, aze=None,):
self.success = success
self.aze = aze
@@ -3089,6 +3181,12 @@ class downloadChunk_result:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.success)
+ value = (value * 31) ^ hash(self.aze)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -3105,9 +3203,6 @@ class getNimbusConf_args:
thrift_spec = (
)
- def __hash__(self):
- return 0
-
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))
@@ -3134,6 +3229,10 @@ class getNimbusConf_args:
return
+ def __hash__(self):
+ value = 17
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -3157,9 +3256,6 @@ class getNimbusConf_result:
(1, TType.STRUCT, 'aze', (AuthorizationException, AuthorizationException.thrift_spec), None, ), # 1
)
- def __hash__(self):
- return 0 + hash(self.success) + hash(self.aze)
-
def __init__(self, success=None, aze=None,):
self.success = success
self.aze = aze
@@ -3209,6 +3305,12 @@ class getNimbusConf_result:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.success)
+ value = (value * 31) ^ hash(self.aze)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -3225,9 +3327,6 @@ class getClusterInfo_args:
thrift_spec = (
)
- def __hash__(self):
- return 0
-
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))
@@ -3254,6 +3353,10 @@ class getClusterInfo_args:
return
+ def __hash__(self):
+ value = 17
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -3277,9 +3380,6 @@ class getClusterInfo_result:
(1, TType.STRUCT, 'aze', (AuthorizationException, AuthorizationException.thrift_spec), None, ), # 1
)
- def __hash__(self):
- return 0 + hash(self.success) + hash(self.aze)
-
def __init__(self, success=None, aze=None,):
self.success = success
self.aze = aze
@@ -3330,6 +3430,12 @@ class getClusterInfo_result:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.success)
+ value = (value * 31) ^ hash(self.aze)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -3352,9 +3458,6 @@ class getTopologyInfo_args:
(1, TType.STRING, 'id', None, None, ), # 1
)
- def __hash__(self):
- return 0 + hash(self.id)
-
def __init__(self, id=None,):
self.id = id
@@ -3393,6 +3496,11 @@ class getTopologyInfo_args:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.id)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -3418,9 +3526,6 @@ class getTopologyInfo_result:
(2, TType.STRUCT, 'aze', (AuthorizationException, AuthorizationException.thrift_spec), None, ), # 2
)
- def __hash__(self):
- return 0 + hash(self.success) + hash(self.e) + hash(self.aze)
-
def __init__(self, success=None, e=None, aze=None,):
self.success = success
self.e = e
@@ -3482,6 +3587,13 @@ class getTopologyInfo_result:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.success)
+ value = (value * 31) ^ hash(self.e)
+ value = (value * 31) ^ hash(self.aze)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -3504,9 +3616,6 @@ class getTopologyConf_args:
(1, TType.STRING, 'id', None, None, ), # 1
)
- def __hash__(self):
- return 0 + hash(self.id)
-
def __init__(self, id=None,):
self.id = id
@@ -3545,6 +3654,11 @@ class getTopologyConf_args:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.id)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -3570,9 +3684,6 @@ class getTopologyConf_result:
(2, TType.STRUCT, 'aze', (AuthorizationException, AuthorizationException.thrift_spec), None, ), # 2
)
- def __hash__(self):
- return 0 + hash(self.success) + hash(self.e) + hash(self.aze)
-
def __init__(self, success=None, e=None, aze=None,):
self.success = success
self.e = e
@@ -3633,6 +3744,13 @@ class getTopologyConf_result:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.success)
+ value = (value * 31) ^ hash(self.e)
+ value = (value * 31) ^ hash(self.aze)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -3655,9 +3773,6 @@ class getTopology_args:
(1, TType.STRING, 'id', None, None, ), # 1
)
- def __hash__(self):
- return 0 + hash(self.id)
-
def __init__(self, id=None,):
self.id = id
@@ -3696,6 +3811,11 @@ class getTopology_args:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.id)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -3721,9 +3841,6 @@ class getTopology_result:
(2, TType.STRUCT, 'aze', (AuthorizationException, AuthorizationException.thrift_spec), None, ), # 2
)
- def __hash__(self):
- return 0 + hash(self.success) + hash(self.e) + hash(self.aze)
-
def __init__(self, success=None, e=None, aze=None,):
self.success = success
self.e = e
@@ -3785,6 +3902,13 @@ class getTopology_result:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.success)
+ value = (value * 31) ^ hash(self.e)
+ value = (value * 31) ^ hash(self.aze)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -3807,9 +3931,6 @@ class getUserTopology_args:
(1, TType.STRING, 'id', None, None, ), # 1
)
- def __hash__(self):
- return 0 + hash(self.id)
-
def __init__(self, id=None,):
self.id = id
@@ -3848,6 +3969,11 @@ class getUserTopology_args:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.id)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -3873,9 +3999,6 @@ class getUserTopology_result:
(2, TType.STRUCT, 'aze', (AuthorizationException, AuthorizationException.thrift_spec), None, ), # 2
)
- def __hash__(self):
- return 0 + hash(self.success) + hash(self.e) + hash(self.aze)
-
def __init__(self, success=None, e=None, aze=None,):
self.success = success
self.e = e
@@ -3937,6 +4060,13 @@ class getUserTopology_result:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.success)
+ value = (value * 31) ^ hash(self.e)
+ value = (value * 31) ^ hash(self.aze)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/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 432bbb5..8f77f7c 100644
--- a/storm-core/src/py/storm/constants.py
+++ b/storm-core/src/py/storm/constants.py
@@ -15,11 +15,13 @@
# limitations under the License.
#
-# Autogenerated by Thrift Compiler (0.7.0)
+# Autogenerated by Thrift Compiler (0.9.2)
#
# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
#
+# options string: py:utf8strings
+#
-from thrift.Thrift import *
+from thrift.Thrift import TType, TMessageType, TException, TApplicationException
from ttypes import *
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/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 1bbaf37..58af972 100644
--- a/storm-core/src/py/storm/ttypes.py
+++ b/storm-core/src/py/storm/ttypes.py
@@ -15,12 +15,14 @@
# limitations under the License.
#
-# Autogenerated by Thrift Compiler (0.7.0)
+# Autogenerated by Thrift Compiler (0.9.2)
#
# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
#
+# options string: py:utf8strings
+#
-from thrift.Thrift import *
+from thrift.Thrift import TType, TMessageType, TException, TApplicationException
from thrift.transport import TTransport
from thrift.protocol import TBinaryProtocol, TProtocol
@@ -66,9 +68,6 @@ class JavaObjectArg:
(6, TType.DOUBLE, 'double_arg', None, None, ), # 6
)
- def __hash__(self):
- return 0 + hash(self.int_arg) + hash(self.long_arg) + hash(self.string_arg) + hash(self.bool_arg) + hash(self.binary_arg) + hash(self.double_arg)
-
def __init__(self, int_arg=None, long_arg=None, string_arg=None, bool_arg=None, binary_arg=None, double_arg=None,):
self.int_arg = int_arg
self.long_arg = long_arg
@@ -157,6 +156,16 @@ class JavaObjectArg:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.int_arg)
+ value = (value * 31) ^ hash(self.long_arg)
+ value = (value * 31) ^ hash(self.string_arg)
+ value = (value * 31) ^ hash(self.bool_arg)
+ value = (value * 31) ^ hash(self.binary_arg)
+ value = (value * 31) ^ hash(self.double_arg)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -181,9 +190,6 @@ class JavaObject:
(2, TType.LIST, 'args_list', (TType.STRUCT,(JavaObjectArg, JavaObjectArg.thrift_spec)), None, ), # 2
)
- def __hash__(self):
- return 0 + hash(self.full_class_name) + hash(self.args_list)
-
def __init__(self, full_class_name=None, args_list=None,):
self.full_class_name = full_class_name
self.args_list = args_list
@@ -245,6 +251,12 @@ class JavaObject:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.full_class_name)
+ value = (value * 31) ^ hash(self.args_list)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -261,9 +273,6 @@ class NullStruct:
thrift_spec = (
)
- def __hash__(self):
- return 0
-
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))
@@ -290,6 +299,10 @@ class NullStruct:
return
+ def __hash__(self):
+ value = 17
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -314,9 +327,6 @@ class GlobalStreamId:
(2, TType.STRING, 'streamId', None, None, ), # 2
)
- def __hash__(self):
- return 0 + hash(self.componentId) + hash(self.streamId)
-
def __init__(self, componentId=None, streamId=None,):
self.componentId = componentId
self.streamId = streamId
@@ -369,6 +379,12 @@ class GlobalStreamId:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.componentId)
+ value = (value * 31) ^ hash(self.streamId)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -405,9 +421,6 @@ class Grouping:
(8, TType.STRUCT, 'local_or_shuffle', (NullStruct, NullStruct.thrift_spec), None, ), # 8
)
- def __hash__(self):
- return 0 + hash(self.fields) + hash(self.shuffle) + hash(self.all) + hash(self.none) + hash(self.direct) + hash(self.custom_object) + hash(self.custom_serialized) + hash(self.local_or_shuffle)
-
def __init__(self, fields=None, shuffle=None, all=None, none=None, direct=None, custom_object=None, custom_serialized=None, local_or_shuffle=None,):
self.fields = fields
self.shuffle = shuffle
@@ -530,6 +543,18 @@ class Grouping:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.fields)
+ value = (value * 31) ^ hash(self.shuffle)
+ value = (value * 31) ^ hash(self.all)
+ value = (value * 31) ^ hash(self.none)
+ value = (value * 31) ^ hash(self.direct)
+ value = (value * 31) ^ hash(self.custom_object)
+ value = (value * 31) ^ hash(self.custom_serialized)
+ value = (value * 31) ^ hash(self.local_or_shuffle)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -554,9 +579,6 @@ class StreamInfo:
(2, TType.BOOL, 'direct', None, None, ), # 2
)
- def __hash__(self):
- return 0 + hash(self.output_fields) + hash(self.direct)
-
def __init__(self, output_fields=None, direct=None,):
self.output_fields = output_fields
self.direct = direct
@@ -617,6 +639,12 @@ class StreamInfo:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.output_fields)
+ value = (value * 31) ^ hash(self.direct)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -641,9 +669,6 @@ class ShellComponent:
(2, TType.STRING, 'script', None, None, ), # 2
)
- def __hash__(self):
- return 0 + hash(self.execution_command) + hash(self.script)
-
def __init__(self, execution_command=None, script=None,):
self.execution_command = execution_command
self.script = script
@@ -692,6 +717,12 @@ class ShellComponent:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.execution_command)
+ value = (value * 31) ^ hash(self.script)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -718,9 +749,6 @@ class ComponentObject:
(3, TType.STRUCT, 'java_object', (JavaObject, JavaObject.thrift_spec), None, ), # 3
)
- def __hash__(self):
- return 0 + hash(self.serialized_java) + hash(self.shell) + hash(self.java_object)
-
def __init__(self, serialized_java=None, shell=None, java_object=None,):
self.serialized_java = serialized_java
self.shell = shell
@@ -781,6 +809,13 @@ class ComponentObject:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.serialized_java)
+ value = (value * 31) ^ hash(self.shell)
+ value = (value * 31) ^ hash(self.java_object)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -809,9 +844,6 @@ class ComponentCommon:
(4, TType.STRING, 'json_conf', None, None, ), # 4
)
- def __hash__(self):
- return 0 + hash(self.inputs) + hash(self.streams) + hash(self.parallelism_hint) + hash(self.json_conf)
-
def __init__(self, inputs=None, streams=None, parallelism_hint=None, json_conf=None,):
self.inputs = inputs
self.streams = streams
@@ -830,7 +862,7 @@ class ComponentCommon:
if fid == 1:
if ftype == TType.MAP:
self.inputs = {}
- (_ktype22, _vtype23, _size21 ) = iprot.readMapBegin()
+ (_ktype22, _vtype23, _size21 ) = iprot.readMapBegin()
for _i25 in xrange(_size21):
_key26 = GlobalStreamId()
_key26.read(iprot)
@@ -843,7 +875,7 @@ class ComponentCommon:
elif fid == 2:
if ftype == TType.MAP:
self.streams = {}
- (_ktype29, _vtype30, _size28 ) = iprot.readMapBegin()
+ (_ktype29, _vtype30, _size28 ) = iprot.readMapBegin()
for _i32 in xrange(_size28):
_key33 = iprot.readString().decode('utf-8')
_val34 = StreamInfo()
@@ -907,6 +939,14 @@ class ComponentCommon:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.inputs)
+ value = (value * 31) ^ hash(self.streams)
+ value = (value * 31) ^ hash(self.parallelism_hint)
+ value = (value * 31) ^ hash(self.json_conf)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -931,9 +971,6 @@ class SpoutSpec:
(2, TType.STRUCT, 'common', (ComponentCommon, ComponentCommon.thrift_spec), None, ), # 2
)
- def __hash__(self):
- return 0 + hash(self.spout_object) + hash(self.common)
-
def __init__(self, spout_object=None, common=None,):
self.spout_object = spout_object
self.common = common
@@ -988,6 +1025,12 @@ class SpoutSpec:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.spout_object)
+ value = (value * 31) ^ hash(self.common)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -1012,9 +1055,6 @@ class Bolt:
(2, TType.STRUCT, 'common', (ComponentCommon, ComponentCommon.thrift_spec), None, ), # 2
)
- def __hash__(self):
- return 0 + hash(self.bolt_object) + hash(self.common)
-
def __init__(self, bolt_object=None, common=None,):
self.bolt_object = bolt_object
self.common = common
@@ -1069,6 +1109,12 @@ class Bolt:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.bolt_object)
+ value = (value * 31) ^ hash(self.common)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -1093,9 +1139,6 @@ class StateSpoutSpec:
(2, TType.STRUCT, 'common', (ComponentCommon, ComponentCommon.thrift_spec), None, ), # 2
)
- def __hash__(self):
- return 0 + hash(self.state_spout_object) + hash(self.common)
-
def __init__(self, state_spout_object=None, common=None,):
self.state_spout_object = state_spout_object
self.common = common
@@ -1150,6 +1193,12 @@ class StateSpoutSpec:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.state_spout_object)
+ value = (value * 31) ^ hash(self.common)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -1176,9 +1225,6 @@ class StormTopology:
(3, TType.MAP, 'state_spouts', (TType.STRING,None,TType.STRUCT,(StateSpoutSpec, StateSpoutSpec.thrift_spec)), None, ), # 3
)
- def __hash__(self):
- return 0 + hash(self.spouts) + hash(self.bolts) + hash(self.state_spouts)
-
def __init__(self, spouts=None, bolts=None, state_spouts=None,):
self.spouts = spouts
self.bolts = bolts
@@ -1196,7 +1242,7 @@ class StormTopology:
if fid == 1:
if ftype == TType.MAP:
self.spouts = {}
- (_ktype40, _vtype41, _size39 ) = iprot.readMapBegin()
+ (_ktype40, _vtype41, _size39 ) = iprot.readMapBegin()
for _i43 in xrange(_size39):
_key44 = iprot.readString().decode('utf-8')
_val45 = SpoutSpec()
@@ -1208,7 +1254,7 @@ class StormTopology:
elif fid == 2:
if ftype == TType.MAP:
self.bolts = {}
- (_ktype47, _vtype48, _size46 ) = iprot.readMapBegin()
+ (_ktype47, _vtype48, _size46 ) = iprot.readMapBegin()
for _i50 in xrange(_size46):
_key51 = iprot.readString().decode('utf-8')
_val52 = Bolt()
@@ -1220,7 +1266,7 @@ class StormTopology:
elif fid == 3:
if ftype == TType.MAP:
self.state_spouts = {}
- (_ktype54, _vtype55, _size53 ) = iprot.readMapBegin()
+ (_ktype54, _vtype55, _size53 ) = iprot.readMapBegin()
for _i57 in xrange(_size53):
_key58 = iprot.readString().decode('utf-8')
_val59 = StateSpoutSpec()
@@ -1276,6 +1322,13 @@ class StormTopology:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.spouts)
+ value = (value * 31) ^ hash(self.bolts)
+ value = (value * 31) ^ hash(self.state_spouts)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -1287,7 +1340,7 @@ class StormTopology:
def __ne__(self, other):
return not (self == other)
-class AlreadyAliveException(Exception):
+class AlreadyAliveException(TException):
"""
Attributes:
- msg
@@ -1298,9 +1351,6 @@ class AlreadyAliveException(Exception):
(1, TType.STRING, 'msg', None, None, ), # 1
)
- def __hash__(self):
- return 0 + hash(self.msg)
-
def __init__(self, msg=None,):
self.msg = msg
@@ -1344,6 +1394,11 @@ class AlreadyAliveException(Exception):
def __str__(self):
return repr(self)
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.msg)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -1355,7 +1410,7 @@ class AlreadyAliveException(Exception):
def __ne__(self, other):
return not (self == other)
-class NotAliveException(Exception):
+class NotAliveException(TException):
"""
Attributes:
- msg
@@ -1366,9 +1421,6 @@ class NotAliveException(Exception):
(1, TType.STRING, 'msg', None, None, ), # 1
)
- def __hash__(self):
- return 0 + hash(self.msg)
-
def __init__(self, msg=None,):
self.msg = msg
@@ -1412,6 +1464,11 @@ class NotAliveException(Exception):
def __str__(self):
return repr(self)
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.msg)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -1423,7 +1480,7 @@ class NotAliveException(Exception):
def __ne__(self, other):
return not (self == other)
-class AuthorizationException(Exception):
+class AuthorizationException(TException):
"""
Attributes:
- msg
@@ -1434,9 +1491,6 @@ class AuthorizationException(Exception):
(1, TType.STRING, 'msg', None, None, ), # 1
)
- def __hash__(self):
- return 0 + hash(self.msg)
-
def __init__(self, msg=None,):
self.msg = msg
@@ -1480,6 +1534,11 @@ class AuthorizationException(Exception):
def __str__(self):
return repr(self)
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.msg)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -1491,7 +1550,7 @@ class AuthorizationException(Exception):
def __ne__(self, other):
return not (self == other)
-class InvalidTopologyException(Exception):
+class InvalidTopologyException(TException):
"""
Attributes:
- msg
@@ -1502,9 +1561,6 @@ class InvalidTopologyException(Exception):
(1, TType.STRING, 'msg', None, None, ), # 1
)
- def __hash__(self):
- return 0 + hash(self.msg)
-
def __init__(self, msg=None,):
self.msg = msg
@@ -1548,6 +1604,11 @@ class InvalidTopologyException(Exception):
def __str__(self):
return repr(self)
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.msg)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -2091,9 +2152,6 @@ class TopologySummary:
(514, TType.STRING, 'owner', None, None, ), # 514
)
- def __hash__(self):
- return 0 + hash(self.id) + hash(self.name) + hash(self.num_tasks) + hash(self.num_executors) + hash(self.num_workers) + hash(self.uptime_secs) + hash(self.status) + hash(self.sched_status) + hash(self.owner)
-
def __init__(self, id=None, name=None, num_tasks=None, num_executors=None, num_workers=None, uptime_secs=None, status=None, sched_status=None, owner=None,):
self.id = id
self.name = name
@@ -2226,6 +2284,19 @@ class TopologySummary:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.id)
+ value = (value * 31) ^ hash(self.name)
+ value = (value * 31) ^ hash(self.num_tasks)
+ value = (value * 31) ^ hash(self.num_executors)
+ value = (value * 31) ^ hash(self.num_workers)
+ value = (value * 31) ^ hash(self.uptime_secs)
+ value = (value * 31) ^ hash(self.status)
+ value = (value * 31) ^ hash(self.sched_status)
+ value = (value * 31) ^ hash(self.owner)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -2256,9 +2327,6 @@ class SupervisorSummary:
(5, TType.STRING, 'supervisor_id', None, None, ), # 5
)
- def __hash__(self):
- return 0 + hash(self.host) + hash(self.uptime_secs) + hash(self.num_workers) + hash(self.num_used_workers) + hash(self.supervisor_id)
-
def __init__(self, host=None, uptime_secs=None, num_workers=None, num_used_workers=None, supervisor_id=None,):
self.host = host
self.uptime_secs = uptime_secs
@@ -2347,6 +2415,15 @@ class SupervisorSummary:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.host)
+ value = (value * 31) ^ hash(self.uptime_secs)
+ value = (value * 31) ^ hash(self.num_workers)
+ value = (value * 31) ^ hash(self.num_used_workers)
+ value = (value * 31) ^ hash(self.supervisor_id)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -2373,9 +2450,6 @@ class ClusterSummary:
(3, TType.LIST, 'topologies', (TType.STRUCT,(TopologySummary, TopologySummary.thrift_spec)), None, ), # 3
)
- def __hash__(self):
- return 0 + hash(self.supervisors) + hash(self.nimbus_uptime_secs) + hash(self.topologies)
-
def __init__(self, supervisors=None, nimbus_uptime_secs=None, topologies=None,):
self.supervisors = supervisors
self.nimbus_uptime_secs = nimbus_uptime_secs
@@ -2458,6 +2532,13 @@ class ClusterSummary:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.supervisors)
+ value = (value * 31) ^ hash(self.nimbus_uptime_secs)
+ value = (value * 31) ^ hash(self.topologies)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -2486,9 +2567,6 @@ class ErrorInfo:
(4, TType.I32, 'port', None, None, ), # 4
)
- def __hash__(self):
- return 0 + hash(self.error) + hash(self.error_time_secs) + hash(self.host) + hash(self.port)
-
def __init__(self, error=None, error_time_secs=None, host=None, port=None,):
self.error = error
self.error_time_secs = error_time_secs
@@ -2561,6 +2639,14 @@ class ErrorInfo:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.error)
+ value = (value * 31) ^ hash(self.error_time_secs)
+ value = (value * 31) ^ hash(self.host)
+ value = (value * 31) ^ hash(self.port)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -2591,9 +2677,6 @@ class BoltStats:
(5, TType.MAP, 'execute_ms_avg', (TType.STRING,None,TType.MAP,(TType.STRUCT,(GlobalStreamId, GlobalStreamId.thrift_spec),TType.DOUBLE,None)), None, ), # 5
)
- def __hash__(self):
- return 0 + hash(self.acked) + hash(self.failed) + hash(self.process_ms_avg) + hash(self.executed) + hash(self.execute_ms_avg)
-
def __init__(self, acked=None, failed=None, process_ms_avg=None, executed=None, execute_ms_avg=None,):
self.acked = acked
self.failed = failed
@@ -2613,11 +2696,11 @@ class BoltStats:
if fid == 1:
if ftype == TType.MAP:
self.acked = {}
- (_ktype81, _vtype82, _size80 ) = iprot.readMapBegin()
+ (_ktype81, _vtype82, _size80 ) = iprot.readMapBegin()
for _i84 in xrange(_size80):
_key85 = iprot.readString().decode('utf-8')
_val86 = {}
- (_ktype88, _vtype89, _size87 ) = iprot.readMapBegin()
+ (_ktype88, _vtype89, _size87 ) = iprot.readMapBegin()
for _i91 in xrange(_size87):
_key92 = GlobalStreamId()
_key92.read(iprot)
@@ -2631,11 +2714,11 @@ class BoltStats:
elif fid == 2:
if ftype == TType.MAP:
self.failed = {}
- (_ktype95, _vtype96, _size94 ) = iprot.readMapBegin()
+ (_ktype95, _vtype96, _size94 ) = iprot.readMapBegin()
for _i98 in xrange(_size94):
_key99 = iprot.readString().decode('utf-8')
_val100 = {}
- (_ktype102, _vtype103, _size101 ) = iprot.readMapBegin()
+ (_ktype102, _vtype103, _size101 ) = iprot.readMapBegin()
for _i105 in xrange(_size101):
_key106 = GlobalStreamId()
_key106.read(iprot)
@@ -2649,11 +2732,11 @@ class BoltStats:
elif fid == 3:
if ftype == TType.MAP:
self.process_ms_avg = {}
- (_ktype109, _vtype110, _size108 ) = iprot.readMapBegin()
+ (_ktype109, _vtype110, _size108 ) = iprot.readMapBegin()
for _i112 in xrange(_size108):
_key113 = iprot.readString().decode('utf-8')
_val114 = {}
- (_ktype116, _vtype117, _size115 ) = iprot.readMapBegin()
+ (_ktype116, _vtype117, _size115 ) = iprot.readMapBegin()
for _i119 in xrange(_size115):
_key120 = GlobalStreamId()
_key120.read(iprot)
@@ -2667,11 +2750,11 @@ class BoltStats:
elif fid == 4:
if ftype == TType.MAP:
self.executed = {}
- (_ktype123, _vtype124, _size122 ) = iprot.readMapBegin()
+ (_ktype123, _vtype124, _size122 ) = iprot.readMapBegin()
for _i126 in xrange(_size122):
_key127 = iprot.readString().decode('utf-8')
_val128 = {}
- (_ktype130, _vtype131, _size129 ) = iprot.readMapBegin()
+ (_ktype130, _vtype131, _size129 ) = iprot.readMapBegin()
for _i133 in xrange(_size129):
_key134 = GlobalStreamId()
_key134.read(iprot)
@@ -2685,11 +2768,11 @@ class BoltStats:
elif fid == 5:
if ftype == TType.MAP:
self.execute_ms_avg = {}
- (_ktype137, _vtype138, _size136 ) = iprot.readMapBegin()
+ (_ktype137, _vtype138, _size136 ) = iprot.readMapBegin()
for _i140 in xrange(_size136):
_key141 = iprot.readString().decode('utf-8')
_val142 = {}
- (_ktype144, _vtype145, _size143 ) = iprot.readMapBegin()
+ (_ktype144, _vtype145, _size143 ) = iprot.readMapBegin()
for _i147 in xrange(_size143):
_key148 = GlobalStreamId()
_key148.read(iprot)
@@ -2787,6 +2870,15 @@ class BoltStats:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.acked)
+ value = (value * 31) ^ hash(self.failed)
+ value = (value * 31) ^ hash(self.process_ms_avg)
+ value = (value * 31) ^ hash(self.executed)
+ value = (value * 31) ^ hash(self.execute_ms_avg)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -2813,9 +2905,6 @@ class SpoutStats:
(3, TType.MAP, 'complete_ms_avg', (TType.STRING,None,TType.MAP,(TType.STRING,None,TType.DOUBLE,None)), None, ), # 3
)
- def __hash__(self):
- return 0 + hash(self.acked) + hash(self.failed) + hash(self.complete_ms_avg)
-
def __init__(self, acked=None, failed=None, complete_ms_avg=None,):
self.acked = acked
self.failed = failed
@@ -2833,11 +2922,11 @@ class SpoutStats:
if fid == 1:
if ftype == TType.MAP:
self.acked = {}
- (_ktype171, _vtype172, _size170 ) = iprot.readMapBegin()
+ (_ktype171, _vtype172, _size170 ) = iprot.readMapBegin()
for _i174 in xrange(_size170):
_key175 = iprot.readString().decode('utf-8')
_val176 = {}
- (_ktype178, _vtype179, _size177 ) = iprot.readMapBegin()
+ (_ktype178, _vtype179, _size177 ) = iprot.readMapBegin()
for _i181 in xrange(_size177):
_key182 = iprot.readString().decode('utf-8')
_val183 = iprot.readI64();
@@ -2850,11 +2939,11 @@ class SpoutStats:
elif fid == 2:
if ftype == TType.MAP:
self.failed = {}
- (_ktype185, _vtype186, _size184 ) = iprot.readMapBegin()
+ (_ktype185, _vtype186, _size184 ) = iprot.readMapBegin()
for _i188 in xrange(_size184):
_key189 = iprot.readString().decode('utf-8')
_val190 = {}
- (_ktype192, _vtype193, _size191 ) = iprot.readMapBegin()
+ (_ktype192, _vtype193, _size191 ) = iprot.readMapBegin()
for _i195 in xrange(_size191):
_key196 = iprot.readString().decode('utf-8')
_val197 = iprot.readI64();
@@ -2867,11 +2956,11 @@ class SpoutStats:
elif fid == 3:
if ftype == TType.MAP:
self.complete_ms_avg = {}
- (_ktype199, _vtype200, _size198 ) = iprot.readMapBegin()
+ (_ktype199, _vtype200, _size198 ) = iprot.readMapBegin()
for _i202 in xrange(_size198):
_key203 = iprot.readString().decode('utf-8')
_val204 = {}
- (_ktype206, _vtype207, _size205 ) = iprot.readMapBegin()
+ (_ktype206, _vtype207, _size205 ) = iprot.readMapBegin()
for _i209 in xrange(_size205):
_key210 = iprot.readString().decode('utf-8')
_val211 = iprot.readDouble();
@@ -2940,6 +3029,13 @@ class SpoutStats:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.acked)
+ value = (value * 31) ^ hash(self.failed)
+ value = (value * 31) ^ hash(self.complete_ms_avg)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -2964,9 +3060,6 @@ class ExecutorSpecificStats:
(2, TType.STRUCT, 'spout', (SpoutStats, SpoutStats.thrift_spec), None, ), # 2
)
- def __hash__(self):
- return 0 + hash(self.bolt) + hash(self.spout)
-
def __init__(self, bolt=None, spout=None,):
self.bolt = bolt
self.spout = spout
@@ -3017,6 +3110,12 @@ class ExecutorSpecificStats:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.bolt)
+ value = (value * 31) ^ hash(self.spout)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -3043,9 +3142,6 @@ class ExecutorStats:
(3, TType.STRUCT, 'specific', (ExecutorSpecificStats, ExecutorSpecificStats.thrift_spec), None, ), # 3
)
- def __hash__(self):
- return 0 + hash(self.emitted) + hash(self.transferred) + hash(self.specific)
-
def __init__(self, emitted=None, transferred=None, specific=None,):
self.emitted = emitted
self.transferred = transferred
@@ -3063,11 +3159,11 @@ class ExecutorStats:
if fid == 1:
if ftype == TType.MAP:
self.emitted = {}
- (_ktype225, _vtype226, _size224 ) = iprot.readMapBegin()
+ (_ktype225, _vtype226, _size224 ) = iprot.readMapBegin()
for _i228 in xrange(_size224):
_key229 = iprot.readString().decode('utf-8')
_val230 = {}
- (_ktype232, _vtype233, _size231 ) = iprot.readMapBegin()
+ (_ktype232, _vtype233, _size231 ) = iprot.readMapBegin()
for _i235 in xrange(_size231):
_key236 = iprot.readString().decode('utf-8')
_val237 = iprot.readI64();
@@ -3080,11 +3176,11 @@ class ExecutorStats:
elif fid == 2:
if ftype == TType.MAP:
self.transferred = {}
- (_ktype239, _vtype240, _size238 ) = iprot.readMapBegin()
+ (_ktype239, _vtype240, _size238 ) = iprot.readMapBegin()
for _i242 in xrange(_size238):
_key243 = iprot.readString().decode('utf-8')
_val244 = {}
- (_ktype246, _vtype247, _size245 ) = iprot.readMapBegin()
+ (_ktype246, _vtype247, _size245 ) = iprot.readMapBegin()
for _i249 in xrange(_size245):
_key250 = iprot.readString().decode('utf-8')
_val251 = iprot.readI64();
@@ -3151,6 +3247,13 @@ class ExecutorStats:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.emitted)
+ value = (value * 31) ^ hash(self.transferred)
+ value = (value * 31) ^ hash(self.specific)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -3175,9 +3278,6 @@ class ExecutorInfo:
(2, TType.I32, 'task_end', None, None, ), # 2
)
- def __hash__(self):
- return 0 + hash(self.task_start) + hash(self.task_end)
-
def __init__(self, task_start=None, task_end=None,):
self.task_start = task_start
self.task_end = task_end
@@ -3230,6 +3330,12 @@ class ExecutorInfo:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.task_start)
+ value = (value * 31) ^ hash(self.task_end)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -3263,9 +3369,6 @@ class ExecutorSummary:
(7, TType.STRUCT, 'stats', (ExecutorStats, ExecutorStats.thrift_spec), None, ), # 7
)
- def __hash__(self):
- return 0 + hash(self.executor_info) + hash(self.component_id) + hash(self.host) + hash(self.port) + hash(self.uptime_secs) + hash(self.stats)
-
def __init__(self, executor_info=None, component_id=None, host=None, port=None, uptime_secs=None, stats=None,):
self.executor_info = executor_info
self.component_id = component_id
@@ -3366,6 +3469,16 @@ class ExecutorSummary:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.executor_info)
+ value = (value * 31) ^ hash(self.component_id)
+ value = (value * 31) ^ hash(self.host)
+ value = (value * 31) ^ hash(self.port)
+ value = (value * 31) ^ hash(self.uptime_secs)
+ value = (value * 31) ^ hash(self.stats)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -3908,9 +4021,6 @@ class TopologyInfo:
(514, TType.STRING, 'owner', None, None, ), # 514
)
- def __hash__(self):
- return 0 + hash(self.id) + hash(self.name) + hash(self.uptime_secs) + hash(self.executors) + hash(self.status) + hash(self.errors) + hash(self.sched_status) + hash(self.owner)
-
def __init__(self, id=None, name=None, uptime_secs=None, executors=None, status=None, errors=None, sched_status=None, owner=None,):
self.id = id
self.name = name
@@ -3964,7 +4074,7 @@ class TopologyInfo:
elif fid == 6:
if ftype == TType.MAP:
self.errors = {}
- (_ktype267, _vtype268, _size266 ) = iprot.readMapBegin()
+ (_ktype267, _vtype268, _size266 ) = iprot.readMapBegin()
for _i270 in xrange(_size266):
_key271 = iprot.readString().decode('utf-8')
_val272 = []
@@ -4059,6 +4169,18 @@ class TopologyInfo:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.id)
+ value = (value * 31) ^ hash(self.name)
+ value = (value * 31) ^ hash(self.uptime_secs)
+ value = (value * 31) ^ hash(self.executors)
+ value = (value * 31) ^ hash(self.status)
+ value = (value * 31) ^ hash(self.errors)
+ value = (value * 31) ^ hash(self.sched_status)
+ value = (value * 31) ^ hash(self.owner)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -4081,9 +4203,6 @@ class KillOptions:
(1, TType.I32, 'wait_secs', None, None, ), # 1
)
- def __hash__(self):
- return 0 + hash(self.wait_secs)
-
def __init__(self, wait_secs=None,):
self.wait_secs = wait_secs
@@ -4122,6 +4241,11 @@ class KillOptions:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.wait_secs)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -4148,9 +4272,6 @@ class RebalanceOptions:
(3, TType.MAP, 'num_executors', (TType.STRING,None,TType.I32,None), None, ), # 3
)
- def __hash__(self):
- return 0 + hash(self.wait_secs) + hash(self.num_workers) + hash(self.num_executors)
-
def __init__(self, wait_secs=None, num_workers=None, num_executors=None,):
self.wait_secs = wait_secs
self.num_workers = num_workers
@@ -4178,7 +4299,7 @@ class RebalanceOptions:
elif fid == 3:
if ftype == TType.MAP:
self.num_executors = {}
- (_ktype284, _vtype285, _size283 ) = iprot.readMapBegin()
+ (_ktype284, _vtype285, _size283 ) = iprot.readMapBegin()
for _i287 in xrange(_size283):
_key288 = iprot.readString().decode('utf-8')
_val289 = iprot.readI32();
@@ -4219,6 +4340,13 @@ class RebalanceOptions:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.wait_secs)
+ value = (value * 31) ^ hash(self.num_workers)
+ value = (value * 31) ^ hash(self.num_executors)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -4241,9 +4369,6 @@ class Credentials:
(1, TType.MAP, 'creds', (TType.STRING,None,TType.STRING,None), None, ), # 1
)
- def __hash__(self):
- return 0 + hash(self.creds)
-
def __init__(self, creds=None,):
self.creds = creds
@@ -4259,7 +4384,7 @@ class Credentials:
if fid == 1:
if ftype == TType.MAP:
self.creds = {}
- (_ktype293, _vtype294, _size292 ) = iprot.readMapBegin()
+ (_ktype293, _vtype294, _size292 ) = iprot.readMapBegin()
for _i296 in xrange(_size292):
_key297 = iprot.readString().decode('utf-8')
_val298 = iprot.readString().decode('utf-8')
@@ -4294,6 +4419,11 @@ class Credentials:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.creds)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -4318,9 +4448,6 @@ class SubmitOptions:
(2, TType.STRUCT, 'creds', (Credentials, Credentials.thrift_spec), None, ), # 2
)
- def __hash__(self):
- return 0 + hash(self.initial_status) + hash(self.creds)
-
def __init__(self, initial_status=None, creds=None,):
self.initial_status = initial_status
self.creds = creds
@@ -4372,6 +4499,12 @@ class SubmitOptions:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.initial_status)
+ value = (value * 31) ^ hash(self.creds)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -4396,9 +4529,6 @@ class DRPCRequest:
(2, TType.STRING, 'request_id', None, None, ), # 2
)
- def __hash__(self):
- return 0 + hash(self.func_args) + hash(self.request_id)
-
def __init__(self, func_args=None, request_id=None,):
self.func_args = func_args
self.request_id = request_id
@@ -4451,6 +4581,12 @@ class DRPCRequest:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.func_args)
+ value = (value * 31) ^ hash(self.request_id)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -4462,7 +4598,7 @@ class DRPCRequest:
def __ne__(self, other):
return not (self == other)
-class DRPCExecutionException(Exception):
+class DRPCExecutionException(TException):
"""
Attributes:
- msg
@@ -4473,9 +4609,6 @@ class DRPCExecutionException(Exception):
(1, TType.STRING, 'msg', None, None, ), # 1
)
- def __hash__(self):
- return 0 + hash(self.msg)
-
def __init__(self, msg=None,):
self.msg = msg
@@ -4519,6 +4652,11 @@ class DRPCExecutionException(Exception):
def __str__(self):
return repr(self)
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.msg)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/storm-core/test/clj/backtype/storm/security/auth/auth_test.clj
----------------------------------------------------------------------
diff --git a/storm-core/test/clj/backtype/storm/security/auth/auth_test.clj b/storm-core/test/clj/backtype/storm/security/auth/auth_test.clj
index 6563730..ce32d78 100644
--- a/storm-core/test/clj/backtype/storm/security/auth/auth_test.clj
+++ b/storm-core/test/clj/backtype/storm/security/auth/auth_test.clj
@@ -167,7 +167,7 @@
"java.security.auth.login.config" "test/clj/backtype/storm/security/auth/jaas_digest.conf"
STORM-NIMBUS-RETRY-TIMES 0})]
(testing "(Negative authentication) Server: Simple vs. Client: Digest"
- (is (thrown-cause? java.net.SocketTimeoutException
+ (is (thrown-cause? org.apache.thrift.transport.TTransportException
(NimbusClient. storm-conf "localhost" a-port nimbus-timeout))))))))
(deftest negative-whitelist-authorization-test
@@ -363,7 +363,7 @@
client (NimbusClient. storm-conf "localhost" a-port nimbus-timeout)
nimbus_client (.getClient client)]
(testing "(Negative authentication) Server: Digest vs. Client: Simple"
- (is (thrown-cause? java.net.SocketTimeoutException
+ (is (thrown-cause? org.apache.thrift.transport.TTransportException
(.activate nimbus_client "security_auth_test_topology"))))
(.close client))
[08/18] storm git commit: Upgrade to thrift-0.9.2
Posted by kn...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/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 c98f423..fa1c3a5 100644
--- a/storm-core/src/jvm/backtype/storm/generated/ExecutorInfo.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ExecutorInfo.java
@@ -16,13 +16,24 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package backtype.storm.generated;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -35,15 +46,24 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class ExecutorInfo implements org.apache.thrift.TBase<ExecutorInfo, ExecutorInfo._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
+public class 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");
private static final org.apache.thrift.protocol.TField TASK_START_FIELD_DESC = new org.apache.thrift.protocol.TField("task_start", org.apache.thrift.protocol.TType.I32, (short)1);
private static final org.apache.thrift.protocol.TField TASK_END_FIELD_DESC = new org.apache.thrift.protocol.TField("task_end", org.apache.thrift.protocol.TType.I32, (short)2);
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new ExecutorInfoStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new ExecutorInfoTupleSchemeFactory());
+ }
+
private int task_start; // required
private int task_end; // required
@@ -111,8 +131,7 @@ public class ExecutorInfo implements org.apache.thrift.TBase<ExecutorInfo, Execu
// isset id assignments
private static final int __TASK_START_ISSET_ID = 0;
private static final int __TASK_END_ISSET_ID = 1;
- private BitSet __isset_bit_vector = new BitSet(2);
-
+ 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);
@@ -142,8 +161,7 @@ public class ExecutorInfo implements org.apache.thrift.TBase<ExecutorInfo, Execu
* Performs a deep copy on <i>other</i>.
*/
public ExecutorInfo(ExecutorInfo other) {
- __isset_bit_vector.clear();
- __isset_bit_vector.or(other.__isset_bit_vector);
+ __isset_bitfield = other.__isset_bitfield;
this.task_start = other.task_start;
this.task_end = other.task_end;
}
@@ -170,16 +188,16 @@ public class ExecutorInfo implements org.apache.thrift.TBase<ExecutorInfo, Execu
}
public void unset_task_start() {
- __isset_bit_vector.clear(__TASK_START_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __TASK_START_ISSET_ID);
}
/** Returns true if field task_start is set (has been assigned a value) and false otherwise */
public boolean is_set_task_start() {
- return __isset_bit_vector.get(__TASK_START_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __TASK_START_ISSET_ID);
}
public void set_task_start_isSet(boolean value) {
- __isset_bit_vector.set(__TASK_START_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __TASK_START_ISSET_ID, value);
}
public int get_task_end() {
@@ -192,16 +210,16 @@ public class ExecutorInfo implements org.apache.thrift.TBase<ExecutorInfo, Execu
}
public void unset_task_end() {
- __isset_bit_vector.clear(__TASK_END_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __TASK_END_ISSET_ID);
}
/** Returns true if field task_end is set (has been assigned a value) and false otherwise */
public boolean is_set_task_end() {
- return __isset_bit_vector.get(__TASK_END_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __TASK_END_ISSET_ID);
}
public void set_task_end_isSet(boolean value) {
- __isset_bit_vector.set(__TASK_END_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __TASK_END_ISSET_ID, value);
}
public void setFieldValue(_Fields field, Object value) {
@@ -288,45 +306,45 @@ public class ExecutorInfo implements org.apache.thrift.TBase<ExecutorInfo, Execu
@Override
public int hashCode() {
- HashCodeBuilder builder = new HashCodeBuilder();
+ List<Object> list = new ArrayList<Object>();
boolean present_task_start = true;
- builder.append(present_task_start);
+ list.add(present_task_start);
if (present_task_start)
- builder.append(task_start);
+ list.add(task_start);
boolean present_task_end = true;
- builder.append(present_task_end);
+ list.add(present_task_end);
if (present_task_end)
- builder.append(task_end);
+ list.add(task_end);
- return builder.toHashCode();
+ return list.hashCode();
}
+ @Override
public int compareTo(ExecutorInfo other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- ExecutorInfo typedOther = (ExecutorInfo)other;
- lastComparison = Boolean.valueOf(is_set_task_start()).compareTo(typedOther.is_set_task_start());
+ lastComparison = Boolean.valueOf(is_set_task_start()).compareTo(other.is_set_task_start());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_task_start()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.task_start, typedOther.task_start);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.task_start, other.task_start);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_task_end()).compareTo(typedOther.is_set_task_end());
+ lastComparison = Boolean.valueOf(is_set_task_end()).compareTo(other.is_set_task_end());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_task_end()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.task_end, typedOther.task_end);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.task_end, other.task_end);
if (lastComparison != 0) {
return lastComparison;
}
@@ -339,52 +357,11 @@ public class ExecutorInfo implements org.apache.thrift.TBase<ExecutorInfo, Execu
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // TASK_START
- if (field.type == org.apache.thrift.protocol.TType.I32) {
- this.task_start = iprot.readI32();
- set_task_start_isSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 2: // TASK_END
- if (field.type == org.apache.thrift.protocol.TType.I32) {
- this.task_end = iprot.readI32();
- set_task_end_isSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- oprot.writeFieldBegin(TASK_START_FIELD_DESC);
- oprot.writeI32(this.task_start);
- oprot.writeFieldEnd();
- oprot.writeFieldBegin(TASK_END_FIELD_DESC);
- oprot.writeI32(this.task_end);
- oprot.writeFieldEnd();
- oprot.writeFieldStop();
- oprot.writeStructEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@Override
@@ -413,6 +390,7 @@ public class ExecutorInfo implements org.apache.thrift.TBase<ExecutorInfo, Execu
throw new org.apache.thrift.protocol.TProtocolException("Required field 'task_end' is unset! Struct:" + toString());
}
+ // check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -426,12 +404,96 @@ public class ExecutorInfo implements org.apache.thrift.TBase<ExecutorInfo, Execu
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_bit_vector = new BitSet(1);
+ __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 ExecutorInfoStandardSchemeFactory implements SchemeFactory {
+ public ExecutorInfoStandardScheme getScheme() {
+ return new ExecutorInfoStandardScheme();
+ }
+ }
+
+ private static class ExecutorInfoStandardScheme extends StandardScheme<ExecutorInfo> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, ExecutorInfo 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: // TASK_START
+ if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ struct.task_start = iprot.readI32();
+ struct.set_task_start_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // TASK_END
+ if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ struct.task_end = iprot.readI32();
+ struct.set_task_end_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, ExecutorInfo struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ oprot.writeFieldBegin(TASK_START_FIELD_DESC);
+ oprot.writeI32(struct.task_start);
+ oprot.writeFieldEnd();
+ oprot.writeFieldBegin(TASK_END_FIELD_DESC);
+ oprot.writeI32(struct.task_end);
+ oprot.writeFieldEnd();
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class ExecutorInfoTupleSchemeFactory implements SchemeFactory {
+ public ExecutorInfoTupleScheme getScheme() {
+ return new ExecutorInfoTupleScheme();
+ }
+ }
+
+ private static class ExecutorInfoTupleScheme extends TupleScheme<ExecutorInfo> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, ExecutorInfo struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ oprot.writeI32(struct.task_start);
+ oprot.writeI32(struct.task_end);
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, ExecutorInfo struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ struct.task_start = iprot.readI32();
+ struct.set_task_start_isSet(true);
+ struct.task_end = iprot.readI32();
+ struct.set_task_end_isSet(true);
+ }
+ }
+
}
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/storm-core/src/jvm/backtype/storm/generated/ExecutorSpecificStats.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/ExecutorSpecificStats.java b/storm-core/src/jvm/backtype/storm/generated/ExecutorSpecificStats.java
index 174ecff..06b741c 100644
--- a/storm-core/src/jvm/backtype/storm/generated/ExecutorSpecificStats.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ExecutorSpecificStats.java
@@ -16,13 +16,24 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package backtype.storm.generated;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -35,9 +46,11 @@ 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"})
public class ExecutorSpecificStats extends org.apache.thrift.TUnion<ExecutorSpecificStats, ExecutorSpecificStats._Fields> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExecutorSpecificStats");
private static final org.apache.thrift.protocol.TField BOLT_FIELD_DESC = new org.apache.thrift.protocol.TField("bolt", org.apache.thrift.protocol.TType.STRUCT, (short)1);
@@ -162,7 +175,7 @@ public class ExecutorSpecificStats extends org.apache.thrift.TUnion<ExecutorSpec
}
@Override
- protected Object readValue(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TField field) throws org.apache.thrift.TException {
+ protected Object standardSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TField field) throws org.apache.thrift.TException {
_Fields setField = _Fields.findByThriftId(field.id);
if (setField != null) {
switch (setField) {
@@ -196,7 +209,46 @@ public class ExecutorSpecificStats extends org.apache.thrift.TUnion<ExecutorSpec
}
@Override
- protected void writeValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+ protected void standardSchemeWriteValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+ switch (setField_) {
+ case BOLT:
+ BoltStats bolt = (BoltStats)value_;
+ bolt.write(oprot);
+ return;
+ case SPOUT:
+ SpoutStats spout = (SpoutStats)value_;
+ spout.write(oprot);
+ return;
+ default:
+ throw new IllegalStateException("Cannot write union with unknown field " + setField_);
+ }
+ }
+
+ @Override
+ protected Object tupleSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, short fieldID) throws org.apache.thrift.TException {
+ _Fields setField = _Fields.findByThriftId(fieldID);
+ if (setField != null) {
+ switch (setField) {
+ case BOLT:
+ BoltStats bolt;
+ bolt = new BoltStats();
+ bolt.read(iprot);
+ return bolt;
+ case SPOUT:
+ SpoutStats spout;
+ spout = new SpoutStats();
+ spout.read(iprot);
+ return spout;
+ default:
+ throw new IllegalStateException("setField wasn't null, but didn't match any of the case statements!");
+ }
+ } else {
+ throw new TProtocolException("Couldn't find a field with field id " + fieldID);
+ }
+ }
+
+ @Override
+ protected void tupleSchemeWriteValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
switch (setField_) {
case BOLT:
BoltStats bolt = (BoltStats)value_;
@@ -300,19 +352,19 @@ public class ExecutorSpecificStats extends org.apache.thrift.TUnion<ExecutorSpec
@Override
public int hashCode() {
- HashCodeBuilder hcb = new HashCodeBuilder();
- hcb.append(this.getClass().getName());
+ List<Object> list = new ArrayList<Object>();
+ list.add(this.getClass().getName());
org.apache.thrift.TFieldIdEnum setField = getSetField();
if (setField != null) {
- hcb.append(setField.getThriftFieldId());
+ list.add(setField.getThriftFieldId());
Object value = getFieldValue();
if (value instanceof org.apache.thrift.TEnum) {
- hcb.append(((org.apache.thrift.TEnum)getFieldValue()).getValue());
+ list.add(((org.apache.thrift.TEnum)getFieldValue()).getValue());
} else {
- hcb.append(value);
+ list.add(value);
}
}
- return hcb.toHashCode();
+ return list.hashCode();
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
try {
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/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 a297fa7..26e63a1 100644
--- a/storm-core/src/jvm/backtype/storm/generated/ExecutorStats.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ExecutorStats.java
@@ -16,13 +16,24 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package backtype.storm.generated;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -35,16 +46,25 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, ExecutorStats._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
+public class 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");
private static final org.apache.thrift.protocol.TField EMITTED_FIELD_DESC = new org.apache.thrift.protocol.TField("emitted", org.apache.thrift.protocol.TType.MAP, (short)1);
private static final org.apache.thrift.protocol.TField TRANSFERRED_FIELD_DESC = new org.apache.thrift.protocol.TField("transferred", org.apache.thrift.protocol.TType.MAP, (short)2);
private static final org.apache.thrift.protocol.TField SPECIFIC_FIELD_DESC = new org.apache.thrift.protocol.TField("specific", org.apache.thrift.protocol.TType.STRUCT, (short)3);
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new ExecutorStatsStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new ExecutorStatsTupleSchemeFactory());
+ }
+
private Map<String,Map<String,Long>> emitted; // required
private Map<String,Map<String,Long>> transferred; // required
private ExecutorSpecificStats specific; // required
@@ -114,7 +134,6 @@ public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, Exe
}
// 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);
@@ -155,7 +174,7 @@ public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, Exe
*/
public ExecutorStats(ExecutorStats other) {
if (other.is_set_emitted()) {
- Map<String,Map<String,Long>> __this__emitted = new HashMap<String,Map<String,Long>>();
+ Map<String,Map<String,Long>> __this__emitted = new HashMap<String,Map<String,Long>>(other.emitted.size());
for (Map.Entry<String, Map<String,Long>> other_element : other.emitted.entrySet()) {
String other_element_key = other_element.getKey();
@@ -163,25 +182,14 @@ public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, Exe
String __this__emitted_copy_key = other_element_key;
- Map<String,Long> __this__emitted_copy_value = new HashMap<String,Long>();
- for (Map.Entry<String, Long> other_element_value_element : other_element_value.entrySet()) {
-
- String other_element_value_element_key = other_element_value_element.getKey();
- Long other_element_value_element_value = other_element_value_element.getValue();
-
- String __this__emitted_copy_value_copy_key = other_element_value_element_key;
-
- Long __this__emitted_copy_value_copy_value = other_element_value_element_value;
-
- __this__emitted_copy_value.put(__this__emitted_copy_value_copy_key, __this__emitted_copy_value_copy_value);
- }
+ Map<String,Long> __this__emitted_copy_value = new HashMap<String,Long>(other_element_value);
__this__emitted.put(__this__emitted_copy_key, __this__emitted_copy_value);
}
this.emitted = __this__emitted;
}
if (other.is_set_transferred()) {
- Map<String,Map<String,Long>> __this__transferred = new HashMap<String,Map<String,Long>>();
+ Map<String,Map<String,Long>> __this__transferred = new HashMap<String,Map<String,Long>>(other.transferred.size());
for (Map.Entry<String, Map<String,Long>> other_element : other.transferred.entrySet()) {
String other_element_key = other_element.getKey();
@@ -189,18 +197,7 @@ public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, Exe
String __this__transferred_copy_key = other_element_key;
- Map<String,Long> __this__transferred_copy_value = new HashMap<String,Long>();
- for (Map.Entry<String, Long> other_element_value_element : other_element_value.entrySet()) {
-
- String other_element_value_element_key = other_element_value_element.getKey();
- Long other_element_value_element_value = other_element_value_element.getValue();
-
- String __this__transferred_copy_value_copy_key = other_element_value_element_key;
-
- Long __this__transferred_copy_value_copy_value = other_element_value_element_value;
-
- __this__transferred_copy_value.put(__this__transferred_copy_value_copy_key, __this__transferred_copy_value_copy_value);
- }
+ Map<String,Long> __this__transferred_copy_value = new HashMap<String,Long>(other_element_value);
__this__transferred.put(__this__transferred_copy_key, __this__transferred_copy_value);
}
@@ -419,60 +416,60 @@ public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, Exe
@Override
public int hashCode() {
- HashCodeBuilder builder = new HashCodeBuilder();
+ List<Object> list = new ArrayList<Object>();
boolean present_emitted = true && (is_set_emitted());
- builder.append(present_emitted);
+ list.add(present_emitted);
if (present_emitted)
- builder.append(emitted);
+ list.add(emitted);
boolean present_transferred = true && (is_set_transferred());
- builder.append(present_transferred);
+ list.add(present_transferred);
if (present_transferred)
- builder.append(transferred);
+ list.add(transferred);
boolean present_specific = true && (is_set_specific());
- builder.append(present_specific);
+ list.add(present_specific);
if (present_specific)
- builder.append(specific);
+ list.add(specific);
- return builder.toHashCode();
+ return list.hashCode();
}
+ @Override
public int compareTo(ExecutorStats other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- ExecutorStats typedOther = (ExecutorStats)other;
- lastComparison = Boolean.valueOf(is_set_emitted()).compareTo(typedOther.is_set_emitted());
+ lastComparison = Boolean.valueOf(is_set_emitted()).compareTo(other.is_set_emitted());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_emitted()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.emitted, typedOther.emitted);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.emitted, other.emitted);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_transferred()).compareTo(typedOther.is_set_transferred());
+ lastComparison = Boolean.valueOf(is_set_transferred()).compareTo(other.is_set_transferred());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_transferred()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.transferred, typedOther.transferred);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.transferred, other.transferred);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_specific()).compareTo(typedOther.is_set_specific());
+ lastComparison = Boolean.valueOf(is_set_specific()).compareTo(other.is_set_specific());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_specific()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.specific, typedOther.specific);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.specific, other.specific);
if (lastComparison != 0) {
return lastComparison;
}
@@ -485,147 +482,11 @@ public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, Exe
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // EMITTED
- if (field.type == org.apache.thrift.protocol.TType.MAP) {
- {
- org.apache.thrift.protocol.TMap _map125 = iprot.readMapBegin();
- this.emitted = new HashMap<String,Map<String,Long>>(2*_map125.size);
- for (int _i126 = 0; _i126 < _map125.size; ++_i126)
- {
- String _key127; // required
- Map<String,Long> _val128; // required
- _key127 = iprot.readString();
- {
- org.apache.thrift.protocol.TMap _map129 = iprot.readMapBegin();
- _val128 = new HashMap<String,Long>(2*_map129.size);
- for (int _i130 = 0; _i130 < _map129.size; ++_i130)
- {
- String _key131; // required
- long _val132; // required
- _key131 = iprot.readString();
- _val132 = iprot.readI64();
- _val128.put(_key131, _val132);
- }
- iprot.readMapEnd();
- }
- this.emitted.put(_key127, _val128);
- }
- iprot.readMapEnd();
- }
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 2: // TRANSFERRED
- if (field.type == org.apache.thrift.protocol.TType.MAP) {
- {
- org.apache.thrift.protocol.TMap _map133 = iprot.readMapBegin();
- this.transferred = new HashMap<String,Map<String,Long>>(2*_map133.size);
- for (int _i134 = 0; _i134 < _map133.size; ++_i134)
- {
- String _key135; // required
- Map<String,Long> _val136; // required
- _key135 = iprot.readString();
- {
- org.apache.thrift.protocol.TMap _map137 = iprot.readMapBegin();
- _val136 = new HashMap<String,Long>(2*_map137.size);
- for (int _i138 = 0; _i138 < _map137.size; ++_i138)
- {
- String _key139; // required
- long _val140; // required
- _key139 = iprot.readString();
- _val140 = iprot.readI64();
- _val136.put(_key139, _val140);
- }
- iprot.readMapEnd();
- }
- this.transferred.put(_key135, _val136);
- }
- iprot.readMapEnd();
- }
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 3: // SPECIFIC
- if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
- this.specific = new ExecutorSpecificStats();
- this.specific.read(iprot);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (this.emitted != null) {
- oprot.writeFieldBegin(EMITTED_FIELD_DESC);
- {
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, this.emitted.size()));
- for (Map.Entry<String, Map<String,Long>> _iter141 : this.emitted.entrySet())
- {
- oprot.writeString(_iter141.getKey());
- {
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, _iter141.getValue().size()));
- for (Map.Entry<String, Long> _iter142 : _iter141.getValue().entrySet())
- {
- oprot.writeString(_iter142.getKey());
- oprot.writeI64(_iter142.getValue());
- }
- oprot.writeMapEnd();
- }
- }
- oprot.writeMapEnd();
- }
- oprot.writeFieldEnd();
- }
- if (this.transferred != null) {
- oprot.writeFieldBegin(TRANSFERRED_FIELD_DESC);
- {
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, this.transferred.size()));
- for (Map.Entry<String, Map<String,Long>> _iter143 : this.transferred.entrySet())
- {
- oprot.writeString(_iter143.getKey());
- {
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, _iter143.getValue().size()));
- for (Map.Entry<String, Long> _iter144 : _iter143.getValue().entrySet())
- {
- oprot.writeString(_iter144.getKey());
- oprot.writeI64(_iter144.getValue());
- }
- oprot.writeMapEnd();
- }
- }
- oprot.writeMapEnd();
- }
- oprot.writeFieldEnd();
- }
- if (this.specific != null) {
- oprot.writeFieldBegin(SPECIFIC_FIELD_DESC);
- this.specific.write(oprot);
- oprot.writeFieldEnd();
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@Override
@@ -674,6 +535,7 @@ public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, Exe
throw new org.apache.thrift.protocol.TProtocolException("Required field 'specific' is unset! Struct:" + toString());
}
+ // check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -692,5 +554,263 @@ public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, Exe
}
}
+ private static class ExecutorStatsStandardSchemeFactory implements SchemeFactory {
+ public ExecutorStatsStandardScheme getScheme() {
+ return new ExecutorStatsStandardScheme();
+ }
+ }
+
+ private static class ExecutorStatsStandardScheme extends StandardScheme<ExecutorStats> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, ExecutorStats 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: // EMITTED
+ if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+ {
+ org.apache.thrift.protocol.TMap _map250 = iprot.readMapBegin();
+ struct.emitted = new HashMap<String,Map<String,Long>>(2*_map250.size);
+ String _key251;
+ Map<String,Long> _val252;
+ for (int _i253 = 0; _i253 < _map250.size; ++_i253)
+ {
+ _key251 = iprot.readString();
+ {
+ org.apache.thrift.protocol.TMap _map254 = iprot.readMapBegin();
+ _val252 = new HashMap<String,Long>(2*_map254.size);
+ String _key255;
+ long _val256;
+ for (int _i257 = 0; _i257 < _map254.size; ++_i257)
+ {
+ _key255 = iprot.readString();
+ _val256 = iprot.readI64();
+ _val252.put(_key255, _val256);
+ }
+ iprot.readMapEnd();
+ }
+ struct.emitted.put(_key251, _val252);
+ }
+ iprot.readMapEnd();
+ }
+ struct.set_emitted_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // TRANSFERRED
+ if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+ {
+ org.apache.thrift.protocol.TMap _map258 = iprot.readMapBegin();
+ struct.transferred = new HashMap<String,Map<String,Long>>(2*_map258.size);
+ String _key259;
+ Map<String,Long> _val260;
+ for (int _i261 = 0; _i261 < _map258.size; ++_i261)
+ {
+ _key259 = iprot.readString();
+ {
+ org.apache.thrift.protocol.TMap _map262 = iprot.readMapBegin();
+ _val260 = new HashMap<String,Long>(2*_map262.size);
+ String _key263;
+ long _val264;
+ for (int _i265 = 0; _i265 < _map262.size; ++_i265)
+ {
+ _key263 = iprot.readString();
+ _val264 = iprot.readI64();
+ _val260.put(_key263, _val264);
+ }
+ iprot.readMapEnd();
+ }
+ struct.transferred.put(_key259, _val260);
+ }
+ iprot.readMapEnd();
+ }
+ struct.set_transferred_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 3: // SPECIFIC
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+ struct.specific = new ExecutorSpecificStats();
+ struct.specific.read(iprot);
+ struct.set_specific_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, ExecutorStats struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.emitted != null) {
+ oprot.writeFieldBegin(EMITTED_FIELD_DESC);
+ {
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.emitted.size()));
+ for (Map.Entry<String, Map<String,Long>> _iter266 : struct.emitted.entrySet())
+ {
+ oprot.writeString(_iter266.getKey());
+ {
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, _iter266.getValue().size()));
+ for (Map.Entry<String, Long> _iter267 : _iter266.getValue().entrySet())
+ {
+ oprot.writeString(_iter267.getKey());
+ oprot.writeI64(_iter267.getValue());
+ }
+ oprot.writeMapEnd();
+ }
+ }
+ oprot.writeMapEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ if (struct.transferred != null) {
+ oprot.writeFieldBegin(TRANSFERRED_FIELD_DESC);
+ {
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.transferred.size()));
+ for (Map.Entry<String, Map<String,Long>> _iter268 : struct.transferred.entrySet())
+ {
+ oprot.writeString(_iter268.getKey());
+ {
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, _iter268.getValue().size()));
+ for (Map.Entry<String, Long> _iter269 : _iter268.getValue().entrySet())
+ {
+ oprot.writeString(_iter269.getKey());
+ oprot.writeI64(_iter269.getValue());
+ }
+ oprot.writeMapEnd();
+ }
+ }
+ oprot.writeMapEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ if (struct.specific != null) {
+ oprot.writeFieldBegin(SPECIFIC_FIELD_DESC);
+ struct.specific.write(oprot);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class ExecutorStatsTupleSchemeFactory implements SchemeFactory {
+ public ExecutorStatsTupleScheme getScheme() {
+ return new ExecutorStatsTupleScheme();
+ }
+ }
+
+ private static class ExecutorStatsTupleScheme extends TupleScheme<ExecutorStats> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, ExecutorStats struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ {
+ oprot.writeI32(struct.emitted.size());
+ for (Map.Entry<String, Map<String,Long>> _iter270 : struct.emitted.entrySet())
+ {
+ oprot.writeString(_iter270.getKey());
+ {
+ oprot.writeI32(_iter270.getValue().size());
+ for (Map.Entry<String, Long> _iter271 : _iter270.getValue().entrySet())
+ {
+ oprot.writeString(_iter271.getKey());
+ oprot.writeI64(_iter271.getValue());
+ }
+ }
+ }
+ }
+ {
+ oprot.writeI32(struct.transferred.size());
+ for (Map.Entry<String, Map<String,Long>> _iter272 : struct.transferred.entrySet())
+ {
+ oprot.writeString(_iter272.getKey());
+ {
+ oprot.writeI32(_iter272.getValue().size());
+ for (Map.Entry<String, Long> _iter273 : _iter272.getValue().entrySet())
+ {
+ oprot.writeString(_iter273.getKey());
+ oprot.writeI64(_iter273.getValue());
+ }
+ }
+ }
+ }
+ struct.specific.write(oprot);
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, ExecutorStats struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ {
+ org.apache.thrift.protocol.TMap _map274 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
+ struct.emitted = new HashMap<String,Map<String,Long>>(2*_map274.size);
+ String _key275;
+ Map<String,Long> _val276;
+ for (int _i277 = 0; _i277 < _map274.size; ++_i277)
+ {
+ _key275 = iprot.readString();
+ {
+ org.apache.thrift.protocol.TMap _map278 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32());
+ _val276 = new HashMap<String,Long>(2*_map278.size);
+ String _key279;
+ long _val280;
+ for (int _i281 = 0; _i281 < _map278.size; ++_i281)
+ {
+ _key279 = iprot.readString();
+ _val280 = iprot.readI64();
+ _val276.put(_key279, _val280);
+ }
+ }
+ struct.emitted.put(_key275, _val276);
+ }
+ }
+ struct.set_emitted_isSet(true);
+ {
+ org.apache.thrift.protocol.TMap _map282 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
+ struct.transferred = new HashMap<String,Map<String,Long>>(2*_map282.size);
+ String _key283;
+ Map<String,Long> _val284;
+ for (int _i285 = 0; _i285 < _map282.size; ++_i285)
+ {
+ _key283 = iprot.readString();
+ {
+ org.apache.thrift.protocol.TMap _map286 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32());
+ _val284 = new HashMap<String,Long>(2*_map286.size);
+ String _key287;
+ long _val288;
+ for (int _i289 = 0; _i289 < _map286.size; ++_i289)
+ {
+ _key287 = iprot.readString();
+ _val288 = iprot.readI64();
+ _val284.put(_key287, _val288);
+ }
+ }
+ struct.transferred.put(_key283, _val284);
+ }
+ }
+ struct.set_transferred_isSet(true);
+ struct.specific = new ExecutorSpecificStats();
+ struct.specific.read(iprot);
+ struct.set_specific_isSet(true);
+ }
+ }
+
}
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/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 daa9a6e..3191508 100644
--- a/storm-core/src/jvm/backtype/storm/generated/ExecutorSummary.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ExecutorSummary.java
@@ -16,13 +16,24 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package backtype.storm.generated;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -35,10 +46,13 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class ExecutorSummary implements org.apache.thrift.TBase<ExecutorSummary, ExecutorSummary._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
+public class 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");
private static final org.apache.thrift.protocol.TField EXECUTOR_INFO_FIELD_DESC = new org.apache.thrift.protocol.TField("executor_info", org.apache.thrift.protocol.TType.STRUCT, (short)1);
@@ -48,12 +62,18 @@ public class ExecutorSummary implements org.apache.thrift.TBase<ExecutorSummary,
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)5);
private static final org.apache.thrift.protocol.TField STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("stats", org.apache.thrift.protocol.TType.STRUCT, (short)7);
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new ExecutorSummaryStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new ExecutorSummaryTupleSchemeFactory());
+ }
+
private ExecutorInfo executor_info; // required
private String component_id; // required
private String host; // required
private int port; // required
private int uptime_secs; // required
- private ExecutorStats stats; // required
+ private ExecutorStats stats; // 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 {
@@ -131,8 +151,8 @@ public class ExecutorSummary implements org.apache.thrift.TBase<ExecutorSummary,
// isset id assignments
private static final int __PORT_ISSET_ID = 0;
private static final int __UPTIME_SECS_ISSET_ID = 1;
- private BitSet __isset_bit_vector = new BitSet(2);
-
+ private byte __isset_bitfield = 0;
+ private static final _Fields optionals[] = {_Fields.STATS};
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);
@@ -176,8 +196,7 @@ public class ExecutorSummary implements org.apache.thrift.TBase<ExecutorSummary,
* Performs a deep copy on <i>other</i>.
*/
public ExecutorSummary(ExecutorSummary other) {
- __isset_bit_vector.clear();
- __isset_bit_vector.or(other.__isset_bit_vector);
+ __isset_bitfield = other.__isset_bitfield;
if (other.is_set_executor_info()) {
this.executor_info = new ExecutorInfo(other.executor_info);
}
@@ -289,16 +308,16 @@ public class ExecutorSummary implements org.apache.thrift.TBase<ExecutorSummary,
}
public void unset_port() {
- __isset_bit_vector.clear(__PORT_ISSET_ID);
+ __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 __isset_bit_vector.get(__PORT_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __PORT_ISSET_ID);
}
public void set_port_isSet(boolean value) {
- __isset_bit_vector.set(__PORT_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PORT_ISSET_ID, value);
}
public int get_uptime_secs() {
@@ -311,16 +330,16 @@ public class ExecutorSummary implements org.apache.thrift.TBase<ExecutorSummary,
}
public void unset_uptime_secs() {
- __isset_bit_vector.clear(__UPTIME_SECS_ISSET_ID);
+ __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 __isset_bit_vector.get(__UPTIME_SECS_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
}
public void set_uptime_secs_isSet(boolean value) {
- __isset_bit_vector.set(__UPTIME_SECS_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID, value);
}
public ExecutorStats get_stats() {
@@ -518,105 +537,105 @@ public class ExecutorSummary implements org.apache.thrift.TBase<ExecutorSummary,
@Override
public int hashCode() {
- HashCodeBuilder builder = new HashCodeBuilder();
+ List<Object> list = new ArrayList<Object>();
boolean present_executor_info = true && (is_set_executor_info());
- builder.append(present_executor_info);
+ list.add(present_executor_info);
if (present_executor_info)
- builder.append(executor_info);
+ list.add(executor_info);
boolean present_component_id = true && (is_set_component_id());
- builder.append(present_component_id);
+ list.add(present_component_id);
if (present_component_id)
- builder.append(component_id);
+ list.add(component_id);
boolean present_host = true && (is_set_host());
- builder.append(present_host);
+ list.add(present_host);
if (present_host)
- builder.append(host);
+ list.add(host);
boolean present_port = true;
- builder.append(present_port);
+ list.add(present_port);
if (present_port)
- builder.append(port);
+ list.add(port);
boolean present_uptime_secs = true;
- builder.append(present_uptime_secs);
+ list.add(present_uptime_secs);
if (present_uptime_secs)
- builder.append(uptime_secs);
+ list.add(uptime_secs);
boolean present_stats = true && (is_set_stats());
- builder.append(present_stats);
+ list.add(present_stats);
if (present_stats)
- builder.append(stats);
+ list.add(stats);
- return builder.toHashCode();
+ return list.hashCode();
}
+ @Override
public int compareTo(ExecutorSummary other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- ExecutorSummary typedOther = (ExecutorSummary)other;
- lastComparison = Boolean.valueOf(is_set_executor_info()).compareTo(typedOther.is_set_executor_info());
+ lastComparison = Boolean.valueOf(is_set_executor_info()).compareTo(other.is_set_executor_info());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_executor_info()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.executor_info, typedOther.executor_info);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.executor_info, other.executor_info);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_component_id()).compareTo(typedOther.is_set_component_id());
+ lastComparison = Boolean.valueOf(is_set_component_id()).compareTo(other.is_set_component_id());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_component_id()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.component_id, typedOther.component_id);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.component_id, other.component_id);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_host()).compareTo(typedOther.is_set_host());
+ lastComparison = Boolean.valueOf(is_set_host()).compareTo(other.is_set_host());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_host()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.host, typedOther.host);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.host, other.host);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_port()).compareTo(typedOther.is_set_port());
+ 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, typedOther.port);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.port, other.port);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_uptime_secs()).compareTo(typedOther.is_set_uptime_secs());
+ 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, typedOther.uptime_secs);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uptime_secs, other.uptime_secs);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_stats()).compareTo(typedOther.is_set_stats());
+ lastComparison = Boolean.valueOf(is_set_stats()).compareTo(other.is_set_stats());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_stats()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stats, typedOther.stats);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stats, other.stats);
if (lastComparison != 0) {
return lastComparison;
}
@@ -629,104 +648,11 @@ public class ExecutorSummary implements org.apache.thrift.TBase<ExecutorSummary,
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // EXECUTOR_INFO
- if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
- this.executor_info = new ExecutorInfo();
- this.executor_info.read(iprot);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 2: // COMPONENT_ID
- if (field.type == org.apache.thrift.protocol.TType.STRING) {
- this.component_id = iprot.readString();
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 3: // HOST
- if (field.type == org.apache.thrift.protocol.TType.STRING) {
- this.host = iprot.readString();
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 4: // PORT
- if (field.type == org.apache.thrift.protocol.TType.I32) {
- this.port = iprot.readI32();
- set_port_isSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 5: // UPTIME_SECS
- if (field.type == org.apache.thrift.protocol.TType.I32) {
- this.uptime_secs = iprot.readI32();
- set_uptime_secs_isSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 7: // STATS
- if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
- this.stats = new ExecutorStats();
- this.stats.read(iprot);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (this.executor_info != null) {
- oprot.writeFieldBegin(EXECUTOR_INFO_FIELD_DESC);
- this.executor_info.write(oprot);
- oprot.writeFieldEnd();
- }
- if (this.component_id != null) {
- oprot.writeFieldBegin(COMPONENT_ID_FIELD_DESC);
- oprot.writeString(this.component_id);
- oprot.writeFieldEnd();
- }
- if (this.host != null) {
- oprot.writeFieldBegin(HOST_FIELD_DESC);
- oprot.writeString(this.host);
- oprot.writeFieldEnd();
- }
- oprot.writeFieldBegin(PORT_FIELD_DESC);
- oprot.writeI32(this.port);
- oprot.writeFieldEnd();
- oprot.writeFieldBegin(UPTIME_SECS_FIELD_DESC);
- oprot.writeI32(this.uptime_secs);
- oprot.writeFieldEnd();
- if (this.stats != null) {
- if (is_set_stats()) {
- oprot.writeFieldBegin(STATS_FIELD_DESC);
- this.stats.write(oprot);
- oprot.writeFieldEnd();
- }
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@Override
@@ -801,6 +727,13 @@ public class ExecutorSummary implements org.apache.thrift.TBase<ExecutorSummary,
throw new org.apache.thrift.protocol.TProtocolException("Required field 'uptime_secs' is unset! Struct:" + toString());
}
+ // check for sub-struct validity
+ if (executor_info != null) {
+ executor_info.validate();
+ }
+ if (stats != null) {
+ stats.validate();
+ }
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -814,12 +747,176 @@ public class ExecutorSummary implements org.apache.thrift.TBase<ExecutorSummary,
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_bit_vector = new BitSet(1);
+ __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 ExecutorSummaryStandardSchemeFactory implements SchemeFactory {
+ public ExecutorSummaryStandardScheme getScheme() {
+ return new ExecutorSummaryStandardScheme();
+ }
+ }
+
+ private static class ExecutorSummaryStandardScheme extends StandardScheme<ExecutorSummary> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, ExecutorSummary 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: // EXECUTOR_INFO
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+ struct.executor_info = new ExecutorInfo();
+ struct.executor_info.read(iprot);
+ struct.set_executor_info_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // COMPONENT_ID
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.component_id = iprot.readString();
+ struct.set_component_id_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 3: // HOST
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.host = iprot.readString();
+ struct.set_host_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;
+ case 5: // 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;
+ case 7: // STATS
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+ struct.stats = new ExecutorStats();
+ struct.stats.read(iprot);
+ struct.set_stats_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, ExecutorSummary struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.executor_info != null) {
+ oprot.writeFieldBegin(EXECUTOR_INFO_FIELD_DESC);
+ struct.executor_info.write(oprot);
+ oprot.writeFieldEnd();
+ }
+ if (struct.component_id != null) {
+ oprot.writeFieldBegin(COMPONENT_ID_FIELD_DESC);
+ oprot.writeString(struct.component_id);
+ oprot.writeFieldEnd();
+ }
+ if (struct.host != null) {
+ oprot.writeFieldBegin(HOST_FIELD_DESC);
+ oprot.writeString(struct.host);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldBegin(PORT_FIELD_DESC);
+ oprot.writeI32(struct.port);
+ oprot.writeFieldEnd();
+ oprot.writeFieldBegin(UPTIME_SECS_FIELD_DESC);
+ oprot.writeI32(struct.uptime_secs);
+ oprot.writeFieldEnd();
+ if (struct.stats != null) {
+ if (struct.is_set_stats()) {
+ oprot.writeFieldBegin(STATS_FIELD_DESC);
+ struct.stats.write(oprot);
+ oprot.writeFieldEnd();
+ }
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class ExecutorSummaryTupleSchemeFactory implements SchemeFactory {
+ public ExecutorSummaryTupleScheme getScheme() {
+ return new ExecutorSummaryTupleScheme();
+ }
+ }
+
+ private static class ExecutorSummaryTupleScheme extends TupleScheme<ExecutorSummary> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, ExecutorSummary struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ struct.executor_info.write(oprot);
+ oprot.writeString(struct.component_id);
+ oprot.writeString(struct.host);
+ oprot.writeI32(struct.port);
+ oprot.writeI32(struct.uptime_secs);
+ BitSet optionals = new BitSet();
+ if (struct.is_set_stats()) {
+ optionals.set(0);
+ }
+ oprot.writeBitSet(optionals, 1);
+ if (struct.is_set_stats()) {
+ struct.stats.write(oprot);
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, ExecutorSummary struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ struct.executor_info = new ExecutorInfo();
+ struct.executor_info.read(iprot);
+ struct.set_executor_info_isSet(true);
+ struct.component_id = iprot.readString();
+ struct.set_component_id_isSet(true);
+ struct.host = iprot.readString();
+ struct.set_host_isSet(true);
+ struct.port = iprot.readI32();
+ struct.set_port_isSet(true);
+ struct.uptime_secs = iprot.readI32();
+ struct.set_uptime_secs_isSet(true);
+ BitSet incoming = iprot.readBitSet(1);
+ if (incoming.get(0)) {
+ struct.stats = new ExecutorStats();
+ struct.stats.read(iprot);
+ struct.set_stats_isSet(true);
+ }
+ }
+ }
+
}
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/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 02ed3ed..fa60c6b 100644
--- a/storm-core/src/jvm/backtype/storm/generated/GlobalStreamId.java
+++ b/storm-core/src/jvm/backtype/storm/generated/GlobalStreamId.java
@@ -16,13 +16,24 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package backtype.storm.generated;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -35,15 +46,24 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class GlobalStreamId implements org.apache.thrift.TBase<GlobalStreamId, GlobalStreamId._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
+public class 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");
private static final org.apache.thrift.protocol.TField COMPONENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("componentId", org.apache.thrift.protocol.TType.STRING, (short)1);
private static final org.apache.thrift.protocol.TField STREAM_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("streamId", 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 GlobalStreamIdStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new GlobalStreamIdTupleSchemeFactory());
+ }
+
private String componentId; // required
private String streamId; // required
@@ -109,7 +129,6 @@ public class GlobalStreamId implements org.apache.thrift.TBase<GlobalStreamId, G
}
// isset id assignments
-
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -285,45 +304,45 @@ public class GlobalStreamId implements org.apache.thrift.TBase<GlobalStreamId, G
@Override
public int hashCode() {
- HashCodeBuilder builder = new HashCodeBuilder();
+ List<Object> list = new ArrayList<Object>();
boolean present_componentId = true && (is_set_componentId());
- builder.append(present_componentId);
+ list.add(present_componentId);
if (present_componentId)
- builder.append(componentId);
+ list.add(componentId);
boolean present_streamId = true && (is_set_streamId());
- builder.append(present_streamId);
+ list.add(present_streamId);
if (present_streamId)
- builder.append(streamId);
+ list.add(streamId);
- return builder.toHashCode();
+ return list.hashCode();
}
+ @Override
public int compareTo(GlobalStreamId other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- GlobalStreamId typedOther = (GlobalStreamId)other;
- lastComparison = Boolean.valueOf(is_set_componentId()).compareTo(typedOther.is_set_componentId());
+ lastComparison = Boolean.valueOf(is_set_componentId()).compareTo(other.is_set_componentId());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_componentId()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.componentId, typedOther.componentId);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.componentId, other.componentId);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_streamId()).compareTo(typedOther.is_set_streamId());
+ lastComparison = Boolean.valueOf(is_set_streamId()).compareTo(other.is_set_streamId());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_streamId()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.streamId, typedOther.streamId);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.streamId, other.streamId);
if (lastComparison != 0) {
return lastComparison;
}
@@ -336,54 +355,11 @@ public class GlobalStreamId implements org.apache.thrift.TBase<GlobalStreamId, G
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // COMPONENT_ID
- if (field.type == org.apache.thrift.protocol.TType.STRING) {
- this.componentId = iprot.readString();
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 2: // STREAM_ID
- if (field.type == org.apache.thrift.protocol.TType.STRING) {
- this.streamId = iprot.readString();
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (this.componentId != null) {
- oprot.writeFieldBegin(COMPONENT_ID_FIELD_DESC);
- oprot.writeString(this.componentId);
- oprot.writeFieldEnd();
- }
- if (this.streamId != null) {
- oprot.writeFieldBegin(STREAM_ID_FIELD_DESC);
- oprot.writeString(this.streamId);
- oprot.writeFieldEnd();
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@Override
@@ -420,6 +396,7 @@ public class GlobalStreamId implements org.apache.thrift.TBase<GlobalStreamId, G
throw new org.apache.thrift.protocol.TProtocolException("Required field 'streamId' is unset! Struct:" + toString());
}
+ // check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -438,5 +415,93 @@ public class GlobalStreamId implements org.apache.thrift.TBase<GlobalStreamId, G
}
}
+ private static class GlobalStreamIdStandardSchemeFactory implements SchemeFactory {
+ public GlobalStreamIdStandardScheme getScheme() {
+ return new GlobalStreamIdStandardScheme();
+ }
+ }
+
+ private static class GlobalStreamIdStandardScheme extends StandardScheme<GlobalStreamId> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, GlobalStreamId 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: // COMPONENT_ID
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.componentId = iprot.readString();
+ struct.set_componentId_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // STREAM_ID
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.streamId = iprot.readString();
+ struct.set_streamId_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, GlobalStreamId struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.componentId != null) {
+ oprot.writeFieldBegin(COMPONENT_ID_FIELD_DESC);
+ oprot.writeString(struct.componentId);
+ oprot.writeFieldEnd();
+ }
+ if (struct.streamId != null) {
+ oprot.writeFieldBegin(STREAM_ID_FIELD_DESC);
+ oprot.writeString(struct.streamId);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class GlobalStreamIdTupleSchemeFactory implements SchemeFactory {
+ public GlobalStreamIdTupleScheme getScheme() {
+ return new GlobalStreamIdTupleScheme();
+ }
+ }
+
+ private static class GlobalStreamIdTupleScheme extends TupleScheme<GlobalStreamId> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, GlobalStreamId struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ oprot.writeString(struct.componentId);
+ oprot.writeString(struct.streamId);
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, GlobalStreamId struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ struct.componentId = iprot.readString();
+ struct.set_componentId_isSet(true);
+ struct.streamId = iprot.readString();
+ struct.set_streamId_isSet(true);
+ }
+ }
+
}
[07/18] storm git commit: Upgrade to thrift-0.9.2
Posted by kn...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/storm-core/src/jvm/backtype/storm/generated/Grouping.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/Grouping.java b/storm-core/src/jvm/backtype/storm/generated/Grouping.java
index 48677ad..3994499 100644
--- a/storm-core/src/jvm/backtype/storm/generated/Grouping.java
+++ b/storm-core/src/jvm/backtype/storm/generated/Grouping.java
@@ -16,13 +16,24 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package backtype.storm.generated;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -35,9 +46,11 @@ 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"})
public class Grouping extends org.apache.thrift.TUnion<Grouping, Grouping._Fields> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Grouping");
private static final org.apache.thrift.protocol.TField FIELDS_FIELD_DESC = new org.apache.thrift.protocol.TField("fields", org.apache.thrift.protocol.TType.LIST, (short)1);
@@ -211,7 +224,7 @@ public class Grouping extends org.apache.thrift.TUnion<Grouping, Grouping._Field
public static Grouping custom_serialized(byte[] value) {
Grouping x = new Grouping();
- x.set_custom_serialized(ByteBuffer.wrap(value));
+ x.set_custom_serialized(ByteBuffer.wrap(Arrays.copyOf(value, value.length)));
return x;
}
@@ -271,7 +284,7 @@ public class Grouping extends org.apache.thrift.TUnion<Grouping, Grouping._Field
}
@Override
- protected Object readValue(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TField field) throws org.apache.thrift.TException {
+ protected Object standardSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TField field) throws org.apache.thrift.TException {
_Fields setField = _Fields.findByThriftId(field.id);
if (setField != null) {
switch (setField) {
@@ -279,13 +292,13 @@ public class Grouping extends org.apache.thrift.TUnion<Grouping, Grouping._Field
if (field.type == FIELDS_FIELD_DESC.type) {
List<String> fields;
{
- org.apache.thrift.protocol.TList _list4 = iprot.readListBegin();
- fields = new ArrayList<String>(_list4.size);
- for (int _i5 = 0; _i5 < _list4.size; ++_i5)
+ org.apache.thrift.protocol.TList _list8 = iprot.readListBegin();
+ fields = new ArrayList<String>(_list8.size);
+ String _elem9;
+ for (int _i10 = 0; _i10 < _list8.size; ++_i10)
{
- String _elem6; // required
- _elem6 = iprot.readString();
- fields.add(_elem6);
+ _elem9 = iprot.readString();
+ fields.add(_elem9);
}
iprot.readListEnd();
}
@@ -373,15 +386,123 @@ public class Grouping extends org.apache.thrift.TUnion<Grouping, Grouping._Field
}
@Override
- protected void writeValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+ protected void standardSchemeWriteValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
switch (setField_) {
case FIELDS:
List<String> fields = (List<String>)value_;
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, fields.size()));
- for (String _iter7 : fields)
+ for (String _iter11 : fields)
{
- oprot.writeString(_iter7);
+ oprot.writeString(_iter11);
+ }
+ oprot.writeListEnd();
+ }
+ return;
+ case SHUFFLE:
+ NullStruct shuffle = (NullStruct)value_;
+ shuffle.write(oprot);
+ return;
+ case ALL:
+ NullStruct all = (NullStruct)value_;
+ all.write(oprot);
+ return;
+ case NONE:
+ NullStruct none = (NullStruct)value_;
+ none.write(oprot);
+ return;
+ case DIRECT:
+ NullStruct direct = (NullStruct)value_;
+ direct.write(oprot);
+ return;
+ case CUSTOM_OBJECT:
+ JavaObject custom_object = (JavaObject)value_;
+ custom_object.write(oprot);
+ return;
+ case CUSTOM_SERIALIZED:
+ ByteBuffer custom_serialized = (ByteBuffer)value_;
+ oprot.writeBinary(custom_serialized);
+ return;
+ case LOCAL_OR_SHUFFLE:
+ NullStruct local_or_shuffle = (NullStruct)value_;
+ local_or_shuffle.write(oprot);
+ return;
+ default:
+ throw new IllegalStateException("Cannot write union with unknown field " + setField_);
+ }
+ }
+
+ @Override
+ protected Object tupleSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, short fieldID) throws org.apache.thrift.TException {
+ _Fields setField = _Fields.findByThriftId(fieldID);
+ if (setField != null) {
+ switch (setField) {
+ case FIELDS:
+ List<String> fields;
+ {
+ org.apache.thrift.protocol.TList _list12 = iprot.readListBegin();
+ fields = new ArrayList<String>(_list12.size);
+ String _elem13;
+ for (int _i14 = 0; _i14 < _list12.size; ++_i14)
+ {
+ _elem13 = iprot.readString();
+ fields.add(_elem13);
+ }
+ iprot.readListEnd();
+ }
+ return fields;
+ case SHUFFLE:
+ NullStruct shuffle;
+ shuffle = new NullStruct();
+ shuffle.read(iprot);
+ return shuffle;
+ case ALL:
+ NullStruct all;
+ all = new NullStruct();
+ all.read(iprot);
+ return all;
+ case NONE:
+ NullStruct none;
+ none = new NullStruct();
+ none.read(iprot);
+ return none;
+ case DIRECT:
+ NullStruct direct;
+ direct = new NullStruct();
+ direct.read(iprot);
+ return direct;
+ case CUSTOM_OBJECT:
+ JavaObject custom_object;
+ custom_object = new JavaObject();
+ custom_object.read(iprot);
+ return custom_object;
+ case CUSTOM_SERIALIZED:
+ ByteBuffer custom_serialized;
+ custom_serialized = iprot.readBinary();
+ return custom_serialized;
+ case LOCAL_OR_SHUFFLE:
+ NullStruct local_or_shuffle;
+ local_or_shuffle = new NullStruct();
+ local_or_shuffle.read(iprot);
+ return local_or_shuffle;
+ default:
+ throw new IllegalStateException("setField wasn't null, but didn't match any of the case statements!");
+ }
+ } else {
+ throw new TProtocolException("Couldn't find a field with field id " + fieldID);
+ }
+ }
+
+ @Override
+ protected void tupleSchemeWriteValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+ switch (setField_) {
+ case FIELDS:
+ List<String> fields = (List<String>)value_;
+ {
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, fields.size()));
+ for (String _iter15 : fields)
+ {
+ oprot.writeString(_iter15);
}
oprot.writeListEnd();
}
@@ -550,14 +671,14 @@ public class Grouping extends org.apache.thrift.TUnion<Grouping, Grouping._Field
public ByteBuffer buffer_for_custom_serialized() {
if (getSetField() == _Fields.CUSTOM_SERIALIZED) {
- return (ByteBuffer)getFieldValue();
+ return org.apache.thrift.TBaseHelper.copyBinary((ByteBuffer)getFieldValue());
} else {
throw new RuntimeException("Cannot get field 'custom_serialized' because union is currently set to " + getFieldDesc(getSetField()).name);
}
}
public void set_custom_serialized(byte[] value) {
- set_custom_serialized(ByteBuffer.wrap(value));
+ set_custom_serialized(ByteBuffer.wrap(Arrays.copyOf(value, value.length)));
}
public void set_custom_serialized(ByteBuffer value) {
@@ -644,19 +765,19 @@ public class Grouping extends org.apache.thrift.TUnion<Grouping, Grouping._Field
@Override
public int hashCode() {
- HashCodeBuilder hcb = new HashCodeBuilder();
- hcb.append(this.getClass().getName());
+ List<Object> list = new ArrayList<Object>();
+ list.add(this.getClass().getName());
org.apache.thrift.TFieldIdEnum setField = getSetField();
if (setField != null) {
- hcb.append(setField.getThriftFieldId());
+ list.add(setField.getThriftFieldId());
Object value = getFieldValue();
if (value instanceof org.apache.thrift.TEnum) {
- hcb.append(((org.apache.thrift.TEnum)getFieldValue()).getValue());
+ list.add(((org.apache.thrift.TEnum)getFieldValue()).getValue());
} else {
- hcb.append(value);
+ list.add(value);
}
}
- return hcb.toHashCode();
+ return list.hashCode();
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
try {
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/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 79d917c..f3559a6 100644
--- a/storm-core/src/jvm/backtype/storm/generated/InvalidTopologyException.java
+++ b/storm-core/src/jvm/backtype/storm/generated/InvalidTopologyException.java
@@ -16,13 +16,24 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package backtype.storm.generated;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -35,14 +46,23 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class InvalidTopologyException extends Exception implements org.apache.thrift.TBase<InvalidTopologyException, InvalidTopologyException._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
+public class 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");
private static final org.apache.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.thrift.protocol.TField("msg", org.apache.thrift.protocol.TType.STRING, (short)1);
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new InvalidTopologyExceptionStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new InvalidTopologyExceptionTupleSchemeFactory());
+ }
+
private String msg; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -104,7 +124,6 @@ public class InvalidTopologyException extends Exception implements org.apache.th
}
// isset id assignments
-
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -227,30 +246,30 @@ public class InvalidTopologyException extends Exception implements org.apache.th
@Override
public int hashCode() {
- HashCodeBuilder builder = new HashCodeBuilder();
+ List<Object> list = new ArrayList<Object>();
boolean present_msg = true && (is_set_msg());
- builder.append(present_msg);
+ list.add(present_msg);
if (present_msg)
- builder.append(msg);
+ list.add(msg);
- return builder.toHashCode();
+ return list.hashCode();
}
+ @Override
public int compareTo(InvalidTopologyException other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- InvalidTopologyException typedOther = (InvalidTopologyException)other;
- lastComparison = Boolean.valueOf(is_set_msg()).compareTo(typedOther.is_set_msg());
+ lastComparison = Boolean.valueOf(is_set_msg()).compareTo(other.is_set_msg());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_msg()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.msg, typedOther.msg);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.msg, other.msg);
if (lastComparison != 0) {
return lastComparison;
}
@@ -263,42 +282,11 @@ public class InvalidTopologyException extends Exception implements org.apache.th
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // MSG
- if (field.type == org.apache.thrift.protocol.TType.STRING) {
- this.msg = iprot.readString();
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (this.msg != null) {
- oprot.writeFieldBegin(MSG_FIELD_DESC);
- oprot.writeString(this.msg);
- oprot.writeFieldEnd();
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@Override
@@ -323,6 +311,7 @@ public class InvalidTopologyException extends Exception implements org.apache.th
throw new org.apache.thrift.protocol.TProtocolException("Required field 'msg' is unset! Struct:" + toString());
}
+ // check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -341,5 +330,77 @@ public class InvalidTopologyException extends Exception implements org.apache.th
}
}
+ private static class InvalidTopologyExceptionStandardSchemeFactory implements SchemeFactory {
+ public InvalidTopologyExceptionStandardScheme getScheme() {
+ return new InvalidTopologyExceptionStandardScheme();
+ }
+ }
+
+ private static class InvalidTopologyExceptionStandardScheme extends StandardScheme<InvalidTopologyException> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, InvalidTopologyException struct) throws org.apache.thrift.TException {
+ org.apache.thrift.protocol.TField schemeField;
+ iprot.readStructBegin();
+ while (true)
+ {
+ schemeField = iprot.readFieldBegin();
+ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ break;
+ }
+ switch (schemeField.id) {
+ case 1: // MSG
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.msg = iprot.readString();
+ struct.set_msg_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ default:
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ iprot.readFieldEnd();
+ }
+ iprot.readStructEnd();
+ struct.validate();
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot, InvalidTopologyException struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.msg != null) {
+ oprot.writeFieldBegin(MSG_FIELD_DESC);
+ oprot.writeString(struct.msg);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class InvalidTopologyExceptionTupleSchemeFactory implements SchemeFactory {
+ public InvalidTopologyExceptionTupleScheme getScheme() {
+ return new InvalidTopologyExceptionTupleScheme();
+ }
+ }
+
+ private static class InvalidTopologyExceptionTupleScheme extends TupleScheme<InvalidTopologyException> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, InvalidTopologyException struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ oprot.writeString(struct.msg);
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, InvalidTopologyException struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ struct.msg = iprot.readString();
+ struct.set_msg_isSet(true);
+ }
+ }
+
}
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/storm-core/src/jvm/backtype/storm/generated/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 8e627ca..4eb4b92 100644
--- a/storm-core/src/jvm/backtype/storm/generated/JavaObject.java
+++ b/storm-core/src/jvm/backtype/storm/generated/JavaObject.java
@@ -16,13 +16,24 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package backtype.storm.generated;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -35,15 +46,24 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObject._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
+public class 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");
private static final org.apache.thrift.protocol.TField FULL_CLASS_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("full_class_name", org.apache.thrift.protocol.TType.STRING, (short)1);
private static final org.apache.thrift.protocol.TField ARGS_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("args_list", 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 JavaObjectStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new JavaObjectTupleSchemeFactory());
+ }
+
private String full_class_name; // required
private List<JavaObjectArg> args_list; // required
@@ -109,7 +129,6 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec
}
// 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);
@@ -142,7 +161,7 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec
this.full_class_name = other.full_class_name;
}
if (other.is_set_args_list()) {
- List<JavaObjectArg> __this__args_list = new ArrayList<JavaObjectArg>();
+ List<JavaObjectArg> __this__args_list = new ArrayList<JavaObjectArg>(other.args_list.size());
for (JavaObjectArg other_element : other.args_list) {
__this__args_list.add(new JavaObjectArg(other_element));
}
@@ -305,45 +324,45 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec
@Override
public int hashCode() {
- HashCodeBuilder builder = new HashCodeBuilder();
+ List<Object> list = new ArrayList<Object>();
boolean present_full_class_name = true && (is_set_full_class_name());
- builder.append(present_full_class_name);
+ list.add(present_full_class_name);
if (present_full_class_name)
- builder.append(full_class_name);
+ list.add(full_class_name);
boolean present_args_list = true && (is_set_args_list());
- builder.append(present_args_list);
+ list.add(present_args_list);
if (present_args_list)
- builder.append(args_list);
+ list.add(args_list);
- return builder.toHashCode();
+ return list.hashCode();
}
+ @Override
public int compareTo(JavaObject other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- JavaObject typedOther = (JavaObject)other;
- lastComparison = Boolean.valueOf(is_set_full_class_name()).compareTo(typedOther.is_set_full_class_name());
+ lastComparison = Boolean.valueOf(is_set_full_class_name()).compareTo(other.is_set_full_class_name());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_full_class_name()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.full_class_name, typedOther.full_class_name);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.full_class_name, other.full_class_name);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_args_list()).compareTo(typedOther.is_set_args_list());
+ lastComparison = Boolean.valueOf(is_set_args_list()).compareTo(other.is_set_args_list());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_args_list()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.args_list, typedOther.args_list);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.args_list, other.args_list);
if (lastComparison != 0) {
return lastComparison;
}
@@ -356,72 +375,11 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // FULL_CLASS_NAME
- if (field.type == org.apache.thrift.protocol.TType.STRING) {
- this.full_class_name = iprot.readString();
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 2: // ARGS_LIST
- if (field.type == org.apache.thrift.protocol.TType.LIST) {
- {
- org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
- this.args_list = new ArrayList<JavaObjectArg>(_list0.size);
- for (int _i1 = 0; _i1 < _list0.size; ++_i1)
- {
- JavaObjectArg _elem2; // required
- _elem2 = new JavaObjectArg();
- _elem2.read(iprot);
- this.args_list.add(_elem2);
- }
- iprot.readListEnd();
- }
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (this.full_class_name != null) {
- oprot.writeFieldBegin(FULL_CLASS_NAME_FIELD_DESC);
- oprot.writeString(this.full_class_name);
- oprot.writeFieldEnd();
- }
- if (this.args_list != null) {
- oprot.writeFieldBegin(ARGS_LIST_FIELD_DESC);
- {
- oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.args_list.size()));
- for (JavaObjectArg _iter3 : this.args_list)
- {
- _iter3.write(oprot);
- }
- oprot.writeListEnd();
- }
- oprot.writeFieldEnd();
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@Override
@@ -458,6 +416,7 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec
throw new org.apache.thrift.protocol.TProtocolException("Required field 'args_list' is unset! Struct:" + toString());
}
+ // check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -476,5 +435,127 @@ public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObjec
}
}
+ private static class JavaObjectStandardSchemeFactory implements SchemeFactory {
+ public JavaObjectStandardScheme getScheme() {
+ return new JavaObjectStandardScheme();
+ }
+ }
+
+ private static class JavaObjectStandardScheme extends StandardScheme<JavaObject> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, JavaObject 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: // FULL_CLASS_NAME
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.full_class_name = iprot.readString();
+ struct.set_full_class_name_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // ARGS_LIST
+ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+ {
+ org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
+ struct.args_list = new ArrayList<JavaObjectArg>(_list0.size);
+ JavaObjectArg _elem1;
+ for (int _i2 = 0; _i2 < _list0.size; ++_i2)
+ {
+ _elem1 = new JavaObjectArg();
+ _elem1.read(iprot);
+ struct.args_list.add(_elem1);
+ }
+ iprot.readListEnd();
+ }
+ struct.set_args_list_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, JavaObject struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.full_class_name != null) {
+ oprot.writeFieldBegin(FULL_CLASS_NAME_FIELD_DESC);
+ oprot.writeString(struct.full_class_name);
+ oprot.writeFieldEnd();
+ }
+ if (struct.args_list != null) {
+ oprot.writeFieldBegin(ARGS_LIST_FIELD_DESC);
+ {
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.args_list.size()));
+ for (JavaObjectArg _iter3 : struct.args_list)
+ {
+ _iter3.write(oprot);
+ }
+ oprot.writeListEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class JavaObjectTupleSchemeFactory implements SchemeFactory {
+ public JavaObjectTupleScheme getScheme() {
+ return new JavaObjectTupleScheme();
+ }
+ }
+
+ private static class JavaObjectTupleScheme extends TupleScheme<JavaObject> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, JavaObject struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ oprot.writeString(struct.full_class_name);
+ {
+ oprot.writeI32(struct.args_list.size());
+ for (JavaObjectArg _iter4 : struct.args_list)
+ {
+ _iter4.write(oprot);
+ }
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, JavaObject struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ struct.full_class_name = iprot.readString();
+ struct.set_full_class_name_isSet(true);
+ {
+ org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.args_list = new ArrayList<JavaObjectArg>(_list5.size);
+ JavaObjectArg _elem6;
+ for (int _i7 = 0; _i7 < _list5.size; ++_i7)
+ {
+ _elem6 = new JavaObjectArg();
+ _elem6.read(iprot);
+ struct.args_list.add(_elem6);
+ }
+ }
+ struct.set_args_list_isSet(true);
+ }
+ }
+
}
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/storm-core/src/jvm/backtype/storm/generated/JavaObjectArg.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/JavaObjectArg.java b/storm-core/src/jvm/backtype/storm/generated/JavaObjectArg.java
index 8ea3225..e69bd34 100644
--- a/storm-core/src/jvm/backtype/storm/generated/JavaObjectArg.java
+++ b/storm-core/src/jvm/backtype/storm/generated/JavaObjectArg.java
@@ -16,13 +16,24 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package backtype.storm.generated;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -35,9 +46,11 @@ 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"})
public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaObjectArg._Fields> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JavaObjectArg");
private static final org.apache.thrift.protocol.TField INT_ARG_FIELD_DESC = new org.apache.thrift.protocol.TField("int_arg", org.apache.thrift.protocol.TType.I32, (short)1);
@@ -186,7 +199,7 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO
public static JavaObjectArg binary_arg(byte[] value) {
JavaObjectArg x = new JavaObjectArg();
- x.set_binary_arg(ByteBuffer.wrap(value));
+ x.set_binary_arg(ByteBuffer.wrap(Arrays.copyOf(value, value.length)));
return x;
}
@@ -236,7 +249,7 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO
}
@Override
- protected Object readValue(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TField field) throws org.apache.thrift.TException {
+ protected Object standardSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TField field) throws org.apache.thrift.TException {
_Fields setField = _Fields.findByThriftId(field.id);
if (setField != null) {
switch (setField) {
@@ -304,7 +317,76 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO
}
@Override
- protected void writeValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+ protected void standardSchemeWriteValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+ switch (setField_) {
+ case INT_ARG:
+ Integer int_arg = (Integer)value_;
+ oprot.writeI32(int_arg);
+ return;
+ case LONG_ARG:
+ Long long_arg = (Long)value_;
+ oprot.writeI64(long_arg);
+ return;
+ case STRING_ARG:
+ String string_arg = (String)value_;
+ oprot.writeString(string_arg);
+ return;
+ case BOOL_ARG:
+ Boolean bool_arg = (Boolean)value_;
+ oprot.writeBool(bool_arg);
+ return;
+ case BINARY_ARG:
+ ByteBuffer binary_arg = (ByteBuffer)value_;
+ oprot.writeBinary(binary_arg);
+ return;
+ case DOUBLE_ARG:
+ Double double_arg = (Double)value_;
+ oprot.writeDouble(double_arg);
+ return;
+ default:
+ throw new IllegalStateException("Cannot write union with unknown field " + setField_);
+ }
+ }
+
+ @Override
+ protected Object tupleSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, short fieldID) throws org.apache.thrift.TException {
+ _Fields setField = _Fields.findByThriftId(fieldID);
+ if (setField != null) {
+ switch (setField) {
+ case INT_ARG:
+ Integer int_arg;
+ int_arg = iprot.readI32();
+ return int_arg;
+ case LONG_ARG:
+ Long long_arg;
+ long_arg = iprot.readI64();
+ return long_arg;
+ case STRING_ARG:
+ String string_arg;
+ string_arg = iprot.readString();
+ return string_arg;
+ case BOOL_ARG:
+ Boolean bool_arg;
+ bool_arg = iprot.readBool();
+ return bool_arg;
+ case BINARY_ARG:
+ ByteBuffer binary_arg;
+ binary_arg = iprot.readBinary();
+ return binary_arg;
+ case DOUBLE_ARG:
+ Double double_arg;
+ double_arg = iprot.readDouble();
+ return double_arg;
+ default:
+ throw new IllegalStateException("setField wasn't null, but didn't match any of the case statements!");
+ }
+ } else {
+ throw new TProtocolException("Couldn't find a field with field id " + fieldID);
+ }
+ }
+
+ @Override
+ protected void tupleSchemeWriteValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
switch (setField_) {
case INT_ARG:
Integer int_arg = (Integer)value_;
@@ -431,14 +513,14 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO
public ByteBuffer buffer_for_binary_arg() {
if (getSetField() == _Fields.BINARY_ARG) {
- return (ByteBuffer)getFieldValue();
+ return org.apache.thrift.TBaseHelper.copyBinary((ByteBuffer)getFieldValue());
} else {
throw new RuntimeException("Cannot get field 'binary_arg' because union is currently set to " + getFieldDesc(getSetField()).name);
}
}
public void set_binary_arg(byte[] value) {
- set_binary_arg(ByteBuffer.wrap(value));
+ set_binary_arg(ByteBuffer.wrap(Arrays.copyOf(value, value.length)));
}
public void set_binary_arg(ByteBuffer value) {
@@ -514,19 +596,19 @@ public class JavaObjectArg extends org.apache.thrift.TUnion<JavaObjectArg, JavaO
@Override
public int hashCode() {
- HashCodeBuilder hcb = new HashCodeBuilder();
- hcb.append(this.getClass().getName());
+ List<Object> list = new ArrayList<Object>();
+ list.add(this.getClass().getName());
org.apache.thrift.TFieldIdEnum setField = getSetField();
if (setField != null) {
- hcb.append(setField.getThriftFieldId());
+ list.add(setField.getThriftFieldId());
Object value = getFieldValue();
if (value instanceof org.apache.thrift.TEnum) {
- hcb.append(((org.apache.thrift.TEnum)getFieldValue()).getValue());
+ list.add(((org.apache.thrift.TEnum)getFieldValue()).getValue());
} else {
- hcb.append(value);
+ list.add(value);
}
}
- return hcb.toHashCode();
+ return list.hashCode();
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
try {
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/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 26dd959..0207550 100644
--- a/storm-core/src/jvm/backtype/storm/generated/KillOptions.java
+++ b/storm-core/src/jvm/backtype/storm/generated/KillOptions.java
@@ -16,13 +16,24 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package backtype.storm.generated;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -35,15 +46,24 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class KillOptions implements org.apache.thrift.TBase<KillOptions, KillOptions._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
+public class 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");
private static final org.apache.thrift.protocol.TField WAIT_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("wait_secs", org.apache.thrift.protocol.TType.I32, (short)1);
- private int wait_secs; // required
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new KillOptionsStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new KillOptionsTupleSchemeFactory());
+ }
+
+ private int wait_secs; // 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 {
@@ -105,8 +125,8 @@ public class KillOptions implements org.apache.thrift.TBase<KillOptions, KillOpt
// isset id assignments
private static final int __WAIT_SECS_ISSET_ID = 0;
- private BitSet __isset_bit_vector = new BitSet(1);
-
+ private byte __isset_bitfield = 0;
+ private static final _Fields optionals[] = {_Fields.WAIT_SECS};
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);
@@ -123,8 +143,7 @@ public class KillOptions implements org.apache.thrift.TBase<KillOptions, KillOpt
* Performs a deep copy on <i>other</i>.
*/
public KillOptions(KillOptions other) {
- __isset_bit_vector.clear();
- __isset_bit_vector.or(other.__isset_bit_vector);
+ __isset_bitfield = other.__isset_bitfield;
this.wait_secs = other.wait_secs;
}
@@ -148,16 +167,16 @@ public class KillOptions implements org.apache.thrift.TBase<KillOptions, KillOpt
}
public void unset_wait_secs() {
- __isset_bit_vector.clear(__WAIT_SECS_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __WAIT_SECS_ISSET_ID);
}
/** Returns true if field wait_secs is set (has been assigned a value) and false otherwise */
public boolean is_set_wait_secs() {
- return __isset_bit_vector.get(__WAIT_SECS_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __WAIT_SECS_ISSET_ID);
}
public void set_wait_secs_isSet(boolean value) {
- __isset_bit_vector.set(__WAIT_SECS_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __WAIT_SECS_ISSET_ID, value);
}
public void setFieldValue(_Fields field, Object value) {
@@ -222,30 +241,30 @@ public class KillOptions implements org.apache.thrift.TBase<KillOptions, KillOpt
@Override
public int hashCode() {
- HashCodeBuilder builder = new HashCodeBuilder();
+ List<Object> list = new ArrayList<Object>();
boolean present_wait_secs = true && (is_set_wait_secs());
- builder.append(present_wait_secs);
+ list.add(present_wait_secs);
if (present_wait_secs)
- builder.append(wait_secs);
+ list.add(wait_secs);
- return builder.toHashCode();
+ return list.hashCode();
}
+ @Override
public int compareTo(KillOptions other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- KillOptions typedOther = (KillOptions)other;
- lastComparison = Boolean.valueOf(is_set_wait_secs()).compareTo(typedOther.is_set_wait_secs());
+ lastComparison = Boolean.valueOf(is_set_wait_secs()).compareTo(other.is_set_wait_secs());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_wait_secs()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.wait_secs, typedOther.wait_secs);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.wait_secs, other.wait_secs);
if (lastComparison != 0) {
return lastComparison;
}
@@ -258,43 +277,11 @@ public class KillOptions implements org.apache.thrift.TBase<KillOptions, KillOpt
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // WAIT_SECS
- if (field.type == org.apache.thrift.protocol.TType.I32) {
- this.wait_secs = iprot.readI32();
- set_wait_secs_isSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (is_set_wait_secs()) {
- oprot.writeFieldBegin(WAIT_SECS_FIELD_DESC);
- oprot.writeI32(this.wait_secs);
- oprot.writeFieldEnd();
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@Override
@@ -313,6 +300,7 @@ public class KillOptions implements org.apache.thrift.TBase<KillOptions, KillOpt
public void validate() throws org.apache.thrift.TException {
// check for required fields
+ // check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -326,12 +314,94 @@ public class KillOptions implements org.apache.thrift.TBase<KillOptions, KillOpt
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_bit_vector = new BitSet(1);
+ __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 KillOptionsStandardSchemeFactory implements SchemeFactory {
+ public KillOptionsStandardScheme getScheme() {
+ return new KillOptionsStandardScheme();
+ }
+ }
+
+ private static class KillOptionsStandardScheme extends StandardScheme<KillOptions> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, KillOptions 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: // WAIT_SECS
+ if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ struct.wait_secs = iprot.readI32();
+ struct.set_wait_secs_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, KillOptions struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.is_set_wait_secs()) {
+ oprot.writeFieldBegin(WAIT_SECS_FIELD_DESC);
+ oprot.writeI32(struct.wait_secs);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class KillOptionsTupleSchemeFactory implements SchemeFactory {
+ public KillOptionsTupleScheme getScheme() {
+ return new KillOptionsTupleScheme();
+ }
+ }
+
+ private static class KillOptionsTupleScheme extends TupleScheme<KillOptions> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, KillOptions struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ BitSet optionals = new BitSet();
+ if (struct.is_set_wait_secs()) {
+ optionals.set(0);
+ }
+ oprot.writeBitSet(optionals, 1);
+ if (struct.is_set_wait_secs()) {
+ oprot.writeI32(struct.wait_secs);
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, KillOptions struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ BitSet incoming = iprot.readBitSet(1);
+ if (incoming.get(0)) {
+ struct.wait_secs = iprot.readI32();
+ struct.set_wait_secs_isSet(true);
+ }
+ }
+ }
+
}
[06/18] storm git commit: Upgrade to thrift-0.9.2
Posted by kn...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/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 7d04901..49585a6 100644
--- a/storm-core/src/jvm/backtype/storm/generated/Nimbus.java
+++ b/storm-core/src/jvm/backtype/storm/generated/Nimbus.java
@@ -16,13 +16,24 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package backtype.storm.generated;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -35,9 +46,12 @@ 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-2-2")
public class Nimbus {
public interface Iface {
@@ -84,43 +98,43 @@ public class Nimbus {
public interface AsyncIface {
- public void submitTopology(String name, String uploadedJarLocation, String jsonConf, StormTopology topology, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.submitTopology_call> resultHandler) throws org.apache.thrift.TException;
+ public void submitTopology(String name, String uploadedJarLocation, String jsonConf, StormTopology topology, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void submitTopologyWithOpts(String name, String uploadedJarLocation, String jsonConf, StormTopology topology, SubmitOptions options, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.submitTopologyWithOpts_call> resultHandler) throws org.apache.thrift.TException;
+ public void submitTopologyWithOpts(String name, String uploadedJarLocation, String jsonConf, StormTopology topology, SubmitOptions options, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void killTopology(String name, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.killTopology_call> resultHandler) throws org.apache.thrift.TException;
+ public void killTopology(String name, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void killTopologyWithOpts(String name, KillOptions options, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.killTopologyWithOpts_call> resultHandler) throws org.apache.thrift.TException;
+ public void killTopologyWithOpts(String name, KillOptions options, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void activate(String name, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.activate_call> resultHandler) throws org.apache.thrift.TException;
+ public void activate(String name, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void deactivate(String name, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.deactivate_call> resultHandler) throws org.apache.thrift.TException;
+ public void deactivate(String name, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void rebalance(String name, RebalanceOptions options, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.rebalance_call> resultHandler) throws org.apache.thrift.TException;
+ public void rebalance(String name, RebalanceOptions options, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void uploadNewCredentials(String name, Credentials creds, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.uploadNewCredentials_call> resultHandler) throws org.apache.thrift.TException;
+ public void uploadNewCredentials(String name, Credentials creds, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void beginFileUpload(org.apache.thrift.async.AsyncMethodCallback<AsyncClient.beginFileUpload_call> resultHandler) throws org.apache.thrift.TException;
+ public void beginFileUpload(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void uploadChunk(String location, ByteBuffer chunk, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.uploadChunk_call> resultHandler) throws org.apache.thrift.TException;
+ public void uploadChunk(String location, ByteBuffer chunk, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void finishFileUpload(String location, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.finishFileUpload_call> resultHandler) throws org.apache.thrift.TException;
+ public void finishFileUpload(String location, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void beginFileDownload(String file, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.beginFileDownload_call> resultHandler) throws org.apache.thrift.TException;
+ public void beginFileDownload(String file, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void downloadChunk(String id, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.downloadChunk_call> resultHandler) throws org.apache.thrift.TException;
+ public void downloadChunk(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void getNimbusConf(org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getNimbusConf_call> resultHandler) throws org.apache.thrift.TException;
+ public void getNimbusConf(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void getClusterInfo(org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getClusterInfo_call> resultHandler) throws org.apache.thrift.TException;
+ public void getClusterInfo(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void getTopologyInfo(String id, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getTopologyInfo_call> resultHandler) throws org.apache.thrift.TException;
+ public void getTopologyInfo(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void getTopologyConf(String id, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getTopologyConf_call> resultHandler) throws org.apache.thrift.TException;
+ public void getTopologyConf(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void getTopology(String id, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getTopology_call> resultHandler) throws org.apache.thrift.TException;
+ public void getTopology(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void getUserTopology(String id, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getUserTopology_call> resultHandler) throws org.apache.thrift.TException;
+ public void getUserTopology(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
}
@@ -682,7 +696,7 @@ public class Nimbus {
super(protocolFactory, clientManager, transport);
}
- public void submitTopology(String name, String uploadedJarLocation, String jsonConf, StormTopology topology, org.apache.thrift.async.AsyncMethodCallback<submitTopology_call> resultHandler) throws org.apache.thrift.TException {
+ public void submitTopology(String name, String uploadedJarLocation, String jsonConf, StormTopology topology, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
submitTopology_call method_call = new submitTopology_call(name, uploadedJarLocation, jsonConf, topology, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -694,7 +708,7 @@ public class Nimbus {
private String uploadedJarLocation;
private String jsonConf;
private StormTopology topology;
- public submitTopology_call(String name, String uploadedJarLocation, String jsonConf, StormTopology topology, org.apache.thrift.async.AsyncMethodCallback<submitTopology_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ public submitTopology_call(String name, String uploadedJarLocation, String jsonConf, StormTopology topology, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
super(client, protocolFactory, transport, resultHandler, false);
this.name = name;
this.uploadedJarLocation = uploadedJarLocation;
@@ -723,7 +737,7 @@ public class Nimbus {
}
}
- public void submitTopologyWithOpts(String name, String uploadedJarLocation, String jsonConf, StormTopology topology, SubmitOptions options, org.apache.thrift.async.AsyncMethodCallback<submitTopologyWithOpts_call> resultHandler) throws org.apache.thrift.TException {
+ public void submitTopologyWithOpts(String name, String uploadedJarLocation, String jsonConf, StormTopology topology, SubmitOptions options, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
submitTopologyWithOpts_call method_call = new submitTopologyWithOpts_call(name, uploadedJarLocation, jsonConf, topology, options, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -736,7 +750,7 @@ public class Nimbus {
private String jsonConf;
private StormTopology topology;
private SubmitOptions options;
- public submitTopologyWithOpts_call(String name, String uploadedJarLocation, String jsonConf, StormTopology topology, SubmitOptions options, org.apache.thrift.async.AsyncMethodCallback<submitTopologyWithOpts_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ public submitTopologyWithOpts_call(String name, String uploadedJarLocation, String jsonConf, StormTopology topology, SubmitOptions options, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
super(client, protocolFactory, transport, resultHandler, false);
this.name = name;
this.uploadedJarLocation = uploadedJarLocation;
@@ -767,7 +781,7 @@ public class Nimbus {
}
}
- public void killTopology(String name, org.apache.thrift.async.AsyncMethodCallback<killTopology_call> resultHandler) throws org.apache.thrift.TException {
+ public void killTopology(String name, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
killTopology_call method_call = new killTopology_call(name, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -776,7 +790,7 @@ public class Nimbus {
public static class killTopology_call extends org.apache.thrift.async.TAsyncMethodCall {
private String name;
- public killTopology_call(String name, org.apache.thrift.async.AsyncMethodCallback<killTopology_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ public killTopology_call(String name, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
super(client, protocolFactory, transport, resultHandler, false);
this.name = name;
}
@@ -799,7 +813,7 @@ public class Nimbus {
}
}
- public void killTopologyWithOpts(String name, KillOptions options, org.apache.thrift.async.AsyncMethodCallback<killTopologyWithOpts_call> resultHandler) throws org.apache.thrift.TException {
+ public void killTopologyWithOpts(String name, KillOptions options, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
killTopologyWithOpts_call method_call = new killTopologyWithOpts_call(name, options, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -809,7 +823,7 @@ public class Nimbus {
public static class killTopologyWithOpts_call extends org.apache.thrift.async.TAsyncMethodCall {
private String name;
private KillOptions options;
- public killTopologyWithOpts_call(String name, KillOptions options, org.apache.thrift.async.AsyncMethodCallback<killTopologyWithOpts_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ public killTopologyWithOpts_call(String name, KillOptions options, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
super(client, protocolFactory, transport, resultHandler, false);
this.name = name;
this.options = options;
@@ -834,7 +848,7 @@ public class Nimbus {
}
}
- public void activate(String name, org.apache.thrift.async.AsyncMethodCallback<activate_call> resultHandler) throws org.apache.thrift.TException {
+ public void activate(String name, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
activate_call method_call = new activate_call(name, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -843,7 +857,7 @@ public class Nimbus {
public static class activate_call extends org.apache.thrift.async.TAsyncMethodCall {
private String name;
- public activate_call(String name, org.apache.thrift.async.AsyncMethodCallback<activate_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ public activate_call(String name, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
super(client, protocolFactory, transport, resultHandler, false);
this.name = name;
}
@@ -866,7 +880,7 @@ public class Nimbus {
}
}
- public void deactivate(String name, org.apache.thrift.async.AsyncMethodCallback<deactivate_call> resultHandler) throws org.apache.thrift.TException {
+ public void deactivate(String name, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
deactivate_call method_call = new deactivate_call(name, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -875,7 +889,7 @@ public class Nimbus {
public static class deactivate_call extends org.apache.thrift.async.TAsyncMethodCall {
private String name;
- public deactivate_call(String name, org.apache.thrift.async.AsyncMethodCallback<deactivate_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ public deactivate_call(String name, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
super(client, protocolFactory, transport, resultHandler, false);
this.name = name;
}
@@ -898,7 +912,7 @@ public class Nimbus {
}
}
- public void rebalance(String name, RebalanceOptions options, org.apache.thrift.async.AsyncMethodCallback<rebalance_call> resultHandler) throws org.apache.thrift.TException {
+ public void rebalance(String name, RebalanceOptions options, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
rebalance_call method_call = new rebalance_call(name, options, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -908,7 +922,7 @@ public class Nimbus {
public static class rebalance_call extends org.apache.thrift.async.TAsyncMethodCall {
private String name;
private RebalanceOptions options;
- public rebalance_call(String name, RebalanceOptions options, org.apache.thrift.async.AsyncMethodCallback<rebalance_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ public rebalance_call(String name, RebalanceOptions options, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
super(client, protocolFactory, transport, resultHandler, false);
this.name = name;
this.options = options;
@@ -933,7 +947,7 @@ public class Nimbus {
}
}
- public void uploadNewCredentials(String name, Credentials creds, org.apache.thrift.async.AsyncMethodCallback<uploadNewCredentials_call> resultHandler) throws org.apache.thrift.TException {
+ public void uploadNewCredentials(String name, Credentials creds, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
uploadNewCredentials_call method_call = new uploadNewCredentials_call(name, creds, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -943,7 +957,7 @@ public class Nimbus {
public static class uploadNewCredentials_call extends org.apache.thrift.async.TAsyncMethodCall {
private String name;
private Credentials creds;
- public uploadNewCredentials_call(String name, Credentials creds, org.apache.thrift.async.AsyncMethodCallback<uploadNewCredentials_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ public uploadNewCredentials_call(String name, Credentials creds, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
super(client, protocolFactory, transport, resultHandler, false);
this.name = name;
this.creds = creds;
@@ -968,7 +982,7 @@ public class Nimbus {
}
}
- public void beginFileUpload(org.apache.thrift.async.AsyncMethodCallback<beginFileUpload_call> resultHandler) throws org.apache.thrift.TException {
+ public void beginFileUpload(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
beginFileUpload_call method_call = new beginFileUpload_call(resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -976,7 +990,7 @@ public class Nimbus {
}
public static class beginFileUpload_call extends org.apache.thrift.async.TAsyncMethodCall {
- public beginFileUpload_call(org.apache.thrift.async.AsyncMethodCallback<beginFileUpload_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ public beginFileUpload_call(org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
super(client, protocolFactory, transport, resultHandler, false);
}
@@ -997,7 +1011,7 @@ public class Nimbus {
}
}
- public void uploadChunk(String location, ByteBuffer chunk, org.apache.thrift.async.AsyncMethodCallback<uploadChunk_call> resultHandler) throws org.apache.thrift.TException {
+ public void uploadChunk(String location, ByteBuffer chunk, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
uploadChunk_call method_call = new uploadChunk_call(location, chunk, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -1007,7 +1021,7 @@ public class Nimbus {
public static class uploadChunk_call extends org.apache.thrift.async.TAsyncMethodCall {
private String location;
private ByteBuffer chunk;
- public uploadChunk_call(String location, ByteBuffer chunk, org.apache.thrift.async.AsyncMethodCallback<uploadChunk_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ public uploadChunk_call(String location, ByteBuffer chunk, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
super(client, protocolFactory, transport, resultHandler, false);
this.location = location;
this.chunk = chunk;
@@ -1032,7 +1046,7 @@ public class Nimbus {
}
}
- public void finishFileUpload(String location, org.apache.thrift.async.AsyncMethodCallback<finishFileUpload_call> resultHandler) throws org.apache.thrift.TException {
+ public void finishFileUpload(String location, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
finishFileUpload_call method_call = new finishFileUpload_call(location, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -1041,7 +1055,7 @@ public class Nimbus {
public static class finishFileUpload_call extends org.apache.thrift.async.TAsyncMethodCall {
private String location;
- public finishFileUpload_call(String location, org.apache.thrift.async.AsyncMethodCallback<finishFileUpload_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ public finishFileUpload_call(String location, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
super(client, protocolFactory, transport, resultHandler, false);
this.location = location;
}
@@ -1064,7 +1078,7 @@ public class Nimbus {
}
}
- public void beginFileDownload(String file, org.apache.thrift.async.AsyncMethodCallback<beginFileDownload_call> resultHandler) throws org.apache.thrift.TException {
+ public void beginFileDownload(String file, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
beginFileDownload_call method_call = new beginFileDownload_call(file, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -1073,7 +1087,7 @@ public class Nimbus {
public static class beginFileDownload_call extends org.apache.thrift.async.TAsyncMethodCall {
private String file;
- public beginFileDownload_call(String file, org.apache.thrift.async.AsyncMethodCallback<beginFileDownload_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ public beginFileDownload_call(String file, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
super(client, protocolFactory, transport, resultHandler, false);
this.file = file;
}
@@ -1096,7 +1110,7 @@ public class Nimbus {
}
}
- public void downloadChunk(String id, org.apache.thrift.async.AsyncMethodCallback<downloadChunk_call> resultHandler) throws org.apache.thrift.TException {
+ public void downloadChunk(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
downloadChunk_call method_call = new downloadChunk_call(id, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -1105,7 +1119,7 @@ public class Nimbus {
public static class downloadChunk_call extends org.apache.thrift.async.TAsyncMethodCall {
private String id;
- public downloadChunk_call(String id, org.apache.thrift.async.AsyncMethodCallback<downloadChunk_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ public downloadChunk_call(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
super(client, protocolFactory, transport, resultHandler, false);
this.id = id;
}
@@ -1128,7 +1142,7 @@ public class Nimbus {
}
}
- public void getNimbusConf(org.apache.thrift.async.AsyncMethodCallback<getNimbusConf_call> resultHandler) throws org.apache.thrift.TException {
+ public void getNimbusConf(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
getNimbusConf_call method_call = new getNimbusConf_call(resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -1136,7 +1150,7 @@ public class Nimbus {
}
public static class getNimbusConf_call extends org.apache.thrift.async.TAsyncMethodCall {
- public getNimbusConf_call(org.apache.thrift.async.AsyncMethodCallback<getNimbusConf_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ public getNimbusConf_call(org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
super(client, protocolFactory, transport, resultHandler, false);
}
@@ -1157,7 +1171,7 @@ public class Nimbus {
}
}
- public void getClusterInfo(org.apache.thrift.async.AsyncMethodCallback<getClusterInfo_call> resultHandler) throws org.apache.thrift.TException {
+ public void getClusterInfo(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
getClusterInfo_call method_call = new getClusterInfo_call(resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -1165,7 +1179,7 @@ public class Nimbus {
}
public static class getClusterInfo_call extends org.apache.thrift.async.TAsyncMethodCall {
- public getClusterInfo_call(org.apache.thrift.async.AsyncMethodCallback<getClusterInfo_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ public getClusterInfo_call(org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
super(client, protocolFactory, transport, resultHandler, false);
}
@@ -1186,7 +1200,7 @@ public class Nimbus {
}
}
- public void getTopologyInfo(String id, org.apache.thrift.async.AsyncMethodCallback<getTopologyInfo_call> resultHandler) throws org.apache.thrift.TException {
+ public void getTopologyInfo(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
getTopologyInfo_call method_call = new getTopologyInfo_call(id, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -1195,7 +1209,7 @@ public class Nimbus {
public static class getTopologyInfo_call extends org.apache.thrift.async.TAsyncMethodCall {
private String id;
- public getTopologyInfo_call(String id, org.apache.thrift.async.AsyncMethodCallback<getTopologyInfo_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ public getTopologyInfo_call(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
super(client, protocolFactory, transport, resultHandler, false);
this.id = id;
}
@@ -1218,7 +1232,7 @@ public class Nimbus {
}
}
- public void getTopologyConf(String id, org.apache.thrift.async.AsyncMethodCallback<getTopologyConf_call> resultHandler) throws org.apache.thrift.TException {
+ public void getTopologyConf(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
getTopologyConf_call method_call = new getTopologyConf_call(id, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -1227,7 +1241,7 @@ public class Nimbus {
public static class getTopologyConf_call extends org.apache.thrift.async.TAsyncMethodCall {
private String id;
- public getTopologyConf_call(String id, org.apache.thrift.async.AsyncMethodCallback<getTopologyConf_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ public getTopologyConf_call(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
super(client, protocolFactory, transport, resultHandler, false);
this.id = id;
}
@@ -1250,7 +1264,7 @@ public class Nimbus {
}
}
- public void getTopology(String id, org.apache.thrift.async.AsyncMethodCallback<getTopology_call> resultHandler) throws org.apache.thrift.TException {
+ public void getTopology(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
getTopology_call method_call = new getTopology_call(id, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -1259,7 +1273,7 @@ public class Nimbus {
public static class getTopology_call extends org.apache.thrift.async.TAsyncMethodCall {
private String id;
- public getTopology_call(String id, org.apache.thrift.async.AsyncMethodCallback<getTopology_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ public getTopology_call(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
super(client, protocolFactory, transport, resultHandler, false);
this.id = id;
}
@@ -1282,7 +1296,7 @@ public class Nimbus {
}
}
- public void getUserTopology(String id, org.apache.thrift.async.AsyncMethodCallback<getUserTopology_call> resultHandler) throws org.apache.thrift.TException {
+ public void getUserTopology(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
getUserTopology_call method_call = new getUserTopology_call(id, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -1291,7 +1305,7 @@ public class Nimbus {
public static class getUserTopology_call extends org.apache.thrift.async.TAsyncMethodCall {
private String id;
- public getUserTopology_call(String id, org.apache.thrift.async.AsyncMethodCallback<getUserTopology_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ public getUserTopology_call(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
super(client, protocolFactory, transport, resultHandler, false);
this.id = id;
}
@@ -1316,7 +1330,7 @@ public class Nimbus {
}
- public static class Processor<I extends Iface> extends org.apache.thrift.TBaseProcessor implements org.apache.thrift.TProcessor {
+ public static class Processor<I extends Iface> extends org.apache.thrift.TBaseProcessor<I> implements org.apache.thrift.TProcessor {
private static final Logger LOGGER = LoggerFactory.getLogger(Processor.class.getName());
public Processor(I iface) {
super(iface, getProcessMap(new HashMap<String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>>()));
@@ -1349,16 +1363,20 @@ public class Nimbus {
return processMap;
}
- private static class submitTopology<I extends Iface> extends org.apache.thrift.ProcessFunction<I, submitTopology_args> {
+ public static class submitTopology<I extends Iface> extends org.apache.thrift.ProcessFunction<I, submitTopology_args> {
public submitTopology() {
super("submitTopology");
}
- protected submitTopology_args getEmptyArgsInstance() {
+ public submitTopology_args getEmptyArgsInstance() {
return new submitTopology_args();
}
- protected submitTopology_result getResult(I iface, submitTopology_args args) throws org.apache.thrift.TException {
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public submitTopology_result getResult(I iface, submitTopology_args args) throws org.apache.thrift.TException {
submitTopology_result result = new submitTopology_result();
try {
iface.submitTopology(args.name, args.uploadedJarLocation, args.jsonConf, args.topology);
@@ -1373,16 +1391,20 @@ public class Nimbus {
}
}
- private static class submitTopologyWithOpts<I extends Iface> extends org.apache.thrift.ProcessFunction<I, submitTopologyWithOpts_args> {
+ public static class submitTopologyWithOpts<I extends Iface> extends org.apache.thrift.ProcessFunction<I, submitTopologyWithOpts_args> {
public submitTopologyWithOpts() {
super("submitTopologyWithOpts");
}
- protected submitTopologyWithOpts_args getEmptyArgsInstance() {
+ public submitTopologyWithOpts_args getEmptyArgsInstance() {
return new submitTopologyWithOpts_args();
}
- protected submitTopologyWithOpts_result getResult(I iface, submitTopologyWithOpts_args args) throws org.apache.thrift.TException {
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public submitTopologyWithOpts_result getResult(I iface, submitTopologyWithOpts_args args) throws org.apache.thrift.TException {
submitTopologyWithOpts_result result = new submitTopologyWithOpts_result();
try {
iface.submitTopologyWithOpts(args.name, args.uploadedJarLocation, args.jsonConf, args.topology, args.options);
@@ -1397,16 +1419,20 @@ public class Nimbus {
}
}
- private static class killTopology<I extends Iface> extends org.apache.thrift.ProcessFunction<I, killTopology_args> {
+ public static class killTopology<I extends Iface> extends org.apache.thrift.ProcessFunction<I, killTopology_args> {
public killTopology() {
super("killTopology");
}
- protected killTopology_args getEmptyArgsInstance() {
+ public killTopology_args getEmptyArgsInstance() {
return new killTopology_args();
}
- protected killTopology_result getResult(I iface, killTopology_args args) throws org.apache.thrift.TException {
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public killTopology_result getResult(I iface, killTopology_args args) throws org.apache.thrift.TException {
killTopology_result result = new killTopology_result();
try {
iface.killTopology(args.name);
@@ -1419,16 +1445,20 @@ public class Nimbus {
}
}
- private static class killTopologyWithOpts<I extends Iface> extends org.apache.thrift.ProcessFunction<I, killTopologyWithOpts_args> {
+ public static class killTopologyWithOpts<I extends Iface> extends org.apache.thrift.ProcessFunction<I, killTopologyWithOpts_args> {
public killTopologyWithOpts() {
super("killTopologyWithOpts");
}
- protected killTopologyWithOpts_args getEmptyArgsInstance() {
+ public killTopologyWithOpts_args getEmptyArgsInstance() {
return new killTopologyWithOpts_args();
}
- protected killTopologyWithOpts_result getResult(I iface, killTopologyWithOpts_args args) throws org.apache.thrift.TException {
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public killTopologyWithOpts_result getResult(I iface, killTopologyWithOpts_args args) throws org.apache.thrift.TException {
killTopologyWithOpts_result result = new killTopologyWithOpts_result();
try {
iface.killTopologyWithOpts(args.name, args.options);
@@ -1441,16 +1471,20 @@ public class Nimbus {
}
}
- private static class activate<I extends Iface> extends org.apache.thrift.ProcessFunction<I, activate_args> {
+ public static class activate<I extends Iface> extends org.apache.thrift.ProcessFunction<I, activate_args> {
public activate() {
super("activate");
}
- protected activate_args getEmptyArgsInstance() {
+ public activate_args getEmptyArgsInstance() {
return new activate_args();
}
- protected activate_result getResult(I iface, activate_args args) throws org.apache.thrift.TException {
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public activate_result getResult(I iface, activate_args args) throws org.apache.thrift.TException {
activate_result result = new activate_result();
try {
iface.activate(args.name);
@@ -1463,16 +1497,20 @@ public class Nimbus {
}
}
- private static class deactivate<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deactivate_args> {
+ public static class deactivate<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deactivate_args> {
public deactivate() {
super("deactivate");
}
- protected deactivate_args getEmptyArgsInstance() {
+ public deactivate_args getEmptyArgsInstance() {
return new deactivate_args();
}
- protected deactivate_result getResult(I iface, deactivate_args args) throws org.apache.thrift.TException {
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public deactivate_result getResult(I iface, deactivate_args args) throws org.apache.thrift.TException {
deactivate_result result = new deactivate_result();
try {
iface.deactivate(args.name);
@@ -1485,16 +1523,20 @@ public class Nimbus {
}
}
- private static class rebalance<I extends Iface> extends org.apache.thrift.ProcessFunction<I, rebalance_args> {
+ public static class rebalance<I extends Iface> extends org.apache.thrift.ProcessFunction<I, rebalance_args> {
public rebalance() {
super("rebalance");
}
- protected rebalance_args getEmptyArgsInstance() {
+ public rebalance_args getEmptyArgsInstance() {
return new rebalance_args();
}
- protected rebalance_result getResult(I iface, rebalance_args args) throws org.apache.thrift.TException {
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public rebalance_result getResult(I iface, rebalance_args args) throws org.apache.thrift.TException {
rebalance_result result = new rebalance_result();
try {
iface.rebalance(args.name, args.options);
@@ -1509,16 +1551,20 @@ public class Nimbus {
}
}
- private static class uploadNewCredentials<I extends Iface> extends org.apache.thrift.ProcessFunction<I, uploadNewCredentials_args> {
+ public static class uploadNewCredentials<I extends Iface> extends org.apache.thrift.ProcessFunction<I, uploadNewCredentials_args> {
public uploadNewCredentials() {
super("uploadNewCredentials");
}
- protected uploadNewCredentials_args getEmptyArgsInstance() {
+ public uploadNewCredentials_args getEmptyArgsInstance() {
return new uploadNewCredentials_args();
}
- protected uploadNewCredentials_result getResult(I iface, uploadNewCredentials_args args) throws org.apache.thrift.TException {
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public uploadNewCredentials_result getResult(I iface, uploadNewCredentials_args args) throws org.apache.thrift.TException {
uploadNewCredentials_result result = new uploadNewCredentials_result();
try {
iface.uploadNewCredentials(args.name, args.creds);
@@ -1533,16 +1579,20 @@ public class Nimbus {
}
}
- private static class beginFileUpload<I extends Iface> extends org.apache.thrift.ProcessFunction<I, beginFileUpload_args> {
+ public static class beginFileUpload<I extends Iface> extends org.apache.thrift.ProcessFunction<I, beginFileUpload_args> {
public beginFileUpload() {
super("beginFileUpload");
}
- protected beginFileUpload_args getEmptyArgsInstance() {
+ public beginFileUpload_args getEmptyArgsInstance() {
return new beginFileUpload_args();
}
- protected beginFileUpload_result getResult(I iface, beginFileUpload_args args) throws org.apache.thrift.TException {
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public beginFileUpload_result getResult(I iface, beginFileUpload_args args) throws org.apache.thrift.TException {
beginFileUpload_result result = new beginFileUpload_result();
try {
result.success = iface.beginFileUpload();
@@ -1553,16 +1603,20 @@ public class Nimbus {
}
}
- private static class uploadChunk<I extends Iface> extends org.apache.thrift.ProcessFunction<I, uploadChunk_args> {
+ public static class uploadChunk<I extends Iface> extends org.apache.thrift.ProcessFunction<I, uploadChunk_args> {
public uploadChunk() {
super("uploadChunk");
}
- protected uploadChunk_args getEmptyArgsInstance() {
+ public uploadChunk_args getEmptyArgsInstance() {
return new uploadChunk_args();
}
- protected uploadChunk_result getResult(I iface, uploadChunk_args args) throws org.apache.thrift.TException {
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public uploadChunk_result getResult(I iface, uploadChunk_args args) throws org.apache.thrift.TException {
uploadChunk_result result = new uploadChunk_result();
try {
iface.uploadChunk(args.location, args.chunk);
@@ -1573,16 +1627,20 @@ public class Nimbus {
}
}
- private static class finishFileUpload<I extends Iface> extends org.apache.thrift.ProcessFunction<I, finishFileUpload_args> {
+ public static class finishFileUpload<I extends Iface> extends org.apache.thrift.ProcessFunction<I, finishFileUpload_args> {
public finishFileUpload() {
super("finishFileUpload");
}
- protected finishFileUpload_args getEmptyArgsInstance() {
+ public finishFileUpload_args getEmptyArgsInstance() {
return new finishFileUpload_args();
}
- protected finishFileUpload_result getResult(I iface, finishFileUpload_args args) throws org.apache.thrift.TException {
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public finishFileUpload_result getResult(I iface, finishFileUpload_args args) throws org.apache.thrift.TException {
finishFileUpload_result result = new finishFileUpload_result();
try {
iface.finishFileUpload(args.location);
@@ -1593,16 +1651,20 @@ public class Nimbus {
}
}
- private static class beginFileDownload<I extends Iface> extends org.apache.thrift.ProcessFunction<I, beginFileDownload_args> {
+ public static class beginFileDownload<I extends Iface> extends org.apache.thrift.ProcessFunction<I, beginFileDownload_args> {
public beginFileDownload() {
super("beginFileDownload");
}
- protected beginFileDownload_args getEmptyArgsInstance() {
+ public beginFileDownload_args getEmptyArgsInstance() {
return new beginFileDownload_args();
}
- protected beginFileDownload_result getResult(I iface, beginFileDownload_args args) throws org.apache.thrift.TException {
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public beginFileDownload_result getResult(I iface, beginFileDownload_args args) throws org.apache.thrift.TException {
beginFileDownload_result result = new beginFileDownload_result();
try {
result.success = iface.beginFileDownload(args.file);
@@ -1613,16 +1675,20 @@ public class Nimbus {
}
}
- private static class downloadChunk<I extends Iface> extends org.apache.thrift.ProcessFunction<I, downloadChunk_args> {
+ public static class downloadChunk<I extends Iface> extends org.apache.thrift.ProcessFunction<I, downloadChunk_args> {
public downloadChunk() {
super("downloadChunk");
}
- protected downloadChunk_args getEmptyArgsInstance() {
+ public downloadChunk_args getEmptyArgsInstance() {
return new downloadChunk_args();
}
- protected downloadChunk_result getResult(I iface, downloadChunk_args args) throws org.apache.thrift.TException {
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public downloadChunk_result getResult(I iface, downloadChunk_args args) throws org.apache.thrift.TException {
downloadChunk_result result = new downloadChunk_result();
try {
result.success = iface.downloadChunk(args.id);
@@ -1633,16 +1699,20 @@ public class Nimbus {
}
}
- private static class getNimbusConf<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getNimbusConf_args> {
+ public static class getNimbusConf<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getNimbusConf_args> {
public getNimbusConf() {
super("getNimbusConf");
}
- protected getNimbusConf_args getEmptyArgsInstance() {
+ public getNimbusConf_args getEmptyArgsInstance() {
return new getNimbusConf_args();
}
- protected getNimbusConf_result getResult(I iface, getNimbusConf_args args) throws org.apache.thrift.TException {
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public getNimbusConf_result getResult(I iface, getNimbusConf_args args) throws org.apache.thrift.TException {
getNimbusConf_result result = new getNimbusConf_result();
try {
result.success = iface.getNimbusConf();
@@ -1653,117 +1723,1325 @@ public class Nimbus {
}
}
- private static class getClusterInfo<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getClusterInfo_args> {
+ public static class getClusterInfo<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getClusterInfo_args> {
+ public getClusterInfo() {
+ super("getClusterInfo");
+ }
+
+ public getClusterInfo_args getEmptyArgsInstance() {
+ return new getClusterInfo_args();
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public getClusterInfo_result getResult(I iface, getClusterInfo_args args) throws org.apache.thrift.TException {
+ getClusterInfo_result result = new getClusterInfo_result();
+ try {
+ result.success = iface.getClusterInfo();
+ } catch (AuthorizationException aze) {
+ result.aze = aze;
+ }
+ return result;
+ }
+ }
+
+ public static class getTopologyInfo<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getTopologyInfo_args> {
+ public getTopologyInfo() {
+ super("getTopologyInfo");
+ }
+
+ public getTopologyInfo_args getEmptyArgsInstance() {
+ return new getTopologyInfo_args();
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public getTopologyInfo_result getResult(I iface, getTopologyInfo_args args) throws org.apache.thrift.TException {
+ getTopologyInfo_result result = new getTopologyInfo_result();
+ try {
+ result.success = iface.getTopologyInfo(args.id);
+ } catch (NotAliveException e) {
+ result.e = e;
+ } catch (AuthorizationException aze) {
+ result.aze = aze;
+ }
+ return result;
+ }
+ }
+
+ public static class getTopologyConf<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getTopologyConf_args> {
+ public getTopologyConf() {
+ super("getTopologyConf");
+ }
+
+ public getTopologyConf_args getEmptyArgsInstance() {
+ return new getTopologyConf_args();
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public getTopologyConf_result getResult(I iface, getTopologyConf_args args) throws org.apache.thrift.TException {
+ getTopologyConf_result result = new getTopologyConf_result();
+ try {
+ result.success = iface.getTopologyConf(args.id);
+ } catch (NotAliveException e) {
+ result.e = e;
+ } catch (AuthorizationException aze) {
+ result.aze = aze;
+ }
+ return result;
+ }
+ }
+
+ public static class getTopology<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getTopology_args> {
+ public getTopology() {
+ super("getTopology");
+ }
+
+ public getTopology_args getEmptyArgsInstance() {
+ return new getTopology_args();
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public getTopology_result getResult(I iface, getTopology_args args) throws org.apache.thrift.TException {
+ getTopology_result result = new getTopology_result();
+ try {
+ result.success = iface.getTopology(args.id);
+ } catch (NotAliveException e) {
+ result.e = e;
+ } catch (AuthorizationException aze) {
+ result.aze = aze;
+ }
+ return result;
+ }
+ }
+
+ public static class getUserTopology<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getUserTopology_args> {
+ public getUserTopology() {
+ super("getUserTopology");
+ }
+
+ public getUserTopology_args getEmptyArgsInstance() {
+ return new getUserTopology_args();
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public getUserTopology_result getResult(I iface, getUserTopology_args args) throws org.apache.thrift.TException {
+ getUserTopology_result result = new getUserTopology_result();
+ try {
+ result.success = iface.getUserTopology(args.id);
+ } catch (NotAliveException e) {
+ result.e = e;
+ } catch (AuthorizationException aze) {
+ result.aze = aze;
+ }
+ return result;
+ }
+ }
+
+ }
+
+ public static class AsyncProcessor<I extends AsyncIface> extends org.apache.thrift.TBaseAsyncProcessor<I> {
+ private static final Logger LOGGER = LoggerFactory.getLogger(AsyncProcessor.class.getName());
+ public AsyncProcessor(I iface) {
+ super(iface, getProcessMap(new HashMap<String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?>>()));
+ }
+
+ protected AsyncProcessor(I iface, Map<String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?>> processMap) {
+ super(iface, getProcessMap(processMap));
+ }
+
+ private static <I extends AsyncIface> Map<String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase,?>> getProcessMap(Map<String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?>> processMap) {
+ processMap.put("submitTopology", new submitTopology());
+ processMap.put("submitTopologyWithOpts", new submitTopologyWithOpts());
+ processMap.put("killTopology", new killTopology());
+ processMap.put("killTopologyWithOpts", new killTopologyWithOpts());
+ processMap.put("activate", new activate());
+ processMap.put("deactivate", new deactivate());
+ processMap.put("rebalance", new rebalance());
+ processMap.put("uploadNewCredentials", new uploadNewCredentials());
+ processMap.put("beginFileUpload", new beginFileUpload());
+ processMap.put("uploadChunk", new uploadChunk());
+ processMap.put("finishFileUpload", new finishFileUpload());
+ processMap.put("beginFileDownload", new beginFileDownload());
+ processMap.put("downloadChunk", new downloadChunk());
+ processMap.put("getNimbusConf", new getNimbusConf());
+ processMap.put("getClusterInfo", new getClusterInfo());
+ processMap.put("getTopologyInfo", new getTopologyInfo());
+ processMap.put("getTopologyConf", new getTopologyConf());
+ processMap.put("getTopology", new getTopology());
+ processMap.put("getUserTopology", new getUserTopology());
+ return processMap;
+ }
+
+ public static class submitTopology<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, submitTopology_args, Void> {
+ public submitTopology() {
+ super("submitTopology");
+ }
+
+ public submitTopology_args getEmptyArgsInstance() {
+ return new submitTopology_args();
+ }
+
+ public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ final org.apache.thrift.AsyncProcessFunction fcall = this;
+ return new AsyncMethodCallback<Void>() {
+ public void onComplete(Void o) {
+ submitTopology_result result = new submitTopology_result();
+ try {
+ fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+ return;
+ } catch (Exception e) {
+ LOGGER.error("Exception writing to internal frame buffer", e);
+ }
+ fb.close();
+ }
+ public void onError(Exception e) {
+ byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+ org.apache.thrift.TBase msg;
+ submitTopology_result result = new submitTopology_result();
+ if (e instanceof AlreadyAliveException) {
+ result.e = (AlreadyAliveException) e;
+ result.set_e_isSet(true);
+ msg = result;
+ }
+ else if (e instanceof InvalidTopologyException) {
+ result.ite = (InvalidTopologyException) e;
+ result.set_ite_isSet(true);
+ msg = result;
+ }
+ else if (e instanceof AuthorizationException) {
+ result.aze = (AuthorizationException) e;
+ result.set_aze_isSet(true);
+ msg = result;
+ }
+ else
+ {
+ msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+ msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+ }
+ try {
+ fcall.sendResponse(fb,msg,msgType,seqid);
+ return;
+ } catch (Exception ex) {
+ LOGGER.error("Exception writing to internal frame buffer", ex);
+ }
+ fb.close();
+ }
+ };
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public void start(I iface, submitTopology_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+ iface.submitTopology(args.name, args.uploadedJarLocation, args.jsonConf, args.topology,resultHandler);
+ }
+ }
+
+ public static class submitTopologyWithOpts<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, submitTopologyWithOpts_args, Void> {
+ public submitTopologyWithOpts() {
+ super("submitTopologyWithOpts");
+ }
+
+ public submitTopologyWithOpts_args getEmptyArgsInstance() {
+ return new submitTopologyWithOpts_args();
+ }
+
+ public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ final org.apache.thrift.AsyncProcessFunction fcall = this;
+ return new AsyncMethodCallback<Void>() {
+ public void onComplete(Void o) {
+ submitTopologyWithOpts_result result = new submitTopologyWithOpts_result();
+ try {
+ fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+ return;
+ } catch (Exception e) {
+ LOGGER.error("Exception writing to internal frame buffer", e);
+ }
+ fb.close();
+ }
+ public void onError(Exception e) {
+ byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+ org.apache.thrift.TBase msg;
+ submitTopologyWithOpts_result result = new submitTopologyWithOpts_result();
+ if (e instanceof AlreadyAliveException) {
+ result.e = (AlreadyAliveException) e;
+ result.set_e_isSet(true);
+ msg = result;
+ }
+ else if (e instanceof InvalidTopologyException) {
+ result.ite = (InvalidTopologyException) e;
+ result.set_ite_isSet(true);
+ msg = result;
+ }
+ else if (e instanceof AuthorizationException) {
+ result.aze = (AuthorizationException) e;
+ result.set_aze_isSet(true);
+ msg = result;
+ }
+ else
+ {
+ msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+ msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+ }
+ try {
+ fcall.sendResponse(fb,msg,msgType,seqid);
+ return;
+ } catch (Exception ex) {
+ LOGGER.error("Exception writing to internal frame buffer", ex);
+ }
+ fb.close();
+ }
+ };
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public void start(I iface, submitTopologyWithOpts_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+ iface.submitTopologyWithOpts(args.name, args.uploadedJarLocation, args.jsonConf, args.topology, args.options,resultHandler);
+ }
+ }
+
+ public static class killTopology<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, killTopology_args, Void> {
+ public killTopology() {
+ super("killTopology");
+ }
+
+ public killTopology_args getEmptyArgsInstance() {
+ return new killTopology_args();
+ }
+
+ public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ final org.apache.thrift.AsyncProcessFunction fcall = this;
+ return new AsyncMethodCallback<Void>() {
+ public void onComplete(Void o) {
+ killTopology_result result = new killTopology_result();
+ try {
+ fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+ return;
+ } catch (Exception e) {
+ LOGGER.error("Exception writing to internal frame buffer", e);
+ }
+ fb.close();
+ }
+ public void onError(Exception e) {
+ byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+ org.apache.thrift.TBase msg;
+ killTopology_result result = new killTopology_result();
+ if (e instanceof NotAliveException) {
+ result.e = (NotAliveException) e;
+ result.set_e_isSet(true);
+ msg = result;
+ }
+ else if (e instanceof AuthorizationException) {
+ result.aze = (AuthorizationException) e;
+ result.set_aze_isSet(true);
+ msg = result;
+ }
+ else
+ {
+ msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+ msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+ }
+ try {
+ fcall.sendResponse(fb,msg,msgType,seqid);
+ return;
+ } catch (Exception ex) {
+ LOGGER.error("Exception writing to internal frame buffer", ex);
+ }
+ fb.close();
+ }
+ };
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public void start(I iface, killTopology_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+ iface.killTopology(args.name,resultHandler);
+ }
+ }
+
+ public static class killTopologyWithOpts<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, killTopologyWithOpts_args, Void> {
+ public killTopologyWithOpts() {
+ super("killTopologyWithOpts");
+ }
+
+ public killTopologyWithOpts_args getEmptyArgsInstance() {
+ return new killTopologyWithOpts_args();
+ }
+
+ public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ final org.apache.thrift.AsyncProcessFunction fcall = this;
+ return new AsyncMethodCallback<Void>() {
+ public void onComplete(Void o) {
+ killTopologyWithOpts_result result = new killTopologyWithOpts_result();
+ try {
+ fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+ return;
+ } catch (Exception e) {
+ LOGGER.error("Exception writing to internal frame buffer", e);
+ }
+ fb.close();
+ }
+ public void onError(Exception e) {
+ byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+ org.apache.thrift.TBase msg;
+ killTopologyWithOpts_result result = new killTopologyWithOpts_result();
+ if (e instanceof NotAliveException) {
+ result.e = (NotAliveException) e;
+ result.set_e_isSet(true);
+ msg = result;
+ }
+ else if (e instanceof AuthorizationException) {
+ result.aze = (AuthorizationException) e;
+ result.set_aze_isSet(true);
+ msg = result;
+ }
+ else
+ {
+ msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+ msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+ }
+ try {
+ fcall.sendResponse(fb,msg,msgType,seqid);
+ return;
+ } catch (Exception ex) {
+ LOGGER.error("Exception writing to internal frame buffer", ex);
+ }
+ fb.close();
+ }
+ };
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public void start(I iface, killTopologyWithOpts_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+ iface.killTopologyWithOpts(args.name, args.options,resultHandler);
+ }
+ }
+
+ public static class activate<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, activate_args, Void> {
+ public activate() {
+ super("activate");
+ }
+
+ public activate_args getEmptyArgsInstance() {
+ return new activate_args();
+ }
+
+ public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ final org.apache.thrift.AsyncProcessFunction fcall = this;
+ return new AsyncMethodCallback<Void>() {
+ public void onComplete(Void o) {
+ activate_result result = new activate_result();
+ try {
+ fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+ return;
+ } catch (Exception e) {
+ LOGGER.error("Exception writing to internal frame buffer", e);
+ }
+ fb.close();
+ }
+ public void onError(Exception e) {
+ byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+ org.apache.thrift.TBase msg;
+ activate_result result = new activate_result();
+ if (e instanceof NotAliveException) {
+ result.e = (NotAliveException) e;
+ result.set_e_isSet(true);
+ msg = result;
+ }
+ else if (e instanceof AuthorizationException) {
+ result.aze = (AuthorizationException) e;
+ result.set_aze_isSet(true);
+ msg = result;
+ }
+ else
+ {
+ msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+ msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+ }
+ try {
+ fcall.sendResponse(fb,msg,msgType,seqid);
+ return;
+ } catch (Exception ex) {
+ LOGGER.error("Exception writing to internal frame buffer", ex);
+ }
+ fb.close();
+ }
+ };
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public void start(I iface, activate_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+ iface.activate(args.name,resultHandler);
+ }
+ }
+
+ public static class deactivate<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deactivate_args, Void> {
+ public deactivate() {
+ super("deactivate");
+ }
+
+ public deactivate_args getEmptyArgsInstance() {
+ return new deactivate_args();
+ }
+
+ public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ final org.apache.thrift.AsyncProcessFunction fcall = this;
+ return new AsyncMethodCallback<Void>() {
+ public void onComplete(Void o) {
+ deactivate_result result = new deactivate_result();
+ try {
+ fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+ return;
+ } catch (Exception e) {
+ LOGGER.error("Exception writing to internal frame buffer", e);
+ }
+ fb.close();
+ }
+ public void onError(Exception e) {
+ byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+ org.apache.thrift.TBase msg;
+ deactivate_result result = new deactivate_result();
+ if (e instanceof NotAliveException) {
+ result.e = (NotAliveException) e;
+ result.set_e_isSet(true);
+ msg = result;
+ }
+ else if (e instanceof AuthorizationException) {
+ result.aze = (AuthorizationException) e;
+ result.set_aze_isSet(true);
+ msg = result;
+ }
+ else
+ {
+ msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+ msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+ }
+ try {
+ fcall.sendResponse(fb,msg,msgType,seqid);
+ return;
+ } catch (Exception ex) {
+ LOGGER.error("Exception writing to internal frame buffer", ex);
+ }
+ fb.close();
+ }
+ };
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public void start(I iface, deactivate_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+ iface.deactivate(args.name,resultHandler);
+ }
+ }
+
+ public static class rebalance<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, rebalance_args, Void> {
+ public rebalance() {
+ super("rebalance");
+ }
+
+ public rebalance_args getEmptyArgsInstance() {
+ return new rebalance_args();
+ }
+
+ public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ final org.apache.thrift.AsyncProcessFunction fcall = this;
+ return new AsyncMethodCallback<Void>() {
+ public void onComplete(Void o) {
+ rebalance_result result = new rebalance_result();
+ try {
+ fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+ return;
+ } catch (Exception e) {
+ LOGGER.error("Exception writing to internal frame buffer", e);
+ }
+ fb.close();
+ }
+ public void onError(Exception e) {
+ byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+ org.apache.thrift.TBase msg;
+ rebalance_result result = new rebalance_result();
+ if (e instanceof NotAliveException) {
+ result.e = (NotAliveException) e;
+ result.set_e_isSet(true);
+ msg = result;
+ }
+ else if (e instanceof InvalidTopologyException) {
+ result.ite = (InvalidTopologyException) e;
+ result.set_ite_isSet(true);
+ msg = result;
+ }
+ else if (e instanceof AuthorizationException) {
+ result.aze = (AuthorizationException) e;
+ result.set_aze_isSet(true);
+ msg = result;
+ }
+ else
+ {
+ msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+ msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+ }
+ try {
+ fcall.sendResponse(fb,msg,msgType,seqid);
+ return;
+ } catch (Exception ex) {
+ LOGGER.error("Exception writing to internal frame buffer", ex);
+ }
+ fb.close();
+ }
+ };
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public void start(I iface, rebalance_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+ iface.rebalance(args.name, args.options,resultHandler);
+ }
+ }
+
+ public static class uploadNewCredentials<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, uploadNewCredentials_args, Void> {
+ public uploadNewCredentials() {
+ super("uploadNewCredentials");
+ }
+
+ public uploadNewCredentials_args getEmptyArgsInstance() {
+ return new uploadNewCredentials_args();
+ }
+
+ public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ final org.apache.thrift.AsyncProcessFunction fcall = this;
+ return new AsyncMethodCallback<Void>() {
+ public void onComplete(Void o) {
+ uploadNewCredentials_result result = new uploadNewCredentials_result();
+ try {
+ fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+ return;
+ } catch (Exception e) {
+ LOGGER.error("Exception writing to internal frame buffer", e);
+ }
+ fb.close();
+ }
+ public void onError(Exception e) {
+ byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+ org.apache.thrift.TBase msg;
+ uploadNewCredentials_result result = new uploadNewCredentials_result();
+ if (e instanceof NotAliveException) {
+ result.e = (NotAliveException) e;
+ result.set_e_isSet(true);
+ msg = result;
+ }
+ else if (e instanceof InvalidTopologyException) {
+ result.ite = (InvalidTopologyException) e;
+ result.set_ite_isSet(true);
+ msg = result;
+ }
+ else if (e instanceof AuthorizationException) {
+ result.aze = (AuthorizationException) e;
+ result.set_aze_isSet(true);
+ msg = result;
+ }
+ else
+ {
+ msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+ msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+ }
+ try {
+ fcall.sendResponse(fb,msg,msgType,seqid);
+ return;
+ } catch (Exception ex) {
+ LOGGER.error("Exception writing to internal frame buffer", ex);
+ }
+ fb.close();
+ }
+ };
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public void start(I iface, uploadNewCredentials_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+ iface.uploadNewCredentials(args.name, args.creds,resultHandler);
+ }
+ }
+
+ public static class beginFileUpload<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, beginFileUpload_args, String> {
+ public beginFileUpload() {
+ super("beginFileUpload");
+ }
+
+ public beginFileUpload_args getEmptyArgsInstance() {
+ return new beginFileUpload_args();
+ }
+
+ public AsyncMethodCallback<String> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ final org.apache.thrift.AsyncProcessFunction fcall = this;
+ return new AsyncMethodCallback<String>() {
+ public void onComplete(String o) {
+ beginFileUpload_result result = new beginFileUpload_result();
+ result.success = o;
+ try {
+ fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+ return;
+ } catch (Exception e) {
+ LOGGER.error("Exception writing to internal frame buffer", e);
+ }
+ fb.close();
+ }
+ public void onError(Exception e) {
+ byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+ org.apache.thrift.TBase msg;
+ beginFileUpload_result result = new beginFileUpload_result();
+ if (e instanceof AuthorizationException) {
+ result.aze = (AuthorizationException) e;
+ result.set_aze_isSet(true);
+ msg = result;
+ }
+ else
+ {
+ msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+ msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+ }
+ try {
+ fcall.sendResponse(fb,msg,msgType,seqid);
+ return;
+ } catch (Exception ex) {
+ LOGGER.error("Exception writing to internal frame buffer", ex);
+ }
+ fb.close();
+ }
+ };
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public void start(I iface, beginFileUpload_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException {
+ iface.beginFileUpload(resultHandler);
+ }
+ }
+
+ public static class uploadChunk<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, uploadChunk_args, Void> {
+ public uploadChunk() {
+ super("uploadChunk");
+ }
+
+ public uploadChunk_args getEmptyArgsInstance() {
+ return new uploadChunk_args();
+ }
+
+ public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ final org.apache.thrift.AsyncProcessFunction fcall = this;
+ return new AsyncMethodCallback<Void>() {
+ public void onComplete(Void o) {
+ uploadChunk_result result = new uploadChunk_result();
+ try {
+ fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+ return;
+ } catch (Exception e) {
+ LOGGER.error("Exception writing to internal frame buffer", e);
+ }
+ fb.close();
+ }
+ public void onError(Exception e) {
+ byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+ org.apache.thrift.TBase msg;
+ uploadChunk_result result = new uploadChunk_result();
+ if (e instanceof AuthorizationException) {
+ result.aze = (AuthorizationException) e;
+ result.set_aze_isSet(true);
+ msg = result;
+ }
+ else
+ {
+ msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+ msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+ }
+ try {
+ fcall.sendResponse(fb,msg,msgType,seqid);
+ return;
+ } catch (Exception ex) {
+ LOGGER.error("Exception writing to internal frame buffer", ex);
+ }
+ fb.close();
+ }
+ };
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public void start(I iface, uploadChunk_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+ iface.uploadChunk(args.location, args.chunk,resultHandler);
+ }
+ }
+
+ public static class finishFileUpload<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, finishFileUpload_args, Void> {
+ public finishFileUpload() {
+ super("finishFileUpload");
+ }
+
+ public finishFileUpload_args getEmptyArgsInstance() {
+ return new finishFileUpload_args();
+ }
+
+ public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ final org.apache.thrift.AsyncProcessFunction fcall = this;
+ return new AsyncMethodCallback<Void>() {
+ public void onComplete(Void o) {
+ finishFileUpload_result result = new finishFileUpload_result();
+ try {
+ fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+ return;
+ } catch (Exception e) {
+ LOGGER.error("Exception writing to internal frame buffer", e);
+ }
+ fb.close();
+ }
+ public void onError(Exception e) {
+ byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+ org.apache.thrift.TBase msg;
+ finishFileUpload_result result = new finishFileUpload_result();
+ if (e instanceof AuthorizationException) {
+ result.aze = (AuthorizationException) e;
+ result.set_aze_isSet(true);
+ msg = result;
+ }
+ else
+ {
+ msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+ msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+ }
+ try {
+ fcall.sendResponse(fb,msg,msgType,seqid);
+ return;
+ } catch (Exception ex) {
+ LOGGER.error("Exception writing to internal frame buffer", ex);
+ }
+ fb.close();
+ }
+ };
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public void start(I iface, finishFileUpload_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+ iface.finishFileUpload(args.location,resultHandler);
+ }
+ }
+
+ public static class beginFileDownload<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, beginFileDownload_args, String> {
+ public beginFileDownload() {
+ super("beginFileDownload");
+ }
+
+ public beginFileDownload_args getEmptyArgsInstance() {
+ return new beginFileDownload_args();
+ }
+
+ public AsyncMethodCallback<String> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ final org.apache.thrift.AsyncProcessFunction fcall = this;
+ return new AsyncMethodCallback<String>() {
+ public void onComplete(String o) {
+ beginFileDownload_result result = new beginFileDownload_result();
+ result.success = o;
+ try {
+ fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+ return;
+ } catch (Exception e) {
+ LOGGER.error("Exception writing to internal frame buffer", e);
+ }
+ fb.close();
+ }
+ public void onError(Exception e) {
+ byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+ org.apache.thrift.TBase msg;
+ beginFileDownload_result result = new beginFileDownload_result();
+ if (e instanceof AuthorizationException) {
+ result.aze = (AuthorizationException) e;
+ result.set_aze_isSet(true);
+ msg = result;
+ }
+ else
+ {
+ msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+ msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+
<TRUNCATED>
[11/18] storm git commit: Upgrade to thrift-0.9.2
Posted by kn...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/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 f2cc2e9..3feaec4 100644
--- a/storm-core/src/jvm/backtype/storm/generated/ComponentCommon.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ComponentCommon.java
@@ -16,13 +16,24 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package backtype.storm.generated;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -35,10 +46,13 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon, ComponentCommon._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
+public class 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");
private static final org.apache.thrift.protocol.TField INPUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("inputs", org.apache.thrift.protocol.TType.MAP, (short)1);
@@ -46,10 +60,16 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
private static final org.apache.thrift.protocol.TField PARALLELISM_HINT_FIELD_DESC = new org.apache.thrift.protocol.TField("parallelism_hint", org.apache.thrift.protocol.TType.I32, (short)3);
private static final org.apache.thrift.protocol.TField JSON_CONF_FIELD_DESC = new org.apache.thrift.protocol.TField("json_conf", org.apache.thrift.protocol.TType.STRING, (short)4);
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new ComponentCommonStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new ComponentCommonTupleSchemeFactory());
+ }
+
private Map<GlobalStreamId,Grouping> inputs; // required
private Map<String,StreamInfo> streams; // required
- private int parallelism_hint; // required
- private String json_conf; // required
+ private int parallelism_hint; // optional
+ private String json_conf; // 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 {
@@ -120,8 +140,8 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
// isset id assignments
private static final int __PARALLELISM_HINT_ISSET_ID = 0;
- private BitSet __isset_bit_vector = new BitSet(1);
-
+ private byte __isset_bitfield = 0;
+ private static final _Fields optionals[] = {_Fields.PARALLELISM_HINT,_Fields.JSON_CONF};
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);
@@ -157,10 +177,9 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
* Performs a deep copy on <i>other</i>.
*/
public ComponentCommon(ComponentCommon other) {
- __isset_bit_vector.clear();
- __isset_bit_vector.or(other.__isset_bit_vector);
+ __isset_bitfield = other.__isset_bitfield;
if (other.is_set_inputs()) {
- Map<GlobalStreamId,Grouping> __this__inputs = new HashMap<GlobalStreamId,Grouping>();
+ Map<GlobalStreamId,Grouping> __this__inputs = new HashMap<GlobalStreamId,Grouping>(other.inputs.size());
for (Map.Entry<GlobalStreamId, Grouping> other_element : other.inputs.entrySet()) {
GlobalStreamId other_element_key = other_element.getKey();
@@ -175,7 +194,7 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
this.inputs = __this__inputs;
}
if (other.is_set_streams()) {
- Map<String,StreamInfo> __this__streams = new HashMap<String,StreamInfo>();
+ Map<String,StreamInfo> __this__streams = new HashMap<String,StreamInfo>(other.streams.size());
for (Map.Entry<String, StreamInfo> other_element : other.streams.entrySet()) {
String other_element_key = other_element.getKey();
@@ -286,16 +305,16 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
}
public void unset_parallelism_hint() {
- __isset_bit_vector.clear(__PARALLELISM_HINT_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __PARALLELISM_HINT_ISSET_ID);
}
/** Returns true if field parallelism_hint is set (has been assigned a value) and false otherwise */
public boolean is_set_parallelism_hint() {
- return __isset_bit_vector.get(__PARALLELISM_HINT_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __PARALLELISM_HINT_ISSET_ID);
}
public void set_parallelism_hint_isSet(boolean value) {
- __isset_bit_vector.set(__PARALLELISM_HINT_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PARALLELISM_HINT_ISSET_ID, value);
}
public String get_json_conf() {
@@ -449,75 +468,75 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
@Override
public int hashCode() {
- HashCodeBuilder builder = new HashCodeBuilder();
+ List<Object> list = new ArrayList<Object>();
boolean present_inputs = true && (is_set_inputs());
- builder.append(present_inputs);
+ list.add(present_inputs);
if (present_inputs)
- builder.append(inputs);
+ list.add(inputs);
boolean present_streams = true && (is_set_streams());
- builder.append(present_streams);
+ list.add(present_streams);
if (present_streams)
- builder.append(streams);
+ list.add(streams);
boolean present_parallelism_hint = true && (is_set_parallelism_hint());
- builder.append(present_parallelism_hint);
+ list.add(present_parallelism_hint);
if (present_parallelism_hint)
- builder.append(parallelism_hint);
+ list.add(parallelism_hint);
boolean present_json_conf = true && (is_set_json_conf());
- builder.append(present_json_conf);
+ list.add(present_json_conf);
if (present_json_conf)
- builder.append(json_conf);
+ list.add(json_conf);
- return builder.toHashCode();
+ return list.hashCode();
}
+ @Override
public int compareTo(ComponentCommon other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- ComponentCommon typedOther = (ComponentCommon)other;
- lastComparison = Boolean.valueOf(is_set_inputs()).compareTo(typedOther.is_set_inputs());
+ lastComparison = Boolean.valueOf(is_set_inputs()).compareTo(other.is_set_inputs());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_inputs()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.inputs, typedOther.inputs);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.inputs, other.inputs);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_streams()).compareTo(typedOther.is_set_streams());
+ lastComparison = Boolean.valueOf(is_set_streams()).compareTo(other.is_set_streams());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_streams()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.streams, typedOther.streams);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.streams, other.streams);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_parallelism_hint()).compareTo(typedOther.is_set_parallelism_hint());
+ lastComparison = Boolean.valueOf(is_set_parallelism_hint()).compareTo(other.is_set_parallelism_hint());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_parallelism_hint()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.parallelism_hint, typedOther.parallelism_hint);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.parallelism_hint, other.parallelism_hint);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_json_conf()).compareTo(typedOther.is_set_json_conf());
+ lastComparison = Boolean.valueOf(is_set_json_conf()).compareTo(other.is_set_json_conf());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_json_conf()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.json_conf, typedOther.json_conf);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.json_conf, other.json_conf);
if (lastComparison != 0) {
return lastComparison;
}
@@ -530,124 +549,11 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // INPUTS
- if (field.type == org.apache.thrift.protocol.TType.MAP) {
- {
- org.apache.thrift.protocol.TMap _map12 = iprot.readMapBegin();
- this.inputs = new HashMap<GlobalStreamId,Grouping>(2*_map12.size);
- for (int _i13 = 0; _i13 < _map12.size; ++_i13)
- {
- GlobalStreamId _key14; // required
- Grouping _val15; // required
- _key14 = new GlobalStreamId();
- _key14.read(iprot);
- _val15 = new Grouping();
- _val15.read(iprot);
- this.inputs.put(_key14, _val15);
- }
- iprot.readMapEnd();
- }
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 2: // STREAMS
- if (field.type == org.apache.thrift.protocol.TType.MAP) {
- {
- org.apache.thrift.protocol.TMap _map16 = iprot.readMapBegin();
- this.streams = new HashMap<String,StreamInfo>(2*_map16.size);
- for (int _i17 = 0; _i17 < _map16.size; ++_i17)
- {
- String _key18; // required
- StreamInfo _val19; // required
- _key18 = iprot.readString();
- _val19 = new StreamInfo();
- _val19.read(iprot);
- this.streams.put(_key18, _val19);
- }
- iprot.readMapEnd();
- }
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 3: // PARALLELISM_HINT
- if (field.type == org.apache.thrift.protocol.TType.I32) {
- this.parallelism_hint = iprot.readI32();
- set_parallelism_hint_isSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 4: // JSON_CONF
- if (field.type == org.apache.thrift.protocol.TType.STRING) {
- this.json_conf = iprot.readString();
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (this.inputs != null) {
- oprot.writeFieldBegin(INPUTS_FIELD_DESC);
- {
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.STRUCT, this.inputs.size()));
- for (Map.Entry<GlobalStreamId, Grouping> _iter20 : this.inputs.entrySet())
- {
- _iter20.getKey().write(oprot);
- _iter20.getValue().write(oprot);
- }
- oprot.writeMapEnd();
- }
- oprot.writeFieldEnd();
- }
- if (this.streams != null) {
- oprot.writeFieldBegin(STREAMS_FIELD_DESC);
- {
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, this.streams.size()));
- for (Map.Entry<String, StreamInfo> _iter21 : this.streams.entrySet())
- {
- oprot.writeString(_iter21.getKey());
- _iter21.getValue().write(oprot);
- }
- oprot.writeMapEnd();
- }
- oprot.writeFieldEnd();
- }
- if (is_set_parallelism_hint()) {
- oprot.writeFieldBegin(PARALLELISM_HINT_FIELD_DESC);
- oprot.writeI32(this.parallelism_hint);
- oprot.writeFieldEnd();
- }
- if (this.json_conf != null) {
- if (is_set_json_conf()) {
- oprot.writeFieldBegin(JSON_CONF_FIELD_DESC);
- oprot.writeString(this.json_conf);
- oprot.writeFieldEnd();
- }
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@Override
@@ -700,6 +606,7 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
throw new org.apache.thrift.protocol.TProtocolException("Required field 'streams' is unset! Struct:" + toString());
}
+ // check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -713,12 +620,233 @@ public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon,
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_bit_vector = new BitSet(1);
+ __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 ComponentCommonStandardSchemeFactory implements SchemeFactory {
+ public ComponentCommonStandardScheme getScheme() {
+ return new ComponentCommonStandardScheme();
+ }
+ }
+
+ private static class ComponentCommonStandardScheme extends StandardScheme<ComponentCommon> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, ComponentCommon 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: // INPUTS
+ if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+ {
+ org.apache.thrift.protocol.TMap _map24 = iprot.readMapBegin();
+ struct.inputs = new HashMap<GlobalStreamId,Grouping>(2*_map24.size);
+ GlobalStreamId _key25;
+ Grouping _val26;
+ for (int _i27 = 0; _i27 < _map24.size; ++_i27)
+ {
+ _key25 = new GlobalStreamId();
+ _key25.read(iprot);
+ _val26 = new Grouping();
+ _val26.read(iprot);
+ struct.inputs.put(_key25, _val26);
+ }
+ iprot.readMapEnd();
+ }
+ struct.set_inputs_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // STREAMS
+ if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+ {
+ org.apache.thrift.protocol.TMap _map28 = iprot.readMapBegin();
+ struct.streams = new HashMap<String,StreamInfo>(2*_map28.size);
+ String _key29;
+ StreamInfo _val30;
+ for (int _i31 = 0; _i31 < _map28.size; ++_i31)
+ {
+ _key29 = iprot.readString();
+ _val30 = new StreamInfo();
+ _val30.read(iprot);
+ struct.streams.put(_key29, _val30);
+ }
+ iprot.readMapEnd();
+ }
+ struct.set_streams_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 3: // PARALLELISM_HINT
+ if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ struct.parallelism_hint = iprot.readI32();
+ struct.set_parallelism_hint_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 4: // JSON_CONF
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.json_conf = iprot.readString();
+ struct.set_json_conf_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, ComponentCommon struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.inputs != null) {
+ oprot.writeFieldBegin(INPUTS_FIELD_DESC);
+ {
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.STRUCT, struct.inputs.size()));
+ for (Map.Entry<GlobalStreamId, Grouping> _iter32 : struct.inputs.entrySet())
+ {
+ _iter32.getKey().write(oprot);
+ _iter32.getValue().write(oprot);
+ }
+ oprot.writeMapEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ if (struct.streams != null) {
+ oprot.writeFieldBegin(STREAMS_FIELD_DESC);
+ {
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.streams.size()));
+ for (Map.Entry<String, StreamInfo> _iter33 : struct.streams.entrySet())
+ {
+ oprot.writeString(_iter33.getKey());
+ _iter33.getValue().write(oprot);
+ }
+ oprot.writeMapEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ if (struct.is_set_parallelism_hint()) {
+ oprot.writeFieldBegin(PARALLELISM_HINT_FIELD_DESC);
+ oprot.writeI32(struct.parallelism_hint);
+ oprot.writeFieldEnd();
+ }
+ if (struct.json_conf != null) {
+ if (struct.is_set_json_conf()) {
+ oprot.writeFieldBegin(JSON_CONF_FIELD_DESC);
+ oprot.writeString(struct.json_conf);
+ oprot.writeFieldEnd();
+ }
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class ComponentCommonTupleSchemeFactory implements SchemeFactory {
+ public ComponentCommonTupleScheme getScheme() {
+ return new ComponentCommonTupleScheme();
+ }
+ }
+
+ private static class ComponentCommonTupleScheme extends TupleScheme<ComponentCommon> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, ComponentCommon struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ {
+ oprot.writeI32(struct.inputs.size());
+ for (Map.Entry<GlobalStreamId, Grouping> _iter34 : struct.inputs.entrySet())
+ {
+ _iter34.getKey().write(oprot);
+ _iter34.getValue().write(oprot);
+ }
+ }
+ {
+ oprot.writeI32(struct.streams.size());
+ for (Map.Entry<String, StreamInfo> _iter35 : struct.streams.entrySet())
+ {
+ oprot.writeString(_iter35.getKey());
+ _iter35.getValue().write(oprot);
+ }
+ }
+ BitSet optionals = new BitSet();
+ if (struct.is_set_parallelism_hint()) {
+ optionals.set(0);
+ }
+ if (struct.is_set_json_conf()) {
+ optionals.set(1);
+ }
+ oprot.writeBitSet(optionals, 2);
+ if (struct.is_set_parallelism_hint()) {
+ oprot.writeI32(struct.parallelism_hint);
+ }
+ if (struct.is_set_json_conf()) {
+ oprot.writeString(struct.json_conf);
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, ComponentCommon struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ {
+ org.apache.thrift.protocol.TMap _map36 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.inputs = new HashMap<GlobalStreamId,Grouping>(2*_map36.size);
+ GlobalStreamId _key37;
+ Grouping _val38;
+ for (int _i39 = 0; _i39 < _map36.size; ++_i39)
+ {
+ _key37 = new GlobalStreamId();
+ _key37.read(iprot);
+ _val38 = new Grouping();
+ _val38.read(iprot);
+ struct.inputs.put(_key37, _val38);
+ }
+ }
+ struct.set_inputs_isSet(true);
+ {
+ org.apache.thrift.protocol.TMap _map40 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.streams = new HashMap<String,StreamInfo>(2*_map40.size);
+ String _key41;
+ StreamInfo _val42;
+ for (int _i43 = 0; _i43 < _map40.size; ++_i43)
+ {
+ _key41 = iprot.readString();
+ _val42 = new StreamInfo();
+ _val42.read(iprot);
+ struct.streams.put(_key41, _val42);
+ }
+ }
+ struct.set_streams_isSet(true);
+ BitSet incoming = iprot.readBitSet(2);
+ if (incoming.get(0)) {
+ struct.parallelism_hint = iprot.readI32();
+ struct.set_parallelism_hint_isSet(true);
+ }
+ if (incoming.get(1)) {
+ struct.json_conf = iprot.readString();
+ struct.set_json_conf_isSet(true);
+ }
+ }
+ }
+
}
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/storm-core/src/jvm/backtype/storm/generated/ComponentObject.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/ComponentObject.java b/storm-core/src/jvm/backtype/storm/generated/ComponentObject.java
index 8581ef7..575069f 100644
--- a/storm-core/src/jvm/backtype/storm/generated/ComponentObject.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ComponentObject.java
@@ -16,13 +16,24 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package backtype.storm.generated;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -35,9 +46,11 @@ 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"})
public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, ComponentObject._Fields> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComponentObject");
private static final org.apache.thrift.protocol.TField SERIALIZED_JAVA_FIELD_DESC = new org.apache.thrift.protocol.TField("serialized_java", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -144,7 +157,7 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
public static ComponentObject serialized_java(byte[] value) {
ComponentObject x = new ComponentObject();
- x.set_serialized_java(ByteBuffer.wrap(value));
+ x.set_serialized_java(ByteBuffer.wrap(Arrays.copyOf(value, value.length)));
return x;
}
@@ -185,7 +198,7 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
}
@Override
- protected Object readValue(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TField field) throws org.apache.thrift.TException {
+ protected Object standardSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TField field) throws org.apache.thrift.TException {
_Fields setField = _Fields.findByThriftId(field.id);
if (setField != null) {
switch (setField) {
@@ -228,7 +241,54 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
}
@Override
- protected void writeValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+ protected void standardSchemeWriteValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+ switch (setField_) {
+ case SERIALIZED_JAVA:
+ ByteBuffer serialized_java = (ByteBuffer)value_;
+ oprot.writeBinary(serialized_java);
+ return;
+ case SHELL:
+ ShellComponent shell = (ShellComponent)value_;
+ shell.write(oprot);
+ return;
+ case JAVA_OBJECT:
+ JavaObject java_object = (JavaObject)value_;
+ java_object.write(oprot);
+ return;
+ default:
+ throw new IllegalStateException("Cannot write union with unknown field " + setField_);
+ }
+ }
+
+ @Override
+ protected Object tupleSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, short fieldID) throws org.apache.thrift.TException {
+ _Fields setField = _Fields.findByThriftId(fieldID);
+ if (setField != null) {
+ switch (setField) {
+ case SERIALIZED_JAVA:
+ ByteBuffer serialized_java;
+ serialized_java = iprot.readBinary();
+ return serialized_java;
+ case SHELL:
+ ShellComponent shell;
+ shell = new ShellComponent();
+ shell.read(iprot);
+ return shell;
+ case JAVA_OBJECT:
+ JavaObject java_object;
+ java_object = new JavaObject();
+ java_object.read(iprot);
+ return java_object;
+ default:
+ throw new IllegalStateException("setField wasn't null, but didn't match any of the case statements!");
+ }
+ } else {
+ throw new TProtocolException("Couldn't find a field with field id " + fieldID);
+ }
+ }
+
+ @Override
+ protected void tupleSchemeWriteValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
switch (setField_) {
case SERIALIZED_JAVA:
ByteBuffer serialized_java = (ByteBuffer)value_;
@@ -284,14 +344,14 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
public ByteBuffer buffer_for_serialized_java() {
if (getSetField() == _Fields.SERIALIZED_JAVA) {
- return (ByteBuffer)getFieldValue();
+ return org.apache.thrift.TBaseHelper.copyBinary((ByteBuffer)getFieldValue());
} else {
throw new RuntimeException("Cannot get field 'serialized_java' because union is currently set to " + getFieldDesc(getSetField()).name);
}
}
public void set_serialized_java(byte[] value) {
- set_serialized_java(ByteBuffer.wrap(value));
+ set_serialized_java(ByteBuffer.wrap(Arrays.copyOf(value, value.length)));
}
public void set_serialized_java(ByteBuffer value) {
@@ -367,19 +427,19 @@ public class ComponentObject extends org.apache.thrift.TUnion<ComponentObject, C
@Override
public int hashCode() {
- HashCodeBuilder hcb = new HashCodeBuilder();
- hcb.append(this.getClass().getName());
+ List<Object> list = new ArrayList<Object>();
+ list.add(this.getClass().getName());
org.apache.thrift.TFieldIdEnum setField = getSetField();
if (setField != null) {
- hcb.append(setField.getThriftFieldId());
+ list.add(setField.getThriftFieldId());
Object value = getFieldValue();
if (value instanceof org.apache.thrift.TEnum) {
- hcb.append(((org.apache.thrift.TEnum)getFieldValue()).getValue());
+ list.add(((org.apache.thrift.TEnum)getFieldValue()).getValue());
} else {
- hcb.append(value);
+ list.add(value);
}
}
- return hcb.toHashCode();
+ return list.hashCode();
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
try {
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/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 c4563a7..50d63a9 100644
--- a/storm-core/src/jvm/backtype/storm/generated/Credentials.java
+++ b/storm-core/src/jvm/backtype/storm/generated/Credentials.java
@@ -16,13 +16,24 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package backtype.storm.generated;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -35,14 +46,23 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class Credentials implements org.apache.thrift.TBase<Credentials, Credentials._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
+public class 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");
private static final org.apache.thrift.protocol.TField CREDS_FIELD_DESC = new org.apache.thrift.protocol.TField("creds", 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 CredentialsStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new CredentialsTupleSchemeFactory());
+ }
+
private Map<String,String> creds; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -104,7 +124,6 @@ public class Credentials implements org.apache.thrift.TBase<Credentials, Credent
}
// 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);
@@ -131,18 +150,7 @@ public class Credentials implements org.apache.thrift.TBase<Credentials, Credent
*/
public Credentials(Credentials other) {
if (other.is_set_creds()) {
- Map<String,String> __this__creds = new HashMap<String,String>();
- for (Map.Entry<String, String> other_element : other.creds.entrySet()) {
-
- String other_element_key = other_element.getKey();
- String other_element_value = other_element.getValue();
-
- String __this__creds_copy_key = other_element_key;
-
- String __this__creds_copy_value = other_element_value;
-
- __this__creds.put(__this__creds_copy_key, __this__creds_copy_value);
- }
+ Map<String,String> __this__creds = new HashMap<String,String>(other.creds);
this.creds = __this__creds;
}
}
@@ -252,30 +260,30 @@ public class Credentials implements org.apache.thrift.TBase<Credentials, Credent
@Override
public int hashCode() {
- HashCodeBuilder builder = new HashCodeBuilder();
+ List<Object> list = new ArrayList<Object>();
boolean present_creds = true && (is_set_creds());
- builder.append(present_creds);
+ list.add(present_creds);
if (present_creds)
- builder.append(creds);
+ list.add(creds);
- return builder.toHashCode();
+ return list.hashCode();
}
+ @Override
public int compareTo(Credentials other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- Credentials typedOther = (Credentials)other;
- lastComparison = Boolean.valueOf(is_set_creds()).compareTo(typedOther.is_set_creds());
+ lastComparison = Boolean.valueOf(is_set_creds()).compareTo(other.is_set_creds());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_creds()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.creds, typedOther.creds);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.creds, other.creds);
if (lastComparison != 0) {
return lastComparison;
}
@@ -288,62 +296,11 @@ public class Credentials implements org.apache.thrift.TBase<Credentials, Credent
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // CREDS
- if (field.type == org.apache.thrift.protocol.TType.MAP) {
- {
- org.apache.thrift.protocol.TMap _map163 = iprot.readMapBegin();
- this.creds = new HashMap<String,String>(2*_map163.size);
- for (int _i164 = 0; _i164 < _map163.size; ++_i164)
- {
- String _key165; // required
- String _val166; // required
- _key165 = iprot.readString();
- _val166 = iprot.readString();
- this.creds.put(_key165, _val166);
- }
- iprot.readMapEnd();
- }
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (this.creds != null) {
- oprot.writeFieldBegin(CREDS_FIELD_DESC);
- {
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, this.creds.size()));
- for (Map.Entry<String, String> _iter167 : this.creds.entrySet())
- {
- oprot.writeString(_iter167.getKey());
- oprot.writeString(_iter167.getValue());
- }
- oprot.writeMapEnd();
- }
- oprot.writeFieldEnd();
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@Override
@@ -368,6 +325,7 @@ public class Credentials implements org.apache.thrift.TBase<Credentials, Credent
throw new org.apache.thrift.protocol.TProtocolException("Required field 'creds' is unset! Struct:" + toString());
}
+ // check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -386,5 +344,115 @@ public class Credentials implements org.apache.thrift.TBase<Credentials, Credent
}
}
+ private static class CredentialsStandardSchemeFactory implements SchemeFactory {
+ public CredentialsStandardScheme getScheme() {
+ return new CredentialsStandardScheme();
+ }
+ }
+
+ private static class CredentialsStandardScheme extends StandardScheme<Credentials> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, Credentials 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: // CREDS
+ if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+ {
+ org.apache.thrift.protocol.TMap _map326 = iprot.readMapBegin();
+ struct.creds = new HashMap<String,String>(2*_map326.size);
+ String _key327;
+ String _val328;
+ for (int _i329 = 0; _i329 < _map326.size; ++_i329)
+ {
+ _key327 = iprot.readString();
+ _val328 = iprot.readString();
+ struct.creds.put(_key327, _val328);
+ }
+ iprot.readMapEnd();
+ }
+ struct.set_creds_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, Credentials struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.creds != null) {
+ oprot.writeFieldBegin(CREDS_FIELD_DESC);
+ {
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.creds.size()));
+ for (Map.Entry<String, String> _iter330 : struct.creds.entrySet())
+ {
+ oprot.writeString(_iter330.getKey());
+ oprot.writeString(_iter330.getValue());
+ }
+ oprot.writeMapEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class CredentialsTupleSchemeFactory implements SchemeFactory {
+ public CredentialsTupleScheme getScheme() {
+ return new CredentialsTupleScheme();
+ }
+ }
+
+ private static class CredentialsTupleScheme extends TupleScheme<Credentials> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, Credentials struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ {
+ oprot.writeI32(struct.creds.size());
+ for (Map.Entry<String, String> _iter331 : struct.creds.entrySet())
+ {
+ oprot.writeString(_iter331.getKey());
+ oprot.writeString(_iter331.getValue());
+ }
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, Credentials struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ {
+ org.apache.thrift.protocol.TMap _map332 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.creds = new HashMap<String,String>(2*_map332.size);
+ String _key333;
+ String _val334;
+ for (int _i335 = 0; _i335 < _map332.size; ++_i335)
+ {
+ _key333 = iprot.readString();
+ _val334 = iprot.readString();
+ struct.creds.put(_key333, _val334);
+ }
+ }
+ struct.set_creds_isSet(true);
+ }
+ }
+
}
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/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 e40bd94..eb69200 100644
--- a/storm-core/src/jvm/backtype/storm/generated/DRPCExecutionException.java
+++ b/storm-core/src/jvm/backtype/storm/generated/DRPCExecutionException.java
@@ -16,13 +16,24 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package backtype.storm.generated;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -35,14 +46,23 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class DRPCExecutionException extends Exception implements org.apache.thrift.TBase<DRPCExecutionException, DRPCExecutionException._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
+public class 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");
private static final org.apache.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.thrift.protocol.TField("msg", org.apache.thrift.protocol.TType.STRING, (short)1);
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new DRPCExecutionExceptionStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new DRPCExecutionExceptionTupleSchemeFactory());
+ }
+
private String msg; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -104,7 +124,6 @@ public class DRPCExecutionException extends Exception implements org.apache.thri
}
// isset id assignments
-
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -227,30 +246,30 @@ public class DRPCExecutionException extends Exception implements org.apache.thri
@Override
public int hashCode() {
- HashCodeBuilder builder = new HashCodeBuilder();
+ List<Object> list = new ArrayList<Object>();
boolean present_msg = true && (is_set_msg());
- builder.append(present_msg);
+ list.add(present_msg);
if (present_msg)
- builder.append(msg);
+ list.add(msg);
- return builder.toHashCode();
+ return list.hashCode();
}
+ @Override
public int compareTo(DRPCExecutionException other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- DRPCExecutionException typedOther = (DRPCExecutionException)other;
- lastComparison = Boolean.valueOf(is_set_msg()).compareTo(typedOther.is_set_msg());
+ lastComparison = Boolean.valueOf(is_set_msg()).compareTo(other.is_set_msg());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_msg()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.msg, typedOther.msg);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.msg, other.msg);
if (lastComparison != 0) {
return lastComparison;
}
@@ -263,42 +282,11 @@ public class DRPCExecutionException extends Exception implements org.apache.thri
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // MSG
- if (field.type == org.apache.thrift.protocol.TType.STRING) {
- this.msg = iprot.readString();
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (this.msg != null) {
- oprot.writeFieldBegin(MSG_FIELD_DESC);
- oprot.writeString(this.msg);
- oprot.writeFieldEnd();
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@Override
@@ -323,6 +311,7 @@ public class DRPCExecutionException extends Exception implements org.apache.thri
throw new org.apache.thrift.protocol.TProtocolException("Required field 'msg' is unset! Struct:" + toString());
}
+ // check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -341,5 +330,77 @@ public class DRPCExecutionException extends Exception implements org.apache.thri
}
}
+ private static class DRPCExecutionExceptionStandardSchemeFactory implements SchemeFactory {
+ public DRPCExecutionExceptionStandardScheme getScheme() {
+ return new DRPCExecutionExceptionStandardScheme();
+ }
+ }
+
+ private static class DRPCExecutionExceptionStandardScheme extends StandardScheme<DRPCExecutionException> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, DRPCExecutionException struct) throws org.apache.thrift.TException {
+ org.apache.thrift.protocol.TField schemeField;
+ iprot.readStructBegin();
+ while (true)
+ {
+ schemeField = iprot.readFieldBegin();
+ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ break;
+ }
+ switch (schemeField.id) {
+ case 1: // MSG
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.msg = iprot.readString();
+ struct.set_msg_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ default:
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ iprot.readFieldEnd();
+ }
+ iprot.readStructEnd();
+ struct.validate();
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot, DRPCExecutionException struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.msg != null) {
+ oprot.writeFieldBegin(MSG_FIELD_DESC);
+ oprot.writeString(struct.msg);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class DRPCExecutionExceptionTupleSchemeFactory implements SchemeFactory {
+ public DRPCExecutionExceptionTupleScheme getScheme() {
+ return new DRPCExecutionExceptionTupleScheme();
+ }
+ }
+
+ private static class DRPCExecutionExceptionTupleScheme extends TupleScheme<DRPCExecutionException> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, DRPCExecutionException struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ oprot.writeString(struct.msg);
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, DRPCExecutionException struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ struct.msg = iprot.readString();
+ struct.set_msg_isSet(true);
+ }
+ }
+
}
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/storm-core/src/jvm/backtype/storm/generated/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 3b0a660..df8aa84 100644
--- a/storm-core/src/jvm/backtype/storm/generated/DRPCRequest.java
+++ b/storm-core/src/jvm/backtype/storm/generated/DRPCRequest.java
@@ -16,13 +16,24 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package backtype.storm.generated;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -35,15 +46,24 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class DRPCRequest implements org.apache.thrift.TBase<DRPCRequest, DRPCRequest._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
+public class 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");
private static final org.apache.thrift.protocol.TField FUNC_ARGS_FIELD_DESC = new org.apache.thrift.protocol.TField("func_args", org.apache.thrift.protocol.TType.STRING, (short)1);
private static final org.apache.thrift.protocol.TField REQUEST_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("request_id", 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 DRPCRequestStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new DRPCRequestTupleSchemeFactory());
+ }
+
private String func_args; // required
private String request_id; // required
@@ -109,7 +129,6 @@ public class DRPCRequest implements org.apache.thrift.TBase<DRPCRequest, DRPCReq
}
// isset id assignments
-
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -285,45 +304,45 @@ public class DRPCRequest implements org.apache.thrift.TBase<DRPCRequest, DRPCReq
@Override
public int hashCode() {
- HashCodeBuilder builder = new HashCodeBuilder();
+ List<Object> list = new ArrayList<Object>();
boolean present_func_args = true && (is_set_func_args());
- builder.append(present_func_args);
+ list.add(present_func_args);
if (present_func_args)
- builder.append(func_args);
+ list.add(func_args);
boolean present_request_id = true && (is_set_request_id());
- builder.append(present_request_id);
+ list.add(present_request_id);
if (present_request_id)
- builder.append(request_id);
+ list.add(request_id);
- return builder.toHashCode();
+ return list.hashCode();
}
+ @Override
public int compareTo(DRPCRequest other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- DRPCRequest typedOther = (DRPCRequest)other;
- lastComparison = Boolean.valueOf(is_set_func_args()).compareTo(typedOther.is_set_func_args());
+ lastComparison = Boolean.valueOf(is_set_func_args()).compareTo(other.is_set_func_args());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_func_args()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.func_args, typedOther.func_args);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.func_args, other.func_args);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_request_id()).compareTo(typedOther.is_set_request_id());
+ lastComparison = Boolean.valueOf(is_set_request_id()).compareTo(other.is_set_request_id());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_request_id()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.request_id, typedOther.request_id);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.request_id, other.request_id);
if (lastComparison != 0) {
return lastComparison;
}
@@ -336,54 +355,11 @@ public class DRPCRequest implements org.apache.thrift.TBase<DRPCRequest, DRPCReq
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // FUNC_ARGS
- if (field.type == org.apache.thrift.protocol.TType.STRING) {
- this.func_args = iprot.readString();
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 2: // REQUEST_ID
- if (field.type == org.apache.thrift.protocol.TType.STRING) {
- this.request_id = iprot.readString();
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (this.func_args != null) {
- oprot.writeFieldBegin(FUNC_ARGS_FIELD_DESC);
- oprot.writeString(this.func_args);
- oprot.writeFieldEnd();
- }
- if (this.request_id != null) {
- oprot.writeFieldBegin(REQUEST_ID_FIELD_DESC);
- oprot.writeString(this.request_id);
- oprot.writeFieldEnd();
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@Override
@@ -420,6 +396,7 @@ public class DRPCRequest implements org.apache.thrift.TBase<DRPCRequest, DRPCReq
throw new org.apache.thrift.protocol.TProtocolException("Required field 'request_id' is unset! Struct:" + toString());
}
+ // check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -438,5 +415,93 @@ public class DRPCRequest implements org.apache.thrift.TBase<DRPCRequest, DRPCReq
}
}
+ private static class DRPCRequestStandardSchemeFactory implements SchemeFactory {
+ public DRPCRequestStandardScheme getScheme() {
+ return new DRPCRequestStandardScheme();
+ }
+ }
+
+ private static class DRPCRequestStandardScheme extends StandardScheme<DRPCRequest> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, DRPCRequest 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: // FUNC_ARGS
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.func_args = iprot.readString();
+ struct.set_func_args_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // REQUEST_ID
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.request_id = iprot.readString();
+ struct.set_request_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, DRPCRequest struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.func_args != null) {
+ oprot.writeFieldBegin(FUNC_ARGS_FIELD_DESC);
+ oprot.writeString(struct.func_args);
+ oprot.writeFieldEnd();
+ }
+ if (struct.request_id != null) {
+ oprot.writeFieldBegin(REQUEST_ID_FIELD_DESC);
+ oprot.writeString(struct.request_id);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class DRPCRequestTupleSchemeFactory implements SchemeFactory {
+ public DRPCRequestTupleScheme getScheme() {
+ return new DRPCRequestTupleScheme();
+ }
+ }
+
+ private static class DRPCRequestTupleScheme extends TupleScheme<DRPCRequest> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, DRPCRequest struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ oprot.writeString(struct.func_args);
+ oprot.writeString(struct.request_id);
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, DRPCRequest struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ struct.func_args = iprot.readString();
+ struct.set_func_args_isSet(true);
+ struct.request_id = iprot.readString();
+ struct.set_request_id_isSet(true);
+ }
+ }
+
}
[09/18] storm git commit: Upgrade to thrift-0.9.2
Posted by kn...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/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 e236e41..bb5a138 100644
--- a/storm-core/src/jvm/backtype/storm/generated/DistributedRPCInvocations.java
+++ b/storm-core/src/jvm/backtype/storm/generated/DistributedRPCInvocations.java
@@ -16,13 +16,24 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package backtype.storm.generated;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -35,9 +46,12 @@ 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-2-2")
public class DistributedRPCInvocations {
public interface Iface {
@@ -52,11 +66,11 @@ public class DistributedRPCInvocations {
public interface AsyncIface {
- public void result(String id, String result, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.result_call> resultHandler) throws org.apache.thrift.TException;
+ public void result(String id, String result, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void fetchRequest(String functionName, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.fetchRequest_call> resultHandler) throws org.apache.thrift.TException;
+ public void fetchRequest(String functionName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void failRequest(String id, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.failRequest_call> resultHandler) throws org.apache.thrift.TException;
+ public void failRequest(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
}
@@ -171,7 +185,7 @@ public class DistributedRPCInvocations {
super(protocolFactory, clientManager, transport);
}
- public void result(String id, String result, org.apache.thrift.async.AsyncMethodCallback<result_call> resultHandler) throws org.apache.thrift.TException {
+ public void result(String id, String result, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
result_call method_call = new result_call(id, result, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -181,7 +195,7 @@ public class DistributedRPCInvocations {
public static class result_call extends org.apache.thrift.async.TAsyncMethodCall {
private String id;
private String result;
- public result_call(String id, String result, org.apache.thrift.async.AsyncMethodCallback<result_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ public result_call(String id, String result, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
super(client, protocolFactory, transport, resultHandler, false);
this.id = id;
this.result = result;
@@ -206,7 +220,7 @@ public class DistributedRPCInvocations {
}
}
- public void fetchRequest(String functionName, org.apache.thrift.async.AsyncMethodCallback<fetchRequest_call> resultHandler) throws org.apache.thrift.TException {
+ public void fetchRequest(String functionName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
fetchRequest_call method_call = new fetchRequest_call(functionName, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -215,7 +229,7 @@ public class DistributedRPCInvocations {
public static class fetchRequest_call extends org.apache.thrift.async.TAsyncMethodCall {
private String functionName;
- public fetchRequest_call(String functionName, org.apache.thrift.async.AsyncMethodCallback<fetchRequest_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ public fetchRequest_call(String functionName, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
super(client, protocolFactory, transport, resultHandler, false);
this.functionName = functionName;
}
@@ -238,7 +252,7 @@ public class DistributedRPCInvocations {
}
}
- public void failRequest(String id, org.apache.thrift.async.AsyncMethodCallback<failRequest_call> resultHandler) throws org.apache.thrift.TException {
+ public void failRequest(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
failRequest_call method_call = new failRequest_call(id, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -247,7 +261,7 @@ public class DistributedRPCInvocations {
public static class failRequest_call extends org.apache.thrift.async.TAsyncMethodCall {
private String id;
- public failRequest_call(String id, org.apache.thrift.async.AsyncMethodCallback<failRequest_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ public failRequest_call(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
super(client, protocolFactory, transport, resultHandler, false);
this.id = id;
}
@@ -272,7 +286,7 @@ public class DistributedRPCInvocations {
}
- public static class Processor<I extends Iface> extends org.apache.thrift.TBaseProcessor implements org.apache.thrift.TProcessor {
+ public static class Processor<I extends Iface> extends org.apache.thrift.TBaseProcessor<I> implements org.apache.thrift.TProcessor {
private static final Logger LOGGER = LoggerFactory.getLogger(Processor.class.getName());
public Processor(I iface) {
super(iface, getProcessMap(new HashMap<String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>>()));
@@ -289,16 +303,20 @@ public class DistributedRPCInvocations {
return processMap;
}
- private static class result<I extends Iface> extends org.apache.thrift.ProcessFunction<I, result_args> {
+ public static class result<I extends Iface> extends org.apache.thrift.ProcessFunction<I, result_args> {
public result() {
super("result");
}
- protected result_args getEmptyArgsInstance() {
+ public result_args getEmptyArgsInstance() {
return new result_args();
}
- protected result_result getResult(I iface, result_args args) throws org.apache.thrift.TException {
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public result_result getResult(I iface, result_args args) throws org.apache.thrift.TException {
result_result result = new result_result();
try {
iface.result(args.id, args.result);
@@ -309,16 +327,20 @@ public class DistributedRPCInvocations {
}
}
- private static class fetchRequest<I extends Iface> extends org.apache.thrift.ProcessFunction<I, fetchRequest_args> {
+ public static class fetchRequest<I extends Iface> extends org.apache.thrift.ProcessFunction<I, fetchRequest_args> {
public fetchRequest() {
super("fetchRequest");
}
- protected fetchRequest_args getEmptyArgsInstance() {
+ public fetchRequest_args getEmptyArgsInstance() {
return new fetchRequest_args();
}
- protected fetchRequest_result getResult(I iface, fetchRequest_args args) throws org.apache.thrift.TException {
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public fetchRequest_result getResult(I iface, fetchRequest_args args) throws org.apache.thrift.TException {
fetchRequest_result result = new fetchRequest_result();
try {
result.success = iface.fetchRequest(args.functionName);
@@ -329,16 +351,20 @@ public class DistributedRPCInvocations {
}
}
- private static class failRequest<I extends Iface> extends org.apache.thrift.ProcessFunction<I, failRequest_args> {
+ public static class failRequest<I extends Iface> extends org.apache.thrift.ProcessFunction<I, failRequest_args> {
public failRequest() {
super("failRequest");
}
- protected failRequest_args getEmptyArgsInstance() {
+ public failRequest_args getEmptyArgsInstance() {
return new failRequest_args();
}
- protected failRequest_result getResult(I iface, failRequest_args args) throws org.apache.thrift.TException {
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public failRequest_result getResult(I iface, failRequest_args args) throws org.apache.thrift.TException {
failRequest_result result = new failRequest_result();
try {
iface.failRequest(args.id);
@@ -351,12 +377,206 @@ public class DistributedRPCInvocations {
}
- public static class result_args implements org.apache.thrift.TBase<result_args, result_args._Fields>, java.io.Serializable, Cloneable {
+ public static class AsyncProcessor<I extends AsyncIface> extends org.apache.thrift.TBaseAsyncProcessor<I> {
+ private static final Logger LOGGER = LoggerFactory.getLogger(AsyncProcessor.class.getName());
+ public AsyncProcessor(I iface) {
+ super(iface, getProcessMap(new HashMap<String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?>>()));
+ }
+
+ protected AsyncProcessor(I iface, Map<String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?>> processMap) {
+ super(iface, getProcessMap(processMap));
+ }
+
+ private static <I extends AsyncIface> Map<String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase,?>> getProcessMap(Map<String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?>> processMap) {
+ processMap.put("result", new result());
+ processMap.put("fetchRequest", new fetchRequest());
+ processMap.put("failRequest", new failRequest());
+ return processMap;
+ }
+
+ public static class result<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, result_args, Void> {
+ public result() {
+ super("result");
+ }
+
+ public result_args getEmptyArgsInstance() {
+ return new result_args();
+ }
+
+ public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ final org.apache.thrift.AsyncProcessFunction fcall = this;
+ return new AsyncMethodCallback<Void>() {
+ public void onComplete(Void o) {
+ result_result result = new result_result();
+ try {
+ fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+ return;
+ } catch (Exception e) {
+ LOGGER.error("Exception writing to internal frame buffer", e);
+ }
+ fb.close();
+ }
+ public void onError(Exception e) {
+ byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+ org.apache.thrift.TBase msg;
+ result_result result = new result_result();
+ if (e instanceof AuthorizationException) {
+ result.aze = (AuthorizationException) e;
+ result.set_aze_isSet(true);
+ msg = result;
+ }
+ else
+ {
+ msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+ msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+ }
+ try {
+ fcall.sendResponse(fb,msg,msgType,seqid);
+ return;
+ } catch (Exception ex) {
+ LOGGER.error("Exception writing to internal frame buffer", ex);
+ }
+ fb.close();
+ }
+ };
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public void start(I iface, result_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+ iface.result(args.id, args.result,resultHandler);
+ }
+ }
+
+ public static class fetchRequest<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, fetchRequest_args, DRPCRequest> {
+ public fetchRequest() {
+ super("fetchRequest");
+ }
+
+ public fetchRequest_args getEmptyArgsInstance() {
+ return new fetchRequest_args();
+ }
+
+ public AsyncMethodCallback<DRPCRequest> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ final org.apache.thrift.AsyncProcessFunction fcall = this;
+ return new AsyncMethodCallback<DRPCRequest>() {
+ public void onComplete(DRPCRequest o) {
+ fetchRequest_result result = new fetchRequest_result();
+ result.success = o;
+ try {
+ fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+ return;
+ } catch (Exception e) {
+ LOGGER.error("Exception writing to internal frame buffer", e);
+ }
+ fb.close();
+ }
+ public void onError(Exception e) {
+ byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+ org.apache.thrift.TBase msg;
+ fetchRequest_result result = new fetchRequest_result();
+ if (e instanceof AuthorizationException) {
+ result.aze = (AuthorizationException) e;
+ result.set_aze_isSet(true);
+ msg = result;
+ }
+ else
+ {
+ msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+ msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+ }
+ try {
+ fcall.sendResponse(fb,msg,msgType,seqid);
+ return;
+ } catch (Exception ex) {
+ LOGGER.error("Exception writing to internal frame buffer", ex);
+ }
+ fb.close();
+ }
+ };
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public void start(I iface, fetchRequest_args args, org.apache.thrift.async.AsyncMethodCallback<DRPCRequest> resultHandler) throws TException {
+ iface.fetchRequest(args.functionName,resultHandler);
+ }
+ }
+
+ public static class failRequest<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, failRequest_args, Void> {
+ public failRequest() {
+ super("failRequest");
+ }
+
+ public failRequest_args getEmptyArgsInstance() {
+ return new failRequest_args();
+ }
+
+ public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ final org.apache.thrift.AsyncProcessFunction fcall = this;
+ return new AsyncMethodCallback<Void>() {
+ public void onComplete(Void o) {
+ failRequest_result result = new failRequest_result();
+ try {
+ fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+ return;
+ } catch (Exception e) {
+ LOGGER.error("Exception writing to internal frame buffer", e);
+ }
+ fb.close();
+ }
+ public void onError(Exception e) {
+ byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+ org.apache.thrift.TBase msg;
+ failRequest_result result = new failRequest_result();
+ if (e instanceof AuthorizationException) {
+ result.aze = (AuthorizationException) e;
+ result.set_aze_isSet(true);
+ msg = result;
+ }
+ else
+ {
+ msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+ msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+ }
+ try {
+ fcall.sendResponse(fb,msg,msgType,seqid);
+ return;
+ } catch (Exception ex) {
+ LOGGER.error("Exception writing to internal frame buffer", ex);
+ }
+ fb.close();
+ }
+ };
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public void start(I iface, failRequest_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+ iface.failRequest(args.id,resultHandler);
+ }
+ }
+
+ }
+
+ public static class result_args implements org.apache.thrift.TBase<result_args, result_args._Fields>, java.io.Serializable, Cloneable, Comparable<result_args> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("result_args");
private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)1);
private static final org.apache.thrift.protocol.TField RESULT_FIELD_DESC = new org.apache.thrift.protocol.TField("result", 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 result_argsStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new result_argsTupleSchemeFactory());
+ }
+
private String id; // required
private String result; // required
@@ -422,7 +642,6 @@ public class DistributedRPCInvocations {
}
// 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);
@@ -598,45 +817,45 @@ public class DistributedRPCInvocations {
@Override
public int hashCode() {
- HashCodeBuilder builder = new HashCodeBuilder();
+ List<Object> list = new ArrayList<Object>();
boolean present_id = true && (is_set_id());
- builder.append(present_id);
+ list.add(present_id);
if (present_id)
- builder.append(id);
+ list.add(id);
boolean present_result = true && (is_set_result());
- builder.append(present_result);
+ list.add(present_result);
if (present_result)
- builder.append(result);
+ list.add(result);
- return builder.toHashCode();
+ return list.hashCode();
}
+ @Override
public int compareTo(result_args other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- result_args typedOther = (result_args)other;
- lastComparison = Boolean.valueOf(is_set_id()).compareTo(typedOther.is_set_id());
+ lastComparison = Boolean.valueOf(is_set_id()).compareTo(other.is_set_id());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_id()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, typedOther.id);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, other.id);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_result()).compareTo(typedOther.is_set_result());
+ lastComparison = Boolean.valueOf(is_set_result()).compareTo(other.is_set_result());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_result()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.result, typedOther.result);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.result, other.result);
if (lastComparison != 0) {
return lastComparison;
}
@@ -649,54 +868,11 @@ public class DistributedRPCInvocations {
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // ID
- if (field.type == org.apache.thrift.protocol.TType.STRING) {
- this.id = iprot.readString();
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 2: // RESULT
- if (field.type == org.apache.thrift.protocol.TType.STRING) {
- this.result = iprot.readString();
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (this.id != null) {
- oprot.writeFieldBegin(ID_FIELD_DESC);
- oprot.writeString(this.id);
- oprot.writeFieldEnd();
- }
- if (this.result != null) {
- oprot.writeFieldBegin(RESULT_FIELD_DESC);
- oprot.writeString(this.result);
- oprot.writeFieldEnd();
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@Override
@@ -725,6 +901,7 @@ public class DistributedRPCInvocations {
public void validate() throws org.apache.thrift.TException {
// check for required fields
+ // check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -743,13 +920,124 @@ public class DistributedRPCInvocations {
}
}
+ private static class result_argsStandardSchemeFactory implements SchemeFactory {
+ public result_argsStandardScheme getScheme() {
+ return new result_argsStandardScheme();
+ }
+ }
+
+ private static class result_argsStandardScheme extends StandardScheme<result_args> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, result_args 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: // ID
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.id = iprot.readString();
+ struct.set_id_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // RESULT
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.result = iprot.readString();
+ struct.set_result_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, result_args struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.id != null) {
+ oprot.writeFieldBegin(ID_FIELD_DESC);
+ oprot.writeString(struct.id);
+ oprot.writeFieldEnd();
+ }
+ if (struct.result != null) {
+ oprot.writeFieldBegin(RESULT_FIELD_DESC);
+ oprot.writeString(struct.result);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class result_argsTupleSchemeFactory implements SchemeFactory {
+ public result_argsTupleScheme getScheme() {
+ return new result_argsTupleScheme();
+ }
+ }
+
+ private static class result_argsTupleScheme extends TupleScheme<result_args> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, result_args struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ BitSet optionals = new BitSet();
+ if (struct.is_set_id()) {
+ optionals.set(0);
+ }
+ if (struct.is_set_result()) {
+ optionals.set(1);
+ }
+ oprot.writeBitSet(optionals, 2);
+ if (struct.is_set_id()) {
+ oprot.writeString(struct.id);
+ }
+ if (struct.is_set_result()) {
+ oprot.writeString(struct.result);
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, result_args struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ BitSet incoming = iprot.readBitSet(2);
+ if (incoming.get(0)) {
+ struct.id = iprot.readString();
+ struct.set_id_isSet(true);
+ }
+ if (incoming.get(1)) {
+ struct.result = iprot.readString();
+ struct.set_result_isSet(true);
+ }
+ }
+ }
+
}
- public static class result_result implements org.apache.thrift.TBase<result_result, result_result._Fields>, java.io.Serializable, Cloneable {
+ public static class result_result implements org.apache.thrift.TBase<result_result, result_result._Fields>, java.io.Serializable, Cloneable, Comparable<result_result> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("result_result");
private static final org.apache.thrift.protocol.TField AZE_FIELD_DESC = new org.apache.thrift.protocol.TField("aze", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new result_resultStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new result_resultTupleSchemeFactory());
+ }
+
private AuthorizationException aze; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -811,7 +1099,6 @@ public class DistributedRPCInvocations {
}
// 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);
@@ -934,30 +1221,30 @@ public class DistributedRPCInvocations {
@Override
public int hashCode() {
- HashCodeBuilder builder = new HashCodeBuilder();
+ List<Object> list = new ArrayList<Object>();
boolean present_aze = true && (is_set_aze());
- builder.append(present_aze);
+ list.add(present_aze);
if (present_aze)
- builder.append(aze);
+ list.add(aze);
- return builder.toHashCode();
+ return list.hashCode();
}
+ @Override
public int compareTo(result_result other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- result_result typedOther = (result_result)other;
- lastComparison = Boolean.valueOf(is_set_aze()).compareTo(typedOther.is_set_aze());
+ lastComparison = Boolean.valueOf(is_set_aze()).compareTo(other.is_set_aze());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_aze()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.aze, typedOther.aze);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.aze, other.aze);
if (lastComparison != 0) {
return lastComparison;
}
@@ -970,43 +1257,12 @@ public class DistributedRPCInvocations {
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // AZE
- if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
- this.aze = new AuthorizationException();
- this.aze.read(iprot);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- oprot.writeStructBegin(STRUCT_DESC);
-
- if (this.is_set_aze()) {
- oprot.writeFieldBegin(AZE_FIELD_DESC);
- this.aze.write(oprot);
- oprot.writeFieldEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
- oprot.writeFieldStop();
- oprot.writeStructEnd();
- }
@Override
public String toString() {
@@ -1026,6 +1282,7 @@ public class DistributedRPCInvocations {
public void validate() throws org.apache.thrift.TException {
// check for required fields
+ // check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -1044,13 +1301,103 @@ public class DistributedRPCInvocations {
}
}
+ private static class result_resultStandardSchemeFactory implements SchemeFactory {
+ public result_resultStandardScheme getScheme() {
+ return new result_resultStandardScheme();
+ }
+ }
+
+ private static class result_resultStandardScheme extends StandardScheme<result_result> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, result_result 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: // AZE
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+ struct.aze = new AuthorizationException();
+ struct.aze.read(iprot);
+ struct.set_aze_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ default:
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ iprot.readFieldEnd();
+ }
+ iprot.readStructEnd();
+ struct.validate();
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot, result_result struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.aze != null) {
+ oprot.writeFieldBegin(AZE_FIELD_DESC);
+ struct.aze.write(oprot);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class result_resultTupleSchemeFactory implements SchemeFactory {
+ public result_resultTupleScheme getScheme() {
+ return new result_resultTupleScheme();
+ }
+ }
+
+ private static class result_resultTupleScheme extends TupleScheme<result_result> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, result_result struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ BitSet optionals = new BitSet();
+ if (struct.is_set_aze()) {
+ optionals.set(0);
+ }
+ oprot.writeBitSet(optionals, 1);
+ if (struct.is_set_aze()) {
+ struct.aze.write(oprot);
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, result_result struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ BitSet incoming = iprot.readBitSet(1);
+ if (incoming.get(0)) {
+ struct.aze = new AuthorizationException();
+ struct.aze.read(iprot);
+ struct.set_aze_isSet(true);
+ }
+ }
+ }
+
}
- public static class fetchRequest_args implements org.apache.thrift.TBase<fetchRequest_args, fetchRequest_args._Fields>, java.io.Serializable, Cloneable {
+ public static class fetchRequest_args implements org.apache.thrift.TBase<fetchRequest_args, fetchRequest_args._Fields>, java.io.Serializable, Cloneable, Comparable<fetchRequest_args> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("fetchRequest_args");
private static final org.apache.thrift.protocol.TField FUNCTION_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("functionName", 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 fetchRequest_argsStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new fetchRequest_argsTupleSchemeFactory());
+ }
+
private String functionName; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -1112,7 +1459,6 @@ public class DistributedRPCInvocations {
}
// 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);
@@ -1235,30 +1581,30 @@ public class DistributedRPCInvocations {
@Override
public int hashCode() {
- HashCodeBuilder builder = new HashCodeBuilder();
+ List<Object> list = new ArrayList<Object>();
boolean present_functionName = true && (is_set_functionName());
- builder.append(present_functionName);
+ list.add(present_functionName);
if (present_functionName)
- builder.append(functionName);
+ list.add(functionName);
- return builder.toHashCode();
+ return list.hashCode();
}
+ @Override
public int compareTo(fetchRequest_args other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- fetchRequest_args typedOther = (fetchRequest_args)other;
- lastComparison = Boolean.valueOf(is_set_functionName()).compareTo(typedOther.is_set_functionName());
+ lastComparison = Boolean.valueOf(is_set_functionName()).compareTo(other.is_set_functionName());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_functionName()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.functionName, typedOther.functionName);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.functionName, other.functionName);
if (lastComparison != 0) {
return lastComparison;
}
@@ -1271,42 +1617,11 @@ public class DistributedRPCInvocations {
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // FUNCTION_NAME
- if (field.type == org.apache.thrift.protocol.TType.STRING) {
- this.functionName = iprot.readString();
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (this.functionName != null) {
- oprot.writeFieldBegin(FUNCTION_NAME_FIELD_DESC);
- oprot.writeString(this.functionName);
- oprot.writeFieldEnd();
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@Override
@@ -1327,6 +1642,7 @@ public class DistributedRPCInvocations {
public void validate() throws org.apache.thrift.TException {
// check for required fields
+ // check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -1345,14 +1661,102 @@ public class DistributedRPCInvocations {
}
}
+ private static class fetchRequest_argsStandardSchemeFactory implements SchemeFactory {
+ public fetchRequest_argsStandardScheme getScheme() {
+ return new fetchRequest_argsStandardScheme();
+ }
+ }
+
+ private static class fetchRequest_argsStandardScheme extends StandardScheme<fetchRequest_args> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, fetchRequest_args 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: // FUNCTION_NAME
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.functionName = iprot.readString();
+ struct.set_functionName_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, fetchRequest_args struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.functionName != null) {
+ oprot.writeFieldBegin(FUNCTION_NAME_FIELD_DESC);
+ oprot.writeString(struct.functionName);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class fetchRequest_argsTupleSchemeFactory implements SchemeFactory {
+ public fetchRequest_argsTupleScheme getScheme() {
+ return new fetchRequest_argsTupleScheme();
+ }
+ }
+
+ private static class fetchRequest_argsTupleScheme extends TupleScheme<fetchRequest_args> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, fetchRequest_args struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ BitSet optionals = new BitSet();
+ if (struct.is_set_functionName()) {
+ optionals.set(0);
+ }
+ oprot.writeBitSet(optionals, 1);
+ if (struct.is_set_functionName()) {
+ oprot.writeString(struct.functionName);
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, fetchRequest_args struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ BitSet incoming = iprot.readBitSet(1);
+ if (incoming.get(0)) {
+ struct.functionName = iprot.readString();
+ struct.set_functionName_isSet(true);
+ }
+ }
+ }
+
}
- public static class fetchRequest_result implements org.apache.thrift.TBase<fetchRequest_result, fetchRequest_result._Fields>, java.io.Serializable, Cloneable {
+ public static class fetchRequest_result implements org.apache.thrift.TBase<fetchRequest_result, fetchRequest_result._Fields>, java.io.Serializable, Cloneable, Comparable<fetchRequest_result> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("fetchRequest_result");
private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0);
private static final org.apache.thrift.protocol.TField AZE_FIELD_DESC = new org.apache.thrift.protocol.TField("aze", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new fetchRequest_resultStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new fetchRequest_resultTupleSchemeFactory());
+ }
+
private DRPCRequest success; // required
private AuthorizationException aze; // required
@@ -1418,7 +1822,6 @@ public class DistributedRPCInvocations {
}
// 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);
@@ -1594,45 +1997,45 @@ public class DistributedRPCInvocations {
@Override
public int hashCode() {
- HashCodeBuilder builder = new HashCodeBuilder();
+ List<Object> list = new ArrayList<Object>();
boolean present_success = true && (is_set_success());
- builder.append(present_success);
+ list.add(present_success);
if (present_success)
- builder.append(success);
+ list.add(success);
boolean present_aze = true && (is_set_aze());
- builder.append(present_aze);
+ list.add(present_aze);
if (present_aze)
- builder.append(aze);
+ list.add(aze);
- return builder.toHashCode();
+ return list.hashCode();
}
+ @Override
public int compareTo(fetchRequest_result other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- fetchRequest_result typedOther = (fetchRequest_result)other;
- lastComparison = Boolean.valueOf(is_set_success()).compareTo(typedOther.is_set_success());
+ lastComparison = Boolean.valueOf(is_set_success()).compareTo(other.is_set_success());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_success()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_aze()).compareTo(typedOther.is_set_aze());
+ lastComparison = Boolean.valueOf(is_set_aze()).compareTo(other.is_set_aze());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_aze()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.aze, typedOther.aze);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.aze, other.aze);
if (lastComparison != 0) {
return lastComparison;
}
@@ -1645,55 +2048,12 @@ public class DistributedRPCInvocations {
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 0: // SUCCESS
- if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
- this.success = new DRPCRequest();
- this.success.read(iprot);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 1: // AZE
- if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
- this.aze = new AuthorizationException();
- this.aze.read(iprot);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- oprot.writeStructBegin(STRUCT_DESC);
-
- if (this.is_set_success()) {
- oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
- this.success.write(oprot);
- oprot.writeFieldEnd();
- } else if (this.is_set_aze()) {
- oprot.writeFieldBegin(AZE_FIELD_DESC);
- this.aze.write(oprot);
- oprot.writeFieldEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
- oprot.writeFieldStop();
- oprot.writeStructEnd();
- }
@Override
public String toString() {
@@ -1721,6 +2081,10 @@ public class DistributedRPCInvocations {
public void validate() throws org.apache.thrift.TException {
// check for required fields
+ // check for sub-struct validity
+ if (success != null) {
+ success.validate();
+ }
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -1739,13 +2103,128 @@ public class DistributedRPCInvocations {
}
}
+ private static class fetchRequest_resultStandardSchemeFactory implements SchemeFactory {
+ public fetchRequest_resultStandardScheme getScheme() {
+ return new fetchRequest_resultStandardScheme();
+ }
+ }
+
+ private static class fetchRequest_resultStandardScheme extends StandardScheme<fetchRequest_result> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, fetchRequest_result 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 0: // SUCCESS
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+ struct.success = new DRPCRequest();
+ struct.success.read(iprot);
+ struct.set_success_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 1: // AZE
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+ struct.aze = new AuthorizationException();
+ struct.aze.read(iprot);
+ struct.set_aze_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ default:
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ iprot.readFieldEnd();
+ }
+ iprot.readStructEnd();
+ struct.validate();
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot, fetchRequest_result struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.success != null) {
+ oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+ struct.success.write(oprot);
+ oprot.writeFieldEnd();
+ }
+ if (struct.aze != null) {
+ oprot.writeFieldBegin(AZE_FIELD_DESC);
+ struct.aze.write(oprot);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class fetchRequest_resultTupleSchemeFactory implements SchemeFactory {
+ public fetchRequest_resultTupleScheme getScheme() {
+ return new fetchRequest_resultTupleScheme();
+ }
+ }
+
+ private static class fetchRequest_resultTupleScheme extends TupleScheme<fetchRequest_result> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, fetchRequest_result struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ BitSet optionals = new BitSet();
+ if (struct.is_set_success()) {
+ optionals.set(0);
+ }
+ if (struct.is_set_aze()) {
+ optionals.set(1);
+ }
+ oprot.writeBitSet(optionals, 2);
+ if (struct.is_set_success()) {
+ struct.success.write(oprot);
+ }
+ if (struct.is_set_aze()) {
+ struct.aze.write(oprot);
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, fetchRequest_result struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ BitSet incoming = iprot.readBitSet(2);
+ if (incoming.get(0)) {
+ struct.success = new DRPCRequest();
+ struct.success.read(iprot);
+ struct.set_success_isSet(true);
+ }
+ if (incoming.get(1)) {
+ struct.aze = new AuthorizationException();
+ struct.aze.read(iprot);
+ struct.set_aze_isSet(true);
+ }
+ }
+ }
+
}
- public static class failRequest_args implements org.apache.thrift.TBase<failRequest_args, failRequest_args._Fields>, java.io.Serializable, Cloneable {
+ public static class failRequest_args implements org.apache.thrift.TBase<failRequest_args, failRequest_args._Fields>, java.io.Serializable, Cloneable, Comparable<failRequest_args> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("failRequest_args");
private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("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 failRequest_argsStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new failRequest_argsTupleSchemeFactory());
+ }
+
private String id; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -1807,7 +2286,6 @@ public class DistributedRPCInvocations {
}
// 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);
@@ -1930,30 +2408,30 @@ public class DistributedRPCInvocations {
@Override
public int hashCode() {
- HashCodeBuilder builder = new HashCodeBuilder();
+ List<Object> list = new ArrayList<Object>();
boolean present_id = true && (is_set_id());
- builder.append(present_id);
+ list.add(present_id);
if (present_id)
- builder.append(id);
+ list.add(id);
- return builder.toHashCode();
+ return list.hashCode();
}
+ @Override
public int compareTo(failRequest_args other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- failRequest_args typedOther = (failRequest_args)other;
- lastComparison = Boolean.valueOf(is_set_id()).compareTo(typedOther.is_set_id());
+ lastComparison = Boolean.valueOf(is_set_id()).compareTo(other.is_set_id());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_id()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, typedOther.id);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, other.id);
if (lastComparison != 0) {
return lastComparison;
}
@@ -1966,42 +2444,11 @@ public class DistributedRPCInvocations {
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // ID
- if (field.type == org.apache.thrift.protocol.TType.STRING) {
- this.id = iprot.readString();
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (this.id != null) {
- oprot.writeFieldBegin(ID_FIELD_DESC);
- oprot.writeString(this.id);
- oprot.writeFieldEnd();
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@Override
@@ -2022,6 +2469,7 @@ public class DistributedRPCInvocations {
public void validate() throws org.apache.thrift.TException {
// check for required fields
+ // check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -2040,13 +2488,101 @@ public class DistributedRPCInvocations {
}
}
+ private static class failRequest_argsStandardSchemeFactory implements SchemeFactory {
+ public failRequest_argsStandardScheme getScheme() {
+ return new failRequest_argsStandardScheme();
+ }
+ }
+
+ private static class failRequest_argsStandardScheme extends StandardScheme<failRequest_args> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, failRequest_args 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: // ID
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.id = iprot.readString();
+ struct.set_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, failRequest_args struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.id != null) {
+ oprot.writeFieldBegin(ID_FIELD_DESC);
+ oprot.writeString(struct.id);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class failRequest_argsTupleSchemeFactory implements SchemeFactory {
+ public failRequest_argsTupleScheme getScheme() {
+ return new failRequest_argsTupleScheme();
+ }
+ }
+
+ private static class failRequest_argsTupleScheme extends TupleScheme<failRequest_args> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, failRequest_args struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ BitSet optionals = new BitSet();
+ if (struct.is_set_id()) {
+ optionals.set(0);
+ }
+ oprot.writeBitSet(optionals, 1);
+ if (struct.is_set_id()) {
+ oprot.writeString(struct.id);
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, failRequest_args struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ BitSet incoming = iprot.readBitSet(1);
+ if (incoming.get(0)) {
+ struct.id = iprot.readString();
+ struct.set_id_isSet(true);
+ }
+ }
+ }
+
}
- public static class failRequest_result implements org.apache.thrift.TBase<failRequest_result, failRequest_result._Fields>, java.io.Serializable, Cloneable {
+ public static class failRequest_result implements org.apache.thrift.TBase<failRequest_result, failRequest_result._Fields>, java.io.Serializable, Cloneable, Comparable<failRequest_result> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("failRequest_result");
private static final org.apache.thrift.protocol.TField AZE_FIELD_DESC = new org.apache.thrift.protocol.TField("aze", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new failRequest_resultStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new failRequest_resultTupleSchemeFactory());
+ }
+
private AuthorizationException aze; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -2108,7 +2644,6 @@ public class DistributedRPCInvocations {
}
// 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);
@@ -2231,30 +2766,30 @@ public class DistributedRPCInvocations {
@Override
public int hashCode() {
- HashCodeBuilder builder = new HashCodeBuilder();
+ List<Object> list = new ArrayList<Object>();
boolean present_aze = true && (is_set_aze());
- builder.append(present_aze);
+ list.add(present_aze);
if (present_aze)
- builder.append(aze);
+ list.add(aze);
- return builder.toHashCode();
+ return list.hashCode();
}
+ @Override
public int compareTo(failRequest_result other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- failRequest_result typedOther = (failRequest_result)other;
- lastComparison = Boolean.valueOf(is_set_aze()).compareTo(typedOther.is_set_aze());
+ lastComparison = Boolean.valueOf(is_set_aze()).compareTo(other.is_set_aze());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_aze()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.aze, typedOther.aze);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.aze, other.aze);
if (lastComparison != 0) {
return lastComparison;
}
@@ -2267,43 +2802,12 @@ public class DistributedRPCInvocations {
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // AZE
- if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
- this.aze = new AuthorizationException();
- this.aze.read(iprot);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- oprot.writeStructBegin(STRUCT_DESC);
-
- if (this.is_set_aze()) {
- oprot.writeFieldBegin(AZE_FIELD_DESC);
- this.aze.write(oprot);
- oprot.writeFieldEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
- oprot.writeFieldStop();
- oprot.writeStructEnd();
- }
@Override
public String toString() {
@@ -2323,6 +2827,7 @@ public class DistributedRPCInvocations {
public void validate() throws org.apache.thrift.TException {
// check for required fields
+ // check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -2341,6 +2846,90 @@ public class DistributedRPCInvocations {
}
}
+ private static class failRequest_resultStandardSchemeFactory implements SchemeFactory {
+ public failRequest_resultStandardScheme getScheme() {
+ return new failRequest_resultStandardScheme();
+ }
+ }
+
+ private static class failRequest_resultStandardScheme extends StandardScheme<failRequest_result> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, failRequest_result 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: // AZE
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+ struct.aze = new AuthorizationException();
+ struct.aze.read(iprot);
+ struct.set_aze_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ default:
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ iprot.readFieldEnd();
+ }
+ iprot.readStructEnd();
+ struct.validate();
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot, failRequest_result struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.aze != null) {
+ oprot.writeFieldBegin(AZE_FIELD_DESC);
+ struct.aze.write(oprot);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class failRequest_resultTupleSchemeFactory implements SchemeFactory {
+ public failRequest_resultTupleScheme getScheme() {
+ return new failRequest_resultTupleScheme();
+ }
+ }
+
+ private static class failRequest_resultTupleScheme extends TupleScheme<failRequest_result> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, failRequest_result struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ BitSet optionals = new BitSet();
+ if (struct.is_set_aze()) {
+ optionals.set(0);
+ }
+ oprot.writeBitSet(optionals, 1);
+ if (struct.is_set_aze()) {
+ struct.aze.write(oprot);
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, failRequest_result struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ BitSet incoming = iprot.readBitSet(1);
+ if (incoming.get(0)) {
+ struct.aze = new AuthorizationException();
+ struct.aze.read(iprot);
+ struct.set_aze_isSet(true);
+ }
+ }
+ }
+
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/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 13b3fad..7024458 100644
--- a/storm-core/src/jvm/backtype/storm/generated/ErrorInfo.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ErrorInfo.java
@@ -16,13 +16,24 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package backtype.storm.generated;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -35,10 +46,13 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
+public class 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");
private static final org.apache.thrift.protocol.TField ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("error", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -46,10 +60,16 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._
private static final org.apache.thrift.protocol.TField HOST_FIELD_DESC = new org.apache.thrift.protocol.TField("host", org.apache.thrift.protocol.TType.STRING, (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 ErrorInfoStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new ErrorInfoTupleSchemeFactory());
+ }
+
private String error; // required
private int error_time_secs; // required
- private String host; // required
- private int port; // required
+ private String host; // optional
+ private int port; // 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 {
@@ -121,8 +141,8 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._
// isset id assignments
private static final int __ERROR_TIME_SECS_ISSET_ID = 0;
private static final int __PORT_ISSET_ID = 1;
- private BitSet __isset_bit_vector = new BitSet(2);
-
+ private byte __isset_bitfield = 0;
+ private static final _Fields optionals[] = {_Fields.HOST,_Fields.PORT};
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);
@@ -155,8 +175,7 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._
* Performs a deep copy on <i>other</i>.
*/
public ErrorInfo(ErrorInfo other) {
- __isset_bit_vector.clear();
- __isset_bit_vector.or(other.__isset_bit_vector);
+ __isset_bitfield = other.__isset_bitfield;
if (other.is_set_error()) {
this.error = other.error;
}
@@ -214,16 +233,16 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._
}
public void unset_error_time_secs() {
- __isset_bit_vector.clear(__ERROR_TIME_SECS_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ERROR_TIME_SECS_ISSET_ID);
}
/** Returns true if field error_time_secs is set (has been assigned a value) and false otherwise */
public boolean is_set_error_time_secs() {
- return __isset_bit_vector.get(__ERROR_TIME_SECS_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __ERROR_TIME_SECS_ISSET_ID);
}
public void set_error_time_secs_isSet(boolean value) {
- __isset_bit_vector.set(__ERROR_TIME_SECS_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ERROR_TIME_SECS_ISSET_ID, value);
}
public String get_host() {
@@ -259,16 +278,16 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._
}
public void unset_port() {
- __isset_bit_vector.clear(__PORT_ISSET_ID);
+ __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 __isset_bit_vector.get(__PORT_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __PORT_ISSET_ID);
}
public void set_port_isSet(boolean value) {
- __isset_bit_vector.set(__PORT_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PORT_ISSET_ID, value);
}
public void setFieldValue(_Fields field, Object value) {
@@ -399,75 +418,75 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._
@Override
public int hashCode() {
- HashCodeBuilder builder = new HashCodeBuilder();
+ List<Object> list = new ArrayList<Object>();
boolean present_error = true && (is_set_error());
- builder.append(present_error);
+ list.add(present_error);
if (present_error)
- builder.append(error);
+ list.add(error);
boolean present_error_time_secs = true;
- builder.append(present_error_time_secs);
+ list.add(present_error_time_secs);
if (present_error_time_secs)
- builder.append(error_time_secs);
+ list.add(error_time_secs);
boolean present_host = true && (is_set_host());
- builder.append(present_host);
+ list.add(present_host);
if (present_host)
- builder.append(host);
+ list.add(host);
boolean present_port = true && (is_set_port());
- builder.append(present_port);
+ list.add(present_port);
if (present_port)
- builder.append(port);
+ list.add(port);
- return builder.toHashCode();
+ return list.hashCode();
}
+ @Override
public int compareTo(ErrorInfo other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- ErrorInfo typedOther = (ErrorInfo)other;
- lastComparison = Boolean.valueOf(is_set_error()).compareTo(typedOther.is_set_error());
+ lastComparison = Boolean.valueOf(is_set_error()).compareTo(other.is_set_error());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_error()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.error, typedOther.error);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.error, other.error);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_error_time_secs()).compareTo(typedOther.is_set_error_time_secs());
+ lastComparison = Boolean.valueOf(is_set_error_time_secs()).compareTo(other.is_set_error_time_secs());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_error_time_secs()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.error_time_secs, typedOther.error_time_secs);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.error_time_secs, other.error_time_secs);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_host()).compareTo(typedOther.is_set_host());
+ lastComparison = Boolean.valueOf(is_set_host()).compareTo(other.is_set_host());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_host()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.host, typedOther.host);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.host, other.host);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_port()).compareTo(typedOther.is_set_port());
+ 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, typedOther.port);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.port, other.port);
if (lastComparison != 0) {
return lastComparison;
}
@@ -480,80 +499,11 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // ERROR
- if (field.type == org.apache.thrift.protocol.TType.STRING) {
- this.error = iprot.readString();
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 2: // ERROR_TIME_SECS
- if (field.type == org.apache.thrift.protocol.TType.I32) {
- this.error_time_secs = iprot.readI32();
- set_error_time_secs_isSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 3: // HOST
- if (field.type == org.apache.thrift.protocol.TType.STRING) {
- this.host = iprot.readString();
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 4: // PORT
- if (field.type == org.apache.thrift.protocol.TType.I32) {
- this.port = iprot.readI32();
- set_port_isSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (this.error != null) {
- oprot.writeFieldBegin(ERROR_FIELD_DESC);
- oprot.writeString(this.error);
- oprot.writeFieldEnd();
- }
- oprot.writeFieldBegin(ERROR_TIME_SECS_FIELD_DESC);
- oprot.writeI32(this.error_time_secs);
- oprot.writeFieldEnd();
- if (this.host != null) {
- if (is_set_host()) {
- oprot.writeFieldBegin(HOST_FIELD_DESC);
- oprot.writeString(this.host);
- oprot.writeFieldEnd();
- }
- }
- if (is_set_port()) {
- oprot.writeFieldBegin(PORT_FIELD_DESC);
- oprot.writeI32(this.port);
- oprot.writeFieldEnd();
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@Override
@@ -602,6 +552,7 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._
throw new org.apache.thrift.protocol.TProtocolException("Required field 'error_time_secs' is unset! Struct:" + toString());
}
+ // check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -615,12 +566,149 @@ public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._
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_bit_vector = new BitSet(1);
+ __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 ErrorInfoStandardSchemeFactory implements SchemeFactory {
+ public ErrorInfoStandardScheme getScheme() {
+ return new ErrorInfoStandardScheme();
+ }
+ }
+
+ private static class ErrorInfoStandardScheme extends StandardScheme<ErrorInfo> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, ErrorInfo 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: // ERROR
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.error = iprot.readString();
+ struct.set_error_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // ERROR_TIME_SECS
+ if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ struct.error_time_secs = iprot.readI32();
+ struct.set_error_time_secs_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 3: // HOST
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.host = iprot.readString();
+ struct.set_host_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, ErrorInfo struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.error != null) {
+ oprot.writeFieldBegin(ERROR_FIELD_DESC);
+ oprot.writeString(struct.error);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldBegin(ERROR_TIME_SECS_FIELD_DESC);
+ oprot.writeI32(struct.error_time_secs);
+ oprot.writeFieldEnd();
+ if (struct.host != null) {
+ if (struct.is_set_host()) {
+ oprot.writeFieldBegin(HOST_FIELD_DESC);
+ oprot.writeString(struct.host);
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.is_set_port()) {
+ oprot.writeFieldBegin(PORT_FIELD_DESC);
+ oprot.writeI32(struct.port);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class ErrorInfoTupleSchemeFactory implements SchemeFactory {
+ public ErrorInfoTupleScheme getScheme() {
+ return new ErrorInfoTupleScheme();
+ }
+ }
+
+ private static class ErrorInfoTupleScheme extends TupleScheme<ErrorInfo> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, ErrorInfo struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ oprot.writeString(struct.error);
+ oprot.writeI32(struct.error_time_secs);
+ BitSet optionals = new BitSet();
+ if (struct.is_set_host()) {
+ optionals.set(0);
+ }
+ if (struct.is_set_port()) {
+ optionals.set(1);
+ }
+ oprot.writeBitSet(optionals, 2);
+ if (struct.is_set_host()) {
+ oprot.writeString(struct.host);
+ }
+ if (struct.is_set_port()) {
+ oprot.writeI32(struct.port);
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, ErrorInfo struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ struct.error = iprot.readString();
+ struct.set_error_isSet(true);
+ struct.error_time_secs = iprot.readI32();
+ struct.set_error_time_secs_isSet(true);
+ BitSet incoming = iprot.readBitSet(2);
+ if (incoming.get(0)) {
+ struct.host = iprot.readString();
+ struct.set_host_isSet(true);
+ }
+ if (incoming.get(1)) {
+ struct.port = iprot.readI32();
+ struct.set_port_isSet(true);
+ }
+ }
+ }
+
}
[10/18] storm git commit: Upgrade to thrift-0.9.2
Posted by kn...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/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 06c4f5c..d81d719 100644
--- a/storm-core/src/jvm/backtype/storm/generated/DistributedRPC.java
+++ b/storm-core/src/jvm/backtype/storm/generated/DistributedRPC.java
@@ -16,13 +16,24 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package backtype.storm.generated;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -35,9 +46,12 @@ 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-2-2")
public class DistributedRPC {
public interface Iface {
@@ -48,7 +62,7 @@ public class DistributedRPC {
public interface AsyncIface {
- public void execute(String functionName, String funcArgs, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.execute_call> resultHandler) throws org.apache.thrift.TException;
+ public void execute(String functionName, String funcArgs, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
}
@@ -120,7 +134,7 @@ public class DistributedRPC {
super(protocolFactory, clientManager, transport);
}
- public void execute(String functionName, String funcArgs, org.apache.thrift.async.AsyncMethodCallback<execute_call> resultHandler) throws org.apache.thrift.TException {
+ public void execute(String functionName, String funcArgs, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
execute_call method_call = new execute_call(functionName, funcArgs, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@ -130,7 +144,7 @@ public class DistributedRPC {
public static class execute_call extends org.apache.thrift.async.TAsyncMethodCall {
private String functionName;
private String funcArgs;
- public execute_call(String functionName, String funcArgs, org.apache.thrift.async.AsyncMethodCallback<execute_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ public execute_call(String functionName, String funcArgs, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
super(client, protocolFactory, transport, resultHandler, false);
this.functionName = functionName;
this.funcArgs = funcArgs;
@@ -157,7 +171,7 @@ public class DistributedRPC {
}
- public static class Processor<I extends Iface> extends org.apache.thrift.TBaseProcessor implements org.apache.thrift.TProcessor {
+ public static class Processor<I extends Iface> extends org.apache.thrift.TBaseProcessor<I> implements org.apache.thrift.TProcessor {
private static final Logger LOGGER = LoggerFactory.getLogger(Processor.class.getName());
public Processor(I iface) {
super(iface, getProcessMap(new HashMap<String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>>()));
@@ -172,16 +186,20 @@ public class DistributedRPC {
return processMap;
}
- private static class execute<I extends Iface> extends org.apache.thrift.ProcessFunction<I, execute_args> {
+ public static class execute<I extends Iface> extends org.apache.thrift.ProcessFunction<I, execute_args> {
public execute() {
super("execute");
}
- protected execute_args getEmptyArgsInstance() {
+ public execute_args getEmptyArgsInstance() {
return new execute_args();
}
- protected execute_result getResult(I iface, execute_args args) throws org.apache.thrift.TException {
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public execute_result getResult(I iface, execute_args args) throws org.apache.thrift.TException {
execute_result result = new execute_result();
try {
result.success = iface.execute(args.functionName, args.funcArgs);
@@ -196,12 +214,97 @@ public class DistributedRPC {
}
- public static class execute_args implements org.apache.thrift.TBase<execute_args, execute_args._Fields>, java.io.Serializable, Cloneable {
+ public static class AsyncProcessor<I extends AsyncIface> extends org.apache.thrift.TBaseAsyncProcessor<I> {
+ private static final Logger LOGGER = LoggerFactory.getLogger(AsyncProcessor.class.getName());
+ public AsyncProcessor(I iface) {
+ super(iface, getProcessMap(new HashMap<String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?>>()));
+ }
+
+ protected AsyncProcessor(I iface, Map<String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?>> processMap) {
+ super(iface, getProcessMap(processMap));
+ }
+
+ private static <I extends AsyncIface> Map<String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase,?>> getProcessMap(Map<String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?>> processMap) {
+ processMap.put("execute", new execute());
+ return processMap;
+ }
+
+ public static class execute<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, execute_args, String> {
+ public execute() {
+ super("execute");
+ }
+
+ public execute_args getEmptyArgsInstance() {
+ return new execute_args();
+ }
+
+ public AsyncMethodCallback<String> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ final org.apache.thrift.AsyncProcessFunction fcall = this;
+ return new AsyncMethodCallback<String>() {
+ public void onComplete(String o) {
+ execute_result result = new execute_result();
+ result.success = o;
+ try {
+ fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+ return;
+ } catch (Exception e) {
+ LOGGER.error("Exception writing to internal frame buffer", e);
+ }
+ fb.close();
+ }
+ public void onError(Exception e) {
+ byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+ org.apache.thrift.TBase msg;
+ execute_result result = new execute_result();
+ if (e instanceof DRPCExecutionException) {
+ result.e = (DRPCExecutionException) e;
+ result.set_e_isSet(true);
+ msg = result;
+ }
+ else if (e instanceof AuthorizationException) {
+ result.aze = (AuthorizationException) e;
+ result.set_aze_isSet(true);
+ msg = result;
+ }
+ else
+ {
+ msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+ msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+ }
+ try {
+ fcall.sendResponse(fb,msg,msgType,seqid);
+ return;
+ } catch (Exception ex) {
+ LOGGER.error("Exception writing to internal frame buffer", ex);
+ }
+ fb.close();
+ }
+ };
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public void start(I iface, execute_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException {
+ iface.execute(args.functionName, args.funcArgs,resultHandler);
+ }
+ }
+
+ }
+
+ public static class execute_args implements org.apache.thrift.TBase<execute_args, execute_args._Fields>, java.io.Serializable, Cloneable, Comparable<execute_args> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("execute_args");
private static final org.apache.thrift.protocol.TField FUNCTION_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("functionName", org.apache.thrift.protocol.TType.STRING, (short)1);
private static final org.apache.thrift.protocol.TField FUNC_ARGS_FIELD_DESC = new org.apache.thrift.protocol.TField("funcArgs", 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 execute_argsStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new execute_argsTupleSchemeFactory());
+ }
+
private String functionName; // required
private String funcArgs; // required
@@ -267,7 +370,6 @@ public class DistributedRPC {
}
// 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);
@@ -443,45 +545,45 @@ public class DistributedRPC {
@Override
public int hashCode() {
- HashCodeBuilder builder = new HashCodeBuilder();
+ List<Object> list = new ArrayList<Object>();
boolean present_functionName = true && (is_set_functionName());
- builder.append(present_functionName);
+ list.add(present_functionName);
if (present_functionName)
- builder.append(functionName);
+ list.add(functionName);
boolean present_funcArgs = true && (is_set_funcArgs());
- builder.append(present_funcArgs);
+ list.add(present_funcArgs);
if (present_funcArgs)
- builder.append(funcArgs);
+ list.add(funcArgs);
- return builder.toHashCode();
+ return list.hashCode();
}
+ @Override
public int compareTo(execute_args other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- execute_args typedOther = (execute_args)other;
- lastComparison = Boolean.valueOf(is_set_functionName()).compareTo(typedOther.is_set_functionName());
+ lastComparison = Boolean.valueOf(is_set_functionName()).compareTo(other.is_set_functionName());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_functionName()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.functionName, typedOther.functionName);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.functionName, other.functionName);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_funcArgs()).compareTo(typedOther.is_set_funcArgs());
+ lastComparison = Boolean.valueOf(is_set_funcArgs()).compareTo(other.is_set_funcArgs());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_funcArgs()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.funcArgs, typedOther.funcArgs);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.funcArgs, other.funcArgs);
if (lastComparison != 0) {
return lastComparison;
}
@@ -494,54 +596,11 @@ public class DistributedRPC {
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // FUNCTION_NAME
- if (field.type == org.apache.thrift.protocol.TType.STRING) {
- this.functionName = iprot.readString();
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 2: // FUNC_ARGS
- if (field.type == org.apache.thrift.protocol.TType.STRING) {
- this.funcArgs = iprot.readString();
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (this.functionName != null) {
- oprot.writeFieldBegin(FUNCTION_NAME_FIELD_DESC);
- oprot.writeString(this.functionName);
- oprot.writeFieldEnd();
- }
- if (this.funcArgs != null) {
- oprot.writeFieldBegin(FUNC_ARGS_FIELD_DESC);
- oprot.writeString(this.funcArgs);
- oprot.writeFieldEnd();
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@Override
@@ -570,6 +629,7 @@ public class DistributedRPC {
public void validate() throws org.apache.thrift.TException {
// check for required fields
+ // check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -588,15 +648,126 @@ public class DistributedRPC {
}
}
+ private static class execute_argsStandardSchemeFactory implements SchemeFactory {
+ public execute_argsStandardScheme getScheme() {
+ return new execute_argsStandardScheme();
+ }
+ }
+
+ private static class execute_argsStandardScheme extends StandardScheme<execute_args> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, execute_args struct) throws org.apache.thrift.TException {
+ 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: // FUNCTION_NAME
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.functionName = iprot.readString();
+ struct.set_functionName_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // FUNC_ARGS
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.funcArgs = iprot.readString();
+ struct.set_funcArgs_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, execute_args struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.functionName != null) {
+ oprot.writeFieldBegin(FUNCTION_NAME_FIELD_DESC);
+ oprot.writeString(struct.functionName);
+ oprot.writeFieldEnd();
+ }
+ if (struct.funcArgs != null) {
+ oprot.writeFieldBegin(FUNC_ARGS_FIELD_DESC);
+ oprot.writeString(struct.funcArgs);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class execute_argsTupleSchemeFactory implements SchemeFactory {
+ public execute_argsTupleScheme getScheme() {
+ return new execute_argsTupleScheme();
+ }
+ }
+
+ private static class execute_argsTupleScheme extends TupleScheme<execute_args> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, execute_args struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ BitSet optionals = new BitSet();
+ if (struct.is_set_functionName()) {
+ optionals.set(0);
+ }
+ if (struct.is_set_funcArgs()) {
+ optionals.set(1);
+ }
+ oprot.writeBitSet(optionals, 2);
+ if (struct.is_set_functionName()) {
+ oprot.writeString(struct.functionName);
+ }
+ if (struct.is_set_funcArgs()) {
+ oprot.writeString(struct.funcArgs);
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, execute_args struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ BitSet incoming = iprot.readBitSet(2);
+ if (incoming.get(0)) {
+ struct.functionName = iprot.readString();
+ struct.set_functionName_isSet(true);
+ }
+ if (incoming.get(1)) {
+ struct.funcArgs = iprot.readString();
+ struct.set_funcArgs_isSet(true);
+ }
+ }
+ }
+
}
- public static class execute_result implements org.apache.thrift.TBase<execute_result, execute_result._Fields>, java.io.Serializable, Cloneable {
+ public static class execute_result implements org.apache.thrift.TBase<execute_result, execute_result._Fields>, java.io.Serializable, Cloneable, Comparable<execute_result> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("execute_result");
private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRING, (short)0);
private static final org.apache.thrift.protocol.TField E_FIELD_DESC = new org.apache.thrift.protocol.TField("e", org.apache.thrift.protocol.TType.STRUCT, (short)1);
private static final org.apache.thrift.protocol.TField AZE_FIELD_DESC = new org.apache.thrift.protocol.TField("aze", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new execute_resultStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new execute_resultTupleSchemeFactory());
+ }
+
private String success; // required
private DRPCExecutionException e; // required
private AuthorizationException aze; // required
@@ -666,7 +837,6 @@ public class DistributedRPC {
}
// 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);
@@ -895,60 +1065,60 @@ public class DistributedRPC {
@Override
public int hashCode() {
- HashCodeBuilder builder = new HashCodeBuilder();
+ List<Object> list = new ArrayList<Object>();
boolean present_success = true && (is_set_success());
- builder.append(present_success);
+ list.add(present_success);
if (present_success)
- builder.append(success);
+ list.add(success);
boolean present_e = true && (is_set_e());
- builder.append(present_e);
+ list.add(present_e);
if (present_e)
- builder.append(e);
+ list.add(e);
boolean present_aze = true && (is_set_aze());
- builder.append(present_aze);
+ list.add(present_aze);
if (present_aze)
- builder.append(aze);
+ list.add(aze);
- return builder.toHashCode();
+ return list.hashCode();
}
+ @Override
public int compareTo(execute_result other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- execute_result typedOther = (execute_result)other;
- lastComparison = Boolean.valueOf(is_set_success()).compareTo(typedOther.is_set_success());
+ lastComparison = Boolean.valueOf(is_set_success()).compareTo(other.is_set_success());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_success()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_e()).compareTo(typedOther.is_set_e());
+ lastComparison = Boolean.valueOf(is_set_e()).compareTo(other.is_set_e());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_e()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.e, typedOther.e);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.e, other.e);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_aze()).compareTo(typedOther.is_set_aze());
+ lastComparison = Boolean.valueOf(is_set_aze()).compareTo(other.is_set_aze());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_aze()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.aze, typedOther.aze);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.aze, other.aze);
if (lastComparison != 0) {
return lastComparison;
}
@@ -961,66 +1131,12 @@ public class DistributedRPC {
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 0: // SUCCESS
- if (field.type == org.apache.thrift.protocol.TType.STRING) {
- this.success = iprot.readString();
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 1: // E
- if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
- this.e = new DRPCExecutionException();
- this.e.read(iprot);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 2: // AZE
- if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
- this.aze = new AuthorizationException();
- this.aze.read(iprot);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- oprot.writeStructBegin(STRUCT_DESC);
-
- if (this.is_set_success()) {
- oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
- oprot.writeString(this.success);
- oprot.writeFieldEnd();
- } else if (this.is_set_e()) {
- oprot.writeFieldBegin(E_FIELD_DESC);
- this.e.write(oprot);
- oprot.writeFieldEnd();
- } else if (this.is_set_aze()) {
- oprot.writeFieldBegin(AZE_FIELD_DESC);
- this.aze.write(oprot);
- oprot.writeFieldEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
- oprot.writeFieldStop();
- oprot.writeStructEnd();
- }
@Override
public String toString() {
@@ -1056,6 +1172,7 @@ public class DistributedRPC {
public void validate() throws org.apache.thrift.TException {
// check for required fields
+ // check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -1074,6 +1191,138 @@ public class DistributedRPC {
}
}
+ private static class execute_resultStandardSchemeFactory implements SchemeFactory {
+ public execute_resultStandardScheme getScheme() {
+ return new execute_resultStandardScheme();
+ }
+ }
+
+ private static class execute_resultStandardScheme extends StandardScheme<execute_result> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, execute_result struct) throws org.apache.thrift.TException {
+ 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 0: // SUCCESS
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.success = iprot.readString();
+ struct.set_success_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 1: // E
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+ struct.e = new DRPCExecutionException();
+ struct.e.read(iprot);
+ struct.set_e_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // AZE
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+ struct.aze = new AuthorizationException();
+ struct.aze.read(iprot);
+ struct.set_aze_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ default:
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ iprot.readFieldEnd();
+ }
+ iprot.readStructEnd();
+ struct.validate();
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot, execute_result struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.success != null) {
+ oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+ oprot.writeString(struct.success);
+ oprot.writeFieldEnd();
+ }
+ if (struct.e != null) {
+ oprot.writeFieldBegin(E_FIELD_DESC);
+ struct.e.write(oprot);
+ oprot.writeFieldEnd();
+ }
+ if (struct.aze != null) {
+ oprot.writeFieldBegin(AZE_FIELD_DESC);
+ struct.aze.write(oprot);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class execute_resultTupleSchemeFactory implements SchemeFactory {
+ public execute_resultTupleScheme getScheme() {
+ return new execute_resultTupleScheme();
+ }
+ }
+
+ private static class execute_resultTupleScheme extends TupleScheme<execute_result> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, execute_result struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ BitSet optionals = new BitSet();
+ if (struct.is_set_success()) {
+ optionals.set(0);
+ }
+ if (struct.is_set_e()) {
+ optionals.set(1);
+ }
+ if (struct.is_set_aze()) {
+ optionals.set(2);
+ }
+ oprot.writeBitSet(optionals, 3);
+ if (struct.is_set_success()) {
+ oprot.writeString(struct.success);
+ }
+ if (struct.is_set_e()) {
+ struct.e.write(oprot);
+ }
+ if (struct.is_set_aze()) {
+ struct.aze.write(oprot);
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, execute_result struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ BitSet incoming = iprot.readBitSet(3);
+ if (incoming.get(0)) {
+ struct.success = iprot.readString();
+ struct.set_success_isSet(true);
+ }
+ if (incoming.get(1)) {
+ struct.e = new DRPCExecutionException();
+ struct.e.read(iprot);
+ struct.set_e_isSet(true);
+ }
+ if (incoming.get(2)) {
+ struct.aze = new AuthorizationException();
+ struct.aze.read(iprot);
+ struct.set_aze_isSet(true);
+ }
+ }
+ }
+
}
}
[15/18] storm git commit: Merge branch 'master' of
github.com:apache/incubator-storm into thrift092
Posted by kn...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/Nimbus.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/Nimbus.java
index 49585a6,ef90dbb..048379a
--- a/storm-core/src/jvm/backtype/storm/generated/Nimbus.java
+++ b/storm-core/src/jvm/backtype/storm/generated/Nimbus.java
@@@ -50,8 -38,6 +50,8 @@@ 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-2-2")
++@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
public class Nimbus {
public interface Iface {
@@@ -98,43 -86,45 +100,45 @@@
public interface AsyncIface {
- public void submitTopology(String name, String uploadedJarLocation, String jsonConf, StormTopology topology, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.submitTopology_call> resultHandler) throws org.apache.thrift.TException;
+ public void submitTopology(String name, String uploadedJarLocation, String jsonConf, StormTopology topology, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void submitTopologyWithOpts(String name, String uploadedJarLocation, String jsonConf, StormTopology topology, SubmitOptions options, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.submitTopologyWithOpts_call> resultHandler) throws org.apache.thrift.TException;
+ public void submitTopologyWithOpts(String name, String uploadedJarLocation, String jsonConf, StormTopology topology, SubmitOptions options, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void killTopology(String name, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.killTopology_call> resultHandler) throws org.apache.thrift.TException;
+ public void killTopology(String name, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void killTopologyWithOpts(String name, KillOptions options, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.killTopologyWithOpts_call> resultHandler) throws org.apache.thrift.TException;
+ public void killTopologyWithOpts(String name, KillOptions options, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void activate(String name, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.activate_call> resultHandler) throws org.apache.thrift.TException;
+ public void activate(String name, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void deactivate(String name, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.deactivate_call> resultHandler) throws org.apache.thrift.TException;
+ public void deactivate(String name, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void rebalance(String name, RebalanceOptions options, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.rebalance_call> resultHandler) throws org.apache.thrift.TException;
+ public void rebalance(String name, RebalanceOptions options, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void uploadNewCredentials(String name, Credentials creds, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.uploadNewCredentials_call> resultHandler) throws org.apache.thrift.TException;
+ public void uploadNewCredentials(String name, Credentials creds, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void beginFileUpload(org.apache.thrift.async.AsyncMethodCallback<AsyncClient.beginFileUpload_call> resultHandler) throws org.apache.thrift.TException;
+ public void beginFileUpload(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void uploadChunk(String location, ByteBuffer chunk, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.uploadChunk_call> resultHandler) throws org.apache.thrift.TException;
+ public void uploadChunk(String location, ByteBuffer chunk, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void finishFileUpload(String location, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.finishFileUpload_call> resultHandler) throws org.apache.thrift.TException;
+ public void finishFileUpload(String location, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void beginFileDownload(String file, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.beginFileDownload_call> resultHandler) throws org.apache.thrift.TException;
+ public void beginFileDownload(String file, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void downloadChunk(String id, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.downloadChunk_call> resultHandler) throws org.apache.thrift.TException;
+ public void downloadChunk(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void getNimbusConf(org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getNimbusConf_call> resultHandler) throws org.apache.thrift.TException;
+ public void getNimbusConf(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void getClusterInfo(org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getClusterInfo_call> resultHandler) throws org.apache.thrift.TException;
+ public void getClusterInfo(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void getTopologyInfo(String id, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getTopologyInfo_call> resultHandler) throws org.apache.thrift.TException;
+ public void getTopologyInfo(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void getTopologyInfoWithOpts(String id, GetInfoOptions options, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getTopologyInfoWithOpts_call> resultHandler) throws org.apache.thrift.TException;
++ public void getTopologyInfoWithOpts(String id, GetInfoOptions options, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+
- public void getTopologyConf(String id, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getTopologyConf_call> resultHandler) throws org.apache.thrift.TException;
+ public void getTopologyConf(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void getTopology(String id, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getTopology_call> resultHandler) throws org.apache.thrift.TException;
+ public void getTopology(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void getUserTopology(String id, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getUserTopology_call> resultHandler) throws org.apache.thrift.TException;
+ public void getUserTopology(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
}
@@@ -1232,7 -1252,42 +1266,42 @@@
}
}
- public void getTopologyInfoWithOpts(String id, GetInfoOptions options, org.apache.thrift.async.AsyncMethodCallback<getTopologyInfoWithOpts_call> resultHandler) throws org.apache.thrift.TException {
++ public void getTopologyInfoWithOpts(String id, GetInfoOptions options, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ checkReady();
+ getTopologyInfoWithOpts_call method_call = new getTopologyInfoWithOpts_call(id, options, resultHandler, this, ___protocolFactory, ___transport);
+ this.___currentMethod = method_call;
+ ___manager.call(method_call);
+ }
+
+ public static class getTopologyInfoWithOpts_call extends org.apache.thrift.async.TAsyncMethodCall {
+ private String id;
+ private GetInfoOptions options;
- public getTopologyInfoWithOpts_call(String id, GetInfoOptions options, org.apache.thrift.async.AsyncMethodCallback<getTopologyInfoWithOpts_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
++ public getTopologyInfoWithOpts_call(String id, GetInfoOptions options, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ super(client, protocolFactory, transport, resultHandler, false);
+ this.id = id;
+ this.options = options;
+ }
+
+ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+ prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getTopologyInfoWithOpts", org.apache.thrift.protocol.TMessageType.CALL, 0));
+ getTopologyInfoWithOpts_args args = new getTopologyInfoWithOpts_args();
+ args.set_id(id);
+ args.set_options(options);
+ args.write(prot);
+ prot.writeMessageEnd();
+ }
+
+ public TopologyInfo getResult() throws NotAliveException, AuthorizationException, org.apache.thrift.TException {
+ if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+ throw new IllegalStateException("Method call not finished!");
+ }
+ org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+ org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+ return (new Client(prot)).recv_getTopologyInfoWithOpts();
+ }
+ }
+
- public void getTopologyConf(String id, org.apache.thrift.async.AsyncMethodCallback<getTopologyConf_call> resultHandler) throws org.apache.thrift.TException {
+ public void getTopologyConf(String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
getTopologyConf_call method_call = new getTopologyConf_call(id, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
@@@ -1579,822 -1603,7 +1649,849 @@@
}
}
- private static class beginFileUpload<I extends Iface> extends org.apache.thrift.ProcessFunction<I, beginFileUpload_args> {
+ public static class beginFileUpload<I extends Iface> extends org.apache.thrift.ProcessFunction<I, beginFileUpload_args> {
+ public beginFileUpload() {
+ super("beginFileUpload");
+ }
+
+ public beginFileUpload_args getEmptyArgsInstance() {
+ return new beginFileUpload_args();
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public beginFileUpload_result getResult(I iface, beginFileUpload_args args) throws org.apache.thrift.TException {
+ beginFileUpload_result result = new beginFileUpload_result();
+ try {
+ result.success = iface.beginFileUpload();
+ } catch (AuthorizationException aze) {
+ result.aze = aze;
+ }
+ return result;
+ }
+ }
+
+ public static class uploadChunk<I extends Iface> extends org.apache.thrift.ProcessFunction<I, uploadChunk_args> {
+ public uploadChunk() {
+ super("uploadChunk");
+ }
+
+ public uploadChunk_args getEmptyArgsInstance() {
+ return new uploadChunk_args();
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public uploadChunk_result getResult(I iface, uploadChunk_args args) throws org.apache.thrift.TException {
+ uploadChunk_result result = new uploadChunk_result();
+ try {
+ iface.uploadChunk(args.location, args.chunk);
+ } catch (AuthorizationException aze) {
+ result.aze = aze;
+ }
+ return result;
+ }
+ }
+
+ public static class finishFileUpload<I extends Iface> extends org.apache.thrift.ProcessFunction<I, finishFileUpload_args> {
+ public finishFileUpload() {
+ super("finishFileUpload");
+ }
+
+ public finishFileUpload_args getEmptyArgsInstance() {
+ return new finishFileUpload_args();
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public finishFileUpload_result getResult(I iface, finishFileUpload_args args) throws org.apache.thrift.TException {
+ finishFileUpload_result result = new finishFileUpload_result();
+ try {
+ iface.finishFileUpload(args.location);
+ } catch (AuthorizationException aze) {
+ result.aze = aze;
+ }
+ return result;
+ }
+ }
+
+ public static class beginFileDownload<I extends Iface> extends org.apache.thrift.ProcessFunction<I, beginFileDownload_args> {
+ public beginFileDownload() {
+ super("beginFileDownload");
+ }
+
+ public beginFileDownload_args getEmptyArgsInstance() {
+ return new beginFileDownload_args();
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public beginFileDownload_result getResult(I iface, beginFileDownload_args args) throws org.apache.thrift.TException {
+ beginFileDownload_result result = new beginFileDownload_result();
+ try {
+ result.success = iface.beginFileDownload(args.file);
+ } catch (AuthorizationException aze) {
+ result.aze = aze;
+ }
+ return result;
+ }
+ }
+
+ public static class downloadChunk<I extends Iface> extends org.apache.thrift.ProcessFunction<I, downloadChunk_args> {
+ public downloadChunk() {
+ super("downloadChunk");
+ }
+
+ public downloadChunk_args getEmptyArgsInstance() {
+ return new downloadChunk_args();
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public downloadChunk_result getResult(I iface, downloadChunk_args args) throws org.apache.thrift.TException {
+ downloadChunk_result result = new downloadChunk_result();
+ try {
+ result.success = iface.downloadChunk(args.id);
+ } catch (AuthorizationException aze) {
+ result.aze = aze;
+ }
+ return result;
+ }
+ }
+
+ public static class getNimbusConf<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getNimbusConf_args> {
+ public getNimbusConf() {
+ super("getNimbusConf");
+ }
+
+ public getNimbusConf_args getEmptyArgsInstance() {
+ return new getNimbusConf_args();
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public getNimbusConf_result getResult(I iface, getNimbusConf_args args) throws org.apache.thrift.TException {
+ getNimbusConf_result result = new getNimbusConf_result();
+ try {
+ result.success = iface.getNimbusConf();
+ } catch (AuthorizationException aze) {
+ result.aze = aze;
+ }
+ return result;
+ }
+ }
+
+ public static class getClusterInfo<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getClusterInfo_args> {
+ public getClusterInfo() {
+ super("getClusterInfo");
+ }
+
+ public getClusterInfo_args getEmptyArgsInstance() {
+ return new getClusterInfo_args();
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public getClusterInfo_result getResult(I iface, getClusterInfo_args args) throws org.apache.thrift.TException {
+ getClusterInfo_result result = new getClusterInfo_result();
+ try {
+ result.success = iface.getClusterInfo();
+ } catch (AuthorizationException aze) {
+ result.aze = aze;
+ }
+ return result;
+ }
+ }
+
+ public static class getTopologyInfo<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getTopologyInfo_args> {
+ public getTopologyInfo() {
+ super("getTopologyInfo");
+ }
+
+ public getTopologyInfo_args getEmptyArgsInstance() {
+ return new getTopologyInfo_args();
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public getTopologyInfo_result getResult(I iface, getTopologyInfo_args args) throws org.apache.thrift.TException {
+ getTopologyInfo_result result = new getTopologyInfo_result();
+ try {
+ result.success = iface.getTopologyInfo(args.id);
+ } catch (NotAliveException e) {
+ result.e = e;
+ } catch (AuthorizationException aze) {
+ result.aze = aze;
+ }
+ return result;
+ }
+ }
+
++ public static class getTopologyInfoWithOpts<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getTopologyInfoWithOpts_args> {
++ public getTopologyInfoWithOpts() {
++ super("getTopologyInfoWithOpts");
++ }
++
++ public getTopologyInfoWithOpts_args getEmptyArgsInstance() {
++ return new getTopologyInfoWithOpts_args();
++ }
++
++ protected boolean isOneway() {
++ return false;
++ }
++
++ public getTopologyInfoWithOpts_result getResult(I iface, getTopologyInfoWithOpts_args args) throws org.apache.thrift.TException {
++ getTopologyInfoWithOpts_result result = new getTopologyInfoWithOpts_result();
++ try {
++ result.success = iface.getTopologyInfoWithOpts(args.id, args.options);
++ } catch (NotAliveException e) {
++ result.e = e;
++ } catch (AuthorizationException aze) {
++ result.aze = aze;
++ }
++ return result;
++ }
++ }
++
+ public static class getTopologyConf<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getTopologyConf_args> {
+ public getTopologyConf() {
+ super("getTopologyConf");
+ }
+
+ public getTopologyConf_args getEmptyArgsInstance() {
+ return new getTopologyConf_args();
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public getTopologyConf_result getResult(I iface, getTopologyConf_args args) throws org.apache.thrift.TException {
+ getTopologyConf_result result = new getTopologyConf_result();
+ try {
+ result.success = iface.getTopologyConf(args.id);
+ } catch (NotAliveException e) {
+ result.e = e;
+ } catch (AuthorizationException aze) {
+ result.aze = aze;
+ }
+ return result;
+ }
+ }
+
+ public static class getTopology<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getTopology_args> {
+ public getTopology() {
+ super("getTopology");
+ }
+
+ public getTopology_args getEmptyArgsInstance() {
+ return new getTopology_args();
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public getTopology_result getResult(I iface, getTopology_args args) throws org.apache.thrift.TException {
+ getTopology_result result = new getTopology_result();
+ try {
+ result.success = iface.getTopology(args.id);
+ } catch (NotAliveException e) {
+ result.e = e;
+ } catch (AuthorizationException aze) {
+ result.aze = aze;
+ }
+ return result;
+ }
+ }
+
+ public static class getUserTopology<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getUserTopology_args> {
+ public getUserTopology() {
+ super("getUserTopology");
+ }
+
+ public getUserTopology_args getEmptyArgsInstance() {
+ return new getUserTopology_args();
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public getUserTopology_result getResult(I iface, getUserTopology_args args) throws org.apache.thrift.TException {
+ getUserTopology_result result = new getUserTopology_result();
+ try {
+ result.success = iface.getUserTopology(args.id);
+ } catch (NotAliveException e) {
+ result.e = e;
+ } catch (AuthorizationException aze) {
+ result.aze = aze;
+ }
+ return result;
+ }
+ }
+
+ }
+
+ public static class AsyncProcessor<I extends AsyncIface> extends org.apache.thrift.TBaseAsyncProcessor<I> {
+ private static final Logger LOGGER = LoggerFactory.getLogger(AsyncProcessor.class.getName());
+ public AsyncProcessor(I iface) {
+ super(iface, getProcessMap(new HashMap<String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?>>()));
+ }
+
+ protected AsyncProcessor(I iface, Map<String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?>> processMap) {
+ super(iface, getProcessMap(processMap));
+ }
+
+ private static <I extends AsyncIface> Map<String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase,?>> getProcessMap(Map<String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?>> processMap) {
+ processMap.put("submitTopology", new submitTopology());
+ processMap.put("submitTopologyWithOpts", new submitTopologyWithOpts());
+ processMap.put("killTopology", new killTopology());
+ processMap.put("killTopologyWithOpts", new killTopologyWithOpts());
+ processMap.put("activate", new activate());
+ processMap.put("deactivate", new deactivate());
+ processMap.put("rebalance", new rebalance());
+ processMap.put("uploadNewCredentials", new uploadNewCredentials());
+ processMap.put("beginFileUpload", new beginFileUpload());
+ processMap.put("uploadChunk", new uploadChunk());
+ processMap.put("finishFileUpload", new finishFileUpload());
+ processMap.put("beginFileDownload", new beginFileDownload());
+ processMap.put("downloadChunk", new downloadChunk());
+ processMap.put("getNimbusConf", new getNimbusConf());
+ processMap.put("getClusterInfo", new getClusterInfo());
+ processMap.put("getTopologyInfo", new getTopologyInfo());
++ processMap.put("getTopologyInfoWithOpts", new getTopologyInfoWithOpts());
+ processMap.put("getTopologyConf", new getTopologyConf());
+ processMap.put("getTopology", new getTopology());
+ processMap.put("getUserTopology", new getUserTopology());
+ return processMap;
+ }
+
+ public static class submitTopology<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, submitTopology_args, Void> {
+ public submitTopology() {
+ super("submitTopology");
+ }
+
+ public submitTopology_args getEmptyArgsInstance() {
+ return new submitTopology_args();
+ }
+
+ public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ final org.apache.thrift.AsyncProcessFunction fcall = this;
+ return new AsyncMethodCallback<Void>() {
+ public void onComplete(Void o) {
+ submitTopology_result result = new submitTopology_result();
+ try {
+ fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+ return;
+ } catch (Exception e) {
+ LOGGER.error("Exception writing to internal frame buffer", e);
+ }
+ fb.close();
+ }
+ public void onError(Exception e) {
+ byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+ org.apache.thrift.TBase msg;
+ submitTopology_result result = new submitTopology_result();
+ if (e instanceof AlreadyAliveException) {
+ result.e = (AlreadyAliveException) e;
+ result.set_e_isSet(true);
+ msg = result;
+ }
+ else if (e instanceof InvalidTopologyException) {
+ result.ite = (InvalidTopologyException) e;
+ result.set_ite_isSet(true);
+ msg = result;
+ }
+ else if (e instanceof AuthorizationException) {
+ result.aze = (AuthorizationException) e;
+ result.set_aze_isSet(true);
+ msg = result;
+ }
+ else
+ {
+ msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+ msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+ }
+ try {
+ fcall.sendResponse(fb,msg,msgType,seqid);
+ return;
+ } catch (Exception ex) {
+ LOGGER.error("Exception writing to internal frame buffer", ex);
+ }
+ fb.close();
+ }
+ };
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public void start(I iface, submitTopology_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+ iface.submitTopology(args.name, args.uploadedJarLocation, args.jsonConf, args.topology,resultHandler);
+ }
+ }
+
+ public static class submitTopologyWithOpts<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, submitTopologyWithOpts_args, Void> {
+ public submitTopologyWithOpts() {
+ super("submitTopologyWithOpts");
+ }
+
+ public submitTopologyWithOpts_args getEmptyArgsInstance() {
+ return new submitTopologyWithOpts_args();
+ }
+
+ public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ final org.apache.thrift.AsyncProcessFunction fcall = this;
+ return new AsyncMethodCallback<Void>() {
+ public void onComplete(Void o) {
+ submitTopologyWithOpts_result result = new submitTopologyWithOpts_result();
+ try {
+ fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+ return;
+ } catch (Exception e) {
+ LOGGER.error("Exception writing to internal frame buffer", e);
+ }
+ fb.close();
+ }
+ public void onError(Exception e) {
+ byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+ org.apache.thrift.TBase msg;
+ submitTopologyWithOpts_result result = new submitTopologyWithOpts_result();
+ if (e instanceof AlreadyAliveException) {
+ result.e = (AlreadyAliveException) e;
+ result.set_e_isSet(true);
+ msg = result;
+ }
+ else if (e instanceof InvalidTopologyException) {
+ result.ite = (InvalidTopologyException) e;
+ result.set_ite_isSet(true);
+ msg = result;
+ }
+ else if (e instanceof AuthorizationException) {
+ result.aze = (AuthorizationException) e;
+ result.set_aze_isSet(true);
+ msg = result;
+ }
+ else
+ {
+ msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+ msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+ }
+ try {
+ fcall.sendResponse(fb,msg,msgType,seqid);
+ return;
+ } catch (Exception ex) {
+ LOGGER.error("Exception writing to internal frame buffer", ex);
+ }
+ fb.close();
+ }
+ };
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public void start(I iface, submitTopologyWithOpts_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+ iface.submitTopologyWithOpts(args.name, args.uploadedJarLocation, args.jsonConf, args.topology, args.options,resultHandler);
+ }
+ }
+
+ public static class killTopology<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, killTopology_args, Void> {
+ public killTopology() {
+ super("killTopology");
+ }
+
+ public killTopology_args getEmptyArgsInstance() {
+ return new killTopology_args();
+ }
+
+ public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ final org.apache.thrift.AsyncProcessFunction fcall = this;
+ return new AsyncMethodCallback<Void>() {
+ public void onComplete(Void o) {
+ killTopology_result result = new killTopology_result();
+ try {
+ fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+ return;
+ } catch (Exception e) {
+ LOGGER.error("Exception writing to internal frame buffer", e);
+ }
+ fb.close();
+ }
+ public void onError(Exception e) {
+ byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+ org.apache.thrift.TBase msg;
+ killTopology_result result = new killTopology_result();
+ if (e instanceof NotAliveException) {
+ result.e = (NotAliveException) e;
+ result.set_e_isSet(true);
+ msg = result;
+ }
+ else if (e instanceof AuthorizationException) {
+ result.aze = (AuthorizationException) e;
+ result.set_aze_isSet(true);
+ msg = result;
+ }
+ else
+ {
+ msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+ msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+ }
+ try {
+ fcall.sendResponse(fb,msg,msgType,seqid);
+ return;
+ } catch (Exception ex) {
+ LOGGER.error("Exception writing to internal frame buffer", ex);
+ }
+ fb.close();
+ }
+ };
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public void start(I iface, killTopology_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+ iface.killTopology(args.name,resultHandler);
+ }
+ }
+
+ public static class killTopologyWithOpts<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, killTopologyWithOpts_args, Void> {
+ public killTopologyWithOpts() {
+ super("killTopologyWithOpts");
+ }
+
+ public killTopologyWithOpts_args getEmptyArgsInstance() {
+ return new killTopologyWithOpts_args();
+ }
+
+ public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ final org.apache.thrift.AsyncProcessFunction fcall = this;
+ return new AsyncMethodCallback<Void>() {
+ public void onComplete(Void o) {
+ killTopologyWithOpts_result result = new killTopologyWithOpts_result();
+ try {
+ fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+ return;
+ } catch (Exception e) {
+ LOGGER.error("Exception writing to internal frame buffer", e);
+ }
+ fb.close();
+ }
+ public void onError(Exception e) {
+ byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+ org.apache.thrift.TBase msg;
+ killTopologyWithOpts_result result = new killTopologyWithOpts_result();
+ if (e instanceof NotAliveException) {
+ result.e = (NotAliveException) e;
+ result.set_e_isSet(true);
+ msg = result;
+ }
+ else if (e instanceof AuthorizationException) {
+ result.aze = (AuthorizationException) e;
+ result.set_aze_isSet(true);
+ msg = result;
+ }
+ else
+ {
+ msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+ msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+ }
+ try {
+ fcall.sendResponse(fb,msg,msgType,seqid);
+ return;
+ } catch (Exception ex) {
+ LOGGER.error("Exception writing to internal frame buffer", ex);
+ }
+ fb.close();
+ }
+ };
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public void start(I iface, killTopologyWithOpts_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+ iface.killTopologyWithOpts(args.name, args.options,resultHandler);
+ }
+ }
+
+ public static class activate<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, activate_args, Void> {
+ public activate() {
+ super("activate");
+ }
+
+ public activate_args getEmptyArgsInstance() {
+ return new activate_args();
+ }
+
+ public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ final org.apache.thrift.AsyncProcessFunction fcall = this;
+ return new AsyncMethodCallback<Void>() {
+ public void onComplete(Void o) {
+ activate_result result = new activate_result();
+ try {
+ fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+ return;
+ } catch (Exception e) {
+ LOGGER.error("Exception writing to internal frame buffer", e);
+ }
+ fb.close();
+ }
+ public void onError(Exception e) {
+ byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+ org.apache.thrift.TBase msg;
+ activate_result result = new activate_result();
+ if (e instanceof NotAliveException) {
+ result.e = (NotAliveException) e;
+ result.set_e_isSet(true);
+ msg = result;
+ }
+ else if (e instanceof AuthorizationException) {
+ result.aze = (AuthorizationException) e;
+ result.set_aze_isSet(true);
+ msg = result;
+ }
+ else
+ {
+ msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+ msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+ }
+ try {
+ fcall.sendResponse(fb,msg,msgType,seqid);
+ return;
+ } catch (Exception ex) {
+ LOGGER.error("Exception writing to internal frame buffer", ex);
+ }
+ fb.close();
+ }
+ };
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public void start(I iface, activate_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+ iface.activate(args.name,resultHandler);
+ }
+ }
+
+ public static class deactivate<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deactivate_args, Void> {
+ public deactivate() {
+ super("deactivate");
+ }
+
+ public deactivate_args getEmptyArgsInstance() {
+ return new deactivate_args();
+ }
+
+ public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ final org.apache.thrift.AsyncProcessFunction fcall = this;
+ return new AsyncMethodCallback<Void>() {
+ public void onComplete(Void o) {
+ deactivate_result result = new deactivate_result();
+ try {
+ fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+ return;
+ } catch (Exception e) {
+ LOGGER.error("Exception writing to internal frame buffer", e);
+ }
+ fb.close();
+ }
+ public void onError(Exception e) {
+ byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+ org.apache.thrift.TBase msg;
+ deactivate_result result = new deactivate_result();
+ if (e instanceof NotAliveException) {
+ result.e = (NotAliveException) e;
+ result.set_e_isSet(true);
+ msg = result;
+ }
+ else if (e instanceof AuthorizationException) {
+ result.aze = (AuthorizationException) e;
+ result.set_aze_isSet(true);
+ msg = result;
+ }
+ else
+ {
+ msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+ msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+ }
+ try {
+ fcall.sendResponse(fb,msg,msgType,seqid);
+ return;
+ } catch (Exception ex) {
+ LOGGER.error("Exception writing to internal frame buffer", ex);
+ }
+ fb.close();
+ }
+ };
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public void start(I iface, deactivate_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+ iface.deactivate(args.name,resultHandler);
+ }
+ }
+
+ public static class rebalance<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, rebalance_args, Void> {
+ public rebalance() {
+ super("rebalance");
+ }
+
+ public rebalance_args getEmptyArgsInstance() {
+ return new rebalance_args();
+ }
+
+ public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ final org.apache.thrift.AsyncProcessFunction fcall = this;
+ return new AsyncMethodCallback<Void>() {
+ public void onComplete(Void o) {
+ rebalance_result result = new rebalance_result();
+ try {
+ fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+ return;
+ } catch (Exception e) {
+ LOGGER.error("Exception writing to internal frame buffer", e);
+ }
+ fb.close();
+ }
+ public void onError(Exception e) {
+ byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+ org.apache.thrift.TBase msg;
+ rebalance_result result = new rebalance_result();
+ if (e instanceof NotAliveException) {
+ result.e = (NotAliveException) e;
+ result.set_e_isSet(true);
+ msg = result;
+ }
+ else if (e instanceof InvalidTopologyException) {
+ result.ite = (InvalidTopologyException) e;
+ result.set_ite_isSet(true);
+ msg = result;
+ }
+ else if (e instanceof AuthorizationException) {
+ result.aze = (AuthorizationException) e;
+ result.set_aze_isSet(true);
+ msg = result;
+ }
+ else
+ {
+ msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+ msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+ }
+ try {
+ fcall.sendResponse(fb,msg,msgType,seqid);
+ return;
+ } catch (Exception ex) {
+ LOGGER.error("Exception writing to internal frame buffer", ex);
+ }
+ fb.close();
+ }
+ };
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public void start(I iface, rebalance_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+ iface.rebalance(args.name, args.options,resultHandler);
+ }
+ }
+
+ public static class uploadNewCredentials<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, uploadNewCredentials_args, Void> {
+ public uploadNewCredentials() {
+ super("uploadNewCredentials");
+ }
+
+ public uploadNewCredentials_args getEmptyArgsInstance() {
+ return new uploadNewCredentials_args();
+ }
+
+ public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ final org.apache.thrift.AsyncProcessFunction fcall = this;
+ return new AsyncMethodCallback<Void>() {
+ public void onComplete(Void o) {
+ uploadNewCredentials_result result = new uploadNewCredentials_result();
+ try {
+ fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+ return;
+ } catch (Exception e) {
+ LOGGER.error("Exception writing to internal frame buffer", e);
+ }
+ fb.close();
+ }
+ public void onError(Exception e) {
+ byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+ org.apache.thrift.TBase msg;
+ uploadNewCredentials_result result = new uploadNewCredentials_result();
+ if (e instanceof NotAliveException) {
+ result.e = (NotAliveException) e;
+ result.set_e_isSet(true);
+ msg = result;
+ }
+ else if (e instanceof InvalidTopologyException) {
+ result.ite = (InvalidTopologyException) e;
+ result.set_ite_isSet(true);
+ msg = result;
+ }
+ else if (e instanceof AuthorizationException) {
+ result.aze = (AuthorizationException) e;
+ result.set_aze_isSet(true);
+ msg = result;
+ }
+ else
+ {
+ msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+ msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+ }
+ try {
+ fcall.sendResponse(fb,msg,msgType,seqid);
+ return;
+ } catch (Exception ex) {
+ LOGGER.error("Exception writing to internal frame buffer", ex);
+ }
+ fb.close();
+ }
+ };
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public void start(I iface, uploadNewCredentials_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+ iface.uploadNewCredentials(args.name, args.creds,resultHandler);
+ }
+ }
+
+ public static class beginFileUpload<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, beginFileUpload_args, String> {
public beginFileUpload() {
super("beginFileUpload");
}
@@@ -2853,7 -1765,29 +2950,69 @@@
}
}
- private static class getTopologyInfoWithOpts<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getTopologyInfoWithOpts_args> {
++ public static class getTopologyInfoWithOpts<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getTopologyInfoWithOpts_args, TopologyInfo> {
+ public getTopologyInfoWithOpts() {
+ super("getTopologyInfoWithOpts");
+ }
+
- protected getTopologyInfoWithOpts_args getEmptyArgsInstance() {
++ public getTopologyInfoWithOpts_args getEmptyArgsInstance() {
+ return new getTopologyInfoWithOpts_args();
+ }
+
- protected getTopologyInfoWithOpts_result getResult(I iface, getTopologyInfoWithOpts_args args) throws org.apache.thrift.TException {
- getTopologyInfoWithOpts_result result = new getTopologyInfoWithOpts_result();
- try {
- result.success = iface.getTopologyInfoWithOpts(args.id, args.options);
- } catch (NotAliveException e) {
- result.e = e;
- } catch (AuthorizationException aze) {
- result.aze = aze;
- }
- return result;
++ public AsyncMethodCallback<TopologyInfo> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
++ final org.apache.thrift.AsyncProcessFunction fcall = this;
++ return new AsyncMethodCallback<TopologyInfo>() {
++ public void onComplete(TopologyInfo o) {
++ getTopologyInfoWithOpts_result result = new getTopologyInfoWithOpts_result();
++ result.success = o;
++ try {
++ fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
++ return;
++ } catch (Exception e) {
++ LOGGER.error("Exception writing to internal frame buffer", e);
++ }
++ fb.close();
++ }
++ public void onError(Exception e) {
++ byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
++ org.apache.thrift.TBase msg;
++ getTopologyInfoWithOpts_result result = new getTopologyInfoWithOpts_result();
++ if (e instanceof NotAliveException) {
++ result.e = (NotAliveException) e;
++ result.set_e_isSet(true);
++ msg = result;
++ }
++ else if (e instanceof AuthorizationException) {
++ result.aze = (AuthorizationException) e;
++ result.set_aze_isSet(true);
++ msg = result;
++ }
++ else
++ {
++ msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
++ msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
++ }
++ try {
++ fcall.sendResponse(fb,msg,msgType,seqid);
++ return;
++ } catch (Exception ex) {
++ LOGGER.error("Exception writing to internal frame buffer", ex);
++ }
++ fb.close();
++ }
++ };
++ }
++
++ protected boolean isOneway() {
++ return false;
++ }
++
++ public void start(I iface, getTopologyInfoWithOpts_args args, org.apache.thrift.async.AsyncMethodCallback<TopologyInfo> resultHandler) throws TException {
++ iface.getTopologyInfoWithOpts(args.id, args.options,resultHandler);
+ }
+ }
+
- private static class getTopologyConf<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getTopologyConf_args> {
+ public static class getTopologyConf<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getTopologyConf_args, String> {
public getTopologyConf() {
super("getTopologyConf");
}
@@@ -17261,143 -14000,891 +17420,1185 @@@
}
}
+ private static class getTopologyInfo_resultStandardSchemeFactory implements SchemeFactory {
+ public getTopologyInfo_resultStandardScheme getScheme() {
+ return new getTopologyInfo_resultStandardScheme();
+ }
+ }
+
+ private static class getTopologyInfo_resultStandardScheme extends StandardScheme<getTopologyInfo_result> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, getTopologyInfo_result 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 0: // SUCCESS
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+ struct.success = new TopologyInfo();
+ struct.success.read(iprot);
+ struct.set_success_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 1: // E
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+ struct.e = new NotAliveException();
+ struct.e.read(iprot);
+ struct.set_e_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // AZE
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+ struct.aze = new AuthorizationException();
+ struct.aze.read(iprot);
+ struct.set_aze_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ default:
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ iprot.readFieldEnd();
+ }
+ iprot.readStructEnd();
+ struct.validate();
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot, getTopologyInfo_result struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.success != null) {
+ oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+ struct.success.write(oprot);
+ oprot.writeFieldEnd();
+ }
+ if (struct.e != null) {
+ oprot.writeFieldBegin(E_FIELD_DESC);
+ struct.e.write(oprot);
+ oprot.writeFieldEnd();
+ }
+ if (struct.aze != null) {
+ oprot.writeFieldBegin(AZE_FIELD_DESC);
+ struct.aze.write(oprot);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class getTopologyInfo_resultTupleSchemeFactory implements SchemeFactory {
+ public getTopologyInfo_resultTupleScheme getScheme() {
+ return new getTopologyInfo_resultTupleScheme();
+ }
+ }
+
+ private static class getTopologyInfo_resultTupleScheme extends TupleScheme<getTopologyInfo_result> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, getTopologyInfo_result struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ BitSet optionals = new BitSet();
+ if (struct.is_set_success()) {
+ optionals.set(0);
+ }
+ if (struct.is_set_e()) {
+ optionals.set(1);
+ }
+ if (struct.is_set_aze()) {
+ optionals.set(2);
+ }
+ oprot.writeBitSet(optionals, 3);
+ if (struct.is_set_success()) {
+ struct.success.write(oprot);
+ }
+ if (struct.is_set_e()) {
+ struct.e.write(oprot);
+ }
+ if (struct.is_set_aze()) {
+ struct.aze.write(oprot);
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, getTopologyInfo_result struct) throws org.apache.thrift.TException {
++ TTupleProtocol iprot = (TTupleProtocol) prot;
++ BitSet incoming = iprot.readBitSet(3);
++ if (incoming.get(0)) {
++ struct.success = new TopologyInfo();
++ struct.success.read(iprot);
++ struct.set_success_isSet(true);
++ }
++ if (incoming.get(1)) {
++ struct.e = new NotAliveException();
++ struct.e.read(iprot);
++ struct.set_e_isSet(true);
++ }
++ if (incoming.get(2)) {
++ struct.aze = new AuthorizationException();
++ struct.aze.read(iprot);
++ struct.set_aze_isSet(true);
++ }
++ }
++ }
++
+ }
+
- public static class getTopologyInfoWithOpts_args implements org.apache.thrift.TBase<getTopologyInfoWithOpts_args, getTopologyInfoWithOpts_args._Fields>, java.io.Serializable, Cloneable {
++ public static class getTopologyInfoWithOpts_args implements org.apache.thrift.TBase<getTopologyInfoWithOpts_args, getTopologyInfoWithOpts_args._Fields>, java.io.Serializable, Cloneable, Comparable<getTopologyInfoWithOpts_args> {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getTopologyInfoWithOpts_args");
+
+ private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)1);
+ private static final org.apache.thrift.protocol.TField OPTIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("options", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+
++ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
++ static {
++ schemes.put(StandardScheme.class, new getTopologyInfoWithOpts_argsStandardSchemeFactory());
++ schemes.put(TupleScheme.class, new getTopologyInfoWithOpts_argsTupleSchemeFactory());
++ }
++
+ private String id; // required
+ private GetInfoOptions options; // 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 {
+ ID((short)1, "id"),
+ OPTIONS((short)2, "options");
+
+ 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: // ID
+ return ID;
+ case 2: // OPTIONS
+ return OPTIONS;
+ 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.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.OPTIONS, new org.apache.thrift.meta_data.FieldMetaData("options", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, GetInfoOptions.class)));
+ metaDataMap = Collections.unmodifiableMap(tmpMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getTopologyInfoWithOpts_args.class, metaDataMap);
+ }
+
+ public getTopologyInfoWithOpts_args() {
+ }
+
+ public getTopologyInfoWithOpts_args(
+ String id,
+ GetInfoOptions options)
+ {
+ this();
+ this.id = id;
+ this.options = options;
+ }
+
+ /**
+ * Performs a deep copy on <i>other</i>.
+ */
+ public getTopologyInfoWithOpts_args(getTopologyInfoWithOpts_args other) {
+ if (other.is_set_id()) {
+ this.id = other.id;
+ }
+ if (other.is_set_options()) {
+ this.options = new GetInfoOptions(other.options);
+ }
+ }
+
+ public getTopologyInfoWithOpts_args deepCopy() {
+ return new getTopologyInfoWithOpts_args(this);
+ }
+
+ @Override
+ public void clear() {
+ this.id = null;
+ this.options = null;
+ }
+
+ public String get_id() {
+ return this.id;
+ }
+
+ public void set_id(String id) {
+ this.id = id;
+ }
+
+ public void unset_id() {
+ this.id = null;
+ }
+
+ /** Returns true if field id is set (has been assigned a value) and false otherwise */
+ public boolean is_set_id() {
+ return this.id != null;
+ }
+
+ public void set_id_isSet(boolean value) {
+ if (!value) {
+ this.id = null;
+ }
+ }
+
+ public GetInfoOptions get_options() {
+ return this.options;
+ }
+
+ public void set_options(GetInfoOptions options) {
+ this.options = options;
+ }
+
+ public void unset_options() {
+ this.options = null;
+ }
+
+ /** Returns true if field options is set (has been assigned a value) and false otherwise */
+ public boolean is_set_options() {
+ return this.options != null;
+ }
+
+ public void set_options_isSet(boolean value) {
+ if (!value) {
+ this.options = null;
+ }
+ }
+
+ public void setFieldValue(_Fields field, Object value) {
+ switch (field) {
+ case ID:
+ if (value == null) {
+ unset_id();
+ } else {
+ set_id((String)value);
+ }
+ break;
+
+ case OPTIONS:
+ if (value == null) {
+ unset_options();
+ } else {
+ set_options((GetInfoOptions)value);
+ }
+ break;
+
+ }
+ }
+
+ public Object getFieldValue(_Fields field) {
+ switch (field) {
+ case ID:
+ return get_id();
+
+ case OPTIONS:
+ return get_options();
+
+ }
+ 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 ID:
+ return is_set_id();
+ case OPTIONS:
+ return is_set_options();
+ }
+ throw new IllegalStateException();
+ }
+
+ @Override
+ public boolean equals(Object that) {
+ if (that == null)
+ return false;
+ if (that instanceof getTopologyInfoWithOpts_args)
+ return this.equals((getTopologyInfoWithOpts_args)that);
+ return false;
+ }
+
+ public boolean equals(getTopologyInfoWithOpts_args that) {
+ if (that == null)
+ return false;
+
+ boolean this_present_id = true && this.is_set_id();
+ boolean that_present_id = true && that.is_set_id();
+ if (this_present_id || that_present_id) {
+ if (!(this_present_id && that_present_id))
+ return false;
+ if (!this.id.equals(that.id))
+ return false;
+ }
+
+ boolean this_present_options = true && this.is_set_options();
+ boolean that_present_options = true && that.is_set_options();
+ if (this_present_options || that_present_options) {
+ if (!(this_present_options && that_present_options))
+ return false;
+ if (!this.options.equals(that.options))
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
- HashCodeBuilder builder = new HashCodeBuilder();
++ List<Object> list = new ArrayList<Object>();
+
+ boolean present_id = true && (is_set_id());
- builder.append(present_id);
++ list.add(present_id);
+ if (present_id)
- builder.append(id);
++ list.add(id);
+
+ boolean present_options = true && (is_set_options());
- builder.append(present_options);
++ list.add(present_options);
+ if (present_options)
- builder.append(options);
++ list.add(options);
+
- return builder.toHashCode();
++ return list.hashCode();
+ }
+
++ @Override
+ public int compareTo(getTopologyInfoWithOpts_args other) {
+ if (!getClass().equals(other.getClass())) {
+ return getClass().getName().compareTo(other.getClass().getName());
+ }
+
+ int lastComparison = 0;
- getTopologyInfoWithOpts_args typedOther = (getTopologyInfoWithOpts_args)other;
+
- lastComparison = Boolean.valueOf(is_set_id()).compareTo(typedOther.is_set_id());
++ lastComparison = Boolean.valueOf(is_set_id()).compareTo(other.is_set_id());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (is_set_id()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, typedOther.id);
++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, other.id);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
- lastComparison = Boolean.valueOf(is_set_options()).compareTo(typedOther.is_set_options());
++ lastComparison = Boolean.valueOf(is_set_options()).compareTo(other.is_set_options());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (is_set_options()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.options, typedOther.options);
++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.options, other.options);
+ 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 {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // ID
- if (field.type == org.apache.thrift.protocol.TType.STRING) {
- this.id = iprot.readString();
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 2: // OPTIONS
- if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
- this.options = new GetInfoOptions();
- this.options.read(iprot);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
++ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (this.id != null) {
- oprot.writeFieldBegin(ID_FIELD_DESC);
- oprot.writeString(this.id);
- oprot.writeFieldEnd();
- }
- if (this.options != null) {
- oprot.writeFieldBegin(OPTIONS_FIELD_DESC);
- this.options.write(oprot);
- oprot.writeFieldEnd();
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
++ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder("getTopologyInfoWithOpts_args(");
+ boolean first = true;
+
+ sb.append("id:");
+ if (this.id == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.id);
+ }
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("options:");
+ if (this.options == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.options);
+ }
+ first = false;
+ sb.append(")");
+ return sb.toString();
+ }
+
+ public void validate() throws org.apache.thrift.TException {
+ // check for required fields
++ // check for sub-struct validity
++ if (options != null) {
++ options.validate();
++ }
+ }
+
+ 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 getTopologyInfoWithOpts_argsStandardSchemeFactory implements SchemeFactory {
++ public getTopologyInfoWithOpts_argsStandardScheme getScheme() {
++ return new getTopologyInfoWithOpts_argsStandardScheme();
++ }
++ }
++
++ private static class getTopologyInfoWithOpts_argsStandardScheme extends StandardScheme<getTopologyInfoWithOpts_args> {
++
++ public void read(org.apache.thrift.protocol.TProtocol iprot, getTopologyInfoWithOpts_args 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: // ID
++ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
++ struct.id = iprot.readString();
++ struct.set_id_isSet(true);
++ } else {
++ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
++ }
++ break;
++ case 2: // OPTIONS
++ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
++ struct.options = new GetInfoOptions();
++ struct.options.read(iprot);
++ struct.set_options_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, getTopologyInfoWithOpts_args struct) throws org.apache.thrift.TException {
++ struct.validate();
++
++ oprot.writeStructBegin(STRUCT_DESC);
++ if (struct.id != null) {
++ oprot.writeFieldBegin(ID_FIELD_DESC);
++ oprot.writeString(struct.id);
++ oprot.writeFieldEnd();
++ }
++ if (struct.options != null) {
++ oprot.writeFieldBegin(OPTIONS_FIELD_DESC);
++ struct.options.write(oprot);
++ oprot.writeFieldEnd();
++ }
++ oprot.writeFieldStop();
++ oprot.writeStructEnd();
++ }
++
++ }
++
++ private static class getTopologyInfoWithOpts_argsTupleSchemeFactory implements SchemeFactory {
++ public getTopologyInfoWithOpts_argsTupleScheme getScheme() {
++ return new getTopologyInfoWithOpts_argsTupleScheme();
++ }
++ }
++
++ private static class getTopologyInfoWithOpts_argsTupleScheme extends TupleScheme<getTopologyInfoWithOpts_args> {
++
++ @Override
++ public void write(org.apache.thrift.protocol.TProtocol prot, getTopologyInfoWithOpts_args struct) throws org.apache.thrift.TException {
++ TTupleProtocol oprot = (TTupleProtocol) prot;
++ BitSet optionals = new BitSet();
++ if (struct.is_set_id()) {
++ optionals.set(0);
++ }
++ if (struct.is_set_options()) {
++ optionals.set(1);
++ }
++ oprot.writeBitSet(optionals, 2);
++ if (struct.is_set_id()) {
++ oprot.writeString(struct.id);
++ }
++ if (struct.is_set_options()) {
++ struct.options.write(oprot);
++ }
++ }
++
++ @Override
++ public void read(org.apache.thrift.protocol.TProtocol prot, getTopologyInfoWithOpts_args struct) throws org.apache.thrift.TException {
++ TTupleProtocol iprot = (TTupleProtocol) prot;
++ BitSet incoming = iprot.readBitSet(2);
++ if (incoming.get(0)) {
++ struct.id = iprot.readString();
++ struct.set_id_isSet(true);
++ }
++ if (incoming.get(1)) {
++ struct.options = new GetInfoOptions();
++ struct.options.read(iprot);
++ struct.set_options_isSet(true);
++ }
++ }
++ }
++
+ }
+
- public static class getTopologyInfoWithOpts_result implements org.apache.thrift.TBase<getTopologyInfoWithOpts_result, getTopologyInfoWithOpts_result._Fields>, java.io.Serializable, Cloneable {
++ public static class getTopologyInfoWithOpts_result implements org.apache.thrift.TBase<getTopologyInfoWithOpts_result, getTopologyInfoWithOpts_result._Fields>, java.io.Serializable, Cloneable, Comparable<getTopologyInfoWithOpts_result> {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getTopologyInfoWithOpts_result");
+
+ private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0);
+ private static final org.apache.thrift.protocol.TField E_FIELD_DESC = new org.apache.thrift.protocol.TField("e", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+ private static final org.apache.thrift.protocol.TField AZE_FIELD_DESC = new org.apache.thrift.protocol.TField("aze", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+
++ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
++ static {
++ schemes.put(StandardScheme.class, new getTopologyInfoWithOpts_resultStandardSchemeFactory());
++ schemes.put(TupleScheme.class, new getTopologyInfoWithOpts_resultTupleSchemeFactory());
++ }
++
+ private TopologyInfo success; // required
+ private NotAliveException e; // required
+ private AuthorizationException aze; // required
+
+ /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ SUCCESS((short)0, "success"),
+ E((short)1, "e"),
+ AZE((short)2, "aze");
+
+ 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 0: // SUCCESS
+ return SUCCESS;
+ case 1: // E
+ return E;
+ case 2: // AZE
+ return AZE;
+ 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.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TopologyInfo.class)));
+ tmpMap.put(_Fields.E, new org.apache.thrift.meta_data.FieldMetaData("e", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+ tmpMap.put(_Fields.AZE, new org.apache.thrift.meta_data.FieldMetaData("aze", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+ metaDataMap = Collections.unmodifiableMap(tmpMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getTopologyInfoWithOpts_result.class, metaDataMap);
+ }
+
+ public getTopologyInfoWithOpts_result() {
+ }
+
+ public getTopologyInfoWithOpts_result(
+ TopologyInfo success,
+ NotAliveException e,
+ AuthorizationException aze)
+ {
+ this();
+ this.success = success;
+ this.e = e;
+ this.aze = aze;
+ }
+
+ /**
+ * Performs a deep copy on <i>other</i>.
+ */
+ public getTopologyInfoWithOpts_result(getTopologyInfoWithOpts_result other) {
+ if (other.is_set_success()) {
+ this.success = new TopologyInfo(other.success);
+ }
+ if (other.is_set_e()) {
+ this.e = new NotAliveException(other.e);
+ }
+ if (other.is_set_aze()) {
+ this.aze = new AuthorizationException(other.aze);
+ }
+ }
+
+ public getTopologyInfoWithOpts_result deepCopy() {
+ return new getTopologyInfoWithOpts_result(this);
+ }
+
+ @Override
+ public void clear() {
+ this.success = null;
+ this.e = null;
+ this.aze = null;
+ }
+
+ public TopologyInfo get_success() {
+ return this.success;
+ }
+
+ public void set_success(TopologyInfo success) {
+ this.success = success;
+ }
+
+ public void unset_success() {
+ this.success = null;
+ }
+
+ /** Returns true if field success is set (has been assigned a value) and false otherwise */
+ public boolean is_set_success() {
+ return this.success != null;
+ }
+
+ public void set_success_isSet(boolean value) {
+ if (!value) {
+ this.success = null;
+ }
+ }
+
+ public NotAliveException get_e() {
+ return this.e;
+ }
+
+ public void set_e(NotAliveException e) {
+ this.e = e;
+ }
+
+ public void unset_e() {
+ this.e = null;
+ }
+
+ /** Returns true if field e is set (has been assigned a value) and false otherwise */
+ public boolean is_set_e() {
+ return this.e != null;
+ }
+
+ public void set_e_isSet(boolean value) {
+ if (!value) {
+ this.e = null;
+ }
+ }
+
+ public AuthorizationException get_aze() {
+ return this.aze;
+ }
+
+ public void set_aze(AuthorizationException aze) {
+ this.aze = aze;
+ }
+
+ public void unset_aze() {
+ this.aze = null;
+ }
+
+ /** Returns true if field aze is set (has been assigned a value) and false otherwise */
+ public boolean is_set_aze() {
+ return this.aze != null;
+ }
+
+ public void set_aze_isSet(boolean value) {
+ if (!value) {
+ this.aze = null;
+ }
+ }
+
+ public void setFieldValue(_Fields field, Object value) {
+ switch (field) {
+ case SUCCESS:
+ if (value == null) {
+ unset_success();
+ } else {
+ set_success((TopologyInfo)value);
+ }
+ break;
+
+ case E:
+ if (value == null) {
+ unset_e();
+ } else {
+ set_e((NotAliveException)value);
+ }
+ break;
+
+ case AZE:
+ if (value == null) {
+ unset_aze();
+ } else {
+ set_aze((AuthorizationException)value);
+ }
+ break;
+
+ }
+ }
+
+ public Object getFieldValue(_Fields field) {
+ switch (field) {
+ case SUCCESS:
+ return get_success();
+
+ case E:
+ return get_e();
+
+ case AZE:
+ return get_aze();
+
+ }
+ 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 SUCCESS:
+ return is_set_success();
+ case E:
+ return is_set_e();
+ case AZE:
+ return is_set_aze();
+ }
+ throw new IllegalStateException();
+ }
+
+ @Override
+ public boolean equals(Object that) {
+ if (that == null)
+ return false;
+ if (that instanceof getTopologyInfoWithOpts_result)
+ return this.equals((getTopologyInfoWithOpts_result)that);
+ return false;
+ }
+
+ public boolean equals(getTopologyInfoWithOpts_result that) {
+ if (that == null)
+ return false;
+
+ boolean this_present_success = true && this.is_set_success();
+ boolean that_present_success = true && that.is_set_success();
+ if (this_present_success || that_present_success) {
+ if (!(this_present_success && that_present_success))
+ return false;
+ if (!this.success.equals(that.success))
+ return false;
+ }
+
+ boolean this_present_e = true && this.is_set_e();
+ boolean that_present_e = true && that.is_set_e();
+ if (this_present_e || that_present_e) {
+ if (!(this_present_e && that_present_e))
+ return false;
+ if (!this.e.equals(that.e))
+ return false;
+ }
+
+ boolean this_present_aze = true && this.is_set_aze();
+ boolean that_present_aze = true && that.is_set_aze();
+ if (this_present_aze || that_present_aze) {
+ if (!(this_present_aze && that_present_aze))
+ return false;
+ if (!this.aze.equals(that.aze))
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
- HashCodeBuilder builder = new HashCodeBuilder();
++ List<Object> list = new ArrayList<Object>();
+
+ boolean present_success = true && (is_set_success());
- builder.append(present_success);
++ list.add(present_success);
+ if (present_success)
- builder.append(success);
++ list.add(success);
+
+ boolean present_e = true && (is_set_e());
- builder.append(present_e);
++ list.add(present_e);
+ if (present_e)
- builder.append(e);
++ list.add(e);
+
+ boolean present_aze = true && (is_set_aze());
- builder.append(present_aze);
++ list.add(present_aze);
+ if (present_aze)
- builder.append(aze);
++ list.add(aze);
+
- return builder.toHashCode();
++ return list.hashCode();
+ }
+
++ @Override
+ public int compareTo(getTopologyInfoWithOpts_result other) {
+ if (!getClass().equals(other.getClass())) {
+ return getClass().getName().compareTo(other.getClass().getName());
+ }
+
+ int lastComparison = 0;
- getTopologyInfoWithOpts_result typedOther = (getTopologyInfoWithOpts_result)other;
+
- lastComparison = Boolean.valueOf(is_set_success()).compareTo(typedOther.is_set_success());
++ lastComparison = Boolean.valueOf(is_set_success()).compareTo(other.is_set_success());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (is_set_success()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
- lastComparison = Boolean.valueOf(is_set_e()).compareTo(typedOther.is_set_e());
++ lastComparison = Boolean.valueOf(is_set_e()).compareTo(other.is_set_e());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (is_set_e()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.e, typedOther.e);
++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.e, other.e);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
- lastComparison = Boolean.valueOf(is_set_aze()).compareTo(typedOther.is_set_aze());
++ lastComparison = Boolean.valueOf(is_set_aze()).compareTo(other.is_set_aze());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (is_set_aze()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.aze, typedOther.aze);
++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.aze, other.aze);
+ 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 {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 0: // SUCCESS
- if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
- this.success = new TopologyInfo();
- this.success.read(iprot);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 1: // E
- if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
- this.e = new NotAliveException();
- this.e.read(iprot);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 2: // AZE
- if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
- this.aze = new AuthorizationException();
- this.aze.read(iprot);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
++ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- oprot.writeStructBegin(STRUCT_DESC);
-
- if (this.is_set_success()) {
- oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
- this.success.write(oprot);
- oprot.writeFieldEnd();
- } else if (this.is_set_e()) {
- oprot.writeFieldBegin(E_FIELD_DESC);
- this.e.write(oprot);
- oprot.writeFieldEnd();
- } else if (this.is_set_aze()) {
- oprot.writeFieldBegin(AZE_FIELD_DESC);
- this.aze.write(oprot);
- oprot.writeFieldEnd();
++ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+ }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
- }
+
+ @Override
+ public String toString() {
+ StringBuilde
<TRUNCATED>
[16/18] storm git commit: Merge branch 'master' of
github.com:apache/incubator-storm into thrift092
Posted by kn...@apache.org.
Merge branch 'master' of github.com:apache/incubator-storm into thrift092
Conflicts:
storm-core/src/jvm/backtype/storm/generated/Nimbus.java
storm-core/src/py/storm/Nimbus-remote
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a99e1276
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a99e1276
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a99e1276
Branch: refs/heads/master
Commit: a99e1276e282a7e3bd2ecd9c9b0a54a30f541228
Parents: ef51dbe be64b25
Author: Kishor Patil <kp...@yahoo-inc.com>
Authored: Fri Feb 6 02:40:40 2015 +0000
Committer: Kishor Patil <kp...@yahoo-inc.com>
Committed: Fri Feb 6 02:40:40 2015 +0000
----------------------------------------------------------------------
CHANGELOG.md | 5 +
README.markdown | 3 +-
STORM-UI-REST-API.md | 21 +
docs/README.md | 9 +
docs/documentation/Home.md | 2 +-
docs/documentation/Powered-By.md | 4 +-
pom.xml | 11 +
storm-core/src/clj/backtype/storm/cluster.clj | 38 +-
.../src/clj/backtype/storm/daemon/logviewer.clj | 5 +-
.../src/clj/backtype/storm/daemon/nimbus.clj | 35 +-
.../src/clj/backtype/storm/daemon/worker.clj | 6 +-
storm-core/src/clj/backtype/storm/ui/core.clj | 34 +-
.../storm/generated/AlreadyAliveException.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/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 | 422 ++++++
.../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 | 1203 +++++++++++++++++-
.../storm/generated/NotAliveException.java | 2 +-
.../backtype/storm/generated/NullStruct.java | 2 +-
.../storm/generated/NumErrorsChoice.java | 65 +
.../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 +-
.../backtype/storm/generated/StormTopology.java | 2 +-
.../backtype/storm/generated/StreamInfo.java | 2 +-
.../backtype/storm/generated/SubmitOptions.java | 2 +-
.../storm/generated/SupervisorSummary.java | 2 +-
.../backtype/storm/generated/TopologyInfo.java | 2 +-
.../storm/generated/TopologySummary.java | 2 +-
.../src/jvm/backtype/storm/utils/Monitor.java | 8 +-
storm-core/src/py/storm/DistributedRPC-remote | 0
.../py/storm/DistributedRPCInvocations-remote | 0
storm-core/src/py/storm/Nimbus-remote | 7 +
storm-core/src/py/storm/Nimbus.py | 234 ++++
storm-core/src/py/storm/ttypes.py | 82 ++
storm-core/src/storm.thrift | 11 +
.../clj/backtype/storm/integration_test.clj | 10 +-
55 files changed, 2212 insertions(+), 67 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/AlreadyAliveException.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/AlreadyAliveException.java
index 619f944,a2672c8..62647c3
--- a/storm-core/src/jvm/backtype/storm/generated/AlreadyAliveException.java
+++ b/storm-core/src/jvm/backtype/storm/generated/AlreadyAliveException.java
@@@ -50,9 -38,7 +50,9 @@@ import javax.annotation.Generated
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class AlreadyAliveException extends Exception implements org.apache.thrift.TBase<AlreadyAliveException, AlreadyAliveException._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
++@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");
private static final org.apache.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.thrift.protocol.TField("msg", org.apache.thrift.protocol.TType.STRING, (short)1);
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/AuthorizationException.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/AuthorizationException.java
index 33fd26b,6f0218e..a179751
--- a/storm-core/src/jvm/backtype/storm/generated/AuthorizationException.java
+++ b/storm-core/src/jvm/backtype/storm/generated/AuthorizationException.java
@@@ -50,9 -38,7 +50,9 @@@ import javax.annotation.Generated
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class AuthorizationException extends Exception implements org.apache.thrift.TBase<AuthorizationException, AuthorizationException._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
++@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");
private static final org.apache.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.thrift.protocol.TField("msg", org.apache.thrift.protocol.TType.STRING, (short)1);
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/Bolt.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/Bolt.java
index cd65ccd,63c7147..861226c
--- a/storm-core/src/jvm/backtype/storm/generated/Bolt.java
+++ b/storm-core/src/jvm/backtype/storm/generated/Bolt.java
@@@ -50,9 -38,7 +50,9 @@@ import javax.annotation.Generated
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class Bolt implements org.apache.thrift.TBase<Bolt, Bolt._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
++@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");
private static final org.apache.thrift.protocol.TField BOLT_OBJECT_FIELD_DESC = new org.apache.thrift.protocol.TField("bolt_object", org.apache.thrift.protocol.TType.STRUCT, (short)1);
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/BoltStats.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/BoltStats.java
index 4c1af29,d4b6326..1f8a989
--- a/storm-core/src/jvm/backtype/storm/generated/BoltStats.java
+++ b/storm-core/src/jvm/backtype/storm/generated/BoltStats.java
@@@ -50,9 -38,7 +50,9 @@@ import javax.annotation.Generated
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
++@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");
private static final org.apache.thrift.protocol.TField ACKED_FIELD_DESC = new org.apache.thrift.protocol.TField("acked", org.apache.thrift.protocol.TType.MAP, (short)1);
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/ClusterSummary.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/ClusterSummary.java
index 093bd9a,a2623ab..ee25ac8
--- a/storm-core/src/jvm/backtype/storm/generated/ClusterSummary.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ClusterSummary.java
@@@ -50,9 -38,7 +50,9 @@@ import javax.annotation.Generated
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class ClusterSummary implements org.apache.thrift.TBase<ClusterSummary, ClusterSummary._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
++@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");
private static final org.apache.thrift.protocol.TField SUPERVISORS_FIELD_DESC = new org.apache.thrift.protocol.TField("supervisors", org.apache.thrift.protocol.TType.LIST, (short)1);
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/ComponentCommon.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/ComponentCommon.java
index 3feaec4,f2cc2e9..6868603
--- a/storm-core/src/jvm/backtype/storm/generated/ComponentCommon.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ComponentCommon.java
@@@ -50,9 -38,7 +50,9 @@@ import javax.annotation.Generated
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class ComponentCommon implements org.apache.thrift.TBase<ComponentCommon, ComponentCommon._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
++@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");
private static final org.apache.thrift.protocol.TField INPUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("inputs", org.apache.thrift.protocol.TType.MAP, (short)1);
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/Credentials.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/Credentials.java
index 50d63a9,c4563a7..c1ef293
--- a/storm-core/src/jvm/backtype/storm/generated/Credentials.java
+++ b/storm-core/src/jvm/backtype/storm/generated/Credentials.java
@@@ -50,9 -38,7 +50,9 @@@ import javax.annotation.Generated
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class Credentials implements org.apache.thrift.TBase<Credentials, Credentials._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
++@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");
private static final org.apache.thrift.protocol.TField CREDS_FIELD_DESC = new org.apache.thrift.protocol.TField("creds", org.apache.thrift.protocol.TType.MAP, (short)1);
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/DRPCExecutionException.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/DRPCExecutionException.java
index eb69200,e40bd94..f61ffa1
--- a/storm-core/src/jvm/backtype/storm/generated/DRPCExecutionException.java
+++ b/storm-core/src/jvm/backtype/storm/generated/DRPCExecutionException.java
@@@ -50,9 -38,7 +50,9 @@@ import javax.annotation.Generated
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class DRPCExecutionException extends Exception implements org.apache.thrift.TBase<DRPCExecutionException, DRPCExecutionException._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
++@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");
private static final org.apache.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.thrift.protocol.TField("msg", org.apache.thrift.protocol.TType.STRING, (short)1);
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/DRPCRequest.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/DRPCRequest.java
index df8aa84,3b0a660..b97fa25
--- a/storm-core/src/jvm/backtype/storm/generated/DRPCRequest.java
+++ b/storm-core/src/jvm/backtype/storm/generated/DRPCRequest.java
@@@ -50,9 -38,7 +50,9 @@@ import javax.annotation.Generated
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class DRPCRequest implements org.apache.thrift.TBase<DRPCRequest, DRPCRequest._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
++@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");
private static final org.apache.thrift.protocol.TField FUNC_ARGS_FIELD_DESC = new org.apache.thrift.protocol.TField("func_args", org.apache.thrift.protocol.TType.STRING, (short)1);
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/DistributedRPC.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/DistributedRPC.java
index d81d719,06c4f5c..c4f25ec
--- a/storm-core/src/jvm/backtype/storm/generated/DistributedRPC.java
+++ b/storm-core/src/jvm/backtype/storm/generated/DistributedRPC.java
@@@ -50,8 -38,6 +50,8 @@@ 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-2-2")
++@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/a99e1276/storm-core/src/jvm/backtype/storm/generated/DistributedRPCInvocations.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/DistributedRPCInvocations.java
index bb5a138,e236e41..94b799b
--- a/storm-core/src/jvm/backtype/storm/generated/DistributedRPCInvocations.java
+++ b/storm-core/src/jvm/backtype/storm/generated/DistributedRPCInvocations.java
@@@ -50,8 -38,6 +50,8 @@@ 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-2-2")
++@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/a99e1276/storm-core/src/jvm/backtype/storm/generated/ErrorInfo.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/ErrorInfo.java
index 7024458,13b3fad..32495c7
--- a/storm-core/src/jvm/backtype/storm/generated/ErrorInfo.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ErrorInfo.java
@@@ -50,9 -38,7 +50,9 @@@ import javax.annotation.Generated
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class ErrorInfo implements org.apache.thrift.TBase<ErrorInfo, ErrorInfo._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
++@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");
private static final org.apache.thrift.protocol.TField ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("error", org.apache.thrift.protocol.TType.STRING, (short)1);
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/ExecutorInfo.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/ExecutorInfo.java
index fa1c3a5,c98f423..44415ce
--- a/storm-core/src/jvm/backtype/storm/generated/ExecutorInfo.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ExecutorInfo.java
@@@ -50,9 -38,7 +50,9 @@@ import javax.annotation.Generated
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class ExecutorInfo implements org.apache.thrift.TBase<ExecutorInfo, ExecutorInfo._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
++@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");
private static final org.apache.thrift.protocol.TField TASK_START_FIELD_DESC = new org.apache.thrift.protocol.TField("task_start", org.apache.thrift.protocol.TType.I32, (short)1);
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/ExecutorStats.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/ExecutorStats.java
index 26e63a1,a297fa7..d82a9cf
--- a/storm-core/src/jvm/backtype/storm/generated/ExecutorStats.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ExecutorStats.java
@@@ -50,9 -38,7 +50,9 @@@ import javax.annotation.Generated
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, ExecutorStats._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
++@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
+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");
private static final org.apache.thrift.protocol.TField EMITTED_FIELD_DESC = new org.apache.thrift.protocol.TField("emitted", org.apache.thrift.protocol.TType.MAP, (short)1);
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/ExecutorSummary.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/ExecutorSummary.java
index 3191508,daa9a6e..649342d
--- a/storm-core/src/jvm/backtype/storm/generated/ExecutorSummary.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ExecutorSummary.java
@@@ -50,9 -38,7 +50,9 @@@ import javax.annotation.Generated
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class ExecutorSummary implements org.apache.thrift.TBase<ExecutorSummary, ExecutorSummary._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
++@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");
private static final org.apache.thrift.protocol.TField EXECUTOR_INFO_FIELD_DESC = new org.apache.thrift.protocol.TField("executor_info", org.apache.thrift.protocol.TType.STRUCT, (short)1);
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/GetInfoOptions.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/GetInfoOptions.java
index 0000000,23e6a3b..2d5defc
mode 000000,100644..100644
--- a/storm-core/src/jvm/backtype/storm/generated/GetInfoOptions.java
+++ b/storm-core/src/jvm/backtype/storm/generated/GetInfoOptions.java
@@@ -1,0 -1,350 +1,422 @@@
+ /**
+ * 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.7.0)
++ * Autogenerated by Thrift Compiler (0.9.2)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
++ * @generated
+ */
+ package backtype.storm.generated;
+
-import org.apache.commons.lang.builder.HashCodeBuilder;
++import org.apache.thrift.scheme.IScheme;
++import org.apache.thrift.scheme.SchemeFactory;
++import org.apache.thrift.scheme.StandardScheme;
++
++import org.apache.thrift.scheme.TupleScheme;
++import org.apache.thrift.protocol.TTupleProtocol;
++import org.apache.thrift.protocol.TProtocolException;
++import org.apache.thrift.EncodingUtils;
++import org.apache.thrift.TException;
++import org.apache.thrift.async.AsyncMethodCallback;
++import org.apache.thrift.server.AbstractNonblockingServer.*;
+ import java.util.List;
+ import java.util.ArrayList;
+ import java.util.Map;
+ 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;
+
-public class GetInfoOptions implements org.apache.thrift.TBase<GetInfoOptions, GetInfoOptions._Fields>, java.io.Serializable, Cloneable {
++@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
++@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");
+
+ private static final org.apache.thrift.protocol.TField NUM_ERR_CHOICE_FIELD_DESC = new org.apache.thrift.protocol.TField("num_err_choice", org.apache.thrift.protocol.TType.I32, (short)1);
+
- private NumErrorsChoice num_err_choice; // required
++ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
++ static {
++ schemes.put(StandardScheme.class, new GetInfoOptionsStandardSchemeFactory());
++ schemes.put(TupleScheme.class, new GetInfoOptionsTupleSchemeFactory());
++ }
++
++ private NumErrorsChoice num_err_choice; // 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 {
+ /**
+ *
+ * @see NumErrorsChoice
+ */
+ NUM_ERR_CHOICE((short)1, "num_err_choice");
+
+ 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: // NUM_ERR_CHOICE
+ return NUM_ERR_CHOICE;
+ 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 _Fields optionals[] = {_Fields.NUM_ERR_CHOICE};
+ 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.NUM_ERR_CHOICE, new org.apache.thrift.meta_data.FieldMetaData("num_err_choice", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, NumErrorsChoice.class)));
+ metaDataMap = Collections.unmodifiableMap(tmpMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(GetInfoOptions.class, metaDataMap);
+ }
+
+ public GetInfoOptions() {
+ }
+
+ /**
+ * Performs a deep copy on <i>other</i>.
+ */
+ public GetInfoOptions(GetInfoOptions other) {
+ if (other.is_set_num_err_choice()) {
+ this.num_err_choice = other.num_err_choice;
+ }
+ }
+
+ public GetInfoOptions deepCopy() {
+ return new GetInfoOptions(this);
+ }
+
+ @Override
+ public void clear() {
+ this.num_err_choice = null;
+ }
+
+ /**
+ *
+ * @see NumErrorsChoice
+ */
+ public NumErrorsChoice get_num_err_choice() {
+ return this.num_err_choice;
+ }
+
+ /**
+ *
+ * @see NumErrorsChoice
+ */
+ public void set_num_err_choice(NumErrorsChoice num_err_choice) {
+ this.num_err_choice = num_err_choice;
+ }
+
+ public void unset_num_err_choice() {
+ this.num_err_choice = null;
+ }
+
+ /** Returns true if field num_err_choice is set (has been assigned a value) and false otherwise */
+ public boolean is_set_num_err_choice() {
+ return this.num_err_choice != null;
+ }
+
+ public void set_num_err_choice_isSet(boolean value) {
+ if (!value) {
+ this.num_err_choice = null;
+ }
+ }
+
+ public void setFieldValue(_Fields field, Object value) {
+ switch (field) {
+ case NUM_ERR_CHOICE:
+ if (value == null) {
+ unset_num_err_choice();
+ } else {
+ set_num_err_choice((NumErrorsChoice)value);
+ }
+ break;
+
+ }
+ }
+
+ public Object getFieldValue(_Fields field) {
+ switch (field) {
+ case NUM_ERR_CHOICE:
+ return get_num_err_choice();
+
+ }
+ 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 NUM_ERR_CHOICE:
+ return is_set_num_err_choice();
+ }
+ throw new IllegalStateException();
+ }
+
+ @Override
+ public boolean equals(Object that) {
+ if (that == null)
+ return false;
+ if (that instanceof GetInfoOptions)
+ return this.equals((GetInfoOptions)that);
+ return false;
+ }
+
+ public boolean equals(GetInfoOptions that) {
+ if (that == null)
+ return false;
+
+ boolean this_present_num_err_choice = true && this.is_set_num_err_choice();
+ boolean that_present_num_err_choice = true && that.is_set_num_err_choice();
+ if (this_present_num_err_choice || that_present_num_err_choice) {
+ if (!(this_present_num_err_choice && that_present_num_err_choice))
+ return false;
+ if (!this.num_err_choice.equals(that.num_err_choice))
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
- HashCodeBuilder builder = new HashCodeBuilder();
++ List<Object> list = new ArrayList<Object>();
+
+ boolean present_num_err_choice = true && (is_set_num_err_choice());
- builder.append(present_num_err_choice);
++ list.add(present_num_err_choice);
+ if (present_num_err_choice)
- builder.append(num_err_choice.getValue());
++ list.add(num_err_choice.getValue());
+
- return builder.toHashCode();
++ return list.hashCode();
+ }
+
++ @Override
+ public int compareTo(GetInfoOptions other) {
+ if (!getClass().equals(other.getClass())) {
+ return getClass().getName().compareTo(other.getClass().getName());
+ }
+
+ int lastComparison = 0;
- GetInfoOptions typedOther = (GetInfoOptions)other;
+
- lastComparison = Boolean.valueOf(is_set_num_err_choice()).compareTo(typedOther.is_set_num_err_choice());
++ lastComparison = Boolean.valueOf(is_set_num_err_choice()).compareTo(other.is_set_num_err_choice());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (is_set_num_err_choice()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num_err_choice, typedOther.num_err_choice);
++ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num_err_choice, other.num_err_choice);
+ 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 {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // NUM_ERR_CHOICE
- if (field.type == org.apache.thrift.protocol.TType.I32) {
- this.num_err_choice = NumErrorsChoice.findByValue(iprot.readI32());
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
++ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (this.num_err_choice != null) {
- if (is_set_num_err_choice()) {
- oprot.writeFieldBegin(NUM_ERR_CHOICE_FIELD_DESC);
- oprot.writeI32(this.num_err_choice.getValue());
- oprot.writeFieldEnd();
- }
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
++ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder("GetInfoOptions(");
+ boolean first = true;
+
+ if (is_set_num_err_choice()) {
+ sb.append("num_err_choice:");
+ if (this.num_err_choice == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.num_err_choice);
+ }
+ first = false;
+ }
+ sb.append(")");
+ return sb.toString();
+ }
+
+ public void validate() throws org.apache.thrift.TException {
+ // check for required fields
++ // 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 GetInfoOptionsStandardSchemeFactory implements SchemeFactory {
++ public GetInfoOptionsStandardScheme getScheme() {
++ return new GetInfoOptionsStandardScheme();
++ }
++ }
++
++ private static class GetInfoOptionsStandardScheme extends StandardScheme<GetInfoOptions> {
++
++ public void read(org.apache.thrift.protocol.TProtocol iprot, GetInfoOptions 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: // NUM_ERR_CHOICE
++ if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
++ struct.num_err_choice = backtype.storm.generated.NumErrorsChoice.findByValue(iprot.readI32());
++ struct.set_num_err_choice_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, GetInfoOptions struct) throws org.apache.thrift.TException {
++ struct.validate();
++
++ oprot.writeStructBegin(STRUCT_DESC);
++ if (struct.num_err_choice != null) {
++ if (struct.is_set_num_err_choice()) {
++ oprot.writeFieldBegin(NUM_ERR_CHOICE_FIELD_DESC);
++ oprot.writeI32(struct.num_err_choice.getValue());
++ oprot.writeFieldEnd();
++ }
++ }
++ oprot.writeFieldStop();
++ oprot.writeStructEnd();
++ }
++
++ }
++
++ private static class GetInfoOptionsTupleSchemeFactory implements SchemeFactory {
++ public GetInfoOptionsTupleScheme getScheme() {
++ return new GetInfoOptionsTupleScheme();
++ }
++ }
++
++ private static class GetInfoOptionsTupleScheme extends TupleScheme<GetInfoOptions> {
++
++ @Override
++ public void write(org.apache.thrift.protocol.TProtocol prot, GetInfoOptions struct) throws org.apache.thrift.TException {
++ TTupleProtocol oprot = (TTupleProtocol) prot;
++ BitSet optionals = new BitSet();
++ if (struct.is_set_num_err_choice()) {
++ optionals.set(0);
++ }
++ oprot.writeBitSet(optionals, 1);
++ if (struct.is_set_num_err_choice()) {
++ oprot.writeI32(struct.num_err_choice.getValue());
++ }
++ }
++
++ @Override
++ public void read(org.apache.thrift.protocol.TProtocol prot, GetInfoOptions struct) throws org.apache.thrift.TException {
++ TTupleProtocol iprot = (TTupleProtocol) prot;
++ BitSet incoming = iprot.readBitSet(1);
++ if (incoming.get(0)) {
++ struct.num_err_choice = backtype.storm.generated.NumErrorsChoice.findByValue(iprot.readI32());
++ struct.set_num_err_choice_isSet(true);
++ }
++ }
++ }
++
+ }
+
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/GlobalStreamId.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/GlobalStreamId.java
index fa60c6b,02ed3ed..017ad4f
--- a/storm-core/src/jvm/backtype/storm/generated/GlobalStreamId.java
+++ b/storm-core/src/jvm/backtype/storm/generated/GlobalStreamId.java
@@@ -50,9 -38,7 +50,9 @@@ import javax.annotation.Generated
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class GlobalStreamId implements org.apache.thrift.TBase<GlobalStreamId, GlobalStreamId._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
++@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");
private static final org.apache.thrift.protocol.TField COMPONENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("componentId", org.apache.thrift.protocol.TType.STRING, (short)1);
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/InvalidTopologyException.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/InvalidTopologyException.java
index f3559a6,79d917c..5a98418
--- a/storm-core/src/jvm/backtype/storm/generated/InvalidTopologyException.java
+++ b/storm-core/src/jvm/backtype/storm/generated/InvalidTopologyException.java
@@@ -50,9 -38,7 +50,9 @@@ import javax.annotation.Generated
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class InvalidTopologyException extends Exception implements org.apache.thrift.TBase<InvalidTopologyException, InvalidTopologyException._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
++@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");
private static final org.apache.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.thrift.protocol.TField("msg", org.apache.thrift.protocol.TType.STRING, (short)1);
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/JavaObject.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/JavaObject.java
index 4eb4b92,8e627ca..fde0082
--- a/storm-core/src/jvm/backtype/storm/generated/JavaObject.java
+++ b/storm-core/src/jvm/backtype/storm/generated/JavaObject.java
@@@ -50,9 -38,7 +50,9 @@@ import javax.annotation.Generated
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class JavaObject implements org.apache.thrift.TBase<JavaObject, JavaObject._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
++@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");
private static final org.apache.thrift.protocol.TField FULL_CLASS_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("full_class_name", org.apache.thrift.protocol.TType.STRING, (short)1);
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/KillOptions.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/KillOptions.java
index 0207550,26dd959..f173395
--- a/storm-core/src/jvm/backtype/storm/generated/KillOptions.java
+++ b/storm-core/src/jvm/backtype/storm/generated/KillOptions.java
@@@ -50,9 -38,7 +50,9 @@@ import javax.annotation.Generated
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class KillOptions implements org.apache.thrift.TBase<KillOptions, KillOptions._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
++@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");
private static final org.apache.thrift.protocol.TField WAIT_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("wait_secs", org.apache.thrift.protocol.TType.I32, (short)1);
[05/18] storm git commit: Upgrade to thrift-0.9.2
Posted by kn...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/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 ce03d91..1337697 100644
--- a/storm-core/src/jvm/backtype/storm/generated/NotAliveException.java
+++ b/storm-core/src/jvm/backtype/storm/generated/NotAliveException.java
@@ -16,13 +16,24 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package backtype.storm.generated;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -35,14 +46,23 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class NotAliveException extends Exception implements org.apache.thrift.TBase<NotAliveException, NotAliveException._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
+public class 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");
private static final org.apache.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.thrift.protocol.TField("msg", org.apache.thrift.protocol.TType.STRING, (short)1);
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new NotAliveExceptionStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new NotAliveExceptionTupleSchemeFactory());
+ }
+
private String msg; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -104,7 +124,6 @@ public class NotAliveException extends Exception implements org.apache.thrift.TB
}
// isset id assignments
-
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -227,30 +246,30 @@ public class NotAliveException extends Exception implements org.apache.thrift.TB
@Override
public int hashCode() {
- HashCodeBuilder builder = new HashCodeBuilder();
+ List<Object> list = new ArrayList<Object>();
boolean present_msg = true && (is_set_msg());
- builder.append(present_msg);
+ list.add(present_msg);
if (present_msg)
- builder.append(msg);
+ list.add(msg);
- return builder.toHashCode();
+ return list.hashCode();
}
+ @Override
public int compareTo(NotAliveException other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- NotAliveException typedOther = (NotAliveException)other;
- lastComparison = Boolean.valueOf(is_set_msg()).compareTo(typedOther.is_set_msg());
+ lastComparison = Boolean.valueOf(is_set_msg()).compareTo(other.is_set_msg());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_msg()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.msg, typedOther.msg);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.msg, other.msg);
if (lastComparison != 0) {
return lastComparison;
}
@@ -263,42 +282,11 @@ public class NotAliveException extends Exception implements org.apache.thrift.TB
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // MSG
- if (field.type == org.apache.thrift.protocol.TType.STRING) {
- this.msg = iprot.readString();
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (this.msg != null) {
- oprot.writeFieldBegin(MSG_FIELD_DESC);
- oprot.writeString(this.msg);
- oprot.writeFieldEnd();
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@Override
@@ -323,6 +311,7 @@ public class NotAliveException extends Exception implements org.apache.thrift.TB
throw new org.apache.thrift.protocol.TProtocolException("Required field 'msg' is unset! Struct:" + toString());
}
+ // check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -341,5 +330,77 @@ public class NotAliveException extends Exception implements org.apache.thrift.TB
}
}
+ private static class NotAliveExceptionStandardSchemeFactory implements SchemeFactory {
+ public NotAliveExceptionStandardScheme getScheme() {
+ return new NotAliveExceptionStandardScheme();
+ }
+ }
+
+ private static class NotAliveExceptionStandardScheme extends StandardScheme<NotAliveException> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, NotAliveException struct) throws org.apache.thrift.TException {
+ org.apache.thrift.protocol.TField schemeField;
+ iprot.readStructBegin();
+ while (true)
+ {
+ schemeField = iprot.readFieldBegin();
+ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ break;
+ }
+ switch (schemeField.id) {
+ case 1: // MSG
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.msg = iprot.readString();
+ struct.set_msg_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ default:
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ iprot.readFieldEnd();
+ }
+ iprot.readStructEnd();
+ struct.validate();
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot, NotAliveException struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.msg != null) {
+ oprot.writeFieldBegin(MSG_FIELD_DESC);
+ oprot.writeString(struct.msg);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class NotAliveExceptionTupleSchemeFactory implements SchemeFactory {
+ public NotAliveExceptionTupleScheme getScheme() {
+ return new NotAliveExceptionTupleScheme();
+ }
+ }
+
+ private static class NotAliveExceptionTupleScheme extends TupleScheme<NotAliveException> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, NotAliveException struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ oprot.writeString(struct.msg);
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, NotAliveException struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ struct.msg = iprot.readString();
+ struct.set_msg_isSet(true);
+ }
+ }
+
}
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/storm-core/src/jvm/backtype/storm/generated/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 960c3b2..c72112e 100644
--- a/storm-core/src/jvm/backtype/storm/generated/NullStruct.java
+++ b/storm-core/src/jvm/backtype/storm/generated/NullStruct.java
@@ -16,13 +16,24 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package backtype.storm.generated;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -35,13 +46,22 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class NullStruct implements org.apache.thrift.TBase<NullStruct, NullStruct._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
+public class 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");
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new NullStructStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new NullStructTupleSchemeFactory());
+ }
+
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -162,18 +182,18 @@ public class NullStruct implements org.apache.thrift.TBase<NullStruct, NullStruc
@Override
public int hashCode() {
- HashCodeBuilder builder = new HashCodeBuilder();
+ List<Object> list = new ArrayList<Object>();
- return builder.toHashCode();
+ return list.hashCode();
}
+ @Override
public int compareTo(NullStruct other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- NullStruct typedOther = (NullStruct)other;
return 0;
}
@@ -183,30 +203,11 @@ public class NullStruct implements org.apache.thrift.TBase<NullStruct, NullStruc
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- oprot.writeFieldStop();
- oprot.writeStructEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@Override
@@ -220,6 +221,7 @@ public class NullStruct implements org.apache.thrift.TBase<NullStruct, NullStruc
public void validate() throws org.apache.thrift.TException {
// check for required fields
+ // check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -238,5 +240,61 @@ public class NullStruct implements org.apache.thrift.TBase<NullStruct, NullStruc
}
}
+ private static class NullStructStandardSchemeFactory implements SchemeFactory {
+ public NullStructStandardScheme getScheme() {
+ return new NullStructStandardScheme();
+ }
+ }
+
+ private static class NullStructStandardScheme extends StandardScheme<NullStruct> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, NullStruct 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) {
+ 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, NullStruct struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class NullStructTupleSchemeFactory implements SchemeFactory {
+ public NullStructTupleScheme getScheme() {
+ return new NullStructTupleScheme();
+ }
+ }
+
+ private static class NullStructTupleScheme extends TupleScheme<NullStruct> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, NullStruct struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, NullStruct struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ }
+ }
+
}
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/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 9f3cbf1..690428d 100644
--- a/storm-core/src/jvm/backtype/storm/generated/RebalanceOptions.java
+++ b/storm-core/src/jvm/backtype/storm/generated/RebalanceOptions.java
@@ -16,13 +16,24 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package backtype.storm.generated;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -35,19 +46,28 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOptions, RebalanceOptions._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
+public class 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");
private static final org.apache.thrift.protocol.TField WAIT_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("wait_secs", org.apache.thrift.protocol.TType.I32, (short)1);
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)2);
private static final org.apache.thrift.protocol.TField NUM_EXECUTORS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_executors", org.apache.thrift.protocol.TType.MAP, (short)3);
- private int wait_secs; // required
- private int num_workers; // required
- private Map<String,Integer> num_executors; // required
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new RebalanceOptionsStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new RebalanceOptionsTupleSchemeFactory());
+ }
+
+ private int wait_secs; // optional
+ private int num_workers; // optional
+ private Map<String,Integer> num_executors; // 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 {
@@ -116,8 +136,8 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
// isset id assignments
private static final int __WAIT_SECS_ISSET_ID = 0;
private static final int __NUM_WORKERS_ISSET_ID = 1;
- private BitSet __isset_bit_vector = new BitSet(2);
-
+ private byte __isset_bitfield = 0;
+ private static final _Fields optionals[] = {_Fields.WAIT_SECS,_Fields.NUM_WORKERS,_Fields.NUM_EXECUTORS};
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);
@@ -140,23 +160,11 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
* Performs a deep copy on <i>other</i>.
*/
public RebalanceOptions(RebalanceOptions other) {
- __isset_bit_vector.clear();
- __isset_bit_vector.or(other.__isset_bit_vector);
+ __isset_bitfield = other.__isset_bitfield;
this.wait_secs = other.wait_secs;
this.num_workers = other.num_workers;
if (other.is_set_num_executors()) {
- Map<String,Integer> __this__num_executors = new HashMap<String,Integer>();
- for (Map.Entry<String, Integer> other_element : other.num_executors.entrySet()) {
-
- String other_element_key = other_element.getKey();
- Integer other_element_value = other_element.getValue();
-
- String __this__num_executors_copy_key = other_element_key;
-
- Integer __this__num_executors_copy_value = other_element_value;
-
- __this__num_executors.put(__this__num_executors_copy_key, __this__num_executors_copy_value);
- }
+ Map<String,Integer> __this__num_executors = new HashMap<String,Integer>(other.num_executors);
this.num_executors = __this__num_executors;
}
}
@@ -184,16 +192,16 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
}
public void unset_wait_secs() {
- __isset_bit_vector.clear(__WAIT_SECS_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __WAIT_SECS_ISSET_ID);
}
/** Returns true if field wait_secs is set (has been assigned a value) and false otherwise */
public boolean is_set_wait_secs() {
- return __isset_bit_vector.get(__WAIT_SECS_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __WAIT_SECS_ISSET_ID);
}
public void set_wait_secs_isSet(boolean value) {
- __isset_bit_vector.set(__WAIT_SECS_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __WAIT_SECS_ISSET_ID, value);
}
public int get_num_workers() {
@@ -206,16 +214,16 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
}
public void unset_num_workers() {
- __isset_bit_vector.clear(__NUM_WORKERS_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID);
}
/** Returns true if field num_workers is set (has been assigned a value) and false otherwise */
public boolean is_set_num_workers() {
- return __isset_bit_vector.get(__NUM_WORKERS_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID);
}
public void set_num_workers_isSet(boolean value) {
- __isset_bit_vector.set(__NUM_WORKERS_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID, value);
}
public int get_num_executors_size() {
@@ -358,60 +366,60 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
@Override
public int hashCode() {
- HashCodeBuilder builder = new HashCodeBuilder();
+ List<Object> list = new ArrayList<Object>();
boolean present_wait_secs = true && (is_set_wait_secs());
- builder.append(present_wait_secs);
+ list.add(present_wait_secs);
if (present_wait_secs)
- builder.append(wait_secs);
+ list.add(wait_secs);
boolean present_num_workers = true && (is_set_num_workers());
- builder.append(present_num_workers);
+ list.add(present_num_workers);
if (present_num_workers)
- builder.append(num_workers);
+ list.add(num_workers);
boolean present_num_executors = true && (is_set_num_executors());
- builder.append(present_num_executors);
+ list.add(present_num_executors);
if (present_num_executors)
- builder.append(num_executors);
+ list.add(num_executors);
- return builder.toHashCode();
+ return list.hashCode();
}
+ @Override
public int compareTo(RebalanceOptions other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- RebalanceOptions typedOther = (RebalanceOptions)other;
- lastComparison = Boolean.valueOf(is_set_wait_secs()).compareTo(typedOther.is_set_wait_secs());
+ lastComparison = Boolean.valueOf(is_set_wait_secs()).compareTo(other.is_set_wait_secs());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_wait_secs()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.wait_secs, typedOther.wait_secs);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.wait_secs, other.wait_secs);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_num_workers()).compareTo(typedOther.is_set_num_workers());
+ lastComparison = Boolean.valueOf(is_set_num_workers()).compareTo(other.is_set_num_workers());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_num_workers()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num_workers, typedOther.num_workers);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num_workers, other.num_workers);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_num_executors()).compareTo(typedOther.is_set_num_executors());
+ lastComparison = Boolean.valueOf(is_set_num_executors()).compareTo(other.is_set_num_executors());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_num_executors()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num_executors, typedOther.num_executors);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num_executors, other.num_executors);
if (lastComparison != 0) {
return lastComparison;
}
@@ -424,90 +432,11 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // WAIT_SECS
- if (field.type == org.apache.thrift.protocol.TType.I32) {
- this.wait_secs = iprot.readI32();
- set_wait_secs_isSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 2: // NUM_WORKERS
- if (field.type == org.apache.thrift.protocol.TType.I32) {
- this.num_workers = iprot.readI32();
- set_num_workers_isSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 3: // NUM_EXECUTORS
- if (field.type == org.apache.thrift.protocol.TType.MAP) {
- {
- org.apache.thrift.protocol.TMap _map158 = iprot.readMapBegin();
- this.num_executors = new HashMap<String,Integer>(2*_map158.size);
- for (int _i159 = 0; _i159 < _map158.size; ++_i159)
- {
- String _key160; // required
- int _val161; // required
- _key160 = iprot.readString();
- _val161 = iprot.readI32();
- this.num_executors.put(_key160, _val161);
- }
- iprot.readMapEnd();
- }
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (is_set_wait_secs()) {
- oprot.writeFieldBegin(WAIT_SECS_FIELD_DESC);
- oprot.writeI32(this.wait_secs);
- oprot.writeFieldEnd();
- }
- if (is_set_num_workers()) {
- oprot.writeFieldBegin(NUM_WORKERS_FIELD_DESC);
- oprot.writeI32(this.num_workers);
- oprot.writeFieldEnd();
- }
- if (this.num_executors != null) {
- if (is_set_num_executors()) {
- oprot.writeFieldBegin(NUM_EXECUTORS_FIELD_DESC);
- {
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, this.num_executors.size()));
- for (Map.Entry<String, Integer> _iter162 : this.num_executors.entrySet())
- {
- oprot.writeString(_iter162.getKey());
- oprot.writeI32(_iter162.getValue());
- }
- oprot.writeMapEnd();
- }
- oprot.writeFieldEnd();
- }
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@Override
@@ -542,6 +471,7 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
public void validate() throws org.apache.thrift.TException {
// check for required fields
+ // check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -555,12 +485,180 @@ public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOption
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_bit_vector = new BitSet(1);
+ __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 RebalanceOptionsStandardSchemeFactory implements SchemeFactory {
+ public RebalanceOptionsStandardScheme getScheme() {
+ return new RebalanceOptionsStandardScheme();
+ }
+ }
+
+ private static class RebalanceOptionsStandardScheme extends StandardScheme<RebalanceOptions> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, RebalanceOptions 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: // WAIT_SECS
+ if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ struct.wait_secs = iprot.readI32();
+ struct.set_wait_secs_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // NUM_WORKERS
+ if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ struct.num_workers = iprot.readI32();
+ struct.set_num_workers_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 3: // NUM_EXECUTORS
+ if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+ {
+ org.apache.thrift.protocol.TMap _map316 = iprot.readMapBegin();
+ struct.num_executors = new HashMap<String,Integer>(2*_map316.size);
+ String _key317;
+ int _val318;
+ for (int _i319 = 0; _i319 < _map316.size; ++_i319)
+ {
+ _key317 = iprot.readString();
+ _val318 = iprot.readI32();
+ struct.num_executors.put(_key317, _val318);
+ }
+ iprot.readMapEnd();
+ }
+ struct.set_num_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, RebalanceOptions struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.is_set_wait_secs()) {
+ oprot.writeFieldBegin(WAIT_SECS_FIELD_DESC);
+ oprot.writeI32(struct.wait_secs);
+ oprot.writeFieldEnd();
+ }
+ if (struct.is_set_num_workers()) {
+ oprot.writeFieldBegin(NUM_WORKERS_FIELD_DESC);
+ oprot.writeI32(struct.num_workers);
+ oprot.writeFieldEnd();
+ }
+ if (struct.num_executors != null) {
+ if (struct.is_set_num_executors()) {
+ oprot.writeFieldBegin(NUM_EXECUTORS_FIELD_DESC);
+ {
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, struct.num_executors.size()));
+ for (Map.Entry<String, Integer> _iter320 : struct.num_executors.entrySet())
+ {
+ oprot.writeString(_iter320.getKey());
+ oprot.writeI32(_iter320.getValue());
+ }
+ oprot.writeMapEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class RebalanceOptionsTupleSchemeFactory implements SchemeFactory {
+ public RebalanceOptionsTupleScheme getScheme() {
+ return new RebalanceOptionsTupleScheme();
+ }
+ }
+
+ private static class RebalanceOptionsTupleScheme extends TupleScheme<RebalanceOptions> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, RebalanceOptions struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ BitSet optionals = new BitSet();
+ if (struct.is_set_wait_secs()) {
+ optionals.set(0);
+ }
+ if (struct.is_set_num_workers()) {
+ optionals.set(1);
+ }
+ if (struct.is_set_num_executors()) {
+ optionals.set(2);
+ }
+ oprot.writeBitSet(optionals, 3);
+ if (struct.is_set_wait_secs()) {
+ oprot.writeI32(struct.wait_secs);
+ }
+ if (struct.is_set_num_workers()) {
+ oprot.writeI32(struct.num_workers);
+ }
+ if (struct.is_set_num_executors()) {
+ {
+ oprot.writeI32(struct.num_executors.size());
+ for (Map.Entry<String, Integer> _iter321 : struct.num_executors.entrySet())
+ {
+ oprot.writeString(_iter321.getKey());
+ oprot.writeI32(_iter321.getValue());
+ }
+ }
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, RebalanceOptions struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ BitSet incoming = iprot.readBitSet(3);
+ if (incoming.get(0)) {
+ struct.wait_secs = iprot.readI32();
+ struct.set_wait_secs_isSet(true);
+ }
+ if (incoming.get(1)) {
+ struct.num_workers = iprot.readI32();
+ struct.set_num_workers_isSet(true);
+ }
+ if (incoming.get(2)) {
+ {
+ org.apache.thrift.protocol.TMap _map322 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, iprot.readI32());
+ struct.num_executors = new HashMap<String,Integer>(2*_map322.size);
+ String _key323;
+ int _val324;
+ for (int _i325 = 0; _i325 < _map322.size; ++_i325)
+ {
+ _key323 = iprot.readString();
+ _val324 = iprot.readI32();
+ struct.num_executors.put(_key323, _val324);
+ }
+ }
+ struct.set_num_executors_isSet(true);
+ }
+ }
+ }
+
}
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/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 6390d5a..083294c 100644
--- a/storm-core/src/jvm/backtype/storm/generated/ShellComponent.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ShellComponent.java
@@ -16,13 +16,24 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package backtype.storm.generated;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -35,15 +46,24 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class ShellComponent implements org.apache.thrift.TBase<ShellComponent, ShellComponent._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
+public class 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");
private static final org.apache.thrift.protocol.TField EXECUTION_COMMAND_FIELD_DESC = new org.apache.thrift.protocol.TField("execution_command", org.apache.thrift.protocol.TType.STRING, (short)1);
private static final org.apache.thrift.protocol.TField SCRIPT_FIELD_DESC = new org.apache.thrift.protocol.TField("script", 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 ShellComponentStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new ShellComponentTupleSchemeFactory());
+ }
+
private String execution_command; // required
private String script; // required
@@ -109,7 +129,6 @@ public class ShellComponent implements org.apache.thrift.TBase<ShellComponent, S
}
// isset id assignments
-
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -285,45 +304,45 @@ public class ShellComponent implements org.apache.thrift.TBase<ShellComponent, S
@Override
public int hashCode() {
- HashCodeBuilder builder = new HashCodeBuilder();
+ List<Object> list = new ArrayList<Object>();
boolean present_execution_command = true && (is_set_execution_command());
- builder.append(present_execution_command);
+ list.add(present_execution_command);
if (present_execution_command)
- builder.append(execution_command);
+ list.add(execution_command);
boolean present_script = true && (is_set_script());
- builder.append(present_script);
+ list.add(present_script);
if (present_script)
- builder.append(script);
+ list.add(script);
- return builder.toHashCode();
+ return list.hashCode();
}
+ @Override
public int compareTo(ShellComponent other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- ShellComponent typedOther = (ShellComponent)other;
- lastComparison = Boolean.valueOf(is_set_execution_command()).compareTo(typedOther.is_set_execution_command());
+ lastComparison = Boolean.valueOf(is_set_execution_command()).compareTo(other.is_set_execution_command());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_execution_command()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.execution_command, typedOther.execution_command);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.execution_command, other.execution_command);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_script()).compareTo(typedOther.is_set_script());
+ lastComparison = Boolean.valueOf(is_set_script()).compareTo(other.is_set_script());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_script()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.script, typedOther.script);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.script, other.script);
if (lastComparison != 0) {
return lastComparison;
}
@@ -336,54 +355,11 @@ public class ShellComponent implements org.apache.thrift.TBase<ShellComponent, S
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // EXECUTION_COMMAND
- if (field.type == org.apache.thrift.protocol.TType.STRING) {
- this.execution_command = iprot.readString();
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 2: // SCRIPT
- if (field.type == org.apache.thrift.protocol.TType.STRING) {
- this.script = iprot.readString();
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (this.execution_command != null) {
- oprot.writeFieldBegin(EXECUTION_COMMAND_FIELD_DESC);
- oprot.writeString(this.execution_command);
- oprot.writeFieldEnd();
- }
- if (this.script != null) {
- oprot.writeFieldBegin(SCRIPT_FIELD_DESC);
- oprot.writeString(this.script);
- oprot.writeFieldEnd();
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@Override
@@ -412,6 +388,7 @@ public class ShellComponent implements org.apache.thrift.TBase<ShellComponent, S
public void validate() throws org.apache.thrift.TException {
// check for required fields
+ // check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -430,5 +407,110 @@ public class ShellComponent implements org.apache.thrift.TBase<ShellComponent, S
}
}
+ private static class ShellComponentStandardSchemeFactory implements SchemeFactory {
+ public ShellComponentStandardScheme getScheme() {
+ return new ShellComponentStandardScheme();
+ }
+ }
+
+ private static class ShellComponentStandardScheme extends StandardScheme<ShellComponent> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, ShellComponent 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: // EXECUTION_COMMAND
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.execution_command = iprot.readString();
+ struct.set_execution_command_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // SCRIPT
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.script = iprot.readString();
+ struct.set_script_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, ShellComponent struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.execution_command != null) {
+ oprot.writeFieldBegin(EXECUTION_COMMAND_FIELD_DESC);
+ oprot.writeString(struct.execution_command);
+ oprot.writeFieldEnd();
+ }
+ if (struct.script != null) {
+ oprot.writeFieldBegin(SCRIPT_FIELD_DESC);
+ oprot.writeString(struct.script);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class ShellComponentTupleSchemeFactory implements SchemeFactory {
+ public ShellComponentTupleScheme getScheme() {
+ return new ShellComponentTupleScheme();
+ }
+ }
+
+ private static class ShellComponentTupleScheme extends TupleScheme<ShellComponent> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, ShellComponent struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ BitSet optionals = new BitSet();
+ if (struct.is_set_execution_command()) {
+ optionals.set(0);
+ }
+ if (struct.is_set_script()) {
+ optionals.set(1);
+ }
+ oprot.writeBitSet(optionals, 2);
+ if (struct.is_set_execution_command()) {
+ oprot.writeString(struct.execution_command);
+ }
+ if (struct.is_set_script()) {
+ oprot.writeString(struct.script);
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, ShellComponent struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ BitSet incoming = iprot.readBitSet(2);
+ if (incoming.get(0)) {
+ struct.execution_command = iprot.readString();
+ struct.set_execution_command_isSet(true);
+ }
+ if (incoming.get(1)) {
+ struct.script = iprot.readString();
+ struct.set_script_isSet(true);
+ }
+ }
+ }
+
}
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/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 60028e7..16931ac 100644
--- a/storm-core/src/jvm/backtype/storm/generated/SpoutSpec.java
+++ b/storm-core/src/jvm/backtype/storm/generated/SpoutSpec.java
@@ -16,13 +16,24 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package backtype.storm.generated;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -35,15 +46,24 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class SpoutSpec implements org.apache.thrift.TBase<SpoutSpec, SpoutSpec._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
+public class 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");
private static final org.apache.thrift.protocol.TField SPOUT_OBJECT_FIELD_DESC = new org.apache.thrift.protocol.TField("spout_object", org.apache.thrift.protocol.TType.STRUCT, (short)1);
private static final org.apache.thrift.protocol.TField COMMON_FIELD_DESC = new org.apache.thrift.protocol.TField("common", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new SpoutSpecStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new SpoutSpecTupleSchemeFactory());
+ }
+
private ComponentObject spout_object; // required
private ComponentCommon common; // required
@@ -109,7 +129,6 @@ public class SpoutSpec implements org.apache.thrift.TBase<SpoutSpec, SpoutSpec._
}
// isset id assignments
-
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -285,45 +304,45 @@ public class SpoutSpec implements org.apache.thrift.TBase<SpoutSpec, SpoutSpec._
@Override
public int hashCode() {
- HashCodeBuilder builder = new HashCodeBuilder();
+ List<Object> list = new ArrayList<Object>();
boolean present_spout_object = true && (is_set_spout_object());
- builder.append(present_spout_object);
+ list.add(present_spout_object);
if (present_spout_object)
- builder.append(spout_object);
+ list.add(spout_object);
boolean present_common = true && (is_set_common());
- builder.append(present_common);
+ list.add(present_common);
if (present_common)
- builder.append(common);
+ list.add(common);
- return builder.toHashCode();
+ return list.hashCode();
}
+ @Override
public int compareTo(SpoutSpec other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- SpoutSpec typedOther = (SpoutSpec)other;
- lastComparison = Boolean.valueOf(is_set_spout_object()).compareTo(typedOther.is_set_spout_object());
+ lastComparison = Boolean.valueOf(is_set_spout_object()).compareTo(other.is_set_spout_object());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_spout_object()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.spout_object, typedOther.spout_object);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.spout_object, other.spout_object);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_common()).compareTo(typedOther.is_set_common());
+ lastComparison = Boolean.valueOf(is_set_common()).compareTo(other.is_set_common());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_common()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.common, typedOther.common);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.common, other.common);
if (lastComparison != 0) {
return lastComparison;
}
@@ -336,56 +355,11 @@ public class SpoutSpec implements org.apache.thrift.TBase<SpoutSpec, SpoutSpec._
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // SPOUT_OBJECT
- if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
- this.spout_object = new ComponentObject();
- this.spout_object.read(iprot);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 2: // COMMON
- if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
- this.common = new ComponentCommon();
- this.common.read(iprot);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (this.spout_object != null) {
- oprot.writeFieldBegin(SPOUT_OBJECT_FIELD_DESC);
- this.spout_object.write(oprot);
- oprot.writeFieldEnd();
- }
- if (this.common != null) {
- oprot.writeFieldBegin(COMMON_FIELD_DESC);
- this.common.write(oprot);
- oprot.writeFieldEnd();
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@Override
@@ -422,6 +396,10 @@ public class SpoutSpec implements org.apache.thrift.TBase<SpoutSpec, SpoutSpec._
throw new org.apache.thrift.protocol.TProtocolException("Required field 'common' is unset! Struct:" + toString());
}
+ // check for sub-struct validity
+ if (common != null) {
+ common.validate();
+ }
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -440,5 +418,97 @@ public class SpoutSpec implements org.apache.thrift.TBase<SpoutSpec, SpoutSpec._
}
}
+ private static class SpoutSpecStandardSchemeFactory implements SchemeFactory {
+ public SpoutSpecStandardScheme getScheme() {
+ return new SpoutSpecStandardScheme();
+ }
+ }
+
+ private static class SpoutSpecStandardScheme extends StandardScheme<SpoutSpec> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, SpoutSpec 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: // SPOUT_OBJECT
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+ struct.spout_object = new ComponentObject();
+ struct.spout_object.read(iprot);
+ struct.set_spout_object_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // COMMON
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+ struct.common = new ComponentCommon();
+ struct.common.read(iprot);
+ struct.set_common_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ default:
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ iprot.readFieldEnd();
+ }
+ iprot.readStructEnd();
+ struct.validate();
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot, SpoutSpec struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.spout_object != null) {
+ oprot.writeFieldBegin(SPOUT_OBJECT_FIELD_DESC);
+ struct.spout_object.write(oprot);
+ oprot.writeFieldEnd();
+ }
+ if (struct.common != null) {
+ oprot.writeFieldBegin(COMMON_FIELD_DESC);
+ struct.common.write(oprot);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class SpoutSpecTupleSchemeFactory implements SchemeFactory {
+ public SpoutSpecTupleScheme getScheme() {
+ return new SpoutSpecTupleScheme();
+ }
+ }
+
+ private static class SpoutSpecTupleScheme extends TupleScheme<SpoutSpec> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, SpoutSpec struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ struct.spout_object.write(oprot);
+ struct.common.write(oprot);
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, SpoutSpec struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ struct.spout_object = new ComponentObject();
+ struct.spout_object.read(iprot);
+ struct.set_spout_object_isSet(true);
+ struct.common = new ComponentCommon();
+ struct.common.read(iprot);
+ struct.set_common_isSet(true);
+ }
+ }
+
}
[17/18] storm git commit: Merge branch 'thrift092' of
https://github.com/kishorvpatil/incubator-storm into STORM-400
Posted by kn...@apache.org.
Merge branch 'thrift092' of https://github.com/kishorvpatil/incubator-storm into STORM-400
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c3bdd114
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c3bdd114
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c3bdd114
Branch: refs/heads/master
Commit: c3bdd1146e9565cffbb6fe8670eb4ded922a64ba
Parents: e790828 a99e127
Author: Kyle Nusbaum <kn...@yahoo-inc.com>
Authored: Tue Feb 17 11:09:30 2015 -0600
Committer: Kyle Nusbaum <kn...@yahoo-inc.com>
Committed: Tue Feb 17 11:09:30 2015 -0600
----------------------------------------------------------------------
pom.xml | 2 +-
storm-core/pom.xml | 2 +-
.../storm/drpc/DRPCInvocationsClient.java | 6 +
.../src/jvm/backtype/storm/drpc/DRPCSpout.java | 14 +-
.../jvm/backtype/storm/drpc/ReturnResults.java | 8 +-
.../storm/generated/AlreadyAliveException.java | 149 +-
.../storm/generated/AuthorizationException.java | 149 +-
.../src/jvm/backtype/storm/generated/Bolt.java | 194 +-
.../jvm/backtype/storm/generated/BoltStats.java | 908 +-
.../storm/generated/ClusterSummary.java | 339 +-
.../storm/generated/ComponentCommon.java | 426 +-
.../storm/generated/ComponentObject.java | 86 +-
.../backtype/storm/generated/Credentials.java | 220 +-
.../storm/generated/DRPCExecutionException.java | 149 +-
.../backtype/storm/generated/DRPCRequest.java | 185 +-
.../storm/generated/DistributedRPC.java | 529 +-
.../generated/DistributedRPCInvocations.java | 1199 ++-
.../jvm/backtype/storm/generated/ErrorInfo.java | 300 +-
.../backtype/storm/generated/ExecutorInfo.java | 198 +-
.../storm/generated/ExecutorSpecificStats.java | 72 +-
.../backtype/storm/generated/ExecutorStats.java | 486 +-
.../storm/generated/ExecutorSummary.java | 371 +-
.../storm/generated/GetInfoOptions.java | 166 +-
.../storm/generated/GlobalStreamId.java | 185 +-
.../jvm/backtype/storm/generated/Grouping.java | 163 +-
.../generated/InvalidTopologyException.java | 149 +-
.../backtype/storm/generated/JavaObject.java | 239 +-
.../backtype/storm/generated/JavaObjectArg.java | 108 +-
.../backtype/storm/generated/KillOptions.java | 176 +-
.../jvm/backtype/storm/generated/Nimbus.java | 9177 +++++++++++++-----
.../storm/generated/NotAliveException.java | 149 +-
.../backtype/storm/generated/NullStruct.java | 112 +-
.../storm/generated/NumErrorsChoice.java | 3 +-
.../storm/generated/RebalanceOptions.java | 348 +-
.../storm/generated/ShellComponent.java | 202 +-
.../jvm/backtype/storm/generated/SpoutSpec.java | 194 +-
.../backtype/storm/generated/SpoutStats.java | 614 +-
.../storm/generated/StateSpoutSpec.java | 194 +-
.../backtype/storm/generated/StormTopology.java | 410 +-
.../backtype/storm/generated/StreamInfo.java | 249 +-
.../backtype/storm/generated/SubmitOptions.java | 208 +-
.../storm/generated/SupervisorSummary.java | 309 +-
.../backtype/storm/generated/TopologyInfo.java | 609 +-
.../storm/generated/TopologyInitialStatus.java | 3 +-
.../storm/generated/TopologySummary.java | 486 +-
.../security/auth/SimpleTransportPlugin.java | 2 +-
.../trident/drpc/ReturnResultsReducer.java | 4 +-
storm-core/src/py/storm/DistributedRPC-remote | 35 +-
storm-core/src/py/storm/DistributedRPC.py | 38 +-
.../py/storm/DistributedRPCInvocations-remote | 43 +-
.../src/py/storm/DistributedRPCInvocations.py | 95 +-
storm-core/src/py/storm/Nimbus-remote | 111 +-
storm-core/src/py/storm/Nimbus.py | 640 +-
storm-core/src/py/storm/constants.py | 6 +-
storm-core/src/py/storm/ttypes.py | 420 +-
.../backtype/storm/security/auth/auth_test.clj | 4 +-
56 files changed, 15137 insertions(+), 6706 deletions(-)
----------------------------------------------------------------------
[12/18] storm git commit: Upgrade to thrift-0.9.2
Posted by kn...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/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 d4b6326..4c1af29 100644
--- a/storm-core/src/jvm/backtype/storm/generated/BoltStats.java
+++ b/storm-core/src/jvm/backtype/storm/generated/BoltStats.java
@@ -16,13 +16,24 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package backtype.storm.generated;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -35,10 +46,13 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
+public class 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");
private static final org.apache.thrift.protocol.TField ACKED_FIELD_DESC = new org.apache.thrift.protocol.TField("acked", org.apache.thrift.protocol.TType.MAP, (short)1);
@@ -47,6 +61,12 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
private static final org.apache.thrift.protocol.TField EXECUTED_FIELD_DESC = new org.apache.thrift.protocol.TField("executed", org.apache.thrift.protocol.TType.MAP, (short)4);
private static final org.apache.thrift.protocol.TField EXECUTE_MS_AVG_FIELD_DESC = new org.apache.thrift.protocol.TField("execute_ms_avg", org.apache.thrift.protocol.TType.MAP, (short)5);
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new BoltStatsStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new BoltStatsTupleSchemeFactory());
+ }
+
private Map<String,Map<GlobalStreamId,Long>> acked; // required
private Map<String,Map<GlobalStreamId,Long>> failed; // required
private Map<String,Map<GlobalStreamId,Double>> process_ms_avg; // required
@@ -124,7 +144,6 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
}
// 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);
@@ -185,7 +204,7 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
*/
public BoltStats(BoltStats other) {
if (other.is_set_acked()) {
- Map<String,Map<GlobalStreamId,Long>> __this__acked = new HashMap<String,Map<GlobalStreamId,Long>>();
+ Map<String,Map<GlobalStreamId,Long>> __this__acked = new HashMap<String,Map<GlobalStreamId,Long>>(other.acked.size());
for (Map.Entry<String, Map<GlobalStreamId,Long>> other_element : other.acked.entrySet()) {
String other_element_key = other_element.getKey();
@@ -193,7 +212,7 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
String __this__acked_copy_key = other_element_key;
- Map<GlobalStreamId,Long> __this__acked_copy_value = new HashMap<GlobalStreamId,Long>();
+ Map<GlobalStreamId,Long> __this__acked_copy_value = new HashMap<GlobalStreamId,Long>(other_element_value.size());
for (Map.Entry<GlobalStreamId, Long> other_element_value_element : other_element_value.entrySet()) {
GlobalStreamId other_element_value_element_key = other_element_value_element.getKey();
@@ -211,7 +230,7 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
this.acked = __this__acked;
}
if (other.is_set_failed()) {
- Map<String,Map<GlobalStreamId,Long>> __this__failed = new HashMap<String,Map<GlobalStreamId,Long>>();
+ Map<String,Map<GlobalStreamId,Long>> __this__failed = new HashMap<String,Map<GlobalStreamId,Long>>(other.failed.size());
for (Map.Entry<String, Map<GlobalStreamId,Long>> other_element : other.failed.entrySet()) {
String other_element_key = other_element.getKey();
@@ -219,7 +238,7 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
String __this__failed_copy_key = other_element_key;
- Map<GlobalStreamId,Long> __this__failed_copy_value = new HashMap<GlobalStreamId,Long>();
+ Map<GlobalStreamId,Long> __this__failed_copy_value = new HashMap<GlobalStreamId,Long>(other_element_value.size());
for (Map.Entry<GlobalStreamId, Long> other_element_value_element : other_element_value.entrySet()) {
GlobalStreamId other_element_value_element_key = other_element_value_element.getKey();
@@ -237,7 +256,7 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
this.failed = __this__failed;
}
if (other.is_set_process_ms_avg()) {
- Map<String,Map<GlobalStreamId,Double>> __this__process_ms_avg = new HashMap<String,Map<GlobalStreamId,Double>>();
+ Map<String,Map<GlobalStreamId,Double>> __this__process_ms_avg = new HashMap<String,Map<GlobalStreamId,Double>>(other.process_ms_avg.size());
for (Map.Entry<String, Map<GlobalStreamId,Double>> other_element : other.process_ms_avg.entrySet()) {
String other_element_key = other_element.getKey();
@@ -245,7 +264,7 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
String __this__process_ms_avg_copy_key = other_element_key;
- Map<GlobalStreamId,Double> __this__process_ms_avg_copy_value = new HashMap<GlobalStreamId,Double>();
+ Map<GlobalStreamId,Double> __this__process_ms_avg_copy_value = new HashMap<GlobalStreamId,Double>(other_element_value.size());
for (Map.Entry<GlobalStreamId, Double> other_element_value_element : other_element_value.entrySet()) {
GlobalStreamId other_element_value_element_key = other_element_value_element.getKey();
@@ -263,7 +282,7 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
this.process_ms_avg = __this__process_ms_avg;
}
if (other.is_set_executed()) {
- Map<String,Map<GlobalStreamId,Long>> __this__executed = new HashMap<String,Map<GlobalStreamId,Long>>();
+ Map<String,Map<GlobalStreamId,Long>> __this__executed = new HashMap<String,Map<GlobalStreamId,Long>>(other.executed.size());
for (Map.Entry<String, Map<GlobalStreamId,Long>> other_element : other.executed.entrySet()) {
String other_element_key = other_element.getKey();
@@ -271,7 +290,7 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
String __this__executed_copy_key = other_element_key;
- Map<GlobalStreamId,Long> __this__executed_copy_value = new HashMap<GlobalStreamId,Long>();
+ Map<GlobalStreamId,Long> __this__executed_copy_value = new HashMap<GlobalStreamId,Long>(other_element_value.size());
for (Map.Entry<GlobalStreamId, Long> other_element_value_element : other_element_value.entrySet()) {
GlobalStreamId other_element_value_element_key = other_element_value_element.getKey();
@@ -289,7 +308,7 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
this.executed = __this__executed;
}
if (other.is_set_execute_ms_avg()) {
- Map<String,Map<GlobalStreamId,Double>> __this__execute_ms_avg = new HashMap<String,Map<GlobalStreamId,Double>>();
+ Map<String,Map<GlobalStreamId,Double>> __this__execute_ms_avg = new HashMap<String,Map<GlobalStreamId,Double>>(other.execute_ms_avg.size());
for (Map.Entry<String, Map<GlobalStreamId,Double>> other_element : other.execute_ms_avg.entrySet()) {
String other_element_key = other_element.getKey();
@@ -297,7 +316,7 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
String __this__execute_ms_avg_copy_key = other_element_key;
- Map<GlobalStreamId,Double> __this__execute_ms_avg_copy_value = new HashMap<GlobalStreamId,Double>();
+ Map<GlobalStreamId,Double> __this__execute_ms_avg_copy_value = new HashMap<GlobalStreamId,Double>(other_element_value.size());
for (Map.Entry<GlobalStreamId, Double> other_element_value_element : other_element_value.entrySet()) {
GlobalStreamId other_element_value_element_key = other_element_value_element.getKey();
@@ -649,90 +668,90 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
@Override
public int hashCode() {
- HashCodeBuilder builder = new HashCodeBuilder();
+ List<Object> list = new ArrayList<Object>();
boolean present_acked = true && (is_set_acked());
- builder.append(present_acked);
+ list.add(present_acked);
if (present_acked)
- builder.append(acked);
+ list.add(acked);
boolean present_failed = true && (is_set_failed());
- builder.append(present_failed);
+ list.add(present_failed);
if (present_failed)
- builder.append(failed);
+ list.add(failed);
boolean present_process_ms_avg = true && (is_set_process_ms_avg());
- builder.append(present_process_ms_avg);
+ list.add(present_process_ms_avg);
if (present_process_ms_avg)
- builder.append(process_ms_avg);
+ list.add(process_ms_avg);
boolean present_executed = true && (is_set_executed());
- builder.append(present_executed);
+ list.add(present_executed);
if (present_executed)
- builder.append(executed);
+ list.add(executed);
boolean present_execute_ms_avg = true && (is_set_execute_ms_avg());
- builder.append(present_execute_ms_avg);
+ list.add(present_execute_ms_avg);
if (present_execute_ms_avg)
- builder.append(execute_ms_avg);
+ list.add(execute_ms_avg);
- return builder.toHashCode();
+ return list.hashCode();
}
+ @Override
public int compareTo(BoltStats other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- BoltStats typedOther = (BoltStats)other;
- lastComparison = Boolean.valueOf(is_set_acked()).compareTo(typedOther.is_set_acked());
+ lastComparison = Boolean.valueOf(is_set_acked()).compareTo(other.is_set_acked());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_acked()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.acked, typedOther.acked);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.acked, other.acked);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_failed()).compareTo(typedOther.is_set_failed());
+ lastComparison = Boolean.valueOf(is_set_failed()).compareTo(other.is_set_failed());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_failed()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failed, typedOther.failed);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failed, other.failed);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_process_ms_avg()).compareTo(typedOther.is_set_process_ms_avg());
+ lastComparison = Boolean.valueOf(is_set_process_ms_avg()).compareTo(other.is_set_process_ms_avg());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_process_ms_avg()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.process_ms_avg, typedOther.process_ms_avg);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.process_ms_avg, other.process_ms_avg);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_executed()).compareTo(typedOther.is_set_executed());
+ lastComparison = Boolean.valueOf(is_set_executed()).compareTo(other.is_set_executed());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_executed()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.executed, typedOther.executed);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.executed, other.executed);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_execute_ms_avg()).compareTo(typedOther.is_set_execute_ms_avg());
+ lastComparison = Boolean.valueOf(is_set_execute_ms_avg()).compareTo(other.is_set_execute_ms_avg());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_execute_ms_avg()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.execute_ms_avg, typedOther.execute_ms_avg);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.execute_ms_avg, other.execute_ms_avg);
if (lastComparison != 0) {
return lastComparison;
}
@@ -745,295 +764,11 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // ACKED
- if (field.type == org.apache.thrift.protocol.TType.MAP) {
- {
- org.apache.thrift.protocol.TMap _map45 = iprot.readMapBegin();
- this.acked = new HashMap<String,Map<GlobalStreamId,Long>>(2*_map45.size);
- for (int _i46 = 0; _i46 < _map45.size; ++_i46)
- {
- String _key47; // required
- Map<GlobalStreamId,Long> _val48; // required
- _key47 = iprot.readString();
- {
- org.apache.thrift.protocol.TMap _map49 = iprot.readMapBegin();
- _val48 = new HashMap<GlobalStreamId,Long>(2*_map49.size);
- for (int _i50 = 0; _i50 < _map49.size; ++_i50)
- {
- GlobalStreamId _key51; // required
- long _val52; // required
- _key51 = new GlobalStreamId();
- _key51.read(iprot);
- _val52 = iprot.readI64();
- _val48.put(_key51, _val52);
- }
- iprot.readMapEnd();
- }
- this.acked.put(_key47, _val48);
- }
- iprot.readMapEnd();
- }
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 2: // FAILED
- if (field.type == org.apache.thrift.protocol.TType.MAP) {
- {
- org.apache.thrift.protocol.TMap _map53 = iprot.readMapBegin();
- this.failed = new HashMap<String,Map<GlobalStreamId,Long>>(2*_map53.size);
- for (int _i54 = 0; _i54 < _map53.size; ++_i54)
- {
- String _key55; // required
- Map<GlobalStreamId,Long> _val56; // required
- _key55 = iprot.readString();
- {
- org.apache.thrift.protocol.TMap _map57 = iprot.readMapBegin();
- _val56 = new HashMap<GlobalStreamId,Long>(2*_map57.size);
- for (int _i58 = 0; _i58 < _map57.size; ++_i58)
- {
- GlobalStreamId _key59; // required
- long _val60; // required
- _key59 = new GlobalStreamId();
- _key59.read(iprot);
- _val60 = iprot.readI64();
- _val56.put(_key59, _val60);
- }
- iprot.readMapEnd();
- }
- this.failed.put(_key55, _val56);
- }
- iprot.readMapEnd();
- }
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 3: // PROCESS_MS_AVG
- if (field.type == org.apache.thrift.protocol.TType.MAP) {
- {
- org.apache.thrift.protocol.TMap _map61 = iprot.readMapBegin();
- this.process_ms_avg = new HashMap<String,Map<GlobalStreamId,Double>>(2*_map61.size);
- for (int _i62 = 0; _i62 < _map61.size; ++_i62)
- {
- String _key63; // required
- Map<GlobalStreamId,Double> _val64; // required
- _key63 = iprot.readString();
- {
- org.apache.thrift.protocol.TMap _map65 = iprot.readMapBegin();
- _val64 = new HashMap<GlobalStreamId,Double>(2*_map65.size);
- for (int _i66 = 0; _i66 < _map65.size; ++_i66)
- {
- GlobalStreamId _key67; // required
- double _val68; // required
- _key67 = new GlobalStreamId();
- _key67.read(iprot);
- _val68 = iprot.readDouble();
- _val64.put(_key67, _val68);
- }
- iprot.readMapEnd();
- }
- this.process_ms_avg.put(_key63, _val64);
- }
- iprot.readMapEnd();
- }
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 4: // EXECUTED
- if (field.type == org.apache.thrift.protocol.TType.MAP) {
- {
- org.apache.thrift.protocol.TMap _map69 = iprot.readMapBegin();
- this.executed = new HashMap<String,Map<GlobalStreamId,Long>>(2*_map69.size);
- for (int _i70 = 0; _i70 < _map69.size; ++_i70)
- {
- String _key71; // required
- Map<GlobalStreamId,Long> _val72; // required
- _key71 = iprot.readString();
- {
- org.apache.thrift.protocol.TMap _map73 = iprot.readMapBegin();
- _val72 = new HashMap<GlobalStreamId,Long>(2*_map73.size);
- for (int _i74 = 0; _i74 < _map73.size; ++_i74)
- {
- GlobalStreamId _key75; // required
- long _val76; // required
- _key75 = new GlobalStreamId();
- _key75.read(iprot);
- _val76 = iprot.readI64();
- _val72.put(_key75, _val76);
- }
- iprot.readMapEnd();
- }
- this.executed.put(_key71, _val72);
- }
- iprot.readMapEnd();
- }
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 5: // EXECUTE_MS_AVG
- if (field.type == org.apache.thrift.protocol.TType.MAP) {
- {
- org.apache.thrift.protocol.TMap _map77 = iprot.readMapBegin();
- this.execute_ms_avg = new HashMap<String,Map<GlobalStreamId,Double>>(2*_map77.size);
- for (int _i78 = 0; _i78 < _map77.size; ++_i78)
- {
- String _key79; // required
- Map<GlobalStreamId,Double> _val80; // required
- _key79 = iprot.readString();
- {
- org.apache.thrift.protocol.TMap _map81 = iprot.readMapBegin();
- _val80 = new HashMap<GlobalStreamId,Double>(2*_map81.size);
- for (int _i82 = 0; _i82 < _map81.size; ++_i82)
- {
- GlobalStreamId _key83; // required
- double _val84; // required
- _key83 = new GlobalStreamId();
- _key83.read(iprot);
- _val84 = iprot.readDouble();
- _val80.put(_key83, _val84);
- }
- iprot.readMapEnd();
- }
- this.execute_ms_avg.put(_key79, _val80);
- }
- iprot.readMapEnd();
- }
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (this.acked != null) {
- oprot.writeFieldBegin(ACKED_FIELD_DESC);
- {
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, this.acked.size()));
- for (Map.Entry<String, Map<GlobalStreamId,Long>> _iter85 : this.acked.entrySet())
- {
- oprot.writeString(_iter85.getKey());
- {
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I64, _iter85.getValue().size()));
- for (Map.Entry<GlobalStreamId, Long> _iter86 : _iter85.getValue().entrySet())
- {
- _iter86.getKey().write(oprot);
- oprot.writeI64(_iter86.getValue());
- }
- oprot.writeMapEnd();
- }
- }
- oprot.writeMapEnd();
- }
- oprot.writeFieldEnd();
- }
- if (this.failed != null) {
- oprot.writeFieldBegin(FAILED_FIELD_DESC);
- {
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, this.failed.size()));
- for (Map.Entry<String, Map<GlobalStreamId,Long>> _iter87 : this.failed.entrySet())
- {
- oprot.writeString(_iter87.getKey());
- {
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I64, _iter87.getValue().size()));
- for (Map.Entry<GlobalStreamId, Long> _iter88 : _iter87.getValue().entrySet())
- {
- _iter88.getKey().write(oprot);
- oprot.writeI64(_iter88.getValue());
- }
- oprot.writeMapEnd();
- }
- }
- oprot.writeMapEnd();
- }
- oprot.writeFieldEnd();
- }
- if (this.process_ms_avg != null) {
- oprot.writeFieldBegin(PROCESS_MS_AVG_FIELD_DESC);
- {
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, this.process_ms_avg.size()));
- for (Map.Entry<String, Map<GlobalStreamId,Double>> _iter89 : this.process_ms_avg.entrySet())
- {
- oprot.writeString(_iter89.getKey());
- {
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.DOUBLE, _iter89.getValue().size()));
- for (Map.Entry<GlobalStreamId, Double> _iter90 : _iter89.getValue().entrySet())
- {
- _iter90.getKey().write(oprot);
- oprot.writeDouble(_iter90.getValue());
- }
- oprot.writeMapEnd();
- }
- }
- oprot.writeMapEnd();
- }
- oprot.writeFieldEnd();
- }
- if (this.executed != null) {
- oprot.writeFieldBegin(EXECUTED_FIELD_DESC);
- {
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, this.executed.size()));
- for (Map.Entry<String, Map<GlobalStreamId,Long>> _iter91 : this.executed.entrySet())
- {
- oprot.writeString(_iter91.getKey());
- {
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I64, _iter91.getValue().size()));
- for (Map.Entry<GlobalStreamId, Long> _iter92 : _iter91.getValue().entrySet())
- {
- _iter92.getKey().write(oprot);
- oprot.writeI64(_iter92.getValue());
- }
- oprot.writeMapEnd();
- }
- }
- oprot.writeMapEnd();
- }
- oprot.writeFieldEnd();
- }
- if (this.execute_ms_avg != null) {
- oprot.writeFieldBegin(EXECUTE_MS_AVG_FIELD_DESC);
- {
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, this.execute_ms_avg.size()));
- for (Map.Entry<String, Map<GlobalStreamId,Double>> _iter93 : this.execute_ms_avg.entrySet())
- {
- oprot.writeString(_iter93.getKey());
- {
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.DOUBLE, _iter93.getValue().size()));
- for (Map.Entry<GlobalStreamId, Double> _iter94 : _iter93.getValue().entrySet())
- {
- _iter94.getKey().write(oprot);
- oprot.writeDouble(_iter94.getValue());
- }
- oprot.writeMapEnd();
- }
- }
- oprot.writeMapEnd();
- }
- oprot.writeFieldEnd();
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@Override
@@ -1106,6 +841,7 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
throw new org.apache.thrift.protocol.TProtocolException("Required field 'execute_ms_avg' is unset! Struct:" + toString());
}
+ // check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -1124,5 +860,531 @@ public class BoltStats implements org.apache.thrift.TBase<BoltStats, BoltStats._
}
}
+ private static class BoltStatsStandardSchemeFactory implements SchemeFactory {
+ public BoltStatsStandardScheme getScheme() {
+ return new BoltStatsStandardScheme();
+ }
+ }
+
+ private static class BoltStatsStandardScheme extends StandardScheme<BoltStats> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, BoltStats 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: // ACKED
+ if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+ {
+ org.apache.thrift.protocol.TMap _map90 = iprot.readMapBegin();
+ struct.acked = new HashMap<String,Map<GlobalStreamId,Long>>(2*_map90.size);
+ String _key91;
+ Map<GlobalStreamId,Long> _val92;
+ for (int _i93 = 0; _i93 < _map90.size; ++_i93)
+ {
+ _key91 = iprot.readString();
+ {
+ org.apache.thrift.protocol.TMap _map94 = iprot.readMapBegin();
+ _val92 = new HashMap<GlobalStreamId,Long>(2*_map94.size);
+ GlobalStreamId _key95;
+ long _val96;
+ for (int _i97 = 0; _i97 < _map94.size; ++_i97)
+ {
+ _key95 = new GlobalStreamId();
+ _key95.read(iprot);
+ _val96 = iprot.readI64();
+ _val92.put(_key95, _val96);
+ }
+ iprot.readMapEnd();
+ }
+ struct.acked.put(_key91, _val92);
+ }
+ iprot.readMapEnd();
+ }
+ struct.set_acked_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // FAILED
+ if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+ {
+ org.apache.thrift.protocol.TMap _map98 = iprot.readMapBegin();
+ struct.failed = new HashMap<String,Map<GlobalStreamId,Long>>(2*_map98.size);
+ String _key99;
+ Map<GlobalStreamId,Long> _val100;
+ for (int _i101 = 0; _i101 < _map98.size; ++_i101)
+ {
+ _key99 = iprot.readString();
+ {
+ org.apache.thrift.protocol.TMap _map102 = iprot.readMapBegin();
+ _val100 = new HashMap<GlobalStreamId,Long>(2*_map102.size);
+ GlobalStreamId _key103;
+ long _val104;
+ for (int _i105 = 0; _i105 < _map102.size; ++_i105)
+ {
+ _key103 = new GlobalStreamId();
+ _key103.read(iprot);
+ _val104 = iprot.readI64();
+ _val100.put(_key103, _val104);
+ }
+ iprot.readMapEnd();
+ }
+ struct.failed.put(_key99, _val100);
+ }
+ iprot.readMapEnd();
+ }
+ struct.set_failed_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 3: // PROCESS_MS_AVG
+ if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+ {
+ org.apache.thrift.protocol.TMap _map106 = iprot.readMapBegin();
+ struct.process_ms_avg = new HashMap<String,Map<GlobalStreamId,Double>>(2*_map106.size);
+ String _key107;
+ Map<GlobalStreamId,Double> _val108;
+ for (int _i109 = 0; _i109 < _map106.size; ++_i109)
+ {
+ _key107 = iprot.readString();
+ {
+ org.apache.thrift.protocol.TMap _map110 = iprot.readMapBegin();
+ _val108 = new HashMap<GlobalStreamId,Double>(2*_map110.size);
+ GlobalStreamId _key111;
+ double _val112;
+ for (int _i113 = 0; _i113 < _map110.size; ++_i113)
+ {
+ _key111 = new GlobalStreamId();
+ _key111.read(iprot);
+ _val112 = iprot.readDouble();
+ _val108.put(_key111, _val112);
+ }
+ iprot.readMapEnd();
+ }
+ struct.process_ms_avg.put(_key107, _val108);
+ }
+ iprot.readMapEnd();
+ }
+ struct.set_process_ms_avg_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 4: // EXECUTED
+ if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+ {
+ org.apache.thrift.protocol.TMap _map114 = iprot.readMapBegin();
+ struct.executed = new HashMap<String,Map<GlobalStreamId,Long>>(2*_map114.size);
+ String _key115;
+ Map<GlobalStreamId,Long> _val116;
+ for (int _i117 = 0; _i117 < _map114.size; ++_i117)
+ {
+ _key115 = iprot.readString();
+ {
+ org.apache.thrift.protocol.TMap _map118 = iprot.readMapBegin();
+ _val116 = new HashMap<GlobalStreamId,Long>(2*_map118.size);
+ GlobalStreamId _key119;
+ long _val120;
+ for (int _i121 = 0; _i121 < _map118.size; ++_i121)
+ {
+ _key119 = new GlobalStreamId();
+ _key119.read(iprot);
+ _val120 = iprot.readI64();
+ _val116.put(_key119, _val120);
+ }
+ iprot.readMapEnd();
+ }
+ struct.executed.put(_key115, _val116);
+ }
+ iprot.readMapEnd();
+ }
+ struct.set_executed_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 5: // EXECUTE_MS_AVG
+ if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+ {
+ org.apache.thrift.protocol.TMap _map122 = iprot.readMapBegin();
+ struct.execute_ms_avg = new HashMap<String,Map<GlobalStreamId,Double>>(2*_map122.size);
+ String _key123;
+ Map<GlobalStreamId,Double> _val124;
+ for (int _i125 = 0; _i125 < _map122.size; ++_i125)
+ {
+ _key123 = iprot.readString();
+ {
+ org.apache.thrift.protocol.TMap _map126 = iprot.readMapBegin();
+ _val124 = new HashMap<GlobalStreamId,Double>(2*_map126.size);
+ GlobalStreamId _key127;
+ double _val128;
+ for (int _i129 = 0; _i129 < _map126.size; ++_i129)
+ {
+ _key127 = new GlobalStreamId();
+ _key127.read(iprot);
+ _val128 = iprot.readDouble();
+ _val124.put(_key127, _val128);
+ }
+ iprot.readMapEnd();
+ }
+ struct.execute_ms_avg.put(_key123, _val124);
+ }
+ iprot.readMapEnd();
+ }
+ struct.set_execute_ms_avg_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, BoltStats struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.acked != null) {
+ oprot.writeFieldBegin(ACKED_FIELD_DESC);
+ {
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.acked.size()));
+ for (Map.Entry<String, Map<GlobalStreamId,Long>> _iter130 : struct.acked.entrySet())
+ {
+ oprot.writeString(_iter130.getKey());
+ {
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I64, _iter130.getValue().size()));
+ for (Map.Entry<GlobalStreamId, Long> _iter131 : _iter130.getValue().entrySet())
+ {
+ _iter131.getKey().write(oprot);
+ oprot.writeI64(_iter131.getValue());
+ }
+ oprot.writeMapEnd();
+ }
+ }
+ oprot.writeMapEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ if (struct.failed != null) {
+ oprot.writeFieldBegin(FAILED_FIELD_DESC);
+ {
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.failed.size()));
+ for (Map.Entry<String, Map<GlobalStreamId,Long>> _iter132 : struct.failed.entrySet())
+ {
+ oprot.writeString(_iter132.getKey());
+ {
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I64, _iter132.getValue().size()));
+ for (Map.Entry<GlobalStreamId, Long> _iter133 : _iter132.getValue().entrySet())
+ {
+ _iter133.getKey().write(oprot);
+ oprot.writeI64(_iter133.getValue());
+ }
+ oprot.writeMapEnd();
+ }
+ }
+ oprot.writeMapEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ if (struct.process_ms_avg != null) {
+ oprot.writeFieldBegin(PROCESS_MS_AVG_FIELD_DESC);
+ {
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.process_ms_avg.size()));
+ for (Map.Entry<String, Map<GlobalStreamId,Double>> _iter134 : struct.process_ms_avg.entrySet())
+ {
+ oprot.writeString(_iter134.getKey());
+ {
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.DOUBLE, _iter134.getValue().size()));
+ for (Map.Entry<GlobalStreamId, Double> _iter135 : _iter134.getValue().entrySet())
+ {
+ _iter135.getKey().write(oprot);
+ oprot.writeDouble(_iter135.getValue());
+ }
+ oprot.writeMapEnd();
+ }
+ }
+ oprot.writeMapEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ if (struct.executed != null) {
+ oprot.writeFieldBegin(EXECUTED_FIELD_DESC);
+ {
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.executed.size()));
+ for (Map.Entry<String, Map<GlobalStreamId,Long>> _iter136 : struct.executed.entrySet())
+ {
+ oprot.writeString(_iter136.getKey());
+ {
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I64, _iter136.getValue().size()));
+ for (Map.Entry<GlobalStreamId, Long> _iter137 : _iter136.getValue().entrySet())
+ {
+ _iter137.getKey().write(oprot);
+ oprot.writeI64(_iter137.getValue());
+ }
+ oprot.writeMapEnd();
+ }
+ }
+ oprot.writeMapEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ if (struct.execute_ms_avg != null) {
+ oprot.writeFieldBegin(EXECUTE_MS_AVG_FIELD_DESC);
+ {
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.execute_ms_avg.size()));
+ for (Map.Entry<String, Map<GlobalStreamId,Double>> _iter138 : struct.execute_ms_avg.entrySet())
+ {
+ oprot.writeString(_iter138.getKey());
+ {
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.DOUBLE, _iter138.getValue().size()));
+ for (Map.Entry<GlobalStreamId, Double> _iter139 : _iter138.getValue().entrySet())
+ {
+ _iter139.getKey().write(oprot);
+ oprot.writeDouble(_iter139.getValue());
+ }
+ oprot.writeMapEnd();
+ }
+ }
+ oprot.writeMapEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class BoltStatsTupleSchemeFactory implements SchemeFactory {
+ public BoltStatsTupleScheme getScheme() {
+ return new BoltStatsTupleScheme();
+ }
+ }
+
+ private static class BoltStatsTupleScheme extends TupleScheme<BoltStats> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, BoltStats struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ {
+ oprot.writeI32(struct.acked.size());
+ for (Map.Entry<String, Map<GlobalStreamId,Long>> _iter140 : struct.acked.entrySet())
+ {
+ oprot.writeString(_iter140.getKey());
+ {
+ oprot.writeI32(_iter140.getValue().size());
+ for (Map.Entry<GlobalStreamId, Long> _iter141 : _iter140.getValue().entrySet())
+ {
+ _iter141.getKey().write(oprot);
+ oprot.writeI64(_iter141.getValue());
+ }
+ }
+ }
+ }
+ {
+ oprot.writeI32(struct.failed.size());
+ for (Map.Entry<String, Map<GlobalStreamId,Long>> _iter142 : struct.failed.entrySet())
+ {
+ oprot.writeString(_iter142.getKey());
+ {
+ oprot.writeI32(_iter142.getValue().size());
+ for (Map.Entry<GlobalStreamId, Long> _iter143 : _iter142.getValue().entrySet())
+ {
+ _iter143.getKey().write(oprot);
+ oprot.writeI64(_iter143.getValue());
+ }
+ }
+ }
+ }
+ {
+ oprot.writeI32(struct.process_ms_avg.size());
+ for (Map.Entry<String, Map<GlobalStreamId,Double>> _iter144 : struct.process_ms_avg.entrySet())
+ {
+ oprot.writeString(_iter144.getKey());
+ {
+ oprot.writeI32(_iter144.getValue().size());
+ for (Map.Entry<GlobalStreamId, Double> _iter145 : _iter144.getValue().entrySet())
+ {
+ _iter145.getKey().write(oprot);
+ oprot.writeDouble(_iter145.getValue());
+ }
+ }
+ }
+ }
+ {
+ oprot.writeI32(struct.executed.size());
+ for (Map.Entry<String, Map<GlobalStreamId,Long>> _iter146 : struct.executed.entrySet())
+ {
+ oprot.writeString(_iter146.getKey());
+ {
+ oprot.writeI32(_iter146.getValue().size());
+ for (Map.Entry<GlobalStreamId, Long> _iter147 : _iter146.getValue().entrySet())
+ {
+ _iter147.getKey().write(oprot);
+ oprot.writeI64(_iter147.getValue());
+ }
+ }
+ }
+ }
+ {
+ oprot.writeI32(struct.execute_ms_avg.size());
+ for (Map.Entry<String, Map<GlobalStreamId,Double>> _iter148 : struct.execute_ms_avg.entrySet())
+ {
+ oprot.writeString(_iter148.getKey());
+ {
+ oprot.writeI32(_iter148.getValue().size());
+ for (Map.Entry<GlobalStreamId, Double> _iter149 : _iter148.getValue().entrySet())
+ {
+ _iter149.getKey().write(oprot);
+ oprot.writeDouble(_iter149.getValue());
+ }
+ }
+ }
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, BoltStats struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ {
+ org.apache.thrift.protocol.TMap _map150 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
+ struct.acked = new HashMap<String,Map<GlobalStreamId,Long>>(2*_map150.size);
+ String _key151;
+ Map<GlobalStreamId,Long> _val152;
+ for (int _i153 = 0; _i153 < _map150.size; ++_i153)
+ {
+ _key151 = iprot.readString();
+ {
+ org.apache.thrift.protocol.TMap _map154 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I64, iprot.readI32());
+ _val152 = new HashMap<GlobalStreamId,Long>(2*_map154.size);
+ GlobalStreamId _key155;
+ long _val156;
+ for (int _i157 = 0; _i157 < _map154.size; ++_i157)
+ {
+ _key155 = new GlobalStreamId();
+ _key155.read(iprot);
+ _val156 = iprot.readI64();
+ _val152.put(_key155, _val156);
+ }
+ }
+ struct.acked.put(_key151, _val152);
+ }
+ }
+ struct.set_acked_isSet(true);
+ {
+ org.apache.thrift.protocol.TMap _map158 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
+ struct.failed = new HashMap<String,Map<GlobalStreamId,Long>>(2*_map158.size);
+ String _key159;
+ Map<GlobalStreamId,Long> _val160;
+ for (int _i161 = 0; _i161 < _map158.size; ++_i161)
+ {
+ _key159 = iprot.readString();
+ {
+ org.apache.thrift.protocol.TMap _map162 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I64, iprot.readI32());
+ _val160 = new HashMap<GlobalStreamId,Long>(2*_map162.size);
+ GlobalStreamId _key163;
+ long _val164;
+ for (int _i165 = 0; _i165 < _map162.size; ++_i165)
+ {
+ _key163 = new GlobalStreamId();
+ _key163.read(iprot);
+ _val164 = iprot.readI64();
+ _val160.put(_key163, _val164);
+ }
+ }
+ struct.failed.put(_key159, _val160);
+ }
+ }
+ struct.set_failed_isSet(true);
+ {
+ org.apache.thrift.protocol.TMap _map166 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
+ struct.process_ms_avg = new HashMap<String,Map<GlobalStreamId,Double>>(2*_map166.size);
+ String _key167;
+ Map<GlobalStreamId,Double> _val168;
+ for (int _i169 = 0; _i169 < _map166.size; ++_i169)
+ {
+ _key167 = iprot.readString();
+ {
+ org.apache.thrift.protocol.TMap _map170 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.DOUBLE, iprot.readI32());
+ _val168 = new HashMap<GlobalStreamId,Double>(2*_map170.size);
+ GlobalStreamId _key171;
+ double _val172;
+ for (int _i173 = 0; _i173 < _map170.size; ++_i173)
+ {
+ _key171 = new GlobalStreamId();
+ _key171.read(iprot);
+ _val172 = iprot.readDouble();
+ _val168.put(_key171, _val172);
+ }
+ }
+ struct.process_ms_avg.put(_key167, _val168);
+ }
+ }
+ struct.set_process_ms_avg_isSet(true);
+ {
+ org.apache.thrift.protocol.TMap _map174 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
+ struct.executed = new HashMap<String,Map<GlobalStreamId,Long>>(2*_map174.size);
+ String _key175;
+ Map<GlobalStreamId,Long> _val176;
+ for (int _i177 = 0; _i177 < _map174.size; ++_i177)
+ {
+ _key175 = iprot.readString();
+ {
+ org.apache.thrift.protocol.TMap _map178 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I64, iprot.readI32());
+ _val176 = new HashMap<GlobalStreamId,Long>(2*_map178.size);
+ GlobalStreamId _key179;
+ long _val180;
+ for (int _i181 = 0; _i181 < _map178.size; ++_i181)
+ {
+ _key179 = new GlobalStreamId();
+ _key179.read(iprot);
+ _val180 = iprot.readI64();
+ _val176.put(_key179, _val180);
+ }
+ }
+ struct.executed.put(_key175, _val176);
+ }
+ }
+ struct.set_executed_isSet(true);
+ {
+ org.apache.thrift.protocol.TMap _map182 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
+ struct.execute_ms_avg = new HashMap<String,Map<GlobalStreamId,Double>>(2*_map182.size);
+ String _key183;
+ Map<GlobalStreamId,Double> _val184;
+ for (int _i185 = 0; _i185 < _map182.size; ++_i185)
+ {
+ _key183 = iprot.readString();
+ {
+ org.apache.thrift.protocol.TMap _map186 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.DOUBLE, iprot.readI32());
+ _val184 = new HashMap<GlobalStreamId,Double>(2*_map186.size);
+ GlobalStreamId _key187;
+ double _val188;
+ for (int _i189 = 0; _i189 < _map186.size; ++_i189)
+ {
+ _key187 = new GlobalStreamId();
+ _key187.read(iprot);
+ _val188 = iprot.readDouble();
+ _val184.put(_key187, _val188);
+ }
+ }
+ struct.execute_ms_avg.put(_key183, _val184);
+ }
+ }
+ struct.set_execute_ms_avg_isSet(true);
+ }
+ }
+
}
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/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 a2623ab..093bd9a 100644
--- a/storm-core/src/jvm/backtype/storm/generated/ClusterSummary.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ClusterSummary.java
@@ -16,13 +16,24 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package backtype.storm.generated;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -35,16 +46,25 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class ClusterSummary implements org.apache.thrift.TBase<ClusterSummary, ClusterSummary._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
+public class 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");
private static final org.apache.thrift.protocol.TField SUPERVISORS_FIELD_DESC = new org.apache.thrift.protocol.TField("supervisors", org.apache.thrift.protocol.TType.LIST, (short)1);
private static final org.apache.thrift.protocol.TField NIMBUS_UPTIME_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("nimbus_uptime_secs", org.apache.thrift.protocol.TType.I32, (short)2);
private static final org.apache.thrift.protocol.TField TOPOLOGIES_FIELD_DESC = new org.apache.thrift.protocol.TField("topologies", org.apache.thrift.protocol.TType.LIST, (short)3);
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new ClusterSummaryStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new ClusterSummaryTupleSchemeFactory());
+ }
+
private List<SupervisorSummary> supervisors; // required
private int nimbus_uptime_secs; // required
private List<TopologySummary> topologies; // required
@@ -115,8 +135,7 @@ public class ClusterSummary implements org.apache.thrift.TBase<ClusterSummary, C
// isset id assignments
private static final int __NIMBUS_UPTIME_SECS_ISSET_ID = 0;
- private BitSet __isset_bit_vector = new BitSet(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);
@@ -151,10 +170,9 @@ public class ClusterSummary implements org.apache.thrift.TBase<ClusterSummary, C
* Performs a deep copy on <i>other</i>.
*/
public ClusterSummary(ClusterSummary other) {
- __isset_bit_vector.clear();
- __isset_bit_vector.or(other.__isset_bit_vector);
+ __isset_bitfield = other.__isset_bitfield;
if (other.is_set_supervisors()) {
- List<SupervisorSummary> __this__supervisors = new ArrayList<SupervisorSummary>();
+ List<SupervisorSummary> __this__supervisors = new ArrayList<SupervisorSummary>(other.supervisors.size());
for (SupervisorSummary other_element : other.supervisors) {
__this__supervisors.add(new SupervisorSummary(other_element));
}
@@ -162,7 +180,7 @@ public class ClusterSummary implements org.apache.thrift.TBase<ClusterSummary, C
}
this.nimbus_uptime_secs = other.nimbus_uptime_secs;
if (other.is_set_topologies()) {
- List<TopologySummary> __this__topologies = new ArrayList<TopologySummary>();
+ List<TopologySummary> __this__topologies = new ArrayList<TopologySummary>(other.topologies.size());
for (TopologySummary other_element : other.topologies) {
__this__topologies.add(new TopologySummary(other_element));
}
@@ -230,16 +248,16 @@ public class ClusterSummary implements org.apache.thrift.TBase<ClusterSummary, C
}
public void unset_nimbus_uptime_secs() {
- __isset_bit_vector.clear(__NIMBUS_UPTIME_SECS_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __NIMBUS_UPTIME_SECS_ISSET_ID);
}
/** Returns true if field nimbus_uptime_secs is set (has been assigned a value) and false otherwise */
public boolean is_set_nimbus_uptime_secs() {
- return __isset_bit_vector.get(__NIMBUS_UPTIME_SECS_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __NIMBUS_UPTIME_SECS_ISSET_ID);
}
public void set_nimbus_uptime_secs_isSet(boolean value) {
- __isset_bit_vector.set(__NIMBUS_UPTIME_SECS_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NIMBUS_UPTIME_SECS_ISSET_ID, value);
}
public int get_topologies_size() {
@@ -386,60 +404,60 @@ public class ClusterSummary implements org.apache.thrift.TBase<ClusterSummary, C
@Override
public int hashCode() {
- HashCodeBuilder builder = new HashCodeBuilder();
+ List<Object> list = new ArrayList<Object>();
boolean present_supervisors = true && (is_set_supervisors());
- builder.append(present_supervisors);
+ list.add(present_supervisors);
if (present_supervisors)
- builder.append(supervisors);
+ list.add(supervisors);
boolean present_nimbus_uptime_secs = true;
- builder.append(present_nimbus_uptime_secs);
+ list.add(present_nimbus_uptime_secs);
if (present_nimbus_uptime_secs)
- builder.append(nimbus_uptime_secs);
+ list.add(nimbus_uptime_secs);
boolean present_topologies = true && (is_set_topologies());
- builder.append(present_topologies);
+ list.add(present_topologies);
if (present_topologies)
- builder.append(topologies);
+ list.add(topologies);
- return builder.toHashCode();
+ return list.hashCode();
}
+ @Override
public int compareTo(ClusterSummary other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- ClusterSummary typedOther = (ClusterSummary)other;
- lastComparison = Boolean.valueOf(is_set_supervisors()).compareTo(typedOther.is_set_supervisors());
+ lastComparison = Boolean.valueOf(is_set_supervisors()).compareTo(other.is_set_supervisors());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_supervisors()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.supervisors, typedOther.supervisors);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.supervisors, other.supervisors);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_nimbus_uptime_secs()).compareTo(typedOther.is_set_nimbus_uptime_secs());
+ lastComparison = Boolean.valueOf(is_set_nimbus_uptime_secs()).compareTo(other.is_set_nimbus_uptime_secs());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_nimbus_uptime_secs()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.nimbus_uptime_secs, typedOther.nimbus_uptime_secs);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.nimbus_uptime_secs, other.nimbus_uptime_secs);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_topologies()).compareTo(typedOther.is_set_topologies());
+ lastComparison = Boolean.valueOf(is_set_topologies()).compareTo(other.is_set_topologies());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_topologies()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.topologies, typedOther.topologies);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.topologies, other.topologies);
if (lastComparison != 0) {
return lastComparison;
}
@@ -452,101 +470,11 @@ public class ClusterSummary implements org.apache.thrift.TBase<ClusterSummary, C
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // SUPERVISORS
- if (field.type == org.apache.thrift.protocol.TType.LIST) {
- {
- org.apache.thrift.protocol.TList _list37 = iprot.readListBegin();
- this.supervisors = new ArrayList<SupervisorSummary>(_list37.size);
- for (int _i38 = 0; _i38 < _list37.size; ++_i38)
- {
- SupervisorSummary _elem39; // required
- _elem39 = new SupervisorSummary();
- _elem39.read(iprot);
- this.supervisors.add(_elem39);
- }
- iprot.readListEnd();
- }
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 2: // NIMBUS_UPTIME_SECS
- if (field.type == org.apache.thrift.protocol.TType.I32) {
- this.nimbus_uptime_secs = iprot.readI32();
- set_nimbus_uptime_secs_isSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 3: // TOPOLOGIES
- if (field.type == org.apache.thrift.protocol.TType.LIST) {
- {
- org.apache.thrift.protocol.TList _list40 = iprot.readListBegin();
- this.topologies = new ArrayList<TopologySummary>(_list40.size);
- for (int _i41 = 0; _i41 < _list40.size; ++_i41)
- {
- TopologySummary _elem42; // required
- _elem42 = new TopologySummary();
- _elem42.read(iprot);
- this.topologies.add(_elem42);
- }
- iprot.readListEnd();
- }
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (this.supervisors != null) {
- oprot.writeFieldBegin(SUPERVISORS_FIELD_DESC);
- {
- oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.supervisors.size()));
- for (SupervisorSummary _iter43 : this.supervisors)
- {
- _iter43.write(oprot);
- }
- oprot.writeListEnd();
- }
- oprot.writeFieldEnd();
- }
- oprot.writeFieldBegin(NIMBUS_UPTIME_SECS_FIELD_DESC);
- oprot.writeI32(this.nimbus_uptime_secs);
- oprot.writeFieldEnd();
- if (this.topologies != null) {
- oprot.writeFieldBegin(TOPOLOGIES_FIELD_DESC);
- {
- oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.topologies.size()));
- for (TopologySummary _iter44 : this.topologies)
- {
- _iter44.write(oprot);
- }
- oprot.writeListEnd();
- }
- oprot.writeFieldEnd();
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@Override
@@ -591,6 +519,7 @@ public class ClusterSummary implements org.apache.thrift.TBase<ClusterSummary, C
throw new org.apache.thrift.protocol.TProtocolException("Required field 'topologies' is unset! Struct:" + toString());
}
+ // check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -604,12 +533,182 @@ public class ClusterSummary implements org.apache.thrift.TBase<ClusterSummary, C
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_bit_vector = new BitSet(1);
+ __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 ClusterSummaryStandardSchemeFactory implements SchemeFactory {
+ public ClusterSummaryStandardScheme getScheme() {
+ return new ClusterSummaryStandardScheme();
+ }
+ }
+
+ private static class ClusterSummaryStandardScheme extends StandardScheme<ClusterSummary> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, ClusterSummary 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: // SUPERVISORS
+ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+ {
+ org.apache.thrift.protocol.TList _list74 = iprot.readListBegin();
+ struct.supervisors = new ArrayList<SupervisorSummary>(_list74.size);
+ SupervisorSummary _elem75;
+ for (int _i76 = 0; _i76 < _list74.size; ++_i76)
+ {
+ _elem75 = new SupervisorSummary();
+ _elem75.read(iprot);
+ struct.supervisors.add(_elem75);
+ }
+ iprot.readListEnd();
+ }
+ struct.set_supervisors_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // NIMBUS_UPTIME_SECS
+ if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ struct.nimbus_uptime_secs = iprot.readI32();
+ struct.set_nimbus_uptime_secs_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 3: // TOPOLOGIES
+ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+ {
+ org.apache.thrift.protocol.TList _list77 = iprot.readListBegin();
+ struct.topologies = new ArrayList<TopologySummary>(_list77.size);
+ TopologySummary _elem78;
+ for (int _i79 = 0; _i79 < _list77.size; ++_i79)
+ {
+ _elem78 = new TopologySummary();
+ _elem78.read(iprot);
+ struct.topologies.add(_elem78);
+ }
+ iprot.readListEnd();
+ }
+ struct.set_topologies_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, ClusterSummary struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.supervisors != null) {
+ oprot.writeFieldBegin(SUPERVISORS_FIELD_DESC);
+ {
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.supervisors.size()));
+ for (SupervisorSummary _iter80 : struct.supervisors)
+ {
+ _iter80.write(oprot);
+ }
+ oprot.writeListEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldBegin(NIMBUS_UPTIME_SECS_FIELD_DESC);
+ oprot.writeI32(struct.nimbus_uptime_secs);
+ oprot.writeFieldEnd();
+ if (struct.topologies != null) {
+ oprot.writeFieldBegin(TOPOLOGIES_FIELD_DESC);
+ {
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.topologies.size()));
+ for (TopologySummary _iter81 : struct.topologies)
+ {
+ _iter81.write(oprot);
+ }
+ oprot.writeListEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class ClusterSummaryTupleSchemeFactory implements SchemeFactory {
+ public ClusterSummaryTupleScheme getScheme() {
+ return new ClusterSummaryTupleScheme();
+ }
+ }
+
+ private static class ClusterSummaryTupleScheme extends TupleScheme<ClusterSummary> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, ClusterSummary struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ {
+ oprot.writeI32(struct.supervisors.size());
+ for (SupervisorSummary _iter82 : struct.supervisors)
+ {
+ _iter82.write(oprot);
+ }
+ }
+ oprot.writeI32(struct.nimbus_uptime_secs);
+ {
+ oprot.writeI32(struct.topologies.size());
+ for (TopologySummary _iter83 : struct.topologies)
+ {
+ _iter83.write(oprot);
+ }
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, ClusterSummary struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ {
+ org.apache.thrift.protocol.TList _list84 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.supervisors = new ArrayList<SupervisorSummary>(_list84.size);
+ SupervisorSummary _elem85;
+ for (int _i86 = 0; _i86 < _list84.size; ++_i86)
+ {
+ _elem85 = new SupervisorSummary();
+ _elem85.read(iprot);
+ struct.supervisors.add(_elem85);
+ }
+ }
+ struct.set_supervisors_isSet(true);
+ struct.nimbus_uptime_secs = iprot.readI32();
+ struct.set_nimbus_uptime_secs_isSet(true);
+ {
+ org.apache.thrift.protocol.TList _list87 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.topologies = new ArrayList<TopologySummary>(_list87.size);
+ TopologySummary _elem88;
+ for (int _i89 = 0; _i89 < _list87.size; ++_i89)
+ {
+ _elem88 = new TopologySummary();
+ _elem88.read(iprot);
+ struct.topologies.add(_elem88);
+ }
+ }
+ struct.set_topologies_isSet(true);
+ }
+ }
+
}
[03/18] storm git commit: Upgrade to thrift-0.9.2
Posted by kn...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/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 f885f69..4c2e310 100644
--- a/storm-core/src/jvm/backtype/storm/generated/SubmitOptions.java
+++ b/storm-core/src/jvm/backtype/storm/generated/SubmitOptions.java
@@ -16,13 +16,24 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package backtype.storm.generated;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -35,17 +46,26 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, SubmitOptions._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
+public class 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");
private static final org.apache.thrift.protocol.TField INITIAL_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("initial_status", org.apache.thrift.protocol.TType.I32, (short)1);
private static final org.apache.thrift.protocol.TField CREDS_FIELD_DESC = new org.apache.thrift.protocol.TField("creds", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new SubmitOptionsStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new SubmitOptionsTupleSchemeFactory());
+ }
+
private TopologyInitialStatus initial_status; // required
- private Credentials creds; // required
+ private Credentials creds; // 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 {
@@ -113,7 +133,7 @@ public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, Sub
}
// isset id assignments
-
+ private static final _Fields optionals[] = {_Fields.CREDS};
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);
@@ -295,45 +315,45 @@ public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, Sub
@Override
public int hashCode() {
- HashCodeBuilder builder = new HashCodeBuilder();
+ List<Object> list = new ArrayList<Object>();
boolean present_initial_status = true && (is_set_initial_status());
- builder.append(present_initial_status);
+ list.add(present_initial_status);
if (present_initial_status)
- builder.append(initial_status.getValue());
+ list.add(initial_status.getValue());
boolean present_creds = true && (is_set_creds());
- builder.append(present_creds);
+ list.add(present_creds);
if (present_creds)
- builder.append(creds);
+ list.add(creds);
- return builder.toHashCode();
+ return list.hashCode();
}
+ @Override
public int compareTo(SubmitOptions other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- SubmitOptions typedOther = (SubmitOptions)other;
- lastComparison = Boolean.valueOf(is_set_initial_status()).compareTo(typedOther.is_set_initial_status());
+ lastComparison = Boolean.valueOf(is_set_initial_status()).compareTo(other.is_set_initial_status());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_initial_status()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.initial_status, typedOther.initial_status);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.initial_status, other.initial_status);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_creds()).compareTo(typedOther.is_set_creds());
+ lastComparison = Boolean.valueOf(is_set_creds()).compareTo(other.is_set_creds());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_creds()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.creds, typedOther.creds);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.creds, other.creds);
if (lastComparison != 0) {
return lastComparison;
}
@@ -346,57 +366,11 @@ public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, Sub
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // INITIAL_STATUS
- if (field.type == org.apache.thrift.protocol.TType.I32) {
- this.initial_status = TopologyInitialStatus.findByValue(iprot.readI32());
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 2: // CREDS
- if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
- this.creds = new Credentials();
- this.creds.read(iprot);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (this.initial_status != null) {
- oprot.writeFieldBegin(INITIAL_STATUS_FIELD_DESC);
- oprot.writeI32(this.initial_status.getValue());
- oprot.writeFieldEnd();
- }
- if (this.creds != null) {
- if (is_set_creds()) {
- oprot.writeFieldBegin(CREDS_FIELD_DESC);
- this.creds.write(oprot);
- oprot.writeFieldEnd();
- }
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@Override
@@ -431,6 +405,10 @@ public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, Sub
throw new org.apache.thrift.protocol.TProtocolException("Required field 'initial_status' is unset! Struct:" + toString());
}
+ // check for sub-struct validity
+ if (creds != null) {
+ creds.validate();
+ }
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -449,5 +427,107 @@ public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, Sub
}
}
+ private static class SubmitOptionsStandardSchemeFactory implements SchemeFactory {
+ public SubmitOptionsStandardScheme getScheme() {
+ return new SubmitOptionsStandardScheme();
+ }
+ }
+
+ private static class SubmitOptionsStandardScheme extends StandardScheme<SubmitOptions> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, SubmitOptions 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: // INITIAL_STATUS
+ if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ struct.initial_status = backtype.storm.generated.TopologyInitialStatus.findByValue(iprot.readI32());
+ struct.set_initial_status_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // CREDS
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+ struct.creds = new Credentials();
+ struct.creds.read(iprot);
+ struct.set_creds_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, SubmitOptions struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.initial_status != null) {
+ oprot.writeFieldBegin(INITIAL_STATUS_FIELD_DESC);
+ oprot.writeI32(struct.initial_status.getValue());
+ oprot.writeFieldEnd();
+ }
+ if (struct.creds != null) {
+ if (struct.is_set_creds()) {
+ oprot.writeFieldBegin(CREDS_FIELD_DESC);
+ struct.creds.write(oprot);
+ oprot.writeFieldEnd();
+ }
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class SubmitOptionsTupleSchemeFactory implements SchemeFactory {
+ public SubmitOptionsTupleScheme getScheme() {
+ return new SubmitOptionsTupleScheme();
+ }
+ }
+
+ private static class SubmitOptionsTupleScheme extends TupleScheme<SubmitOptions> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, SubmitOptions struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ oprot.writeI32(struct.initial_status.getValue());
+ BitSet optionals = new BitSet();
+ if (struct.is_set_creds()) {
+ optionals.set(0);
+ }
+ oprot.writeBitSet(optionals, 1);
+ if (struct.is_set_creds()) {
+ struct.creds.write(oprot);
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, SubmitOptions struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ struct.initial_status = backtype.storm.generated.TopologyInitialStatus.findByValue(iprot.readI32());
+ struct.set_initial_status_isSet(true);
+ BitSet incoming = iprot.readBitSet(1);
+ if (incoming.get(0)) {
+ struct.creds = new Credentials();
+ struct.creds.read(iprot);
+ struct.set_creds_isSet(true);
+ }
+ }
+ }
+
}
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/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 7072cdd..69fca27 100644
--- a/storm-core/src/jvm/backtype/storm/generated/SupervisorSummary.java
+++ b/storm-core/src/jvm/backtype/storm/generated/SupervisorSummary.java
@@ -16,13 +16,24 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package backtype.storm.generated;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -35,10 +46,13 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSummary, SupervisorSummary._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
+public class 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");
private static final org.apache.thrift.protocol.TField HOST_FIELD_DESC = new org.apache.thrift.protocol.TField("host", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -47,6 +61,12 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
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 Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new SupervisorSummaryStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new SupervisorSummaryTupleSchemeFactory());
+ }
+
private String host; // required
private int uptime_secs; // required
private int num_workers; // required
@@ -127,8 +147,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
private static final int __UPTIME_SECS_ISSET_ID = 0;
private static final int __NUM_WORKERS_ISSET_ID = 1;
private static final int __NUM_USED_WORKERS_ISSET_ID = 2;
- private BitSet __isset_bit_vector = new BitSet(3);
-
+ 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);
@@ -171,8 +190,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
* Performs a deep copy on <i>other</i>.
*/
public SupervisorSummary(SupervisorSummary other) {
- __isset_bit_vector.clear();
- __isset_bit_vector.or(other.__isset_bit_vector);
+ __isset_bitfield = other.__isset_bitfield;
if (other.is_set_host()) {
this.host = other.host;
}
@@ -233,16 +251,16 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
}
public void unset_uptime_secs() {
- __isset_bit_vector.clear(__UPTIME_SECS_ISSET_ID);
+ __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 __isset_bit_vector.get(__UPTIME_SECS_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
}
public void set_uptime_secs_isSet(boolean value) {
- __isset_bit_vector.set(__UPTIME_SECS_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID, value);
}
public int get_num_workers() {
@@ -255,16 +273,16 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
}
public void unset_num_workers() {
- __isset_bit_vector.clear(__NUM_WORKERS_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID);
}
/** Returns true if field num_workers is set (has been assigned a value) and false otherwise */
public boolean is_set_num_workers() {
- return __isset_bit_vector.get(__NUM_WORKERS_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID);
}
public void set_num_workers_isSet(boolean value) {
- __isset_bit_vector.set(__NUM_WORKERS_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID, value);
}
public int get_num_used_workers() {
@@ -277,16 +295,16 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
}
public void unset_num_used_workers() {
- __isset_bit_vector.clear(__NUM_USED_WORKERS_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __NUM_USED_WORKERS_ISSET_ID);
}
/** Returns true if field num_used_workers is set (has been assigned a value) and false otherwise */
public boolean is_set_num_used_workers() {
- return __isset_bit_vector.get(__NUM_USED_WORKERS_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __NUM_USED_WORKERS_ISSET_ID);
}
public void set_num_used_workers_isSet(boolean value) {
- __isset_bit_vector.set(__NUM_USED_WORKERS_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NUM_USED_WORKERS_ISSET_ID, value);
}
public String get_supervisor_id() {
@@ -462,90 +480,90 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
@Override
public int hashCode() {
- HashCodeBuilder builder = new HashCodeBuilder();
+ List<Object> list = new ArrayList<Object>();
boolean present_host = true && (is_set_host());
- builder.append(present_host);
+ list.add(present_host);
if (present_host)
- builder.append(host);
+ list.add(host);
boolean present_uptime_secs = true;
- builder.append(present_uptime_secs);
+ list.add(present_uptime_secs);
if (present_uptime_secs)
- builder.append(uptime_secs);
+ list.add(uptime_secs);
boolean present_num_workers = true;
- builder.append(present_num_workers);
+ list.add(present_num_workers);
if (present_num_workers)
- builder.append(num_workers);
+ list.add(num_workers);
boolean present_num_used_workers = true;
- builder.append(present_num_used_workers);
+ list.add(present_num_used_workers);
if (present_num_used_workers)
- builder.append(num_used_workers);
+ list.add(num_used_workers);
boolean present_supervisor_id = true && (is_set_supervisor_id());
- builder.append(present_supervisor_id);
+ list.add(present_supervisor_id);
if (present_supervisor_id)
- builder.append(supervisor_id);
+ list.add(supervisor_id);
- return builder.toHashCode();
+ return list.hashCode();
}
+ @Override
public int compareTo(SupervisorSummary other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- SupervisorSummary typedOther = (SupervisorSummary)other;
- lastComparison = Boolean.valueOf(is_set_host()).compareTo(typedOther.is_set_host());
+ lastComparison = Boolean.valueOf(is_set_host()).compareTo(other.is_set_host());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_host()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.host, typedOther.host);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.host, other.host);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_uptime_secs()).compareTo(typedOther.is_set_uptime_secs());
+ 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, typedOther.uptime_secs);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uptime_secs, other.uptime_secs);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_num_workers()).compareTo(typedOther.is_set_num_workers());
+ lastComparison = Boolean.valueOf(is_set_num_workers()).compareTo(other.is_set_num_workers());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_num_workers()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num_workers, typedOther.num_workers);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num_workers, other.num_workers);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_num_used_workers()).compareTo(typedOther.is_set_num_used_workers());
+ lastComparison = Boolean.valueOf(is_set_num_used_workers()).compareTo(other.is_set_num_used_workers());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_num_used_workers()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num_used_workers, typedOther.num_used_workers);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num_used_workers, other.num_used_workers);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_supervisor_id()).compareTo(typedOther.is_set_supervisor_id());
+ 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, typedOther.supervisor_id);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.supervisor_id, other.supervisor_id);
if (lastComparison != 0) {
return lastComparison;
}
@@ -558,87 +576,11 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // HOST
- if (field.type == org.apache.thrift.protocol.TType.STRING) {
- this.host = iprot.readString();
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 2: // UPTIME_SECS
- if (field.type == org.apache.thrift.protocol.TType.I32) {
- this.uptime_secs = iprot.readI32();
- set_uptime_secs_isSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 3: // NUM_WORKERS
- if (field.type == org.apache.thrift.protocol.TType.I32) {
- this.num_workers = iprot.readI32();
- set_num_workers_isSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 4: // NUM_USED_WORKERS
- if (field.type == org.apache.thrift.protocol.TType.I32) {
- this.num_used_workers = iprot.readI32();
- set_num_used_workers_isSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 5: // SUPERVISOR_ID
- if (field.type == org.apache.thrift.protocol.TType.STRING) {
- this.supervisor_id = iprot.readString();
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (this.host != null) {
- oprot.writeFieldBegin(HOST_FIELD_DESC);
- oprot.writeString(this.host);
- oprot.writeFieldEnd();
- }
- oprot.writeFieldBegin(UPTIME_SECS_FIELD_DESC);
- oprot.writeI32(this.uptime_secs);
- oprot.writeFieldEnd();
- oprot.writeFieldBegin(NUM_WORKERS_FIELD_DESC);
- oprot.writeI32(this.num_workers);
- oprot.writeFieldEnd();
- oprot.writeFieldBegin(NUM_USED_WORKERS_FIELD_DESC);
- oprot.writeI32(this.num_used_workers);
- oprot.writeFieldEnd();
- if (this.supervisor_id != null) {
- oprot.writeFieldBegin(SUPERVISOR_ID_FIELD_DESC);
- oprot.writeString(this.supervisor_id);
- oprot.writeFieldEnd();
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@Override
@@ -699,6 +641,7 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
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 {
@@ -712,12 +655,142 @@ public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSumm
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_bit_vector = new BitSet(1);
+ __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 SupervisorSummaryStandardSchemeFactory implements SchemeFactory {
+ public SupervisorSummaryStandardScheme getScheme() {
+ return new SupervisorSummaryStandardScheme();
+ }
+ }
+
+ private static class SupervisorSummaryStandardScheme extends StandardScheme<SupervisorSummary> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, SupervisorSummary 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: // HOST
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.host = iprot.readString();
+ struct.set_host_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // 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;
+ case 3: // NUM_WORKERS
+ if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ struct.num_workers = iprot.readI32();
+ struct.set_num_workers_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 4: // NUM_USED_WORKERS
+ if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ struct.num_used_workers = iprot.readI32();
+ struct.set_num_used_workers_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 5: // 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, SupervisorSummary struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.host != null) {
+ oprot.writeFieldBegin(HOST_FIELD_DESC);
+ oprot.writeString(struct.host);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldBegin(UPTIME_SECS_FIELD_DESC);
+ oprot.writeI32(struct.uptime_secs);
+ oprot.writeFieldEnd();
+ oprot.writeFieldBegin(NUM_WORKERS_FIELD_DESC);
+ oprot.writeI32(struct.num_workers);
+ oprot.writeFieldEnd();
+ oprot.writeFieldBegin(NUM_USED_WORKERS_FIELD_DESC);
+ oprot.writeI32(struct.num_used_workers);
+ oprot.writeFieldEnd();
+ 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 SupervisorSummaryTupleSchemeFactory implements SchemeFactory {
+ public SupervisorSummaryTupleScheme getScheme() {
+ return new SupervisorSummaryTupleScheme();
+ }
+ }
+
+ private static class SupervisorSummaryTupleScheme extends TupleScheme<SupervisorSummary> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, SupervisorSummary struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ oprot.writeString(struct.host);
+ oprot.writeI32(struct.uptime_secs);
+ oprot.writeI32(struct.num_workers);
+ oprot.writeI32(struct.num_used_workers);
+ oprot.writeString(struct.supervisor_id);
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, SupervisorSummary struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ struct.host = iprot.readString();
+ struct.set_host_isSet(true);
+ struct.uptime_secs = iprot.readI32();
+ struct.set_uptime_secs_isSet(true);
+ struct.num_workers = iprot.readI32();
+ struct.set_num_workers_isSet(true);
+ struct.num_used_workers = iprot.readI32();
+ struct.set_num_used_workers_isSet(true);
+ struct.supervisor_id = iprot.readString();
+ struct.set_supervisor_id_isSet(true);
+ }
+ }
+
}
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/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 2c36d4e..3a9b407 100644
--- a/storm-core/src/jvm/backtype/storm/generated/TopologyInfo.java
+++ b/storm-core/src/jvm/backtype/storm/generated/TopologyInfo.java
@@ -16,13 +16,24 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package backtype.storm.generated;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -35,10 +46,13 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, TopologyInfo._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
+public class 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");
private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -50,14 +64,20 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
private static final org.apache.thrift.protocol.TField SCHED_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("sched_status", org.apache.thrift.protocol.TType.STRING, (short)513);
private static final org.apache.thrift.protocol.TField OWNER_FIELD_DESC = new org.apache.thrift.protocol.TField("owner", org.apache.thrift.protocol.TType.STRING, (short)514);
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new TopologyInfoStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new TopologyInfoTupleSchemeFactory());
+ }
+
private String id; // required
private String name; // required
private int uptime_secs; // required
private List<ExecutorSummary> executors; // required
private String status; // required
private Map<String,List<ErrorInfo>> errors; // required
- private String sched_status; // required
- private String owner; // required
+ private String sched_status; // optional
+ private String owner; // 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 {
@@ -140,8 +160,8 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
// isset id assignments
private static final int __UPTIME_SECS_ISSET_ID = 0;
- private BitSet __isset_bit_vector = new BitSet(1);
-
+ private byte __isset_bitfield = 0;
+ private static final _Fields optionals[] = {_Fields.SCHED_STATUS,_Fields.OWNER};
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);
@@ -194,8 +214,7 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
* Performs a deep copy on <i>other</i>.
*/
public TopologyInfo(TopologyInfo other) {
- __isset_bit_vector.clear();
- __isset_bit_vector.or(other.__isset_bit_vector);
+ __isset_bitfield = other.__isset_bitfield;
if (other.is_set_id()) {
this.id = other.id;
}
@@ -204,7 +223,7 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
}
this.uptime_secs = other.uptime_secs;
if (other.is_set_executors()) {
- List<ExecutorSummary> __this__executors = new ArrayList<ExecutorSummary>();
+ List<ExecutorSummary> __this__executors = new ArrayList<ExecutorSummary>(other.executors.size());
for (ExecutorSummary other_element : other.executors) {
__this__executors.add(new ExecutorSummary(other_element));
}
@@ -214,7 +233,7 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
this.status = other.status;
}
if (other.is_set_errors()) {
- Map<String,List<ErrorInfo>> __this__errors = new HashMap<String,List<ErrorInfo>>();
+ Map<String,List<ErrorInfo>> __this__errors = new HashMap<String,List<ErrorInfo>>(other.errors.size());
for (Map.Entry<String, List<ErrorInfo>> other_element : other.errors.entrySet()) {
String other_element_key = other_element.getKey();
@@ -222,7 +241,7 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
String __this__errors_copy_key = other_element_key;
- List<ErrorInfo> __this__errors_copy_value = new ArrayList<ErrorInfo>();
+ List<ErrorInfo> __this__errors_copy_value = new ArrayList<ErrorInfo>(other_element_value.size());
for (ErrorInfo other_element_value_element : other_element_value) {
__this__errors_copy_value.add(new ErrorInfo(other_element_value_element));
}
@@ -312,16 +331,16 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
}
public void unset_uptime_secs() {
- __isset_bit_vector.clear(__UPTIME_SECS_ISSET_ID);
+ __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 __isset_bit_vector.get(__UPTIME_SECS_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
}
public void set_uptime_secs_isSet(boolean value) {
- __isset_bit_vector.set(__UPTIME_SECS_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID, value);
}
public int get_executors_size() {
@@ -681,135 +700,135 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
@Override
public int hashCode() {
- HashCodeBuilder builder = new HashCodeBuilder();
+ List<Object> list = new ArrayList<Object>();
boolean present_id = true && (is_set_id());
- builder.append(present_id);
+ list.add(present_id);
if (present_id)
- builder.append(id);
+ list.add(id);
boolean present_name = true && (is_set_name());
- builder.append(present_name);
+ list.add(present_name);
if (present_name)
- builder.append(name);
+ list.add(name);
boolean present_uptime_secs = true;
- builder.append(present_uptime_secs);
+ list.add(present_uptime_secs);
if (present_uptime_secs)
- builder.append(uptime_secs);
+ list.add(uptime_secs);
boolean present_executors = true && (is_set_executors());
- builder.append(present_executors);
+ list.add(present_executors);
if (present_executors)
- builder.append(executors);
+ list.add(executors);
boolean present_status = true && (is_set_status());
- builder.append(present_status);
+ list.add(present_status);
if (present_status)
- builder.append(status);
+ list.add(status);
boolean present_errors = true && (is_set_errors());
- builder.append(present_errors);
+ list.add(present_errors);
if (present_errors)
- builder.append(errors);
+ list.add(errors);
boolean present_sched_status = true && (is_set_sched_status());
- builder.append(present_sched_status);
+ list.add(present_sched_status);
if (present_sched_status)
- builder.append(sched_status);
+ list.add(sched_status);
boolean present_owner = true && (is_set_owner());
- builder.append(present_owner);
+ list.add(present_owner);
if (present_owner)
- builder.append(owner);
+ list.add(owner);
- return builder.toHashCode();
+ return list.hashCode();
}
+ @Override
public int compareTo(TopologyInfo other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- TopologyInfo typedOther = (TopologyInfo)other;
- lastComparison = Boolean.valueOf(is_set_id()).compareTo(typedOther.is_set_id());
+ lastComparison = Boolean.valueOf(is_set_id()).compareTo(other.is_set_id());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_id()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, typedOther.id);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, other.id);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_name()).compareTo(typedOther.is_set_name());
+ 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, typedOther.name);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, other.name);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_uptime_secs()).compareTo(typedOther.is_set_uptime_secs());
+ 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, typedOther.uptime_secs);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uptime_secs, other.uptime_secs);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_executors()).compareTo(typedOther.is_set_executors());
+ 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, typedOther.executors);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.executors, other.executors);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_status()).compareTo(typedOther.is_set_status());
+ lastComparison = Boolean.valueOf(is_set_status()).compareTo(other.is_set_status());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_status()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.status, typedOther.status);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.status, other.status);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_errors()).compareTo(typedOther.is_set_errors());
+ lastComparison = Boolean.valueOf(is_set_errors()).compareTo(other.is_set_errors());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_errors()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.errors, typedOther.errors);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.errors, other.errors);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_sched_status()).compareTo(typedOther.is_set_sched_status());
+ lastComparison = Boolean.valueOf(is_set_sched_status()).compareTo(other.is_set_sched_status());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_sched_status()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sched_status, typedOther.sched_status);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sched_status, other.sched_status);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_owner()).compareTo(typedOther.is_set_owner());
+ lastComparison = Boolean.valueOf(is_set_owner()).compareTo(other.is_set_owner());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_owner()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.owner, typedOther.owner);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.owner, other.owner);
if (lastComparison != 0) {
return lastComparison;
}
@@ -822,185 +841,11 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // ID
- if (field.type == org.apache.thrift.protocol.TType.STRING) {
- this.id = iprot.readString();
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 2: // NAME
- if (field.type == org.apache.thrift.protocol.TType.STRING) {
- this.name = iprot.readString();
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 3: // UPTIME_SECS
- if (field.type == org.apache.thrift.protocol.TType.I32) {
- this.uptime_secs = iprot.readI32();
- set_uptime_secs_isSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 4: // EXECUTORS
- if (field.type == org.apache.thrift.protocol.TType.LIST) {
- {
- org.apache.thrift.protocol.TList _list145 = iprot.readListBegin();
- this.executors = new ArrayList<ExecutorSummary>(_list145.size);
- for (int _i146 = 0; _i146 < _list145.size; ++_i146)
- {
- ExecutorSummary _elem147; // required
- _elem147 = new ExecutorSummary();
- _elem147.read(iprot);
- this.executors.add(_elem147);
- }
- iprot.readListEnd();
- }
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 5: // STATUS
- if (field.type == org.apache.thrift.protocol.TType.STRING) {
- this.status = iprot.readString();
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 6: // ERRORS
- if (field.type == org.apache.thrift.protocol.TType.MAP) {
- {
- org.apache.thrift.protocol.TMap _map148 = iprot.readMapBegin();
- this.errors = new HashMap<String,List<ErrorInfo>>(2*_map148.size);
- for (int _i149 = 0; _i149 < _map148.size; ++_i149)
- {
- String _key150; // required
- List<ErrorInfo> _val151; // required
- _key150 = iprot.readString();
- {
- org.apache.thrift.protocol.TList _list152 = iprot.readListBegin();
- _val151 = new ArrayList<ErrorInfo>(_list152.size);
- for (int _i153 = 0; _i153 < _list152.size; ++_i153)
- {
- ErrorInfo _elem154; // required
- _elem154 = new ErrorInfo();
- _elem154.read(iprot);
- _val151.add(_elem154);
- }
- iprot.readListEnd();
- }
- this.errors.put(_key150, _val151);
- }
- iprot.readMapEnd();
- }
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 513: // SCHED_STATUS
- if (field.type == org.apache.thrift.protocol.TType.STRING) {
- this.sched_status = iprot.readString();
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 514: // OWNER
- if (field.type == org.apache.thrift.protocol.TType.STRING) {
- this.owner = iprot.readString();
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (this.id != null) {
- oprot.writeFieldBegin(ID_FIELD_DESC);
- oprot.writeString(this.id);
- oprot.writeFieldEnd();
- }
- if (this.name != null) {
- oprot.writeFieldBegin(NAME_FIELD_DESC);
- oprot.writeString(this.name);
- oprot.writeFieldEnd();
- }
- oprot.writeFieldBegin(UPTIME_SECS_FIELD_DESC);
- oprot.writeI32(this.uptime_secs);
- oprot.writeFieldEnd();
- if (this.executors != null) {
- oprot.writeFieldBegin(EXECUTORS_FIELD_DESC);
- {
- oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.executors.size()));
- for (ExecutorSummary _iter155 : this.executors)
- {
- _iter155.write(oprot);
- }
- oprot.writeListEnd();
- }
- oprot.writeFieldEnd();
- }
- if (this.status != null) {
- oprot.writeFieldBegin(STATUS_FIELD_DESC);
- oprot.writeString(this.status);
- oprot.writeFieldEnd();
- }
- if (this.errors != null) {
- oprot.writeFieldBegin(ERRORS_FIELD_DESC);
- {
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, this.errors.size()));
- for (Map.Entry<String, List<ErrorInfo>> _iter156 : this.errors.entrySet())
- {
- oprot.writeString(_iter156.getKey());
- {
- oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter156.getValue().size()));
- for (ErrorInfo _iter157 : _iter156.getValue())
- {
- _iter157.write(oprot);
- }
- oprot.writeListEnd();
- }
- }
- oprot.writeMapEnd();
- }
- oprot.writeFieldEnd();
- }
- if (this.sched_status != null) {
- if (is_set_sched_status()) {
- oprot.writeFieldBegin(SCHED_STATUS_FIELD_DESC);
- oprot.writeString(this.sched_status);
- oprot.writeFieldEnd();
- }
- }
- if (this.owner != null) {
- if (is_set_owner()) {
- oprot.writeFieldBegin(OWNER_FIELD_DESC);
- oprot.writeString(this.owner);
- oprot.writeFieldEnd();
- }
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@Override
@@ -1101,6 +946,7 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
throw new org.apache.thrift.protocol.TProtocolException("Required field 'errors' is unset! Struct:" + toString());
}
+ // check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -1114,12 +960,321 @@ public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, Topol
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_bit_vector = new BitSet(1);
+ __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 TopologyInfoStandardSchemeFactory implements SchemeFactory {
+ public TopologyInfoStandardScheme getScheme() {
+ return new TopologyInfoStandardScheme();
+ }
+ }
+
+ private static class TopologyInfoStandardScheme extends StandardScheme<TopologyInfo> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, TopologyInfo 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: // ID
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.id = iprot.readString();
+ struct.set_id_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // 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 3: // 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;
+ case 4: // EXECUTORS
+ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+ {
+ org.apache.thrift.protocol.TList _list290 = iprot.readListBegin();
+ struct.executors = new ArrayList<ExecutorSummary>(_list290.size);
+ ExecutorSummary _elem291;
+ for (int _i292 = 0; _i292 < _list290.size; ++_i292)
+ {
+ _elem291 = new ExecutorSummary();
+ _elem291.read(iprot);
+ struct.executors.add(_elem291);
+ }
+ iprot.readListEnd();
+ }
+ struct.set_executors_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 5: // STATUS
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.status = iprot.readString();
+ struct.set_status_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 6: // ERRORS
+ if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+ {
+ org.apache.thrift.protocol.TMap _map293 = iprot.readMapBegin();
+ struct.errors = new HashMap<String,List<ErrorInfo>>(2*_map293.size);
+ String _key294;
+ List<ErrorInfo> _val295;
+ for (int _i296 = 0; _i296 < _map293.size; ++_i296)
+ {
+ _key294 = iprot.readString();
+ {
+ org.apache.thrift.protocol.TList _list297 = iprot.readListBegin();
+ _val295 = new ArrayList<ErrorInfo>(_list297.size);
+ ErrorInfo _elem298;
+ for (int _i299 = 0; _i299 < _list297.size; ++_i299)
+ {
+ _elem298 = new ErrorInfo();
+ _elem298.read(iprot);
+ _val295.add(_elem298);
+ }
+ iprot.readListEnd();
+ }
+ struct.errors.put(_key294, _val295);
+ }
+ iprot.readMapEnd();
+ }
+ struct.set_errors_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 513: // SCHED_STATUS
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.sched_status = iprot.readString();
+ struct.set_sched_status_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 514: // OWNER
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.owner = iprot.readString();
+ struct.set_owner_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, TopologyInfo struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.id != null) {
+ oprot.writeFieldBegin(ID_FIELD_DESC);
+ oprot.writeString(struct.id);
+ oprot.writeFieldEnd();
+ }
+ if (struct.name != null) {
+ oprot.writeFieldBegin(NAME_FIELD_DESC);
+ oprot.writeString(struct.name);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldBegin(UPTIME_SECS_FIELD_DESC);
+ oprot.writeI32(struct.uptime_secs);
+ 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 (ExecutorSummary _iter300 : struct.executors)
+ {
+ _iter300.write(oprot);
+ }
+ oprot.writeListEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ if (struct.status != null) {
+ oprot.writeFieldBegin(STATUS_FIELD_DESC);
+ oprot.writeString(struct.status);
+ oprot.writeFieldEnd();
+ }
+ if (struct.errors != null) {
+ oprot.writeFieldBegin(ERRORS_FIELD_DESC);
+ {
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, struct.errors.size()));
+ for (Map.Entry<String, List<ErrorInfo>> _iter301 : struct.errors.entrySet())
+ {
+ oprot.writeString(_iter301.getKey());
+ {
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter301.getValue().size()));
+ for (ErrorInfo _iter302 : _iter301.getValue())
+ {
+ _iter302.write(oprot);
+ }
+ oprot.writeListEnd();
+ }
+ }
+ oprot.writeMapEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ if (struct.sched_status != null) {
+ if (struct.is_set_sched_status()) {
+ oprot.writeFieldBegin(SCHED_STATUS_FIELD_DESC);
+ oprot.writeString(struct.sched_status);
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.owner != null) {
+ if (struct.is_set_owner()) {
+ oprot.writeFieldBegin(OWNER_FIELD_DESC);
+ oprot.writeString(struct.owner);
+ oprot.writeFieldEnd();
+ }
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class TopologyInfoTupleSchemeFactory implements SchemeFactory {
+ public TopologyInfoTupleScheme getScheme() {
+ return new TopologyInfoTupleScheme();
+ }
+ }
+
+ private static class TopologyInfoTupleScheme extends TupleScheme<TopologyInfo> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, TopologyInfo struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ oprot.writeString(struct.id);
+ oprot.writeString(struct.name);
+ oprot.writeI32(struct.uptime_secs);
+ {
+ oprot.writeI32(struct.executors.size());
+ for (ExecutorSummary _iter303 : struct.executors)
+ {
+ _iter303.write(oprot);
+ }
+ }
+ oprot.writeString(struct.status);
+ {
+ oprot.writeI32(struct.errors.size());
+ for (Map.Entry<String, List<ErrorInfo>> _iter304 : struct.errors.entrySet())
+ {
+ oprot.writeString(_iter304.getKey());
+ {
+ oprot.writeI32(_iter304.getValue().size());
+ for (ErrorInfo _iter305 : _iter304.getValue())
+ {
+ _iter305.write(oprot);
+ }
+ }
+ }
+ }
+ BitSet optionals = new BitSet();
+ if (struct.is_set_sched_status()) {
+ optionals.set(0);
+ }
+ if (struct.is_set_owner()) {
+ optionals.set(1);
+ }
+ oprot.writeBitSet(optionals, 2);
+ if (struct.is_set_sched_status()) {
+ oprot.writeString(struct.sched_status);
+ }
+ if (struct.is_set_owner()) {
+ oprot.writeString(struct.owner);
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, TopologyInfo struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ struct.id = iprot.readString();
+ struct.set_id_isSet(true);
+ struct.name = iprot.readString();
+ struct.set_name_isSet(true);
+ struct.uptime_secs = iprot.readI32();
+ struct.set_uptime_secs_isSet(true);
+ {
+ org.apache.thrift.protocol.TList _list306 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.executors = new ArrayList<ExecutorSummary>(_list306.size);
+ ExecutorSummary _elem307;
+ for (int _i308 = 0; _i308 < _list306.size; ++_i308)
+ {
+ _elem307 = new ExecutorSummary();
+ _elem307.read(iprot);
+ struct.executors.add(_elem307);
+ }
+ }
+ struct.set_executors_isSet(true);
+ struct.status = iprot.readString();
+ struct.set_status_isSet(true);
+ {
+ org.apache.thrift.protocol.TMap _map309 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, iprot.readI32());
+ struct.errors = new HashMap<String,List<ErrorInfo>>(2*_map309.size);
+ String _key310;
+ List<ErrorInfo> _val311;
+ for (int _i312 = 0; _i312 < _map309.size; ++_i312)
+ {
+ _key310 = iprot.readString();
+ {
+ org.apache.thrift.protocol.TList _list313 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ _val311 = new ArrayList<ErrorInfo>(_list313.size);
+ ErrorInfo _elem314;
+ for (int _i315 = 0; _i315 < _list313.size; ++_i315)
+ {
+ _elem314 = new ErrorInfo();
+ _elem314.read(iprot);
+ _val311.add(_elem314);
+ }
+ }
+ struct.errors.put(_key310, _val311);
+ }
+ }
+ struct.set_errors_isSet(true);
+ BitSet incoming = iprot.readBitSet(2);
+ if (incoming.get(0)) {
+ struct.sched_status = iprot.readString();
+ struct.set_sched_status_isSet(true);
+ }
+ if (incoming.get(1)) {
+ struct.owner = iprot.readString();
+ struct.set_owner_isSet(true);
+ }
+ }
+ }
+
}
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/storm-core/src/jvm/backtype/storm/generated/TopologyInitialStatus.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/TopologyInitialStatus.java b/storm-core/src/jvm/backtype/storm/generated/TopologyInitialStatus.java
index 3936b08..a8d6c9e 100644
--- a/storm-core/src/jvm/backtype/storm/generated/TopologyInitialStatus.java
+++ b/storm-core/src/jvm/backtype/storm/generated/TopologyInitialStatus.java
@@ -16,9 +16,10 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package backtype.storm.generated;
[13/18] storm git commit: Upgrade to thrift-0.9.2
Posted by kn...@apache.org.
Upgrade to thrift-0.9.2
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ef51dbee
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ef51dbee
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ef51dbee
Branch: refs/heads/master
Commit: ef51dbeeb1a5a748deb7ee4f399ef430df443525
Parents: a115c9d
Author: Kishor Patil <kp...@yahoo-inc.com>
Authored: Mon Feb 2 23:44:30 2015 +0000
Committer: Kishor Patil <kp...@yahoo-inc.com>
Committed: Mon Feb 2 23:44:30 2015 +0000
----------------------------------------------------------------------
pom.xml | 2 +-
storm-core/pom.xml | 2 +-
.../storm/drpc/DRPCInvocationsClient.java | 6 +
.../src/jvm/backtype/storm/drpc/DRPCSpout.java | 14 +-
.../jvm/backtype/storm/drpc/ReturnResults.java | 8 +-
.../storm/generated/AlreadyAliveException.java | 149 +-
.../storm/generated/AuthorizationException.java | 149 +-
.../src/jvm/backtype/storm/generated/Bolt.java | 194 +-
.../jvm/backtype/storm/generated/BoltStats.java | 908 +-
.../storm/generated/ClusterSummary.java | 339 +-
.../storm/generated/ComponentCommon.java | 426 +-
.../storm/generated/ComponentObject.java | 86 +-
.../backtype/storm/generated/Credentials.java | 220 +-
.../storm/generated/DRPCExecutionException.java | 149 +-
.../backtype/storm/generated/DRPCRequest.java | 185 +-
.../storm/generated/DistributedRPC.java | 529 +-
.../generated/DistributedRPCInvocations.java | 1199 ++-
.../jvm/backtype/storm/generated/ErrorInfo.java | 300 +-
.../backtype/storm/generated/ExecutorInfo.java | 198 +-
.../storm/generated/ExecutorSpecificStats.java | 72 +-
.../backtype/storm/generated/ExecutorStats.java | 486 +-
.../storm/generated/ExecutorSummary.java | 371 +-
.../storm/generated/GlobalStreamId.java | 185 +-
.../jvm/backtype/storm/generated/Grouping.java | 163 +-
.../generated/InvalidTopologyException.java | 149 +-
.../backtype/storm/generated/JavaObject.java | 239 +-
.../backtype/storm/generated/JavaObjectArg.java | 108 +-
.../backtype/storm/generated/KillOptions.java | 176 +-
.../jvm/backtype/storm/generated/Nimbus.java | 8540 +++++++++++++-----
.../storm/generated/NotAliveException.java | 149 +-
.../backtype/storm/generated/NullStruct.java | 112 +-
.../storm/generated/RebalanceOptions.java | 348 +-
.../storm/generated/ShellComponent.java | 202 +-
.../jvm/backtype/storm/generated/SpoutSpec.java | 194 +-
.../backtype/storm/generated/SpoutStats.java | 614 +-
.../storm/generated/StateSpoutSpec.java | 194 +-
.../backtype/storm/generated/StormTopology.java | 410 +-
.../backtype/storm/generated/StreamInfo.java | 249 +-
.../backtype/storm/generated/SubmitOptions.java | 208 +-
.../storm/generated/SupervisorSummary.java | 309 +-
.../backtype/storm/generated/TopologyInfo.java | 609 +-
.../storm/generated/TopologyInitialStatus.java | 3 +-
.../storm/generated/TopologySummary.java | 486 +-
.../security/auth/SimpleTransportPlugin.java | 2 +-
.../trident/drpc/ReturnResultsReducer.java | 4 +-
storm-core/src/py/storm/DistributedRPC-remote | 35 +-
storm-core/src/py/storm/DistributedRPC.py | 38 +-
.../py/storm/DistributedRPCInvocations-remote | 43 +-
.../src/py/storm/DistributedRPCInvocations.py | 95 +-
storm-core/src/py/storm/Nimbus-remote | 107 +-
storm-core/src/py/storm/Nimbus.py | 608 +-
storm-core/src/py/storm/constants.py | 6 +-
storm-core/src/py/storm/ttypes.py | 412 +-
.../backtype/storm/security/auth/auth_test.clj | 4 +-
54 files changed, 14557 insertions(+), 6436 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b0ca857..09e8d81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -518,7 +518,7 @@
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
- <version>0.7.0</version>
+ <version>0.9.2</version>
<scope>compile</scope>
</dependency>
<!-- used by examples/storm-starter -->
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/storm-core/pom.xml
----------------------------------------------------------------------
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index 9f3ed49..a05e3d4 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -133,7 +133,7 @@
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
- <version>0.7.0</version>
+ <version>0.9.2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/storm-core/src/jvm/backtype/storm/drpc/DRPCInvocationsClient.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/drpc/DRPCInvocationsClient.java b/storm-core/src/jvm/backtype/storm/drpc/DRPCInvocationsClient.java
index 987cde0..624db3e 100644
--- a/storm-core/src/jvm/backtype/storm/drpc/DRPCInvocationsClient.java
+++ b/storm-core/src/jvm/backtype/storm/drpc/DRPCInvocationsClient.java
@@ -70,6 +70,8 @@ public class DRPCInvocationsClient extends ThriftClient implements DistributedRP
throw new TException("Client is not connected...");
}
c.result(id, result);
+ } catch(AuthorizationException aze) {
+ throw aze;
} catch(TException e) {
client.compareAndSet(c, null);
throw e;
@@ -83,6 +85,8 @@ public class DRPCInvocationsClient extends ThriftClient implements DistributedRP
throw new TException("Client is not connected...");
}
return c.fetchRequest(func);
+ } catch(AuthorizationException aze) {
+ throw aze;
} catch(TException e) {
client.compareAndSet(c, null);
throw e;
@@ -96,6 +100,8 @@ public class DRPCInvocationsClient extends ThriftClient implements DistributedRP
throw new TException("Client is not connected...");
}
c.failRequest(id);
+ } catch(AuthorizationException aze) {
+ throw aze;
} catch(TException e) {
client.compareAndSet(c, null);
throw e;
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/storm-core/src/jvm/backtype/storm/drpc/DRPCSpout.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/drpc/DRPCSpout.java b/storm-core/src/jvm/backtype/storm/drpc/DRPCSpout.java
index 82fd6cd..cbfb310 100644
--- a/storm-core/src/jvm/backtype/storm/drpc/DRPCSpout.java
+++ b/storm-core/src/jvm/backtype/storm/drpc/DRPCSpout.java
@@ -187,12 +187,12 @@ public class DRPCSpout extends BaseRichSpout {
_collector.emit(new Values(req.get_func_args(), JSONValue.toJSONString(returnInfo)), new DRPCMessageId(req.get_request_id(), i));
break;
}
- } catch (TException e) {
- reconnect(client);
- LOG.error("Failed to fetch DRPC result from DRPC server", e);
} catch (AuthorizationException aze) {
reconnect(client);
LOG.error("Not authorized to fetch DRPC result from DRPC server", aze);
+ } catch (TException e) {
+ reconnect(client);
+ LOG.error("Failed to fetch DRPC result from DRPC server", e);
} catch (Exception e) {
LOG.error("Failed to fetch DRPC result from DRPC server", e);
}
@@ -211,10 +211,10 @@ public class DRPCSpout extends BaseRichSpout {
gotRequest = true;
_collector.emit(new Values(req.get_func_args(), JSONValue.toJSONString(returnInfo)), new DRPCMessageId(req.get_request_id(), 0));
}
- } catch (TException e) {
- throw new RuntimeException(e);
} catch (AuthorizationException aze) {
throw new RuntimeException(aze);
+ } catch (TException e) {
+ throw new RuntimeException(e);
}
}
}
@@ -239,10 +239,10 @@ public class DRPCSpout extends BaseRichSpout {
}
try {
client.failRequest(did.id);
- } catch (TException e) {
- LOG.error("Failed to fail request", e);
} catch (AuthorizationException aze) {
LOG.error("Not authorized to failREquest from DRPC server", aze);
+ } catch (TException e) {
+ LOG.error("Failed to fail request", e);
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/storm-core/src/jvm/backtype/storm/drpc/ReturnResults.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/drpc/ReturnResults.java b/storm-core/src/jvm/backtype/storm/drpc/ReturnResults.java
index 3d50679..b26508d 100644
--- a/storm-core/src/jvm/backtype/storm/drpc/ReturnResults.java
+++ b/storm-core/src/jvm/backtype/storm/drpc/ReturnResults.java
@@ -86,8 +86,8 @@ public class ReturnResults extends BaseRichBolt {
try {
client.result(id, result);
_collector.ack(input);
- } catch(TException e) {
- LOG.error("Failed to return results to DRPC server", e);
+ } catch (AuthorizationException aze) {
+ LOG.error("Not authorized to return results to DRPC server", aze);
_collector.fail(input);
if (client instanceof DRPCInvocationsClient) {
try {
@@ -97,8 +97,8 @@ public class ReturnResults extends BaseRichBolt {
throw new RuntimeException(e2);
}
}
- } catch (AuthorizationException aze) {
- LOG.error("Not authorized to return results to DRPC server", aze);
+ } catch(TException e) {
+ LOG.error("Failed to return results to DRPC server", e);
_collector.fail(input);
if (client instanceof DRPCInvocationsClient) {
try {
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/storm-core/src/jvm/backtype/storm/generated/AlreadyAliveException.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/AlreadyAliveException.java b/storm-core/src/jvm/backtype/storm/generated/AlreadyAliveException.java
index a2672c8..619f944 100644
--- a/storm-core/src/jvm/backtype/storm/generated/AlreadyAliveException.java
+++ b/storm-core/src/jvm/backtype/storm/generated/AlreadyAliveException.java
@@ -16,13 +16,24 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package backtype.storm.generated;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -35,14 +46,23 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class AlreadyAliveException extends Exception implements org.apache.thrift.TBase<AlreadyAliveException, AlreadyAliveException._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
+public class AlreadyAliveException extends TException implements org.apache.thrift.TBase<AlreadyAliveException, AlreadyAliveException._Fields>, java.io.Serializable, Cloneable, Comparable<AlreadyAliveException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AlreadyAliveException");
private static final org.apache.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.thrift.protocol.TField("msg", org.apache.thrift.protocol.TType.STRING, (short)1);
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new AlreadyAliveExceptionStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new AlreadyAliveExceptionTupleSchemeFactory());
+ }
+
private String msg; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -104,7 +124,6 @@ public class AlreadyAliveException extends Exception implements org.apache.thrif
}
// isset id assignments
-
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -227,30 +246,30 @@ public class AlreadyAliveException extends Exception implements org.apache.thrif
@Override
public int hashCode() {
- HashCodeBuilder builder = new HashCodeBuilder();
+ List<Object> list = new ArrayList<Object>();
boolean present_msg = true && (is_set_msg());
- builder.append(present_msg);
+ list.add(present_msg);
if (present_msg)
- builder.append(msg);
+ list.add(msg);
- return builder.toHashCode();
+ return list.hashCode();
}
+ @Override
public int compareTo(AlreadyAliveException other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- AlreadyAliveException typedOther = (AlreadyAliveException)other;
- lastComparison = Boolean.valueOf(is_set_msg()).compareTo(typedOther.is_set_msg());
+ lastComparison = Boolean.valueOf(is_set_msg()).compareTo(other.is_set_msg());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_msg()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.msg, typedOther.msg);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.msg, other.msg);
if (lastComparison != 0) {
return lastComparison;
}
@@ -263,42 +282,11 @@ public class AlreadyAliveException extends Exception implements org.apache.thrif
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // MSG
- if (field.type == org.apache.thrift.protocol.TType.STRING) {
- this.msg = iprot.readString();
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (this.msg != null) {
- oprot.writeFieldBegin(MSG_FIELD_DESC);
- oprot.writeString(this.msg);
- oprot.writeFieldEnd();
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@Override
@@ -323,6 +311,7 @@ public class AlreadyAliveException extends Exception implements org.apache.thrif
throw new org.apache.thrift.protocol.TProtocolException("Required field 'msg' is unset! Struct:" + toString());
}
+ // check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -341,5 +330,77 @@ public class AlreadyAliveException extends Exception implements org.apache.thrif
}
}
+ private static class AlreadyAliveExceptionStandardSchemeFactory implements SchemeFactory {
+ public AlreadyAliveExceptionStandardScheme getScheme() {
+ return new AlreadyAliveExceptionStandardScheme();
+ }
+ }
+
+ private static class AlreadyAliveExceptionStandardScheme extends StandardScheme<AlreadyAliveException> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, AlreadyAliveException struct) throws org.apache.thrift.TException {
+ org.apache.thrift.protocol.TField schemeField;
+ iprot.readStructBegin();
+ while (true)
+ {
+ schemeField = iprot.readFieldBegin();
+ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ break;
+ }
+ switch (schemeField.id) {
+ case 1: // MSG
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.msg = iprot.readString();
+ struct.set_msg_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ default:
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ iprot.readFieldEnd();
+ }
+ iprot.readStructEnd();
+ struct.validate();
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot, AlreadyAliveException struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.msg != null) {
+ oprot.writeFieldBegin(MSG_FIELD_DESC);
+ oprot.writeString(struct.msg);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class AlreadyAliveExceptionTupleSchemeFactory implements SchemeFactory {
+ public AlreadyAliveExceptionTupleScheme getScheme() {
+ return new AlreadyAliveExceptionTupleScheme();
+ }
+ }
+
+ private static class AlreadyAliveExceptionTupleScheme extends TupleScheme<AlreadyAliveException> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, AlreadyAliveException struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ oprot.writeString(struct.msg);
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, AlreadyAliveException struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ struct.msg = iprot.readString();
+ struct.set_msg_isSet(true);
+ }
+ }
+
}
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/storm-core/src/jvm/backtype/storm/generated/AuthorizationException.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/AuthorizationException.java b/storm-core/src/jvm/backtype/storm/generated/AuthorizationException.java
index 6f0218e..33fd26b 100644
--- a/storm-core/src/jvm/backtype/storm/generated/AuthorizationException.java
+++ b/storm-core/src/jvm/backtype/storm/generated/AuthorizationException.java
@@ -16,13 +16,24 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package backtype.storm.generated;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -35,14 +46,23 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class AuthorizationException extends Exception implements org.apache.thrift.TBase<AuthorizationException, AuthorizationException._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
+public class AuthorizationException extends TException implements org.apache.thrift.TBase<AuthorizationException, AuthorizationException._Fields>, java.io.Serializable, Cloneable, Comparable<AuthorizationException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AuthorizationException");
private static final org.apache.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.thrift.protocol.TField("msg", org.apache.thrift.protocol.TType.STRING, (short)1);
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new AuthorizationExceptionStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new AuthorizationExceptionTupleSchemeFactory());
+ }
+
private String msg; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -104,7 +124,6 @@ public class AuthorizationException extends Exception implements org.apache.thri
}
// isset id assignments
-
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -227,30 +246,30 @@ public class AuthorizationException extends Exception implements org.apache.thri
@Override
public int hashCode() {
- HashCodeBuilder builder = new HashCodeBuilder();
+ List<Object> list = new ArrayList<Object>();
boolean present_msg = true && (is_set_msg());
- builder.append(present_msg);
+ list.add(present_msg);
if (present_msg)
- builder.append(msg);
+ list.add(msg);
- return builder.toHashCode();
+ return list.hashCode();
}
+ @Override
public int compareTo(AuthorizationException other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- AuthorizationException typedOther = (AuthorizationException)other;
- lastComparison = Boolean.valueOf(is_set_msg()).compareTo(typedOther.is_set_msg());
+ lastComparison = Boolean.valueOf(is_set_msg()).compareTo(other.is_set_msg());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_msg()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.msg, typedOther.msg);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.msg, other.msg);
if (lastComparison != 0) {
return lastComparison;
}
@@ -263,42 +282,11 @@ public class AuthorizationException extends Exception implements org.apache.thri
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // MSG
- if (field.type == org.apache.thrift.protocol.TType.STRING) {
- this.msg = iprot.readString();
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (this.msg != null) {
- oprot.writeFieldBegin(MSG_FIELD_DESC);
- oprot.writeString(this.msg);
- oprot.writeFieldEnd();
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@Override
@@ -323,6 +311,7 @@ public class AuthorizationException extends Exception implements org.apache.thri
throw new org.apache.thrift.protocol.TProtocolException("Required field 'msg' is unset! Struct:" + toString());
}
+ // check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -341,5 +330,77 @@ public class AuthorizationException extends Exception implements org.apache.thri
}
}
+ private static class AuthorizationExceptionStandardSchemeFactory implements SchemeFactory {
+ public AuthorizationExceptionStandardScheme getScheme() {
+ return new AuthorizationExceptionStandardScheme();
+ }
+ }
+
+ private static class AuthorizationExceptionStandardScheme extends StandardScheme<AuthorizationException> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, AuthorizationException struct) throws org.apache.thrift.TException {
+ org.apache.thrift.protocol.TField schemeField;
+ iprot.readStructBegin();
+ while (true)
+ {
+ schemeField = iprot.readFieldBegin();
+ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ break;
+ }
+ switch (schemeField.id) {
+ case 1: // MSG
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.msg = iprot.readString();
+ struct.set_msg_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ default:
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ iprot.readFieldEnd();
+ }
+ iprot.readStructEnd();
+ struct.validate();
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot, AuthorizationException struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.msg != null) {
+ oprot.writeFieldBegin(MSG_FIELD_DESC);
+ oprot.writeString(struct.msg);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class AuthorizationExceptionTupleSchemeFactory implements SchemeFactory {
+ public AuthorizationExceptionTupleScheme getScheme() {
+ return new AuthorizationExceptionTupleScheme();
+ }
+ }
+
+ private static class AuthorizationExceptionTupleScheme extends TupleScheme<AuthorizationException> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, AuthorizationException struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ oprot.writeString(struct.msg);
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, AuthorizationException struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ struct.msg = iprot.readString();
+ struct.set_msg_isSet(true);
+ }
+ }
+
}
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/storm-core/src/jvm/backtype/storm/generated/Bolt.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/Bolt.java b/storm-core/src/jvm/backtype/storm/generated/Bolt.java
index 63c7147..cd65ccd 100644
--- a/storm-core/src/jvm/backtype/storm/generated/Bolt.java
+++ b/storm-core/src/jvm/backtype/storm/generated/Bolt.java
@@ -16,13 +16,24 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package backtype.storm.generated;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -35,15 +46,24 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class Bolt implements org.apache.thrift.TBase<Bolt, Bolt._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
+public class Bolt implements org.apache.thrift.TBase<Bolt, Bolt._Fields>, java.io.Serializable, Cloneable, Comparable<Bolt> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Bolt");
private static final org.apache.thrift.protocol.TField BOLT_OBJECT_FIELD_DESC = new org.apache.thrift.protocol.TField("bolt_object", org.apache.thrift.protocol.TType.STRUCT, (short)1);
private static final org.apache.thrift.protocol.TField COMMON_FIELD_DESC = new org.apache.thrift.protocol.TField("common", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new BoltStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new BoltTupleSchemeFactory());
+ }
+
private ComponentObject bolt_object; // required
private ComponentCommon common; // required
@@ -109,7 +129,6 @@ public class Bolt implements org.apache.thrift.TBase<Bolt, Bolt._Fields>, java.i
}
// isset id assignments
-
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -285,45 +304,45 @@ public class Bolt implements org.apache.thrift.TBase<Bolt, Bolt._Fields>, java.i
@Override
public int hashCode() {
- HashCodeBuilder builder = new HashCodeBuilder();
+ List<Object> list = new ArrayList<Object>();
boolean present_bolt_object = true && (is_set_bolt_object());
- builder.append(present_bolt_object);
+ list.add(present_bolt_object);
if (present_bolt_object)
- builder.append(bolt_object);
+ list.add(bolt_object);
boolean present_common = true && (is_set_common());
- builder.append(present_common);
+ list.add(present_common);
if (present_common)
- builder.append(common);
+ list.add(common);
- return builder.toHashCode();
+ return list.hashCode();
}
+ @Override
public int compareTo(Bolt other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- Bolt typedOther = (Bolt)other;
- lastComparison = Boolean.valueOf(is_set_bolt_object()).compareTo(typedOther.is_set_bolt_object());
+ lastComparison = Boolean.valueOf(is_set_bolt_object()).compareTo(other.is_set_bolt_object());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_bolt_object()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.bolt_object, typedOther.bolt_object);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.bolt_object, other.bolt_object);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_common()).compareTo(typedOther.is_set_common());
+ lastComparison = Boolean.valueOf(is_set_common()).compareTo(other.is_set_common());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_common()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.common, typedOther.common);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.common, other.common);
if (lastComparison != 0) {
return lastComparison;
}
@@ -336,56 +355,11 @@ public class Bolt implements org.apache.thrift.TBase<Bolt, Bolt._Fields>, java.i
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // BOLT_OBJECT
- if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
- this.bolt_object = new ComponentObject();
- this.bolt_object.read(iprot);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 2: // COMMON
- if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
- this.common = new ComponentCommon();
- this.common.read(iprot);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (this.bolt_object != null) {
- oprot.writeFieldBegin(BOLT_OBJECT_FIELD_DESC);
- this.bolt_object.write(oprot);
- oprot.writeFieldEnd();
- }
- if (this.common != null) {
- oprot.writeFieldBegin(COMMON_FIELD_DESC);
- this.common.write(oprot);
- oprot.writeFieldEnd();
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@Override
@@ -422,6 +396,10 @@ public class Bolt implements org.apache.thrift.TBase<Bolt, Bolt._Fields>, java.i
throw new org.apache.thrift.protocol.TProtocolException("Required field 'common' is unset! Struct:" + toString());
}
+ // check for sub-struct validity
+ if (common != null) {
+ common.validate();
+ }
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -440,5 +418,97 @@ public class Bolt implements org.apache.thrift.TBase<Bolt, Bolt._Fields>, java.i
}
}
+ private static class BoltStandardSchemeFactory implements SchemeFactory {
+ public BoltStandardScheme getScheme() {
+ return new BoltStandardScheme();
+ }
+ }
+
+ private static class BoltStandardScheme extends StandardScheme<Bolt> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, Bolt struct) throws org.apache.thrift.TException {
+ org.apache.thrift.protocol.TField schemeField;
+ iprot.readStructBegin();
+ while (true)
+ {
+ schemeField = iprot.readFieldBegin();
+ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ break;
+ }
+ switch (schemeField.id) {
+ case 1: // BOLT_OBJECT
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+ struct.bolt_object = new ComponentObject();
+ struct.bolt_object.read(iprot);
+ struct.set_bolt_object_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // COMMON
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+ struct.common = new ComponentCommon();
+ struct.common.read(iprot);
+ struct.set_common_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ default:
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ iprot.readFieldEnd();
+ }
+ iprot.readStructEnd();
+ struct.validate();
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot, Bolt struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.bolt_object != null) {
+ oprot.writeFieldBegin(BOLT_OBJECT_FIELD_DESC);
+ struct.bolt_object.write(oprot);
+ oprot.writeFieldEnd();
+ }
+ if (struct.common != null) {
+ oprot.writeFieldBegin(COMMON_FIELD_DESC);
+ struct.common.write(oprot);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class BoltTupleSchemeFactory implements SchemeFactory {
+ public BoltTupleScheme getScheme() {
+ return new BoltTupleScheme();
+ }
+ }
+
+ private static class BoltTupleScheme extends TupleScheme<Bolt> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, Bolt struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ struct.bolt_object.write(oprot);
+ struct.common.write(oprot);
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, Bolt struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ struct.bolt_object = new ComponentObject();
+ struct.bolt_object.read(iprot);
+ struct.set_bolt_object_isSet(true);
+ struct.common = new ComponentCommon();
+ struct.common.read(iprot);
+ struct.set_common_isSet(true);
+ }
+ }
+
}
[02/18] storm git commit: Upgrade to thrift-0.9.2
Posted by kn...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/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 fea2137..d129889 100644
--- a/storm-core/src/jvm/backtype/storm/generated/TopologySummary.java
+++ b/storm-core/src/jvm/backtype/storm/generated/TopologySummary.java
@@ -16,13 +16,24 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package backtype.storm.generated;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -35,10 +46,13 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class TopologySummary implements org.apache.thrift.TBase<TopologySummary, TopologySummary._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
+public class 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");
private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -51,6 +65,12 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
private static final org.apache.thrift.protocol.TField SCHED_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("sched_status", org.apache.thrift.protocol.TType.STRING, (short)513);
private static final org.apache.thrift.protocol.TField OWNER_FIELD_DESC = new org.apache.thrift.protocol.TField("owner", org.apache.thrift.protocol.TType.STRING, (short)514);
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new TopologySummaryStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new TopologySummaryTupleSchemeFactory());
+ }
+
private String id; // required
private String name; // required
private int num_tasks; // required
@@ -58,8 +78,8 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
private int num_workers; // required
private int uptime_secs; // required
private String status; // required
- private String sched_status; // required
- private String owner; // required
+ private String sched_status; // optional
+ private String owner; // 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 {
@@ -148,8 +168,8 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
private static final int __NUM_EXECUTORS_ISSET_ID = 1;
private static final int __NUM_WORKERS_ISSET_ID = 2;
private static final int __UPTIME_SECS_ISSET_ID = 3;
- private BitSet __isset_bit_vector = new BitSet(4);
-
+ private byte __isset_bitfield = 0;
+ private static final _Fields optionals[] = {_Fields.SCHED_STATUS,_Fields.OWNER};
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);
@@ -205,8 +225,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
* Performs a deep copy on <i>other</i>.
*/
public TopologySummary(TopologySummary other) {
- __isset_bit_vector.clear();
- __isset_bit_vector.or(other.__isset_bit_vector);
+ __isset_bitfield = other.__isset_bitfield;
if (other.is_set_id()) {
this.id = other.id;
}
@@ -305,16 +324,16 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
}
public void unset_num_tasks() {
- __isset_bit_vector.clear(__NUM_TASKS_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __NUM_TASKS_ISSET_ID);
}
/** Returns true if field num_tasks is set (has been assigned a value) and false otherwise */
public boolean is_set_num_tasks() {
- return __isset_bit_vector.get(__NUM_TASKS_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __NUM_TASKS_ISSET_ID);
}
public void set_num_tasks_isSet(boolean value) {
- __isset_bit_vector.set(__NUM_TASKS_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NUM_TASKS_ISSET_ID, value);
}
public int get_num_executors() {
@@ -327,16 +346,16 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
}
public void unset_num_executors() {
- __isset_bit_vector.clear(__NUM_EXECUTORS_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID);
}
/** Returns true if field num_executors is set (has been assigned a value) and false otherwise */
public boolean is_set_num_executors() {
- return __isset_bit_vector.get(__NUM_EXECUTORS_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID);
}
public void set_num_executors_isSet(boolean value) {
- __isset_bit_vector.set(__NUM_EXECUTORS_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NUM_EXECUTORS_ISSET_ID, value);
}
public int get_num_workers() {
@@ -349,16 +368,16 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
}
public void unset_num_workers() {
- __isset_bit_vector.clear(__NUM_WORKERS_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID);
}
/** Returns true if field num_workers is set (has been assigned a value) and false otherwise */
public boolean is_set_num_workers() {
- return __isset_bit_vector.get(__NUM_WORKERS_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID);
}
public void set_num_workers_isSet(boolean value) {
- __isset_bit_vector.set(__NUM_WORKERS_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NUM_WORKERS_ISSET_ID, value);
}
public int get_uptime_secs() {
@@ -371,16 +390,16 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
}
public void unset_uptime_secs() {
- __isset_bit_vector.clear(__UPTIME_SECS_ISSET_ID);
+ __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 __isset_bit_vector.get(__UPTIME_SECS_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
}
public void set_uptime_secs_isSet(boolean value) {
- __isset_bit_vector.set(__UPTIME_SECS_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID, value);
}
public String get_status() {
@@ -690,150 +709,150 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
@Override
public int hashCode() {
- HashCodeBuilder builder = new HashCodeBuilder();
+ List<Object> list = new ArrayList<Object>();
boolean present_id = true && (is_set_id());
- builder.append(present_id);
+ list.add(present_id);
if (present_id)
- builder.append(id);
+ list.add(id);
boolean present_name = true && (is_set_name());
- builder.append(present_name);
+ list.add(present_name);
if (present_name)
- builder.append(name);
+ list.add(name);
boolean present_num_tasks = true;
- builder.append(present_num_tasks);
+ list.add(present_num_tasks);
if (present_num_tasks)
- builder.append(num_tasks);
+ list.add(num_tasks);
boolean present_num_executors = true;
- builder.append(present_num_executors);
+ list.add(present_num_executors);
if (present_num_executors)
- builder.append(num_executors);
+ list.add(num_executors);
boolean present_num_workers = true;
- builder.append(present_num_workers);
+ list.add(present_num_workers);
if (present_num_workers)
- builder.append(num_workers);
+ list.add(num_workers);
boolean present_uptime_secs = true;
- builder.append(present_uptime_secs);
+ list.add(present_uptime_secs);
if (present_uptime_secs)
- builder.append(uptime_secs);
+ list.add(uptime_secs);
boolean present_status = true && (is_set_status());
- builder.append(present_status);
+ list.add(present_status);
if (present_status)
- builder.append(status);
+ list.add(status);
boolean present_sched_status = true && (is_set_sched_status());
- builder.append(present_sched_status);
+ list.add(present_sched_status);
if (present_sched_status)
- builder.append(sched_status);
+ list.add(sched_status);
boolean present_owner = true && (is_set_owner());
- builder.append(present_owner);
+ list.add(present_owner);
if (present_owner)
- builder.append(owner);
+ list.add(owner);
- return builder.toHashCode();
+ return list.hashCode();
}
+ @Override
public int compareTo(TopologySummary other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- TopologySummary typedOther = (TopologySummary)other;
- lastComparison = Boolean.valueOf(is_set_id()).compareTo(typedOther.is_set_id());
+ lastComparison = Boolean.valueOf(is_set_id()).compareTo(other.is_set_id());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_id()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, typedOther.id);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, other.id);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_name()).compareTo(typedOther.is_set_name());
+ 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, typedOther.name);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, other.name);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_num_tasks()).compareTo(typedOther.is_set_num_tasks());
+ lastComparison = Boolean.valueOf(is_set_num_tasks()).compareTo(other.is_set_num_tasks());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_num_tasks()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num_tasks, typedOther.num_tasks);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num_tasks, other.num_tasks);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_num_executors()).compareTo(typedOther.is_set_num_executors());
+ lastComparison = Boolean.valueOf(is_set_num_executors()).compareTo(other.is_set_num_executors());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_num_executors()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num_executors, typedOther.num_executors);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num_executors, other.num_executors);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_num_workers()).compareTo(typedOther.is_set_num_workers());
+ lastComparison = Boolean.valueOf(is_set_num_workers()).compareTo(other.is_set_num_workers());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_num_workers()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num_workers, typedOther.num_workers);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num_workers, other.num_workers);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_uptime_secs()).compareTo(typedOther.is_set_uptime_secs());
+ 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, typedOther.uptime_secs);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uptime_secs, other.uptime_secs);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_status()).compareTo(typedOther.is_set_status());
+ lastComparison = Boolean.valueOf(is_set_status()).compareTo(other.is_set_status());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_status()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.status, typedOther.status);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.status, other.status);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_sched_status()).compareTo(typedOther.is_set_sched_status());
+ lastComparison = Boolean.valueOf(is_set_sched_status()).compareTo(other.is_set_sched_status());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_sched_status()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sched_status, typedOther.sched_status);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sched_status, other.sched_status);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_owner()).compareTo(typedOther.is_set_owner());
+ lastComparison = Boolean.valueOf(is_set_owner()).compareTo(other.is_set_owner());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_owner()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.owner, typedOther.owner);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.owner, other.owner);
if (lastComparison != 0) {
return lastComparison;
}
@@ -846,138 +865,11 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // ID
- if (field.type == org.apache.thrift.protocol.TType.STRING) {
- this.id = iprot.readString();
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 2: // NAME
- if (field.type == org.apache.thrift.protocol.TType.STRING) {
- this.name = iprot.readString();
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 3: // NUM_TASKS
- if (field.type == org.apache.thrift.protocol.TType.I32) {
- this.num_tasks = iprot.readI32();
- set_num_tasks_isSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 4: // NUM_EXECUTORS
- if (field.type == org.apache.thrift.protocol.TType.I32) {
- this.num_executors = iprot.readI32();
- set_num_executors_isSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 5: // NUM_WORKERS
- if (field.type == org.apache.thrift.protocol.TType.I32) {
- this.num_workers = iprot.readI32();
- set_num_workers_isSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 6: // UPTIME_SECS
- if (field.type == org.apache.thrift.protocol.TType.I32) {
- this.uptime_secs = iprot.readI32();
- set_uptime_secs_isSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 7: // STATUS
- if (field.type == org.apache.thrift.protocol.TType.STRING) {
- this.status = iprot.readString();
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 513: // SCHED_STATUS
- if (field.type == org.apache.thrift.protocol.TType.STRING) {
- this.sched_status = iprot.readString();
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 514: // OWNER
- if (field.type == org.apache.thrift.protocol.TType.STRING) {
- this.owner = iprot.readString();
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (this.id != null) {
- oprot.writeFieldBegin(ID_FIELD_DESC);
- oprot.writeString(this.id);
- oprot.writeFieldEnd();
- }
- if (this.name != null) {
- oprot.writeFieldBegin(NAME_FIELD_DESC);
- oprot.writeString(this.name);
- oprot.writeFieldEnd();
- }
- oprot.writeFieldBegin(NUM_TASKS_FIELD_DESC);
- oprot.writeI32(this.num_tasks);
- oprot.writeFieldEnd();
- oprot.writeFieldBegin(NUM_EXECUTORS_FIELD_DESC);
- oprot.writeI32(this.num_executors);
- oprot.writeFieldEnd();
- oprot.writeFieldBegin(NUM_WORKERS_FIELD_DESC);
- oprot.writeI32(this.num_workers);
- oprot.writeFieldEnd();
- oprot.writeFieldBegin(UPTIME_SECS_FIELD_DESC);
- oprot.writeI32(this.uptime_secs);
- oprot.writeFieldEnd();
- if (this.status != null) {
- oprot.writeFieldBegin(STATUS_FIELD_DESC);
- oprot.writeString(this.status);
- oprot.writeFieldEnd();
- }
- if (this.sched_status != null) {
- if (is_set_sched_status()) {
- oprot.writeFieldBegin(SCHED_STATUS_FIELD_DESC);
- oprot.writeString(this.sched_status);
- oprot.writeFieldEnd();
- }
- }
- if (this.owner != null) {
- if (is_set_owner()) {
- oprot.writeFieldBegin(OWNER_FIELD_DESC);
- oprot.writeString(this.owner);
- oprot.writeFieldEnd();
- }
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@Override
@@ -1078,6 +970,7 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
throw new org.apache.thrift.protocol.TProtocolException("Required field 'status' is unset! Struct:" + toString());
}
+ // check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -1091,12 +984,225 @@ public class TopologySummary implements org.apache.thrift.TBase<TopologySummary,
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_bit_vector = new BitSet(1);
+ __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 TopologySummaryStandardSchemeFactory implements SchemeFactory {
+ public TopologySummaryStandardScheme getScheme() {
+ return new TopologySummaryStandardScheme();
+ }
+ }
+
+ private static class TopologySummaryStandardScheme extends StandardScheme<TopologySummary> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, TopologySummary 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: // ID
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.id = iprot.readString();
+ struct.set_id_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // 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 3: // NUM_TASKS
+ if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ struct.num_tasks = iprot.readI32();
+ struct.set_num_tasks_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 4: // NUM_EXECUTORS
+ if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ struct.num_executors = iprot.readI32();
+ struct.set_num_executors_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 5: // NUM_WORKERS
+ if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ struct.num_workers = iprot.readI32();
+ struct.set_num_workers_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 6: // 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;
+ case 7: // STATUS
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.status = iprot.readString();
+ struct.set_status_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 513: // SCHED_STATUS
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.sched_status = iprot.readString();
+ struct.set_sched_status_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 514: // OWNER
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.owner = iprot.readString();
+ struct.set_owner_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, TopologySummary struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.id != null) {
+ oprot.writeFieldBegin(ID_FIELD_DESC);
+ oprot.writeString(struct.id);
+ oprot.writeFieldEnd();
+ }
+ if (struct.name != null) {
+ oprot.writeFieldBegin(NAME_FIELD_DESC);
+ oprot.writeString(struct.name);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldBegin(NUM_TASKS_FIELD_DESC);
+ oprot.writeI32(struct.num_tasks);
+ oprot.writeFieldEnd();
+ oprot.writeFieldBegin(NUM_EXECUTORS_FIELD_DESC);
+ oprot.writeI32(struct.num_executors);
+ oprot.writeFieldEnd();
+ oprot.writeFieldBegin(NUM_WORKERS_FIELD_DESC);
+ oprot.writeI32(struct.num_workers);
+ oprot.writeFieldEnd();
+ oprot.writeFieldBegin(UPTIME_SECS_FIELD_DESC);
+ oprot.writeI32(struct.uptime_secs);
+ oprot.writeFieldEnd();
+ if (struct.status != null) {
+ oprot.writeFieldBegin(STATUS_FIELD_DESC);
+ oprot.writeString(struct.status);
+ oprot.writeFieldEnd();
+ }
+ if (struct.sched_status != null) {
+ if (struct.is_set_sched_status()) {
+ oprot.writeFieldBegin(SCHED_STATUS_FIELD_DESC);
+ oprot.writeString(struct.sched_status);
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.owner != null) {
+ if (struct.is_set_owner()) {
+ oprot.writeFieldBegin(OWNER_FIELD_DESC);
+ oprot.writeString(struct.owner);
+ oprot.writeFieldEnd();
+ }
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class TopologySummaryTupleSchemeFactory implements SchemeFactory {
+ public TopologySummaryTupleScheme getScheme() {
+ return new TopologySummaryTupleScheme();
+ }
+ }
+
+ private static class TopologySummaryTupleScheme extends TupleScheme<TopologySummary> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, TopologySummary struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ oprot.writeString(struct.id);
+ oprot.writeString(struct.name);
+ oprot.writeI32(struct.num_tasks);
+ oprot.writeI32(struct.num_executors);
+ oprot.writeI32(struct.num_workers);
+ oprot.writeI32(struct.uptime_secs);
+ oprot.writeString(struct.status);
+ BitSet optionals = new BitSet();
+ if (struct.is_set_sched_status()) {
+ optionals.set(0);
+ }
+ if (struct.is_set_owner()) {
+ optionals.set(1);
+ }
+ oprot.writeBitSet(optionals, 2);
+ if (struct.is_set_sched_status()) {
+ oprot.writeString(struct.sched_status);
+ }
+ if (struct.is_set_owner()) {
+ oprot.writeString(struct.owner);
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, TopologySummary struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ struct.id = iprot.readString();
+ struct.set_id_isSet(true);
+ struct.name = iprot.readString();
+ struct.set_name_isSet(true);
+ struct.num_tasks = iprot.readI32();
+ struct.set_num_tasks_isSet(true);
+ struct.num_executors = iprot.readI32();
+ struct.set_num_executors_isSet(true);
+ struct.num_workers = iprot.readI32();
+ struct.set_num_workers_isSet(true);
+ struct.uptime_secs = iprot.readI32();
+ struct.set_uptime_secs_isSet(true);
+ struct.status = iprot.readString();
+ struct.set_status_isSet(true);
+ BitSet incoming = iprot.readBitSet(2);
+ if (incoming.get(0)) {
+ struct.sched_status = iprot.readString();
+ struct.set_sched_status_isSet(true);
+ }
+ if (incoming.get(1)) {
+ struct.owner = iprot.readString();
+ struct.set_owner_isSet(true);
+ }
+ }
+ }
+
}
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/storm-core/src/jvm/backtype/storm/security/auth/SimpleTransportPlugin.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/security/auth/SimpleTransportPlugin.java b/storm-core/src/jvm/backtype/storm/security/auth/SimpleTransportPlugin.java
index f0905e2..0e1a365 100644
--- a/storm-core/src/jvm/backtype/storm/security/auth/SimpleTransportPlugin.java
+++ b/storm-core/src/jvm/backtype/storm/security/auth/SimpleTransportPlugin.java
@@ -76,7 +76,7 @@ public class SimpleTransportPlugin implements ITransportPlugin {
THsHaServer.Args server_args = new THsHaServer.Args(serverTransport).
processor(new SimpleWrapProcessor(processor)).
workerThreads(numWorkerThreads).
- protocolFactory(new TBinaryProtocol.Factory(false, true, maxBufferSize));
+ protocolFactory(new TBinaryProtocol.Factory(false, true, maxBufferSize, -1));
if (queueSize != null) {
server_args.executorService(new ThreadPoolExecutor(numWorkerThreads, numWorkerThreads,
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/storm-core/src/jvm/storm/trident/drpc/ReturnResultsReducer.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/storm/trident/drpc/ReturnResultsReducer.java b/storm-core/src/jvm/storm/trident/drpc/ReturnResultsReducer.java
index d49371a..849fb10 100644
--- a/storm-core/src/jvm/storm/trident/drpc/ReturnResultsReducer.java
+++ b/storm-core/src/jvm/storm/trident/drpc/ReturnResultsReducer.java
@@ -103,10 +103,10 @@ public class ReturnResultsReducer implements MultiReducer<ReturnResultsState> {
try {
client.result(id, result);
- } catch(TException e) {
- collector.reportError(e);
} catch (AuthorizationException aze) {
collector.reportError(aze);
+ } catch(TException e) {
+ collector.reportError(e);
}
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/storm-core/src/py/storm/DistributedRPC-remote
----------------------------------------------------------------------
diff --git a/storm-core/src/py/storm/DistributedRPC-remote b/storm-core/src/py/storm/DistributedRPC-remote
index 41f8e72..3d06d07 100755
--- a/storm-core/src/py/storm/DistributedRPC-remote
+++ b/storm-core/src/py/storm/DistributedRPC-remote
@@ -18,29 +18,32 @@
#!/usr/bin/env python
#
-# Autogenerated by Thrift Compiler (0.7.0)
+# Autogenerated by Thrift Compiler (0.9.2)
#
# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
#
+# options string: py:utf8strings
+#
import sys
import pprint
from urlparse import urlparse
from thrift.transport import TTransport
from thrift.transport import TSocket
+from thrift.transport import TSSLSocket
from thrift.transport import THttpClient
from thrift.protocol import TBinaryProtocol
-import DistributedRPC
-from ttypes import *
+from storm import DistributedRPC
+from storm.ttypes import *
if len(sys.argv) <= 1 or sys.argv[1] == '--help':
- print ''
- print 'Usage: ' + sys.argv[0] + ' [-h host:port] [-u url] [-f[ramed]] function [arg1 [arg2...]]'
- print ''
- print 'Functions:'
- print ' string execute(string functionName, string funcArgs)'
- print ''
+ print('')
+ print('Usage: ' + sys.argv[0] + ' [-h host[:port]] [-u url] [-f[ramed]] [-s[sl]] function [arg1 [arg2...]]')
+ print('')
+ print('Functions:')
+ print(' string execute(string functionName, string funcArgs)')
+ print('')
sys.exit(0)
pp = pprint.PrettyPrinter(indent = 2)
@@ -48,13 +51,15 @@ host = 'localhost'
port = 9090
uri = ''
framed = False
+ssl = False
http = False
argi = 1
if sys.argv[argi] == '-h':
parts = sys.argv[argi+1].split(':')
host = parts[0]
- port = int(parts[1])
+ if len(parts) > 1:
+ port = int(parts[1])
argi += 2
if sys.argv[argi] == '-u':
@@ -75,13 +80,17 @@ if sys.argv[argi] == '-f' or sys.argv[argi] == '-framed':
framed = True
argi += 1
+if sys.argv[argi] == '-s' or sys.argv[argi] == '-ssl':
+ ssl = True
+ argi += 1
+
cmd = sys.argv[argi]
args = sys.argv[argi+1:]
if http:
transport = THttpClient.THttpClient(host, port, uri)
else:
- socket = TSocket.TSocket(host, port)
+ socket = TSSLSocket.TSSLSocket(host, port, validate=False) if ssl else TSocket.TSocket(host, port)
if framed:
transport = TTransport.TFramedTransport(socket)
else:
@@ -92,12 +101,12 @@ transport.open()
if cmd == 'execute':
if len(args) != 2:
- print 'execute requires 2 args'
+ print('execute requires 2 args')
sys.exit(1)
pp.pprint(client.execute(args[0],args[1],))
else:
- print 'Unrecognized method %s' % cmd
+ print('Unrecognized method %s' % cmd)
sys.exit(1)
transport.close()
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/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 21a9796..1728434 100644
--- a/storm-core/src/py/storm/DistributedRPC.py
+++ b/storm-core/src/py/storm/DistributedRPC.py
@@ -15,12 +15,14 @@
# limitations under the License.
#
-# Autogenerated by Thrift Compiler (0.7.0)
+# Autogenerated by Thrift Compiler (0.9.2)
#
# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
#
+# options string: py:utf8strings
+#
-from thrift.Thrift import *
+from thrift.Thrift import TType, TMessageType, TException, TApplicationException
from ttypes import *
from thrift.Thrift import TProcessor
from thrift.transport import TTransport
@@ -66,16 +68,17 @@ class Client(Iface):
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
- def recv_execute(self, ):
- (fname, mtype, rseqid) = self._iprot.readMessageBegin()
+ def recv_execute(self):
+ iprot = self._iprot
+ (fname, mtype, rseqid) = iprot.readMessageBegin()
if mtype == TMessageType.EXCEPTION:
x = TApplicationException()
- x.read(self._iprot)
- self._iprot.readMessageEnd()
+ x.read(iprot)
+ iprot.readMessageEnd()
raise x
result = execute_result()
- result.read(self._iprot)
- self._iprot.readMessageEnd()
+ result.read(iprot)
+ iprot.readMessageEnd()
if result.success is not None:
return result.success
if result.e is not None:
@@ -138,9 +141,6 @@ class execute_args:
(2, TType.STRING, 'funcArgs', None, None, ), # 2
)
- def __hash__(self):
- return 0 + hash(self.functionName) + hash(self.funcArgs)
-
def __init__(self, functionName=None, funcArgs=None,):
self.functionName = functionName
self.funcArgs = funcArgs
@@ -189,6 +189,12 @@ class execute_args:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.functionName)
+ value = (value * 31) ^ hash(self.funcArgs)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -214,9 +220,6 @@ class execute_result:
(2, TType.STRUCT, 'aze', (AuthorizationException, AuthorizationException.thrift_spec), None, ), # 2
)
- def __hash__(self):
- return 0 + hash(self.success) + hash(self.e) + hash(self.aze)
-
def __init__(self, success=None, e=None, aze=None,):
self.success = success
self.e = e
@@ -277,6 +280,13 @@ class execute_result:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.success)
+ value = (value * 31) ^ hash(self.e)
+ value = (value * 31) ^ hash(self.aze)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/storm-core/src/py/storm/DistributedRPCInvocations-remote
----------------------------------------------------------------------
diff --git a/storm-core/src/py/storm/DistributedRPCInvocations-remote b/storm-core/src/py/storm/DistributedRPCInvocations-remote
index 37f0cb5..9dd50cd 100755
--- a/storm-core/src/py/storm/DistributedRPCInvocations-remote
+++ b/storm-core/src/py/storm/DistributedRPCInvocations-remote
@@ -18,31 +18,34 @@
#!/usr/bin/env python
#
-# Autogenerated by Thrift Compiler (0.7.0)
+# Autogenerated by Thrift Compiler (0.9.2)
#
# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
#
+# options string: py:utf8strings
+#
import sys
import pprint
from urlparse import urlparse
from thrift.transport import TTransport
from thrift.transport import TSocket
+from thrift.transport import TSSLSocket
from thrift.transport import THttpClient
from thrift.protocol import TBinaryProtocol
-import DistributedRPCInvocations
-from ttypes import *
+from storm import DistributedRPCInvocations
+from storm.ttypes import *
if len(sys.argv) <= 1 or sys.argv[1] == '--help':
- print ''
- print 'Usage: ' + sys.argv[0] + ' [-h host:port] [-u url] [-f[ramed]] function [arg1 [arg2...]]'
- print ''
- print 'Functions:'
- print ' void result(string id, string result)'
- print ' DRPCRequest fetchRequest(string functionName)'
- print ' void failRequest(string id)'
- print ''
+ print('')
+ print('Usage: ' + sys.argv[0] + ' [-h host[:port]] [-u url] [-f[ramed]] [-s[sl]] function [arg1 [arg2...]]')
+ print('')
+ print('Functions:')
+ print(' void result(string id, string result)')
+ print(' DRPCRequest fetchRequest(string functionName)')
+ print(' void failRequest(string id)')
+ print('')
sys.exit(0)
pp = pprint.PrettyPrinter(indent = 2)
@@ -50,13 +53,15 @@ host = 'localhost'
port = 9090
uri = ''
framed = False
+ssl = False
http = False
argi = 1
if sys.argv[argi] == '-h':
parts = sys.argv[argi+1].split(':')
host = parts[0]
- port = int(parts[1])
+ if len(parts) > 1:
+ port = int(parts[1])
argi += 2
if sys.argv[argi] == '-u':
@@ -77,13 +82,17 @@ if sys.argv[argi] == '-f' or sys.argv[argi] == '-framed':
framed = True
argi += 1
+if sys.argv[argi] == '-s' or sys.argv[argi] == '-ssl':
+ ssl = True
+ argi += 1
+
cmd = sys.argv[argi]
args = sys.argv[argi+1:]
if http:
transport = THttpClient.THttpClient(host, port, uri)
else:
- socket = TSocket.TSocket(host, port)
+ socket = TSSLSocket.TSSLSocket(host, port, validate=False) if ssl else TSocket.TSocket(host, port)
if framed:
transport = TTransport.TFramedTransport(socket)
else:
@@ -94,24 +103,24 @@ transport.open()
if cmd == 'result':
if len(args) != 2:
- print 'result requires 2 args'
+ print('result requires 2 args')
sys.exit(1)
pp.pprint(client.result(args[0],args[1],))
elif cmd == 'fetchRequest':
if len(args) != 1:
- print 'fetchRequest requires 1 args'
+ print('fetchRequest requires 1 args')
sys.exit(1)
pp.pprint(client.fetchRequest(args[0],))
elif cmd == 'failRequest':
if len(args) != 1:
- print 'failRequest requires 1 args'
+ print('failRequest requires 1 args')
sys.exit(1)
pp.pprint(client.failRequest(args[0],))
else:
- print 'Unrecognized method %s' % cmd
+ print('Unrecognized method %s' % cmd)
sys.exit(1)
transport.close()
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/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 5120f4d..fddbbe5 100644
--- a/storm-core/src/py/storm/DistributedRPCInvocations.py
+++ b/storm-core/src/py/storm/DistributedRPCInvocations.py
@@ -15,12 +15,14 @@
# limitations under the License.
#
-# Autogenerated by Thrift Compiler (0.7.0)
+# Autogenerated by Thrift Compiler (0.9.2)
#
# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
#
+# options string: py:utf8strings
+#
-from thrift.Thrift import *
+from thrift.Thrift import TType, TMessageType, TException, TApplicationException
from ttypes import *
from thrift.Thrift import TProcessor
from thrift.transport import TTransport
@@ -80,16 +82,17 @@ class Client(Iface):
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
- def recv_result(self, ):
- (fname, mtype, rseqid) = self._iprot.readMessageBegin()
+ def recv_result(self):
+ iprot = self._iprot
+ (fname, mtype, rseqid) = iprot.readMessageBegin()
if mtype == TMessageType.EXCEPTION:
x = TApplicationException()
- x.read(self._iprot)
- self._iprot.readMessageEnd()
+ x.read(iprot)
+ iprot.readMessageEnd()
raise x
result = result_result()
- result.read(self._iprot)
- self._iprot.readMessageEnd()
+ result.read(iprot)
+ iprot.readMessageEnd()
if result.aze is not None:
raise result.aze
return
@@ -110,16 +113,17 @@ class Client(Iface):
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
- def recv_fetchRequest(self, ):
- (fname, mtype, rseqid) = self._iprot.readMessageBegin()
+ def recv_fetchRequest(self):
+ iprot = self._iprot
+ (fname, mtype, rseqid) = iprot.readMessageBegin()
if mtype == TMessageType.EXCEPTION:
x = TApplicationException()
- x.read(self._iprot)
- self._iprot.readMessageEnd()
+ x.read(iprot)
+ iprot.readMessageEnd()
raise x
result = fetchRequest_result()
- result.read(self._iprot)
- self._iprot.readMessageEnd()
+ result.read(iprot)
+ iprot.readMessageEnd()
if result.success is not None:
return result.success
if result.aze is not None:
@@ -142,16 +146,17 @@ class Client(Iface):
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
- def recv_failRequest(self, ):
- (fname, mtype, rseqid) = self._iprot.readMessageBegin()
+ def recv_failRequest(self):
+ iprot = self._iprot
+ (fname, mtype, rseqid) = iprot.readMessageBegin()
if mtype == TMessageType.EXCEPTION:
x = TApplicationException()
- x.read(self._iprot)
- self._iprot.readMessageEnd()
+ x.read(iprot)
+ iprot.readMessageEnd()
raise x
result = failRequest_result()
- result.read(self._iprot)
- self._iprot.readMessageEnd()
+ result.read(iprot)
+ iprot.readMessageEnd()
if result.aze is not None:
raise result.aze
return
@@ -238,9 +243,6 @@ class result_args:
(2, TType.STRING, 'result', None, None, ), # 2
)
- def __hash__(self):
- return 0 + hash(self.id) + hash(self.result)
-
def __init__(self, id=None, result=None,):
self.id = id
self.result = result
@@ -289,6 +291,12 @@ class result_args:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.id)
+ value = (value * 31) ^ hash(self.result)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -311,9 +319,6 @@ class result_result:
(1, TType.STRUCT, 'aze', (AuthorizationException, AuthorizationException.thrift_spec), None, ), # 1
)
- def __hash__(self):
- return 0 + hash(self.aze)
-
def __init__(self, aze=None,):
self.aze = aze
@@ -353,6 +358,11 @@ class result_result:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.aze)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -375,9 +385,6 @@ class fetchRequest_args:
(1, TType.STRING, 'functionName', None, None, ), # 1
)
- def __hash__(self):
- return 0 + hash(self.functionName)
-
def __init__(self, functionName=None,):
self.functionName = functionName
@@ -416,6 +423,11 @@ class fetchRequest_args:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.functionName)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -439,9 +451,6 @@ class fetchRequest_result:
(1, TType.STRUCT, 'aze', (AuthorizationException, AuthorizationException.thrift_spec), None, ), # 1
)
- def __hash__(self):
- return 0 + hash(self.success) + hash(self.aze)
-
def __init__(self, success=None, aze=None,):
self.success = success
self.aze = aze
@@ -492,6 +501,12 @@ class fetchRequest_result:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.success)
+ value = (value * 31) ^ hash(self.aze)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -514,9 +529,6 @@ class failRequest_args:
(1, TType.STRING, 'id', None, None, ), # 1
)
- def __hash__(self):
- return 0 + hash(self.id)
-
def __init__(self, id=None,):
self.id = id
@@ -555,6 +567,11 @@ class failRequest_args:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.id)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
@@ -577,9 +594,6 @@ class failRequest_result:
(1, TType.STRUCT, 'aze', (AuthorizationException, AuthorizationException.thrift_spec), None, ), # 1
)
- def __hash__(self):
- return 0 + hash(self.aze)
-
def __init__(self, aze=None,):
self.aze = aze
@@ -619,6 +633,11 @@ class failRequest_result:
return
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.aze)
+ return value
+
def __repr__(self):
L = ['%s=%r' % (key, value)
for key, value in self.__dict__.iteritems()]
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/storm-core/src/py/storm/Nimbus-remote
----------------------------------------------------------------------
diff --git a/storm-core/src/py/storm/Nimbus-remote b/storm-core/src/py/storm/Nimbus-remote
index efd9220..4e487c9 100755
--- a/storm-core/src/py/storm/Nimbus-remote
+++ b/storm-core/src/py/storm/Nimbus-remote
@@ -18,47 +18,50 @@
#!/usr/bin/env python
#
-# Autogenerated by Thrift Compiler (0.7.0)
+# Autogenerated by Thrift Compiler (0.9.2)
#
# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
#
+# options string: py:utf8strings
+#
import sys
import pprint
from urlparse import urlparse
from thrift.transport import TTransport
from thrift.transport import TSocket
+from thrift.transport import TSSLSocket
from thrift.transport import THttpClient
from thrift.protocol import TBinaryProtocol
-import Nimbus
-from ttypes import *
+from storm import Nimbus
+from storm.ttypes import *
if len(sys.argv) <= 1 or sys.argv[1] == '--help':
- print ''
- print 'Usage: ' + sys.argv[0] + ' [-h host:port] [-u url] [-f[ramed]] function [arg1 [arg2...]]'
- print ''
- print 'Functions:'
- print ' void submitTopology(string name, string uploadedJarLocation, string jsonConf, StormTopology topology)'
- print ' void submitTopologyWithOpts(string name, string uploadedJarLocation, string jsonConf, StormTopology topology, SubmitOptions options)'
- print ' void killTopology(string name)'
- print ' void killTopologyWithOpts(string name, KillOptions options)'
- print ' void activate(string name)'
- print ' void deactivate(string name)'
- print ' void rebalance(string name, RebalanceOptions options)'
- print ' void uploadNewCredentials(string name, Credentials creds)'
- print ' string beginFileUpload()'
- print ' void uploadChunk(string location, string chunk)'
- print ' void finishFileUpload(string location)'
- print ' string beginFileDownload(string file)'
- print ' string downloadChunk(string id)'
- print ' string getNimbusConf()'
- print ' ClusterSummary getClusterInfo()'
- print ' TopologyInfo getTopologyInfo(string id)'
- print ' string getTopologyConf(string id)'
- print ' StormTopology getTopology(string id)'
- print ' StormTopology getUserTopology(string id)'
- print ''
+ print('')
+ print('Usage: ' + sys.argv[0] + ' [-h host[:port]] [-u url] [-f[ramed]] [-s[sl]] function [arg1 [arg2...]]')
+ print('')
+ print('Functions:')
+ print(' void submitTopology(string name, string uploadedJarLocation, string jsonConf, StormTopology topology)')
+ print(' void submitTopologyWithOpts(string name, string uploadedJarLocation, string jsonConf, StormTopology topology, SubmitOptions options)')
+ print(' void killTopology(string name)')
+ print(' void killTopologyWithOpts(string name, KillOptions options)')
+ print(' void activate(string name)')
+ print(' void deactivate(string name)')
+ print(' void rebalance(string name, RebalanceOptions options)')
+ print(' void uploadNewCredentials(string name, Credentials creds)')
+ print(' string beginFileUpload()')
+ print(' void uploadChunk(string location, string chunk)')
+ print(' void finishFileUpload(string location)')
+ print(' string beginFileDownload(string file)')
+ print(' string downloadChunk(string id)')
+ print(' string getNimbusConf()')
+ print(' ClusterSummary getClusterInfo()')
+ print(' TopologyInfo getTopologyInfo(string id)')
+ print(' string getTopologyConf(string id)')
+ print(' StormTopology getTopology(string id)')
+ print(' StormTopology getUserTopology(string id)')
+ print('')
sys.exit(0)
pp = pprint.PrettyPrinter(indent = 2)
@@ -66,13 +69,15 @@ host = 'localhost'
port = 9090
uri = ''
framed = False
+ssl = False
http = False
argi = 1
if sys.argv[argi] == '-h':
parts = sys.argv[argi+1].split(':')
host = parts[0]
- port = int(parts[1])
+ if len(parts) > 1:
+ port = int(parts[1])
argi += 2
if sys.argv[argi] == '-u':
@@ -93,13 +98,17 @@ if sys.argv[argi] == '-f' or sys.argv[argi] == '-framed':
framed = True
argi += 1
+if sys.argv[argi] == '-s' or sys.argv[argi] == '-ssl':
+ ssl = True
+ argi += 1
+
cmd = sys.argv[argi]
args = sys.argv[argi+1:]
if http:
transport = THttpClient.THttpClient(host, port, uri)
else:
- socket = TSocket.TSocket(host, port)
+ socket = TSSLSocket.TSSLSocket(host, port, validate=False) if ssl else TSocket.TSocket(host, port)
if framed:
transport = TTransport.TFramedTransport(socket)
else:
@@ -110,120 +119,120 @@ transport.open()
if cmd == 'submitTopology':
if len(args) != 4:
- print 'submitTopology requires 4 args'
+ print('submitTopology requires 4 args')
sys.exit(1)
pp.pprint(client.submitTopology(args[0],args[1],args[2],eval(args[3]),))
elif cmd == 'submitTopologyWithOpts':
if len(args) != 5:
- print 'submitTopologyWithOpts requires 5 args'
+ print('submitTopologyWithOpts requires 5 args')
sys.exit(1)
pp.pprint(client.submitTopologyWithOpts(args[0],args[1],args[2],eval(args[3]),eval(args[4]),))
elif cmd == 'killTopology':
if len(args) != 1:
- print 'killTopology requires 1 args'
+ print('killTopology requires 1 args')
sys.exit(1)
pp.pprint(client.killTopology(args[0],))
elif cmd == 'killTopologyWithOpts':
if len(args) != 2:
- print 'killTopologyWithOpts requires 2 args'
+ print('killTopologyWithOpts requires 2 args')
sys.exit(1)
pp.pprint(client.killTopologyWithOpts(args[0],eval(args[1]),))
elif cmd == 'activate':
if len(args) != 1:
- print 'activate requires 1 args'
+ print('activate requires 1 args')
sys.exit(1)
pp.pprint(client.activate(args[0],))
elif cmd == 'deactivate':
if len(args) != 1:
- print 'deactivate requires 1 args'
+ print('deactivate requires 1 args')
sys.exit(1)
pp.pprint(client.deactivate(args[0],))
elif cmd == 'rebalance':
if len(args) != 2:
- print 'rebalance requires 2 args'
+ print('rebalance requires 2 args')
sys.exit(1)
pp.pprint(client.rebalance(args[0],eval(args[1]),))
elif cmd == 'uploadNewCredentials':
if len(args) != 2:
- print 'uploadNewCredentials requires 2 args'
+ print('uploadNewCredentials requires 2 args')
sys.exit(1)
pp.pprint(client.uploadNewCredentials(args[0],eval(args[1]),))
elif cmd == 'beginFileUpload':
if len(args) != 0:
- print 'beginFileUpload requires 0 args'
+ print('beginFileUpload requires 0 args')
sys.exit(1)
pp.pprint(client.beginFileUpload())
elif cmd == 'uploadChunk':
if len(args) != 2:
- print 'uploadChunk requires 2 args'
+ print('uploadChunk requires 2 args')
sys.exit(1)
pp.pprint(client.uploadChunk(args[0],args[1],))
elif cmd == 'finishFileUpload':
if len(args) != 1:
- print 'finishFileUpload requires 1 args'
+ print('finishFileUpload requires 1 args')
sys.exit(1)
pp.pprint(client.finishFileUpload(args[0],))
elif cmd == 'beginFileDownload':
if len(args) != 1:
- print 'beginFileDownload requires 1 args'
+ print('beginFileDownload requires 1 args')
sys.exit(1)
pp.pprint(client.beginFileDownload(args[0],))
elif cmd == 'downloadChunk':
if len(args) != 1:
- print 'downloadChunk requires 1 args'
+ print('downloadChunk requires 1 args')
sys.exit(1)
pp.pprint(client.downloadChunk(args[0],))
elif cmd == 'getNimbusConf':
if len(args) != 0:
- print 'getNimbusConf requires 0 args'
+ print('getNimbusConf requires 0 args')
sys.exit(1)
pp.pprint(client.getNimbusConf())
elif cmd == 'getClusterInfo':
if len(args) != 0:
- print 'getClusterInfo requires 0 args'
+ print('getClusterInfo requires 0 args')
sys.exit(1)
pp.pprint(client.getClusterInfo())
elif cmd == 'getTopologyInfo':
if len(args) != 1:
- print 'getTopologyInfo requires 1 args'
+ print('getTopologyInfo requires 1 args')
sys.exit(1)
pp.pprint(client.getTopologyInfo(args[0],))
elif cmd == 'getTopologyConf':
if len(args) != 1:
- print 'getTopologyConf requires 1 args'
+ print('getTopologyConf requires 1 args')
sys.exit(1)
pp.pprint(client.getTopologyConf(args[0],))
elif cmd == 'getTopology':
if len(args) != 1:
- print 'getTopology requires 1 args'
+ print('getTopology requires 1 args')
sys.exit(1)
pp.pprint(client.getTopology(args[0],))
elif cmd == 'getUserTopology':
if len(args) != 1:
- print 'getUserTopology requires 1 args'
+ print('getUserTopology requires 1 args')
sys.exit(1)
pp.pprint(client.getUserTopology(args[0],))
else:
- print 'Unrecognized method %s' % cmd
+ print('Unrecognized method %s' % cmd)
sys.exit(1)
transport.close()
[04/18] storm git commit: Upgrade to thrift-0.9.2
Posted by kn...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/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 284f827..e03cfdc 100644
--- a/storm-core/src/jvm/backtype/storm/generated/SpoutStats.java
+++ b/storm-core/src/jvm/backtype/storm/generated/SpoutStats.java
@@ -16,13 +16,24 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package backtype.storm.generated;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -35,16 +46,25 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStats._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
+public class 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");
private static final org.apache.thrift.protocol.TField ACKED_FIELD_DESC = new org.apache.thrift.protocol.TField("acked", org.apache.thrift.protocol.TType.MAP, (short)1);
private static final org.apache.thrift.protocol.TField FAILED_FIELD_DESC = new org.apache.thrift.protocol.TField("failed", org.apache.thrift.protocol.TType.MAP, (short)2);
private static final org.apache.thrift.protocol.TField COMPLETE_MS_AVG_FIELD_DESC = new org.apache.thrift.protocol.TField("complete_ms_avg", org.apache.thrift.protocol.TType.MAP, (short)3);
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new SpoutStatsStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new SpoutStatsTupleSchemeFactory());
+ }
+
private Map<String,Map<String,Long>> acked; // required
private Map<String,Map<String,Long>> failed; // required
private Map<String,Map<String,Double>> complete_ms_avg; // required
@@ -114,7 +134,6 @@ public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStat
}
// 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);
@@ -159,7 +178,7 @@ public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStat
*/
public SpoutStats(SpoutStats other) {
if (other.is_set_acked()) {
- Map<String,Map<String,Long>> __this__acked = new HashMap<String,Map<String,Long>>();
+ Map<String,Map<String,Long>> __this__acked = new HashMap<String,Map<String,Long>>(other.acked.size());
for (Map.Entry<String, Map<String,Long>> other_element : other.acked.entrySet()) {
String other_element_key = other_element.getKey();
@@ -167,25 +186,14 @@ public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStat
String __this__acked_copy_key = other_element_key;
- Map<String,Long> __this__acked_copy_value = new HashMap<String,Long>();
- for (Map.Entry<String, Long> other_element_value_element : other_element_value.entrySet()) {
-
- String other_element_value_element_key = other_element_value_element.getKey();
- Long other_element_value_element_value = other_element_value_element.getValue();
-
- String __this__acked_copy_value_copy_key = other_element_value_element_key;
-
- Long __this__acked_copy_value_copy_value = other_element_value_element_value;
-
- __this__acked_copy_value.put(__this__acked_copy_value_copy_key, __this__acked_copy_value_copy_value);
- }
+ Map<String,Long> __this__acked_copy_value = new HashMap<String,Long>(other_element_value);
__this__acked.put(__this__acked_copy_key, __this__acked_copy_value);
}
this.acked = __this__acked;
}
if (other.is_set_failed()) {
- Map<String,Map<String,Long>> __this__failed = new HashMap<String,Map<String,Long>>();
+ Map<String,Map<String,Long>> __this__failed = new HashMap<String,Map<String,Long>>(other.failed.size());
for (Map.Entry<String, Map<String,Long>> other_element : other.failed.entrySet()) {
String other_element_key = other_element.getKey();
@@ -193,25 +201,14 @@ public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStat
String __this__failed_copy_key = other_element_key;
- Map<String,Long> __this__failed_copy_value = new HashMap<String,Long>();
- for (Map.Entry<String, Long> other_element_value_element : other_element_value.entrySet()) {
-
- String other_element_value_element_key = other_element_value_element.getKey();
- Long other_element_value_element_value = other_element_value_element.getValue();
-
- String __this__failed_copy_value_copy_key = other_element_value_element_key;
-
- Long __this__failed_copy_value_copy_value = other_element_value_element_value;
-
- __this__failed_copy_value.put(__this__failed_copy_value_copy_key, __this__failed_copy_value_copy_value);
- }
+ Map<String,Long> __this__failed_copy_value = new HashMap<String,Long>(other_element_value);
__this__failed.put(__this__failed_copy_key, __this__failed_copy_value);
}
this.failed = __this__failed;
}
if (other.is_set_complete_ms_avg()) {
- Map<String,Map<String,Double>> __this__complete_ms_avg = new HashMap<String,Map<String,Double>>();
+ Map<String,Map<String,Double>> __this__complete_ms_avg = new HashMap<String,Map<String,Double>>(other.complete_ms_avg.size());
for (Map.Entry<String, Map<String,Double>> other_element : other.complete_ms_avg.entrySet()) {
String other_element_key = other_element.getKey();
@@ -219,18 +216,7 @@ public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStat
String __this__complete_ms_avg_copy_key = other_element_key;
- Map<String,Double> __this__complete_ms_avg_copy_value = new HashMap<String,Double>();
- for (Map.Entry<String, Double> other_element_value_element : other_element_value.entrySet()) {
-
- String other_element_value_element_key = other_element_value_element.getKey();
- Double other_element_value_element_value = other_element_value_element.getValue();
-
- String __this__complete_ms_avg_copy_value_copy_key = other_element_value_element_key;
-
- Double __this__complete_ms_avg_copy_value_copy_value = other_element_value_element_value;
-
- __this__complete_ms_avg_copy_value.put(__this__complete_ms_avg_copy_value_copy_key, __this__complete_ms_avg_copy_value_copy_value);
- }
+ Map<String,Double> __this__complete_ms_avg_copy_value = new HashMap<String,Double>(other_element_value);
__this__complete_ms_avg.put(__this__complete_ms_avg_copy_key, __this__complete_ms_avg_copy_value);
}
@@ -457,60 +443,60 @@ public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStat
@Override
public int hashCode() {
- HashCodeBuilder builder = new HashCodeBuilder();
+ List<Object> list = new ArrayList<Object>();
boolean present_acked = true && (is_set_acked());
- builder.append(present_acked);
+ list.add(present_acked);
if (present_acked)
- builder.append(acked);
+ list.add(acked);
boolean present_failed = true && (is_set_failed());
- builder.append(present_failed);
+ list.add(present_failed);
if (present_failed)
- builder.append(failed);
+ list.add(failed);
boolean present_complete_ms_avg = true && (is_set_complete_ms_avg());
- builder.append(present_complete_ms_avg);
+ list.add(present_complete_ms_avg);
if (present_complete_ms_avg)
- builder.append(complete_ms_avg);
+ list.add(complete_ms_avg);
- return builder.toHashCode();
+ return list.hashCode();
}
+ @Override
public int compareTo(SpoutStats other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- SpoutStats typedOther = (SpoutStats)other;
- lastComparison = Boolean.valueOf(is_set_acked()).compareTo(typedOther.is_set_acked());
+ lastComparison = Boolean.valueOf(is_set_acked()).compareTo(other.is_set_acked());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_acked()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.acked, typedOther.acked);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.acked, other.acked);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_failed()).compareTo(typedOther.is_set_failed());
+ lastComparison = Boolean.valueOf(is_set_failed()).compareTo(other.is_set_failed());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_failed()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failed, typedOther.failed);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failed, other.failed);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_complete_ms_avg()).compareTo(typedOther.is_set_complete_ms_avg());
+ lastComparison = Boolean.valueOf(is_set_complete_ms_avg()).compareTo(other.is_set_complete_ms_avg());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_complete_ms_avg()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.complete_ms_avg, typedOther.complete_ms_avg);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.complete_ms_avg, other.complete_ms_avg);
if (lastComparison != 0) {
return lastComparison;
}
@@ -523,186 +509,11 @@ public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStat
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // ACKED
- if (field.type == org.apache.thrift.protocol.TType.MAP) {
- {
- org.apache.thrift.protocol.TMap _map95 = iprot.readMapBegin();
- this.acked = new HashMap<String,Map<String,Long>>(2*_map95.size);
- for (int _i96 = 0; _i96 < _map95.size; ++_i96)
- {
- String _key97; // required
- Map<String,Long> _val98; // required
- _key97 = iprot.readString();
- {
- org.apache.thrift.protocol.TMap _map99 = iprot.readMapBegin();
- _val98 = new HashMap<String,Long>(2*_map99.size);
- for (int _i100 = 0; _i100 < _map99.size; ++_i100)
- {
- String _key101; // required
- long _val102; // required
- _key101 = iprot.readString();
- _val102 = iprot.readI64();
- _val98.put(_key101, _val102);
- }
- iprot.readMapEnd();
- }
- this.acked.put(_key97, _val98);
- }
- iprot.readMapEnd();
- }
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 2: // FAILED
- if (field.type == org.apache.thrift.protocol.TType.MAP) {
- {
- org.apache.thrift.protocol.TMap _map103 = iprot.readMapBegin();
- this.failed = new HashMap<String,Map<String,Long>>(2*_map103.size);
- for (int _i104 = 0; _i104 < _map103.size; ++_i104)
- {
- String _key105; // required
- Map<String,Long> _val106; // required
- _key105 = iprot.readString();
- {
- org.apache.thrift.protocol.TMap _map107 = iprot.readMapBegin();
- _val106 = new HashMap<String,Long>(2*_map107.size);
- for (int _i108 = 0; _i108 < _map107.size; ++_i108)
- {
- String _key109; // required
- long _val110; // required
- _key109 = iprot.readString();
- _val110 = iprot.readI64();
- _val106.put(_key109, _val110);
- }
- iprot.readMapEnd();
- }
- this.failed.put(_key105, _val106);
- }
- iprot.readMapEnd();
- }
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 3: // COMPLETE_MS_AVG
- if (field.type == org.apache.thrift.protocol.TType.MAP) {
- {
- org.apache.thrift.protocol.TMap _map111 = iprot.readMapBegin();
- this.complete_ms_avg = new HashMap<String,Map<String,Double>>(2*_map111.size);
- for (int _i112 = 0; _i112 < _map111.size; ++_i112)
- {
- String _key113; // required
- Map<String,Double> _val114; // required
- _key113 = iprot.readString();
- {
- org.apache.thrift.protocol.TMap _map115 = iprot.readMapBegin();
- _val114 = new HashMap<String,Double>(2*_map115.size);
- for (int _i116 = 0; _i116 < _map115.size; ++_i116)
- {
- String _key117; // required
- double _val118; // required
- _key117 = iprot.readString();
- _val118 = iprot.readDouble();
- _val114.put(_key117, _val118);
- }
- iprot.readMapEnd();
- }
- this.complete_ms_avg.put(_key113, _val114);
- }
- iprot.readMapEnd();
- }
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (this.acked != null) {
- oprot.writeFieldBegin(ACKED_FIELD_DESC);
- {
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, this.acked.size()));
- for (Map.Entry<String, Map<String,Long>> _iter119 : this.acked.entrySet())
- {
- oprot.writeString(_iter119.getKey());
- {
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, _iter119.getValue().size()));
- for (Map.Entry<String, Long> _iter120 : _iter119.getValue().entrySet())
- {
- oprot.writeString(_iter120.getKey());
- oprot.writeI64(_iter120.getValue());
- }
- oprot.writeMapEnd();
- }
- }
- oprot.writeMapEnd();
- }
- oprot.writeFieldEnd();
- }
- if (this.failed != null) {
- oprot.writeFieldBegin(FAILED_FIELD_DESC);
- {
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, this.failed.size()));
- for (Map.Entry<String, Map<String,Long>> _iter121 : this.failed.entrySet())
- {
- oprot.writeString(_iter121.getKey());
- {
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, _iter121.getValue().size()));
- for (Map.Entry<String, Long> _iter122 : _iter121.getValue().entrySet())
- {
- oprot.writeString(_iter122.getKey());
- oprot.writeI64(_iter122.getValue());
- }
- oprot.writeMapEnd();
- }
- }
- oprot.writeMapEnd();
- }
- oprot.writeFieldEnd();
- }
- if (this.complete_ms_avg != null) {
- oprot.writeFieldBegin(COMPLETE_MS_AVG_FIELD_DESC);
- {
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, this.complete_ms_avg.size()));
- for (Map.Entry<String, Map<String,Double>> _iter123 : this.complete_ms_avg.entrySet())
- {
- oprot.writeString(_iter123.getKey());
- {
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, _iter123.getValue().size()));
- for (Map.Entry<String, Double> _iter124 : _iter123.getValue().entrySet())
- {
- oprot.writeString(_iter124.getKey());
- oprot.writeDouble(_iter124.getValue());
- }
- oprot.writeMapEnd();
- }
- }
- oprot.writeMapEnd();
- }
- oprot.writeFieldEnd();
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@Override
@@ -751,6 +562,7 @@ public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStat
throw new org.apache.thrift.protocol.TProtocolException("Required field 'complete_ms_avg' is unset! Struct:" + toString());
}
+ // check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -769,5 +581,337 @@ public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStat
}
}
+ private static class SpoutStatsStandardSchemeFactory implements SchemeFactory {
+ public SpoutStatsStandardScheme getScheme() {
+ return new SpoutStatsStandardScheme();
+ }
+ }
+
+ private static class SpoutStatsStandardScheme extends StandardScheme<SpoutStats> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, SpoutStats 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: // ACKED
+ if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+ {
+ org.apache.thrift.protocol.TMap _map190 = iprot.readMapBegin();
+ struct.acked = new HashMap<String,Map<String,Long>>(2*_map190.size);
+ String _key191;
+ Map<String,Long> _val192;
+ for (int _i193 = 0; _i193 < _map190.size; ++_i193)
+ {
+ _key191 = iprot.readString();
+ {
+ org.apache.thrift.protocol.TMap _map194 = iprot.readMapBegin();
+ _val192 = new HashMap<String,Long>(2*_map194.size);
+ String _key195;
+ long _val196;
+ for (int _i197 = 0; _i197 < _map194.size; ++_i197)
+ {
+ _key195 = iprot.readString();
+ _val196 = iprot.readI64();
+ _val192.put(_key195, _val196);
+ }
+ iprot.readMapEnd();
+ }
+ struct.acked.put(_key191, _val192);
+ }
+ iprot.readMapEnd();
+ }
+ struct.set_acked_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // FAILED
+ if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+ {
+ org.apache.thrift.protocol.TMap _map198 = iprot.readMapBegin();
+ struct.failed = new HashMap<String,Map<String,Long>>(2*_map198.size);
+ String _key199;
+ Map<String,Long> _val200;
+ for (int _i201 = 0; _i201 < _map198.size; ++_i201)
+ {
+ _key199 = iprot.readString();
+ {
+ org.apache.thrift.protocol.TMap _map202 = iprot.readMapBegin();
+ _val200 = new HashMap<String,Long>(2*_map202.size);
+ String _key203;
+ long _val204;
+ for (int _i205 = 0; _i205 < _map202.size; ++_i205)
+ {
+ _key203 = iprot.readString();
+ _val204 = iprot.readI64();
+ _val200.put(_key203, _val204);
+ }
+ iprot.readMapEnd();
+ }
+ struct.failed.put(_key199, _val200);
+ }
+ iprot.readMapEnd();
+ }
+ struct.set_failed_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 3: // COMPLETE_MS_AVG
+ if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+ {
+ org.apache.thrift.protocol.TMap _map206 = iprot.readMapBegin();
+ struct.complete_ms_avg = new HashMap<String,Map<String,Double>>(2*_map206.size);
+ String _key207;
+ Map<String,Double> _val208;
+ for (int _i209 = 0; _i209 < _map206.size; ++_i209)
+ {
+ _key207 = iprot.readString();
+ {
+ org.apache.thrift.protocol.TMap _map210 = iprot.readMapBegin();
+ _val208 = new HashMap<String,Double>(2*_map210.size);
+ String _key211;
+ double _val212;
+ for (int _i213 = 0; _i213 < _map210.size; ++_i213)
+ {
+ _key211 = iprot.readString();
+ _val212 = iprot.readDouble();
+ _val208.put(_key211, _val212);
+ }
+ iprot.readMapEnd();
+ }
+ struct.complete_ms_avg.put(_key207, _val208);
+ }
+ iprot.readMapEnd();
+ }
+ struct.set_complete_ms_avg_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, SpoutStats struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.acked != null) {
+ oprot.writeFieldBegin(ACKED_FIELD_DESC);
+ {
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.acked.size()));
+ for (Map.Entry<String, Map<String,Long>> _iter214 : struct.acked.entrySet())
+ {
+ oprot.writeString(_iter214.getKey());
+ {
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, _iter214.getValue().size()));
+ for (Map.Entry<String, Long> _iter215 : _iter214.getValue().entrySet())
+ {
+ oprot.writeString(_iter215.getKey());
+ oprot.writeI64(_iter215.getValue());
+ }
+ oprot.writeMapEnd();
+ }
+ }
+ oprot.writeMapEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ if (struct.failed != null) {
+ oprot.writeFieldBegin(FAILED_FIELD_DESC);
+ {
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.failed.size()));
+ for (Map.Entry<String, Map<String,Long>> _iter216 : struct.failed.entrySet())
+ {
+ oprot.writeString(_iter216.getKey());
+ {
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, _iter216.getValue().size()));
+ for (Map.Entry<String, Long> _iter217 : _iter216.getValue().entrySet())
+ {
+ oprot.writeString(_iter217.getKey());
+ oprot.writeI64(_iter217.getValue());
+ }
+ oprot.writeMapEnd();
+ }
+ }
+ oprot.writeMapEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ if (struct.complete_ms_avg != null) {
+ oprot.writeFieldBegin(COMPLETE_MS_AVG_FIELD_DESC);
+ {
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.complete_ms_avg.size()));
+ for (Map.Entry<String, Map<String,Double>> _iter218 : struct.complete_ms_avg.entrySet())
+ {
+ oprot.writeString(_iter218.getKey());
+ {
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, _iter218.getValue().size()));
+ for (Map.Entry<String, Double> _iter219 : _iter218.getValue().entrySet())
+ {
+ oprot.writeString(_iter219.getKey());
+ oprot.writeDouble(_iter219.getValue());
+ }
+ oprot.writeMapEnd();
+ }
+ }
+ oprot.writeMapEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class SpoutStatsTupleSchemeFactory implements SchemeFactory {
+ public SpoutStatsTupleScheme getScheme() {
+ return new SpoutStatsTupleScheme();
+ }
+ }
+
+ private static class SpoutStatsTupleScheme extends TupleScheme<SpoutStats> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, SpoutStats struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ {
+ oprot.writeI32(struct.acked.size());
+ for (Map.Entry<String, Map<String,Long>> _iter220 : struct.acked.entrySet())
+ {
+ oprot.writeString(_iter220.getKey());
+ {
+ oprot.writeI32(_iter220.getValue().size());
+ for (Map.Entry<String, Long> _iter221 : _iter220.getValue().entrySet())
+ {
+ oprot.writeString(_iter221.getKey());
+ oprot.writeI64(_iter221.getValue());
+ }
+ }
+ }
+ }
+ {
+ oprot.writeI32(struct.failed.size());
+ for (Map.Entry<String, Map<String,Long>> _iter222 : struct.failed.entrySet())
+ {
+ oprot.writeString(_iter222.getKey());
+ {
+ oprot.writeI32(_iter222.getValue().size());
+ for (Map.Entry<String, Long> _iter223 : _iter222.getValue().entrySet())
+ {
+ oprot.writeString(_iter223.getKey());
+ oprot.writeI64(_iter223.getValue());
+ }
+ }
+ }
+ }
+ {
+ oprot.writeI32(struct.complete_ms_avg.size());
+ for (Map.Entry<String, Map<String,Double>> _iter224 : struct.complete_ms_avg.entrySet())
+ {
+ oprot.writeString(_iter224.getKey());
+ {
+ oprot.writeI32(_iter224.getValue().size());
+ for (Map.Entry<String, Double> _iter225 : _iter224.getValue().entrySet())
+ {
+ oprot.writeString(_iter225.getKey());
+ oprot.writeDouble(_iter225.getValue());
+ }
+ }
+ }
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, SpoutStats struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ {
+ org.apache.thrift.protocol.TMap _map226 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
+ struct.acked = new HashMap<String,Map<String,Long>>(2*_map226.size);
+ String _key227;
+ Map<String,Long> _val228;
+ for (int _i229 = 0; _i229 < _map226.size; ++_i229)
+ {
+ _key227 = iprot.readString();
+ {
+ org.apache.thrift.protocol.TMap _map230 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32());
+ _val228 = new HashMap<String,Long>(2*_map230.size);
+ String _key231;
+ long _val232;
+ for (int _i233 = 0; _i233 < _map230.size; ++_i233)
+ {
+ _key231 = iprot.readString();
+ _val232 = iprot.readI64();
+ _val228.put(_key231, _val232);
+ }
+ }
+ struct.acked.put(_key227, _val228);
+ }
+ }
+ struct.set_acked_isSet(true);
+ {
+ org.apache.thrift.protocol.TMap _map234 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
+ struct.failed = new HashMap<String,Map<String,Long>>(2*_map234.size);
+ String _key235;
+ Map<String,Long> _val236;
+ for (int _i237 = 0; _i237 < _map234.size; ++_i237)
+ {
+ _key235 = iprot.readString();
+ {
+ org.apache.thrift.protocol.TMap _map238 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32());
+ _val236 = new HashMap<String,Long>(2*_map238.size);
+ String _key239;
+ long _val240;
+ for (int _i241 = 0; _i241 < _map238.size; ++_i241)
+ {
+ _key239 = iprot.readString();
+ _val240 = iprot.readI64();
+ _val236.put(_key239, _val240);
+ }
+ }
+ struct.failed.put(_key235, _val236);
+ }
+ }
+ struct.set_failed_isSet(true);
+ {
+ org.apache.thrift.protocol.TMap _map242 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
+ struct.complete_ms_avg = new HashMap<String,Map<String,Double>>(2*_map242.size);
+ String _key243;
+ Map<String,Double> _val244;
+ for (int _i245 = 0; _i245 < _map242.size; ++_i245)
+ {
+ _key243 = iprot.readString();
+ {
+ org.apache.thrift.protocol.TMap _map246 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.DOUBLE, iprot.readI32());
+ _val244 = new HashMap<String,Double>(2*_map246.size);
+ String _key247;
+ double _val248;
+ for (int _i249 = 0; _i249 < _map246.size; ++_i249)
+ {
+ _key247 = iprot.readString();
+ _val248 = iprot.readDouble();
+ _val244.put(_key247, _val248);
+ }
+ }
+ struct.complete_ms_avg.put(_key243, _val244);
+ }
+ }
+ struct.set_complete_ms_avg_isSet(true);
+ }
+ }
+
}
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/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 d89f0fb..f721a14 100644
--- a/storm-core/src/jvm/backtype/storm/generated/StateSpoutSpec.java
+++ b/storm-core/src/jvm/backtype/storm/generated/StateSpoutSpec.java
@@ -16,13 +16,24 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package backtype.storm.generated;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -35,15 +46,24 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class StateSpoutSpec implements org.apache.thrift.TBase<StateSpoutSpec, StateSpoutSpec._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
+public class 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");
private static final org.apache.thrift.protocol.TField STATE_SPOUT_OBJECT_FIELD_DESC = new org.apache.thrift.protocol.TField("state_spout_object", org.apache.thrift.protocol.TType.STRUCT, (short)1);
private static final org.apache.thrift.protocol.TField COMMON_FIELD_DESC = new org.apache.thrift.protocol.TField("common", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new StateSpoutSpecStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new StateSpoutSpecTupleSchemeFactory());
+ }
+
private ComponentObject state_spout_object; // required
private ComponentCommon common; // required
@@ -109,7 +129,6 @@ public class StateSpoutSpec implements org.apache.thrift.TBase<StateSpoutSpec, S
}
// isset id assignments
-
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -285,45 +304,45 @@ public class StateSpoutSpec implements org.apache.thrift.TBase<StateSpoutSpec, S
@Override
public int hashCode() {
- HashCodeBuilder builder = new HashCodeBuilder();
+ List<Object> list = new ArrayList<Object>();
boolean present_state_spout_object = true && (is_set_state_spout_object());
- builder.append(present_state_spout_object);
+ list.add(present_state_spout_object);
if (present_state_spout_object)
- builder.append(state_spout_object);
+ list.add(state_spout_object);
boolean present_common = true && (is_set_common());
- builder.append(present_common);
+ list.add(present_common);
if (present_common)
- builder.append(common);
+ list.add(common);
- return builder.toHashCode();
+ return list.hashCode();
}
+ @Override
public int compareTo(StateSpoutSpec other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- StateSpoutSpec typedOther = (StateSpoutSpec)other;
- lastComparison = Boolean.valueOf(is_set_state_spout_object()).compareTo(typedOther.is_set_state_spout_object());
+ lastComparison = Boolean.valueOf(is_set_state_spout_object()).compareTo(other.is_set_state_spout_object());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_state_spout_object()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.state_spout_object, typedOther.state_spout_object);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.state_spout_object, other.state_spout_object);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_common()).compareTo(typedOther.is_set_common());
+ lastComparison = Boolean.valueOf(is_set_common()).compareTo(other.is_set_common());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_common()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.common, typedOther.common);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.common, other.common);
if (lastComparison != 0) {
return lastComparison;
}
@@ -336,56 +355,11 @@ public class StateSpoutSpec implements org.apache.thrift.TBase<StateSpoutSpec, S
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // STATE_SPOUT_OBJECT
- if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
- this.state_spout_object = new ComponentObject();
- this.state_spout_object.read(iprot);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 2: // COMMON
- if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
- this.common = new ComponentCommon();
- this.common.read(iprot);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (this.state_spout_object != null) {
- oprot.writeFieldBegin(STATE_SPOUT_OBJECT_FIELD_DESC);
- this.state_spout_object.write(oprot);
- oprot.writeFieldEnd();
- }
- if (this.common != null) {
- oprot.writeFieldBegin(COMMON_FIELD_DESC);
- this.common.write(oprot);
- oprot.writeFieldEnd();
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@Override
@@ -422,6 +396,10 @@ public class StateSpoutSpec implements org.apache.thrift.TBase<StateSpoutSpec, S
throw new org.apache.thrift.protocol.TProtocolException("Required field 'common' is unset! Struct:" + toString());
}
+ // check for sub-struct validity
+ if (common != null) {
+ common.validate();
+ }
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -440,5 +418,97 @@ public class StateSpoutSpec implements org.apache.thrift.TBase<StateSpoutSpec, S
}
}
+ private static class StateSpoutSpecStandardSchemeFactory implements SchemeFactory {
+ public StateSpoutSpecStandardScheme getScheme() {
+ return new StateSpoutSpecStandardScheme();
+ }
+ }
+
+ private static class StateSpoutSpecStandardScheme extends StandardScheme<StateSpoutSpec> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, StateSpoutSpec 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: // STATE_SPOUT_OBJECT
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+ struct.state_spout_object = new ComponentObject();
+ struct.state_spout_object.read(iprot);
+ struct.set_state_spout_object_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // COMMON
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+ struct.common = new ComponentCommon();
+ struct.common.read(iprot);
+ struct.set_common_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ default:
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ iprot.readFieldEnd();
+ }
+ iprot.readStructEnd();
+ struct.validate();
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot, StateSpoutSpec struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.state_spout_object != null) {
+ oprot.writeFieldBegin(STATE_SPOUT_OBJECT_FIELD_DESC);
+ struct.state_spout_object.write(oprot);
+ oprot.writeFieldEnd();
+ }
+ if (struct.common != null) {
+ oprot.writeFieldBegin(COMMON_FIELD_DESC);
+ struct.common.write(oprot);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class StateSpoutSpecTupleSchemeFactory implements SchemeFactory {
+ public StateSpoutSpecTupleScheme getScheme() {
+ return new StateSpoutSpecTupleScheme();
+ }
+ }
+
+ private static class StateSpoutSpecTupleScheme extends TupleScheme<StateSpoutSpec> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, StateSpoutSpec struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ struct.state_spout_object.write(oprot);
+ struct.common.write(oprot);
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, StateSpoutSpec struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ struct.state_spout_object = new ComponentObject();
+ struct.state_spout_object.read(iprot);
+ struct.set_state_spout_object_isSet(true);
+ struct.common = new ComponentCommon();
+ struct.common.read(iprot);
+ struct.set_common_isSet(true);
+ }
+ }
+
}
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/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 1ec2b99..6da8287 100644
--- a/storm-core/src/jvm/backtype/storm/generated/StormTopology.java
+++ b/storm-core/src/jvm/backtype/storm/generated/StormTopology.java
@@ -16,13 +16,24 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package backtype.storm.generated;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -35,16 +46,25 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class StormTopology implements org.apache.thrift.TBase<StormTopology, StormTopology._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
+public class 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");
private static final org.apache.thrift.protocol.TField SPOUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("spouts", org.apache.thrift.protocol.TType.MAP, (short)1);
private static final org.apache.thrift.protocol.TField BOLTS_FIELD_DESC = new org.apache.thrift.protocol.TField("bolts", org.apache.thrift.protocol.TType.MAP, (short)2);
private static final org.apache.thrift.protocol.TField STATE_SPOUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("state_spouts", org.apache.thrift.protocol.TType.MAP, (short)3);
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new StormTopologyStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new StormTopologyTupleSchemeFactory());
+ }
+
private Map<String,SpoutSpec> spouts; // required
private Map<String,Bolt> bolts; // required
private Map<String,StateSpoutSpec> state_spouts; // required
@@ -114,7 +134,6 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
}
// 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);
@@ -153,7 +172,7 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
*/
public StormTopology(StormTopology other) {
if (other.is_set_spouts()) {
- Map<String,SpoutSpec> __this__spouts = new HashMap<String,SpoutSpec>();
+ Map<String,SpoutSpec> __this__spouts = new HashMap<String,SpoutSpec>(other.spouts.size());
for (Map.Entry<String, SpoutSpec> other_element : other.spouts.entrySet()) {
String other_element_key = other_element.getKey();
@@ -168,7 +187,7 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
this.spouts = __this__spouts;
}
if (other.is_set_bolts()) {
- Map<String,Bolt> __this__bolts = new HashMap<String,Bolt>();
+ Map<String,Bolt> __this__bolts = new HashMap<String,Bolt>(other.bolts.size());
for (Map.Entry<String, Bolt> other_element : other.bolts.entrySet()) {
String other_element_key = other_element.getKey();
@@ -183,7 +202,7 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
this.bolts = __this__bolts;
}
if (other.is_set_state_spouts()) {
- Map<String,StateSpoutSpec> __this__state_spouts = new HashMap<String,StateSpoutSpec>();
+ Map<String,StateSpoutSpec> __this__state_spouts = new HashMap<String,StateSpoutSpec>(other.state_spouts.size());
for (Map.Entry<String, StateSpoutSpec> other_element : other.state_spouts.entrySet()) {
String other_element_key = other_element.getKey();
@@ -418,60 +437,60 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
@Override
public int hashCode() {
- HashCodeBuilder builder = new HashCodeBuilder();
+ List<Object> list = new ArrayList<Object>();
boolean present_spouts = true && (is_set_spouts());
- builder.append(present_spouts);
+ list.add(present_spouts);
if (present_spouts)
- builder.append(spouts);
+ list.add(spouts);
boolean present_bolts = true && (is_set_bolts());
- builder.append(present_bolts);
+ list.add(present_bolts);
if (present_bolts)
- builder.append(bolts);
+ list.add(bolts);
boolean present_state_spouts = true && (is_set_state_spouts());
- builder.append(present_state_spouts);
+ list.add(present_state_spouts);
if (present_state_spouts)
- builder.append(state_spouts);
+ list.add(state_spouts);
- return builder.toHashCode();
+ return list.hashCode();
}
+ @Override
public int compareTo(StormTopology other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- StormTopology typedOther = (StormTopology)other;
- lastComparison = Boolean.valueOf(is_set_spouts()).compareTo(typedOther.is_set_spouts());
+ lastComparison = Boolean.valueOf(is_set_spouts()).compareTo(other.is_set_spouts());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_spouts()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.spouts, typedOther.spouts);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.spouts, other.spouts);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_bolts()).compareTo(typedOther.is_set_bolts());
+ lastComparison = Boolean.valueOf(is_set_bolts()).compareTo(other.is_set_bolts());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_bolts()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.bolts, typedOther.bolts);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.bolts, other.bolts);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_state_spouts()).compareTo(typedOther.is_set_state_spouts());
+ lastComparison = Boolean.valueOf(is_set_state_spouts()).compareTo(other.is_set_state_spouts());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_state_spouts()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.state_spouts, typedOther.state_spouts);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.state_spouts, other.state_spouts);
if (lastComparison != 0) {
return lastComparison;
}
@@ -484,129 +503,11 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // SPOUTS
- if (field.type == org.apache.thrift.protocol.TType.MAP) {
- {
- org.apache.thrift.protocol.TMap _map22 = iprot.readMapBegin();
- this.spouts = new HashMap<String,SpoutSpec>(2*_map22.size);
- for (int _i23 = 0; _i23 < _map22.size; ++_i23)
- {
- String _key24; // required
- SpoutSpec _val25; // required
- _key24 = iprot.readString();
- _val25 = new SpoutSpec();
- _val25.read(iprot);
- this.spouts.put(_key24, _val25);
- }
- iprot.readMapEnd();
- }
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 2: // BOLTS
- if (field.type == org.apache.thrift.protocol.TType.MAP) {
- {
- org.apache.thrift.protocol.TMap _map26 = iprot.readMapBegin();
- this.bolts = new HashMap<String,Bolt>(2*_map26.size);
- for (int _i27 = 0; _i27 < _map26.size; ++_i27)
- {
- String _key28; // required
- Bolt _val29; // required
- _key28 = iprot.readString();
- _val29 = new Bolt();
- _val29.read(iprot);
- this.bolts.put(_key28, _val29);
- }
- iprot.readMapEnd();
- }
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 3: // STATE_SPOUTS
- if (field.type == org.apache.thrift.protocol.TType.MAP) {
- {
- org.apache.thrift.protocol.TMap _map30 = iprot.readMapBegin();
- this.state_spouts = new HashMap<String,StateSpoutSpec>(2*_map30.size);
- for (int _i31 = 0; _i31 < _map30.size; ++_i31)
- {
- String _key32; // required
- StateSpoutSpec _val33; // required
- _key32 = iprot.readString();
- _val33 = new StateSpoutSpec();
- _val33.read(iprot);
- this.state_spouts.put(_key32, _val33);
- }
- iprot.readMapEnd();
- }
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (this.spouts != null) {
- oprot.writeFieldBegin(SPOUTS_FIELD_DESC);
- {
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, this.spouts.size()));
- for (Map.Entry<String, SpoutSpec> _iter34 : this.spouts.entrySet())
- {
- oprot.writeString(_iter34.getKey());
- _iter34.getValue().write(oprot);
- }
- oprot.writeMapEnd();
- }
- oprot.writeFieldEnd();
- }
- if (this.bolts != null) {
- oprot.writeFieldBegin(BOLTS_FIELD_DESC);
- {
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, this.bolts.size()));
- for (Map.Entry<String, Bolt> _iter35 : this.bolts.entrySet())
- {
- oprot.writeString(_iter35.getKey());
- _iter35.getValue().write(oprot);
- }
- oprot.writeMapEnd();
- }
- oprot.writeFieldEnd();
- }
- if (this.state_spouts != null) {
- oprot.writeFieldBegin(STATE_SPOUTS_FIELD_DESC);
- {
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, this.state_spouts.size()));
- for (Map.Entry<String, StateSpoutSpec> _iter36 : this.state_spouts.entrySet())
- {
- oprot.writeString(_iter36.getKey());
- _iter36.getValue().write(oprot);
- }
- oprot.writeMapEnd();
- }
- oprot.writeFieldEnd();
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@Override
@@ -655,6 +556,7 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
throw new org.apache.thrift.protocol.TProtocolException("Required field 'state_spouts' is unset! Struct:" + toString());
}
+ // check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -673,5 +575,229 @@ public class StormTopology implements org.apache.thrift.TBase<StormTopology, Sto
}
}
+ private static class StormTopologyStandardSchemeFactory implements SchemeFactory {
+ public StormTopologyStandardScheme getScheme() {
+ return new StormTopologyStandardScheme();
+ }
+ }
+
+ private static class StormTopologyStandardScheme extends StandardScheme<StormTopology> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, StormTopology 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: // SPOUTS
+ if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+ {
+ org.apache.thrift.protocol.TMap _map44 = iprot.readMapBegin();
+ struct.spouts = new HashMap<String,SpoutSpec>(2*_map44.size);
+ String _key45;
+ SpoutSpec _val46;
+ for (int _i47 = 0; _i47 < _map44.size; ++_i47)
+ {
+ _key45 = iprot.readString();
+ _val46 = new SpoutSpec();
+ _val46.read(iprot);
+ struct.spouts.put(_key45, _val46);
+ }
+ iprot.readMapEnd();
+ }
+ struct.set_spouts_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // BOLTS
+ if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+ {
+ org.apache.thrift.protocol.TMap _map48 = iprot.readMapBegin();
+ struct.bolts = new HashMap<String,Bolt>(2*_map48.size);
+ String _key49;
+ Bolt _val50;
+ for (int _i51 = 0; _i51 < _map48.size; ++_i51)
+ {
+ _key49 = iprot.readString();
+ _val50 = new Bolt();
+ _val50.read(iprot);
+ struct.bolts.put(_key49, _val50);
+ }
+ iprot.readMapEnd();
+ }
+ struct.set_bolts_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 3: // STATE_SPOUTS
+ if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+ {
+ org.apache.thrift.protocol.TMap _map52 = iprot.readMapBegin();
+ struct.state_spouts = new HashMap<String,StateSpoutSpec>(2*_map52.size);
+ String _key53;
+ StateSpoutSpec _val54;
+ for (int _i55 = 0; _i55 < _map52.size; ++_i55)
+ {
+ _key53 = iprot.readString();
+ _val54 = new StateSpoutSpec();
+ _val54.read(iprot);
+ struct.state_spouts.put(_key53, _val54);
+ }
+ iprot.readMapEnd();
+ }
+ struct.set_state_spouts_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, StormTopology struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.spouts != null) {
+ oprot.writeFieldBegin(SPOUTS_FIELD_DESC);
+ {
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.spouts.size()));
+ for (Map.Entry<String, SpoutSpec> _iter56 : struct.spouts.entrySet())
+ {
+ oprot.writeString(_iter56.getKey());
+ _iter56.getValue().write(oprot);
+ }
+ oprot.writeMapEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ if (struct.bolts != null) {
+ oprot.writeFieldBegin(BOLTS_FIELD_DESC);
+ {
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.bolts.size()));
+ for (Map.Entry<String, Bolt> _iter57 : struct.bolts.entrySet())
+ {
+ oprot.writeString(_iter57.getKey());
+ _iter57.getValue().write(oprot);
+ }
+ oprot.writeMapEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ if (struct.state_spouts != null) {
+ oprot.writeFieldBegin(STATE_SPOUTS_FIELD_DESC);
+ {
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.state_spouts.size()));
+ for (Map.Entry<String, StateSpoutSpec> _iter58 : struct.state_spouts.entrySet())
+ {
+ oprot.writeString(_iter58.getKey());
+ _iter58.getValue().write(oprot);
+ }
+ oprot.writeMapEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class StormTopologyTupleSchemeFactory implements SchemeFactory {
+ public StormTopologyTupleScheme getScheme() {
+ return new StormTopologyTupleScheme();
+ }
+ }
+
+ private static class StormTopologyTupleScheme extends TupleScheme<StormTopology> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, StormTopology struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ {
+ oprot.writeI32(struct.spouts.size());
+ for (Map.Entry<String, SpoutSpec> _iter59 : struct.spouts.entrySet())
+ {
+ oprot.writeString(_iter59.getKey());
+ _iter59.getValue().write(oprot);
+ }
+ }
+ {
+ oprot.writeI32(struct.bolts.size());
+ for (Map.Entry<String, Bolt> _iter60 : struct.bolts.entrySet())
+ {
+ oprot.writeString(_iter60.getKey());
+ _iter60.getValue().write(oprot);
+ }
+ }
+ {
+ oprot.writeI32(struct.state_spouts.size());
+ for (Map.Entry<String, StateSpoutSpec> _iter61 : struct.state_spouts.entrySet())
+ {
+ oprot.writeString(_iter61.getKey());
+ _iter61.getValue().write(oprot);
+ }
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, StormTopology struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ {
+ org.apache.thrift.protocol.TMap _map62 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.spouts = new HashMap<String,SpoutSpec>(2*_map62.size);
+ String _key63;
+ SpoutSpec _val64;
+ for (int _i65 = 0; _i65 < _map62.size; ++_i65)
+ {
+ _key63 = iprot.readString();
+ _val64 = new SpoutSpec();
+ _val64.read(iprot);
+ struct.spouts.put(_key63, _val64);
+ }
+ }
+ struct.set_spouts_isSet(true);
+ {
+ org.apache.thrift.protocol.TMap _map66 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.bolts = new HashMap<String,Bolt>(2*_map66.size);
+ String _key67;
+ Bolt _val68;
+ for (int _i69 = 0; _i69 < _map66.size; ++_i69)
+ {
+ _key67 = iprot.readString();
+ _val68 = new Bolt();
+ _val68.read(iprot);
+ struct.bolts.put(_key67, _val68);
+ }
+ }
+ struct.set_bolts_isSet(true);
+ {
+ org.apache.thrift.protocol.TMap _map70 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.state_spouts = new HashMap<String,StateSpoutSpec>(2*_map70.size);
+ String _key71;
+ StateSpoutSpec _val72;
+ for (int _i73 = 0; _i73 < _map70.size; ++_i73)
+ {
+ _key71 = iprot.readString();
+ _val72 = new StateSpoutSpec();
+ _val72.read(iprot);
+ struct.state_spouts.put(_key71, _val72);
+ }
+ }
+ struct.set_state_spouts_isSet(true);
+ }
+ }
+
}
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/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 7cd9bb8..18339c0 100644
--- a/storm-core/src/jvm/backtype/storm/generated/StreamInfo.java
+++ b/storm-core/src/jvm/backtype/storm/generated/StreamInfo.java
@@ -16,13 +16,24 @@
* limitations under the License.
*/
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package backtype.storm.generated;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -35,15 +46,24 @@ import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import javax.annotation.Generated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class StreamInfo implements org.apache.thrift.TBase<StreamInfo, StreamInfo._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
+public class 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");
private static final org.apache.thrift.protocol.TField OUTPUT_FIELDS_FIELD_DESC = new org.apache.thrift.protocol.TField("output_fields", org.apache.thrift.protocol.TType.LIST, (short)1);
private static final org.apache.thrift.protocol.TField DIRECT_FIELD_DESC = new org.apache.thrift.protocol.TField("direct", org.apache.thrift.protocol.TType.BOOL, (short)2);
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new StreamInfoStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new StreamInfoTupleSchemeFactory());
+ }
+
private List<String> output_fields; // required
private boolean direct; // required
@@ -110,8 +130,7 @@ public class StreamInfo implements org.apache.thrift.TBase<StreamInfo, StreamInf
// isset id assignments
private static final int __DIRECT_ISSET_ID = 0;
- private BitSet __isset_bit_vector = new BitSet(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);
@@ -141,13 +160,9 @@ public class StreamInfo implements org.apache.thrift.TBase<StreamInfo, StreamInf
* Performs a deep copy on <i>other</i>.
*/
public StreamInfo(StreamInfo other) {
- __isset_bit_vector.clear();
- __isset_bit_vector.or(other.__isset_bit_vector);
+ __isset_bitfield = other.__isset_bitfield;
if (other.is_set_output_fields()) {
- List<String> __this__output_fields = new ArrayList<String>();
- for (String other_element : other.output_fields) {
- __this__output_fields.add(other_element);
- }
+ List<String> __this__output_fields = new ArrayList<String>(other.output_fields);
this.output_fields = __this__output_fields;
}
this.direct = other.direct;
@@ -212,16 +227,16 @@ public class StreamInfo implements org.apache.thrift.TBase<StreamInfo, StreamInf
}
public void unset_direct() {
- __isset_bit_vector.clear(__DIRECT_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __DIRECT_ISSET_ID);
}
/** Returns true if field direct is set (has been assigned a value) and false otherwise */
public boolean is_set_direct() {
- return __isset_bit_vector.get(__DIRECT_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __DIRECT_ISSET_ID);
}
public void set_direct_isSet(boolean value) {
- __isset_bit_vector.set(__DIRECT_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __DIRECT_ISSET_ID, value);
}
public void setFieldValue(_Fields field, Object value) {
@@ -308,45 +323,45 @@ public class StreamInfo implements org.apache.thrift.TBase<StreamInfo, StreamInf
@Override
public int hashCode() {
- HashCodeBuilder builder = new HashCodeBuilder();
+ List<Object> list = new ArrayList<Object>();
boolean present_output_fields = true && (is_set_output_fields());
- builder.append(present_output_fields);
+ list.add(present_output_fields);
if (present_output_fields)
- builder.append(output_fields);
+ list.add(output_fields);
boolean present_direct = true;
- builder.append(present_direct);
+ list.add(present_direct);
if (present_direct)
- builder.append(direct);
+ list.add(direct);
- return builder.toHashCode();
+ return list.hashCode();
}
+ @Override
public int compareTo(StreamInfo other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- StreamInfo typedOther = (StreamInfo)other;
- lastComparison = Boolean.valueOf(is_set_output_fields()).compareTo(typedOther.is_set_output_fields());
+ lastComparison = Boolean.valueOf(is_set_output_fields()).compareTo(other.is_set_output_fields());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_output_fields()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.output_fields, typedOther.output_fields);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.output_fields, other.output_fields);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(is_set_direct()).compareTo(typedOther.is_set_direct());
+ lastComparison = Boolean.valueOf(is_set_direct()).compareTo(other.is_set_direct());
if (lastComparison != 0) {
return lastComparison;
}
if (is_set_direct()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.direct, typedOther.direct);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.direct, other.direct);
if (lastComparison != 0) {
return lastComparison;
}
@@ -359,70 +374,11 @@ public class StreamInfo implements org.apache.thrift.TBase<StreamInfo, StreamInf
}
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField field;
- iprot.readStructBegin();
- while (true)
- {
- field = iprot.readFieldBegin();
- if (field.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // OUTPUT_FIELDS
- if (field.type == org.apache.thrift.protocol.TType.LIST) {
- {
- org.apache.thrift.protocol.TList _list8 = iprot.readListBegin();
- this.output_fields = new ArrayList<String>(_list8.size);
- for (int _i9 = 0; _i9 < _list8.size; ++_i9)
- {
- String _elem10; // required
- _elem10 = iprot.readString();
- this.output_fields.add(_elem10);
- }
- iprot.readListEnd();
- }
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 2: // DIRECT
- if (field.type == org.apache.thrift.protocol.TType.BOOL) {
- this.direct = iprot.readBool();
- set_direct_isSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (this.output_fields != null) {
- oprot.writeFieldBegin(OUTPUT_FIELDS_FIELD_DESC);
- {
- oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, this.output_fields.size()));
- for (String _iter11 : this.output_fields)
- {
- oprot.writeString(_iter11);
- }
- oprot.writeListEnd();
- }
- oprot.writeFieldEnd();
- }
- oprot.writeFieldBegin(DIRECT_FIELD_DESC);
- oprot.writeBool(this.direct);
- oprot.writeFieldEnd();
- oprot.writeFieldStop();
- oprot.writeStructEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@Override
@@ -455,6 +411,7 @@ public class StreamInfo implements org.apache.thrift.TBase<StreamInfo, StreamInf
throw new org.apache.thrift.protocol.TProtocolException("Required field 'direct' is unset! Struct:" + toString());
}
+ // check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -468,12 +425,130 @@ public class StreamInfo implements org.apache.thrift.TBase<StreamInfo, StreamInf
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_bit_vector = new BitSet(1);
+ __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 StreamInfoStandardSchemeFactory implements SchemeFactory {
+ public StreamInfoStandardScheme getScheme() {
+ return new StreamInfoStandardScheme();
+ }
+ }
+
+ private static class StreamInfoStandardScheme extends StandardScheme<StreamInfo> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, StreamInfo 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: // OUTPUT_FIELDS
+ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+ {
+ org.apache.thrift.protocol.TList _list16 = iprot.readListBegin();
+ struct.output_fields = new ArrayList<String>(_list16.size);
+ String _elem17;
+ for (int _i18 = 0; _i18 < _list16.size; ++_i18)
+ {
+ _elem17 = iprot.readString();
+ struct.output_fields.add(_elem17);
+ }
+ iprot.readListEnd();
+ }
+ struct.set_output_fields_isSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // DIRECT
+ if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+ struct.direct = iprot.readBool();
+ struct.set_direct_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, StreamInfo struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.output_fields != null) {
+ oprot.writeFieldBegin(OUTPUT_FIELDS_FIELD_DESC);
+ {
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.output_fields.size()));
+ for (String _iter19 : struct.output_fields)
+ {
+ oprot.writeString(_iter19);
+ }
+ oprot.writeListEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldBegin(DIRECT_FIELD_DESC);
+ oprot.writeBool(struct.direct);
+ oprot.writeFieldEnd();
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class StreamInfoTupleSchemeFactory implements SchemeFactory {
+ public StreamInfoTupleScheme getScheme() {
+ return new StreamInfoTupleScheme();
+ }
+ }
+
+ private static class StreamInfoTupleScheme extends TupleScheme<StreamInfo> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, StreamInfo struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ {
+ oprot.writeI32(struct.output_fields.size());
+ for (String _iter20 : struct.output_fields)
+ {
+ oprot.writeString(_iter20);
+ }
+ }
+ oprot.writeBool(struct.direct);
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, StreamInfo struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ {
+ org.apache.thrift.protocol.TList _list21 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.output_fields = new ArrayList<String>(_list21.size);
+ String _elem22;
+ for (int _i23 = 0; _i23 < _list21.size; ++_i23)
+ {
+ _elem22 = iprot.readString();
+ struct.output_fields.add(_elem22);
+ }
+ }
+ struct.set_output_fields_isSet(true);
+ struct.direct = iprot.readBool();
+ struct.set_direct_isSet(true);
+ }
+ }
+
}
[14/18] storm git commit: Merge branch 'master' of
github.com:apache/incubator-storm into thrift092
Posted by kn...@apache.org.
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/NotAliveException.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/NotAliveException.java
index 1337697,ce03d91..100da84
--- a/storm-core/src/jvm/backtype/storm/generated/NotAliveException.java
+++ b/storm-core/src/jvm/backtype/storm/generated/NotAliveException.java
@@@ -50,9 -38,7 +50,9 @@@ import javax.annotation.Generated
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class NotAliveException extends Exception implements org.apache.thrift.TBase<NotAliveException, NotAliveException._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
++@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");
private static final org.apache.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.thrift.protocol.TField("msg", org.apache.thrift.protocol.TType.STRING, (short)1);
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/NullStruct.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/NullStruct.java
index c72112e,960c3b2..f44bccd
--- a/storm-core/src/jvm/backtype/storm/generated/NullStruct.java
+++ b/storm-core/src/jvm/backtype/storm/generated/NullStruct.java
@@@ -50,9 -38,7 +50,9 @@@ import javax.annotation.Generated
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class NullStruct implements org.apache.thrift.TBase<NullStruct, NullStruct._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
++@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/a99e1276/storm-core/src/jvm/backtype/storm/generated/NumErrorsChoice.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/NumErrorsChoice.java
index 0000000,b0548b0..8da6671
mode 000000,100644..100644
--- a/storm-core/src/jvm/backtype/storm/generated/NumErrorsChoice.java
+++ b/storm-core/src/jvm/backtype/storm/generated/NumErrorsChoice.java
@@@ -1,0 -1,64 +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.
+ */
+ /**
- * Autogenerated by Thrift Compiler (0.7.0)
++ * Autogenerated by Thrift Compiler (0.9.2)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
++ * @generated
+ */
+ package backtype.storm.generated;
+
+
+ import java.util.Map;
+ import java.util.HashMap;
+ import org.apache.thrift.TEnum;
+
+ public enum NumErrorsChoice implements org.apache.thrift.TEnum {
+ ALL(0),
+ NONE(1),
+ ONE(2);
+
+ private final int value;
+
+ private NumErrorsChoice(int value) {
+ this.value = value;
+ }
+
+ /**
+ * Get the integer value of this enum value, as defined in the Thrift IDL.
+ */
+ public int getValue() {
+ return value;
+ }
+
+ /**
+ * Find a the enum type by its integer value, as defined in the Thrift IDL.
+ * @return null if the value is not found.
+ */
+ public static NumErrorsChoice findByValue(int value) {
+ switch (value) {
+ case 0:
+ return ALL;
+ case 1:
+ return NONE;
+ case 2:
+ return ONE;
+ default:
+ return null;
+ }
+ }
+ }
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/RebalanceOptions.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/RebalanceOptions.java
index 690428d,9f3cbf1..f973ffc
--- a/storm-core/src/jvm/backtype/storm/generated/RebalanceOptions.java
+++ b/storm-core/src/jvm/backtype/storm/generated/RebalanceOptions.java
@@@ -50,9 -38,7 +50,9 @@@ import javax.annotation.Generated
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOptions, RebalanceOptions._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
++@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");
private static final org.apache.thrift.protocol.TField WAIT_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("wait_secs", org.apache.thrift.protocol.TType.I32, (short)1);
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/ShellComponent.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/ShellComponent.java
index 083294c,6390d5a..27303f1
--- a/storm-core/src/jvm/backtype/storm/generated/ShellComponent.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ShellComponent.java
@@@ -50,9 -38,7 +50,9 @@@ import javax.annotation.Generated
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class ShellComponent implements org.apache.thrift.TBase<ShellComponent, ShellComponent._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
++@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");
private static final org.apache.thrift.protocol.TField EXECUTION_COMMAND_FIELD_DESC = new org.apache.thrift.protocol.TField("execution_command", org.apache.thrift.protocol.TType.STRING, (short)1);
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/SpoutSpec.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/SpoutSpec.java
index 16931ac,60028e7..42fd37b
--- a/storm-core/src/jvm/backtype/storm/generated/SpoutSpec.java
+++ b/storm-core/src/jvm/backtype/storm/generated/SpoutSpec.java
@@@ -50,9 -38,7 +50,9 @@@ import javax.annotation.Generated
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class SpoutSpec implements org.apache.thrift.TBase<SpoutSpec, SpoutSpec._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
++@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");
private static final org.apache.thrift.protocol.TField SPOUT_OBJECT_FIELD_DESC = new org.apache.thrift.protocol.TField("spout_object", org.apache.thrift.protocol.TType.STRUCT, (short)1);
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/SpoutStats.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/SpoutStats.java
index e03cfdc,284f827..7826fe4
--- a/storm-core/src/jvm/backtype/storm/generated/SpoutStats.java
+++ b/storm-core/src/jvm/backtype/storm/generated/SpoutStats.java
@@@ -50,9 -38,7 +50,9 @@@ import javax.annotation.Generated
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStats._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
++@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");
private static final org.apache.thrift.protocol.TField ACKED_FIELD_DESC = new org.apache.thrift.protocol.TField("acked", org.apache.thrift.protocol.TType.MAP, (short)1);
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/StateSpoutSpec.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/StateSpoutSpec.java
index f721a14,d89f0fb..15d34ae
--- a/storm-core/src/jvm/backtype/storm/generated/StateSpoutSpec.java
+++ b/storm-core/src/jvm/backtype/storm/generated/StateSpoutSpec.java
@@@ -50,9 -38,7 +50,9 @@@ import javax.annotation.Generated
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class StateSpoutSpec implements org.apache.thrift.TBase<StateSpoutSpec, StateSpoutSpec._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
++@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");
private static final org.apache.thrift.protocol.TField STATE_SPOUT_OBJECT_FIELD_DESC = new org.apache.thrift.protocol.TField("state_spout_object", org.apache.thrift.protocol.TType.STRUCT, (short)1);
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/StormTopology.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/StormTopology.java
index 6da8287,1ec2b99..d022e95
--- a/storm-core/src/jvm/backtype/storm/generated/StormTopology.java
+++ b/storm-core/src/jvm/backtype/storm/generated/StormTopology.java
@@@ -50,9 -38,7 +50,9 @@@ import javax.annotation.Generated
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class StormTopology implements org.apache.thrift.TBase<StormTopology, StormTopology._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
++@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");
private static final org.apache.thrift.protocol.TField SPOUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("spouts", org.apache.thrift.protocol.TType.MAP, (short)1);
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/StreamInfo.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/StreamInfo.java
index 18339c0,7cd9bb8..b9bc75d
--- a/storm-core/src/jvm/backtype/storm/generated/StreamInfo.java
+++ b/storm-core/src/jvm/backtype/storm/generated/StreamInfo.java
@@@ -50,9 -38,7 +50,9 @@@ import javax.annotation.Generated
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class StreamInfo implements org.apache.thrift.TBase<StreamInfo, StreamInfo._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
++@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");
private static final org.apache.thrift.protocol.TField OUTPUT_FIELDS_FIELD_DESC = new org.apache.thrift.protocol.TField("output_fields", org.apache.thrift.protocol.TType.LIST, (short)1);
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/SubmitOptions.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/SubmitOptions.java
index 4c2e310,f885f69..2a68c3b
--- a/storm-core/src/jvm/backtype/storm/generated/SubmitOptions.java
+++ b/storm-core/src/jvm/backtype/storm/generated/SubmitOptions.java
@@@ -50,9 -38,7 +50,9 @@@ import javax.annotation.Generated
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, SubmitOptions._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
++@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");
private static final org.apache.thrift.protocol.TField INITIAL_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("initial_status", org.apache.thrift.protocol.TType.I32, (short)1);
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/SupervisorSummary.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/SupervisorSummary.java
index 69fca27,7072cdd..bc81586
--- a/storm-core/src/jvm/backtype/storm/generated/SupervisorSummary.java
+++ b/storm-core/src/jvm/backtype/storm/generated/SupervisorSummary.java
@@@ -50,9 -38,7 +50,9 @@@ import javax.annotation.Generated
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSummary, SupervisorSummary._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
++@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
+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");
private static final org.apache.thrift.protocol.TField HOST_FIELD_DESC = new org.apache.thrift.protocol.TField("host", org.apache.thrift.protocol.TType.STRING, (short)1);
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/TopologyInfo.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/TopologyInfo.java
index 3a9b407,2c36d4e..6e1a503
--- a/storm-core/src/jvm/backtype/storm/generated/TopologyInfo.java
+++ b/storm-core/src/jvm/backtype/storm/generated/TopologyInfo.java
@@@ -50,9 -38,7 +50,9 @@@ import javax.annotation.Generated
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, TopologyInfo._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
++@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");
private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)1);
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/TopologySummary.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/TopologySummary.java
index d129889,fea2137..bd8f90e
--- a/storm-core/src/jvm/backtype/storm/generated/TopologySummary.java
+++ b/storm-core/src/jvm/backtype/storm/generated/TopologySummary.java
@@@ -50,9 -38,7 +50,9 @@@ import javax.annotation.Generated
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class TopologySummary implements org.apache.thrift.TBase<TopologySummary, TopologySummary._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
++@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
+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");
private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)1);
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/py/storm/DistributedRPC-remote
----------------------------------------------------------------------
diff --cc storm-core/src/py/storm/DistributedRPC-remote
index 3d06d07,41f8e72..3d06d07
mode 100755,100644..100644
--- a/storm-core/src/py/storm/DistributedRPC-remote
+++ b/storm-core/src/py/storm/DistributedRPC-remote
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/py/storm/DistributedRPCInvocations-remote
----------------------------------------------------------------------
diff --cc storm-core/src/py/storm/DistributedRPCInvocations-remote
index 9dd50cd,37f0cb5..9dd50cd
mode 100755,100644..100644
--- a/storm-core/src/py/storm/DistributedRPCInvocations-remote
+++ b/storm-core/src/py/storm/DistributedRPCInvocations-remote
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/py/storm/Nimbus-remote
----------------------------------------------------------------------
diff --cc storm-core/src/py/storm/Nimbus-remote
index 4e487c9,2e5e41a..9af5ead
mode 100755,100644..100755
--- a/storm-core/src/py/storm/Nimbus-remote
+++ b/storm-core/src/py/storm/Nimbus-remote
@@@ -34,34 -31,35 +34,35 @@@ from thrift.transport import TSSLSocke
from thrift.transport import THttpClient
from thrift.protocol import TBinaryProtocol
-import Nimbus
-from ttypes import *
+from storm import Nimbus
+from storm.ttypes import *
if len(sys.argv) <= 1 or sys.argv[1] == '--help':
- print ''
- print 'Usage: ' + sys.argv[0] + ' [-h host:port] [-u url] [-f[ramed]] function [arg1 [arg2...]]'
- print ''
- print 'Functions:'
- print ' void submitTopology(string name, string uploadedJarLocation, string jsonConf, StormTopology topology)'
- print ' void submitTopologyWithOpts(string name, string uploadedJarLocation, string jsonConf, StormTopology topology, SubmitOptions options)'
- print ' void killTopology(string name)'
- print ' void killTopologyWithOpts(string name, KillOptions options)'
- print ' void activate(string name)'
- print ' void deactivate(string name)'
- print ' void rebalance(string name, RebalanceOptions options)'
- print ' void uploadNewCredentials(string name, Credentials creds)'
- print ' string beginFileUpload()'
- print ' void uploadChunk(string location, string chunk)'
- print ' void finishFileUpload(string location)'
- print ' string beginFileDownload(string file)'
- print ' string downloadChunk(string id)'
- print ' string getNimbusConf()'
- print ' ClusterSummary getClusterInfo()'
- print ' TopologyInfo getTopologyInfo(string id)'
- print ' TopologyInfo getTopologyInfoWithOpts(string id, GetInfoOptions options)'
- print ' string getTopologyConf(string id)'
- print ' StormTopology getTopology(string id)'
- print ' StormTopology getUserTopology(string id)'
- print ''
+ print('')
+ print('Usage: ' + sys.argv[0] + ' [-h host[:port]] [-u url] [-f[ramed]] [-s[sl]] function [arg1 [arg2...]]')
+ print('')
+ print('Functions:')
+ print(' void submitTopology(string name, string uploadedJarLocation, string jsonConf, StormTopology topology)')
+ print(' void submitTopologyWithOpts(string name, string uploadedJarLocation, string jsonConf, StormTopology topology, SubmitOptions options)')
+ print(' void killTopology(string name)')
+ print(' void killTopologyWithOpts(string name, KillOptions options)')
+ print(' void activate(string name)')
+ print(' void deactivate(string name)')
+ print(' void rebalance(string name, RebalanceOptions options)')
+ print(' void uploadNewCredentials(string name, Credentials creds)')
+ print(' string beginFileUpload()')
+ print(' void uploadChunk(string location, string chunk)')
+ print(' void finishFileUpload(string location)')
+ print(' string beginFileDownload(string file)')
+ print(' string downloadChunk(string id)')
+ print(' string getNimbusConf()')
+ print(' ClusterSummary getClusterInfo()')
+ print(' TopologyInfo getTopologyInfo(string id)')
++ print(' TopologyInfo getTopologyInfoWithOpts(string id, GetInfoOptions options)')
+ print(' string getTopologyConf(string id)')
+ print(' StormTopology getTopology(string id)')
+ print(' StormTopology getUserTopology(string id)')
+ print('')
sys.exit(0)
pp = pprint.PrettyPrinter(indent = 2)
@@@ -213,9 -205,15 +214,15 @@@ elif cmd == 'getTopologyInfo'
sys.exit(1)
pp.pprint(client.getTopologyInfo(args[0],))
+ elif cmd == 'getTopologyInfoWithOpts':
+ if len(args) != 2:
- print 'getTopologyInfoWithOpts requires 2 args'
++ print('getTopologyInfoWithOpts requires 2 args')
+ sys.exit(1)
+ pp.pprint(client.getTopologyInfoWithOpts(args[0],eval(args[1]),))
+
elif cmd == 'getTopologyConf':
if len(args) != 1:
- print 'getTopologyConf requires 1 args'
+ print('getTopologyConf requires 1 args')
sys.exit(1)
pp.pprint(client.getTopologyConf(args[0],))
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/py/storm/Nimbus.py
----------------------------------------------------------------------
diff --cc storm-core/src/py/storm/Nimbus.py
index 6159ad7,271780b..38e137d
--- a/storm-core/src/py/storm/Nimbus.py
+++ b/storm-core/src/py/storm/Nimbus.py
@@@ -715,6 -705,42 +723,43 @@@ class Client(Iface)
raise result.aze
raise TApplicationException(TApplicationException.MISSING_RESULT, "getTopologyInfo failed: unknown result");
+ def getTopologyInfoWithOpts(self, id, options):
+ """
+ Parameters:
+ - id
+ - options
+ """
+ self.send_getTopologyInfoWithOpts(id, options)
+ return self.recv_getTopologyInfoWithOpts()
+
+ def send_getTopologyInfoWithOpts(self, id, options):
+ self._oprot.writeMessageBegin('getTopologyInfoWithOpts', TMessageType.CALL, self._seqid)
+ args = getTopologyInfoWithOpts_args()
+ args.id = id
+ args.options = options
+ args.write(self._oprot)
+ self._oprot.writeMessageEnd()
+ self._oprot.trans.flush()
+
- def recv_getTopologyInfoWithOpts(self, ):
- (fname, mtype, rseqid) = self._iprot.readMessageBegin()
++ def recv_getTopologyInfoWithOpts(self):
++ iprot = self._iprot
++ (fname, mtype, rseqid) = iprot.readMessageBegin()
+ if mtype == TMessageType.EXCEPTION:
+ x = TApplicationException()
- x.read(self._iprot)
- self._iprot.readMessageEnd()
++ x.read(iprot)
++ iprot.readMessageEnd()
+ raise x
+ result = getTopologyInfoWithOpts_result()
- result.read(self._iprot)
- self._iprot.readMessageEnd()
++ result.read(iprot)
++ iprot.readMessageEnd()
+ if result.success is not None:
+ return result.success
+ if result.e is not None:
+ raise result.e
+ if result.aze is not None:
+ raise result.aze
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "getTopologyInfoWithOpts failed: unknown result");
+
def getTopologyConf(self, id):
"""
Parameters:
@@@ -3604,6 -3553,171 +3666,178 @@@ class getTopologyInfo_result
def __ne__(self, other):
return not (self == other)
+
+ class getTopologyInfoWithOpts_args:
+ """
+ Attributes:
+ - id
+ - options
+ """
+
+ thrift_spec = (
+ None, # 0
+ (1, TType.STRING, 'id', None, None, ), # 1
+ (2, TType.STRUCT, 'options', (GetInfoOptions, GetInfoOptions.thrift_spec), None, ), # 2
+ )
+
- def __hash__(self):
- return 0 + hash(self.id) + hash(self.options)
-
+ def __init__(self, id=None, options=None,):
+ self.id = id
+ self.options = options
+
+ 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.id = iprot.readString().decode('utf-8')
+ else:
+ iprot.skip(ftype)
+ elif fid == 2:
+ if ftype == TType.STRUCT:
+ self.options = GetInfoOptions()
+ self.options.read(iprot)
+ 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('getTopologyInfoWithOpts_args')
+ if self.id is not None:
+ oprot.writeFieldBegin('id', TType.STRING, 1)
+ oprot.writeString(self.id.encode('utf-8'))
+ oprot.writeFieldEnd()
+ if self.options is not None:
+ oprot.writeFieldBegin('options', TType.STRUCT, 2)
+ self.options.write(oprot)
+ oprot.writeFieldEnd()
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def validate(self):
+ return
+
+
++ def __hash__(self):
++ value = 17
++ value = (value * 31) ^ hash(self.id)
++ value = (value * 31) ^ hash(self.options)
++ 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 getTopologyInfoWithOpts_result:
+ """
+ Attributes:
+ - success
+ - e
+ - aze
+ """
+
+ thrift_spec = (
+ (0, TType.STRUCT, 'success', (TopologyInfo, TopologyInfo.thrift_spec), None, ), # 0
+ (1, TType.STRUCT, 'e', (NotAliveException, NotAliveException.thrift_spec), None, ), # 1
+ (2, TType.STRUCT, 'aze', (AuthorizationException, AuthorizationException.thrift_spec), None, ), # 2
+ )
+
- def __hash__(self):
- return 0 + hash(self.success) + hash(self.e) + hash(self.aze)
-
+ def __init__(self, success=None, e=None, aze=None,):
+ self.success = success
+ self.e = e
+ self.aze = aze
+
+ 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 == 0:
+ if ftype == TType.STRUCT:
+ self.success = TopologyInfo()
+ self.success.read(iprot)
+ else:
+ iprot.skip(ftype)
+ elif fid == 1:
+ if ftype == TType.STRUCT:
+ self.e = NotAliveException()
+ self.e.read(iprot)
+ else:
+ iprot.skip(ftype)
+ elif fid == 2:
+ if ftype == TType.STRUCT:
+ self.aze = AuthorizationException()
+ self.aze.read(iprot)
+ 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('getTopologyInfoWithOpts_result')
+ if self.success is not None:
+ oprot.writeFieldBegin('success', TType.STRUCT, 0)
+ self.success.write(oprot)
+ oprot.writeFieldEnd()
+ if self.e is not None:
+ oprot.writeFieldBegin('e', TType.STRUCT, 1)
+ self.e.write(oprot)
+ oprot.writeFieldEnd()
+ if self.aze is not None:
+ oprot.writeFieldBegin('aze', TType.STRUCT, 2)
+ self.aze.write(oprot)
+ oprot.writeFieldEnd()
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def validate(self):
+ return
+
+
++ def __hash__(self):
++ value = 17
++ value = (value * 31) ^ hash(self.success)
++ value = (value * 31) ^ hash(self.e)
++ value = (value * 31) ^ hash(self.aze)
++ 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 getTopologyConf_args:
"""
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/py/storm/ttypes.py
----------------------------------------------------------------------
diff --cc storm-core/src/py/storm/ttypes.py
index 58af972,46e7a92..8c3f5e6
--- a/storm-core/src/py/storm/ttypes.py
+++ b/storm-core/src/py/storm/ttypes.py
@@@ -4516,6 -4400,69 +4533,71 @@@ class SubmitOptions
def __ne__(self, other):
return not (self == other)
+ class GetInfoOptions:
+ """
+ Attributes:
+ - num_err_choice
+ """
+
+ thrift_spec = (
+ None, # 0
+ (1, TType.I32, 'num_err_choice', None, None, ), # 1
+ )
+
- def __hash__(self):
- return 0 + hash(self.num_err_choice)
-
+ def __init__(self, num_err_choice=None,):
+ self.num_err_choice = num_err_choice
+
+ 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.num_err_choice = 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('GetInfoOptions')
+ if self.num_err_choice is not None:
+ oprot.writeFieldBegin('num_err_choice', TType.I32, 1)
+ oprot.writeI32(self.num_err_choice)
+ oprot.writeFieldEnd()
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def validate(self):
+ return
+
+
++ def __hash__(self):
++ value = 17
++ value = (value * 31) ^ hash(self.num_err_choice)
++ 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 DRPCRequest:
"""
Attributes:
[18/18] storm git commit: Added STORM-400 to Changelog.
Posted by kn...@apache.org.
Added STORM-400 to Changelog.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/fc6d6dd8
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/fc6d6dd8
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/fc6d6dd8
Branch: refs/heads/master
Commit: fc6d6dd86b0487605b9d154752e3e3e387550ab2
Parents: c3bdd11
Author: Kyle Nusbaum <kn...@yahoo-inc.com>
Authored: Tue Feb 17 11:10:25 2015 -0600
Committer: Kyle Nusbaum <kn...@yahoo-inc.com>
Committed: Tue Feb 17 11:10:25 2015 -0600
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/fc6d6dd8/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3bcbf21..6d3b4dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -47,6 +47,7 @@
* STORM-667: Incorrect capitalization "SHell" in Multilang-protocol.md
* STORM-637: Integrate PartialKeyGrouping into storm API
* STORM-672: Typo in Trident documentation example
+ * STORM-400: Thrift upgrade to thrift-0.9.2
## 0.9.3-rc2
* STORM-558: change "swap!" to "reset!" to fix assignment-versions in supervisor