Permalink
Browse files

Temporarily revert to Thrift API 17.1.0

  • Loading branch information...
1 parent ce6197c commit ee384cc6bf5870a52eb7f80bd7975070b3aff080 @thobbs thobbs committed Oct 6, 2010
Showing with 4 additions and 39 deletions.
  1. +3 −38 pycassa/cassandra/Cassandra.py
  2. +1 −1 pycassa/cassandra/constants.py
@@ -927,8 +927,6 @@ def recv_describe_keyspaces(self, ):
self._iprot.readMessageEnd()
if result.success != None:
return result.success
- if result.ire != None:
- raise result.ire
raise TApplicationException(TApplicationException.MISSING_RESULT, "describe_keyspaces failed: unknown result");
def describe_cluster_name(self, ):
@@ -1116,8 +1114,6 @@ def recv_describe_keyspace(self, ):
return result.success
if result.nfe != None:
raise result.nfe
- if result.ire != None:
- raise result.ire
raise TApplicationException(TApplicationException.MISSING_RESULT, "describe_keyspace failed: unknown result");
def describe_splits(self, cfName, start_token, end_token, keys_per_split):
@@ -1736,10 +1732,7 @@ def process_describe_keyspaces(self, seqid, iprot, oprot):
args.read(iprot)
iprot.readMessageEnd()
result = describe_keyspaces_result()
- try:
- result.success = self._handler.describe_keyspaces()
- except InvalidRequestException, ire:
- result.ire = ire
+ result.success = self._handler.describe_keyspaces()
oprot.writeMessageBegin("describe_keyspaces", TMessageType.REPLY, seqid)
result.write(oprot)
oprot.writeMessageEnd()
@@ -1812,8 +1805,6 @@ def process_describe_keyspace(self, seqid, iprot, oprot):
result.success = self._handler.describe_keyspace(args.keyspace)
except NotFoundException, nfe:
result.nfe = nfe
- except InvalidRequestException, ire:
- result.ire = ire
oprot.writeMessageBegin("describe_keyspace", TMessageType.REPLY, seqid)
result.write(oprot)
oprot.writeMessageEnd()
@@ -4401,17 +4392,14 @@ class describe_keyspaces_result:
"""
Attributes:
- success
- - ire
"""
thrift_spec = (
(0, TType.LIST, 'success', (TType.STRUCT,(KsDef, KsDef.thrift_spec)), None, ), # 0
- (1, TType.STRUCT, 'ire', (InvalidRequestException, InvalidRequestException.thrift_spec), None, ), # 1
)
- def __init__(self, success=None, ire=None,):
+ def __init__(self, success=None,):
self.success = success
- self.ire = ire
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:
@@ -4433,12 +4421,6 @@ def read(self, iprot):
iprot.readListEnd()
else:
iprot.skip(ftype)
- elif fid == 1:
- if ftype == TType.STRUCT:
- self.ire = InvalidRequestException()
- self.ire.read(iprot)
- else:
- iprot.skip(ftype)
else:
iprot.skip(ftype)
iprot.readFieldEnd()
@@ -4456,10 +4438,6 @@ def write(self, oprot):
iter174.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
- if self.ire != None:
- oprot.writeFieldBegin('ire', TType.STRUCT, 1)
- self.ire.write(oprot)
- oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -5040,19 +5018,16 @@ class describe_keyspace_result:
Attributes:
- success
- nfe
- - ire
"""
thrift_spec = (
(0, TType.STRUCT, 'success', (KsDef, KsDef.thrift_spec), None, ), # 0
(1, TType.STRUCT, 'nfe', (NotFoundException, NotFoundException.thrift_spec), None, ), # 1
- (2, TType.STRUCT, 'ire', (InvalidRequestException, InvalidRequestException.thrift_spec), None, ), # 2
)
- def __init__(self, success=None, nfe=None, ire=None,):
+ def __init__(self, success=None, nfe=None,):
self.success = success
self.nfe = nfe
- self.ire = ire
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:
@@ -5075,12 +5050,6 @@ def read(self, iprot):
self.nfe.read(iprot)
else:
iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRUCT:
- self.ire = InvalidRequestException()
- self.ire.read(iprot)
- else:
- iprot.skip(ftype)
else:
iprot.skip(ftype)
iprot.readFieldEnd()
@@ -5099,10 +5068,6 @@ def write(self, oprot):
oprot.writeFieldBegin('nfe', TType.STRUCT, 1)
self.nfe.write(oprot)
oprot.writeFieldEnd()
- if self.ire != None:
- oprot.writeFieldBegin('ire', TType.STRUCT, 2)
- self.ire.write(oprot)
- oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -7,5 +7,5 @@
from thrift.Thrift import *
from ttypes import *
-VERSION = "18.1.0"
+VERSION = "17.1.0"

0 comments on commit ee384cc

Please sign in to comment.