diff --git a/CHANGES.txt b/CHANGES.txt index 3de58df802..eccb32d71d 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -41,7 +41,7 @@ in LeveledManifest (CASSANDRA-3691) * finer-grained control over data directories (CASSANDRA-2749) * Fix ClassCastException during hinted handoff (CASSANDRA-3694) - + * Upgrade Thrift to 0.7 (CASSANDRA-3213) 1.0.7 * fix regression in HH page size calculation (CASSANDRA-3624) diff --git a/build.xml b/build.xml index 23f69aad93..d9648f87ef 100644 --- a/build.xml +++ b/build.xml @@ -369,9 +369,7 @@ url=${svn.entry.url}?pathrev=${svn.entry.commit.revision} - - - + diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java index 2ad54d68c0..5d88cd98e8 100644 --- a/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java +++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift + * Autogenerated by Thrift Compiler (0.7.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ @@ -50,7 +50,7 @@ public class AuthenticationException extends Exception implements org.apache.thr private static final org.apache.thrift.protocol.TField WHY_FIELD_DESC = new org.apache.thrift.protocol.TField("why", org.apache.thrift.protocol.TType.STRING, (short)1); - public String why; + public String why; // 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 { diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java index 08fc094038..0f68426841 100644 --- a/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java +++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift + * Autogenerated by Thrift Compiler (0.7.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ @@ -50,7 +50,7 @@ public class AuthenticationRequest implements org.apache.thrift.TBase credentials; + public Map credentials; // 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 { @@ -312,8 +312,8 @@ public class AuthenticationRequest implements org.apache.thrift.TBase(2*_map36.size); for (int _i37 = 0; _i37 < _map36.size; ++_i37) { - String _key38; - String _val39; + String _key38; // required + String _val39; // required _key38 = iprot.readString(); _val39 = iprot.readString(); this.credentials.put(_key38, _val39); diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java index 8ff9d447b0..76bc0614e4 100644 --- a/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java +++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift + * Autogenerated by Thrift Compiler (0.7.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ @@ -50,7 +50,7 @@ public class AuthorizationException extends Exception implements org.apache.thri private static final org.apache.thrift.protocol.TField WHY_FIELD_DESC = new org.apache.thrift.protocol.TField("why", org.apache.thrift.protocol.TType.STRING, (short)1); - public String why; + public String why; // 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 { diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java index eb0310b43e..f96d1d0c7f 100644 --- a/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java +++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift + * Autogenerated by Thrift Compiler (0.7.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ @@ -399,7 +399,7 @@ public class Cassandra { } - public static class Client implements org.apache.thrift.TServiceClient, Iface { + public static class Client extends org.apache.thrift.TServiceClient implements Iface { public static class Factory implements org.apache.thrift.TServiceClientFactory { public Factory() {} public Client getClient(org.apache.thrift.protocol.TProtocol prot) { @@ -412,28 +412,11 @@ public class Cassandra { public Client(org.apache.thrift.protocol.TProtocol prot) { - this(prot, prot); + super(prot, prot); } - public Client(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) - { - iprot_ = iprot; - oprot_ = oprot; - } - - protected org.apache.thrift.protocol.TProtocol iprot_; - protected org.apache.thrift.protocol.TProtocol oprot_; - - protected int seqid_; - - public org.apache.thrift.protocol.TProtocol getInputProtocol() - { - return this.iprot_; - } - - public org.apache.thrift.protocol.TProtocol getOutputProtocol() - { - return this.oprot_; + public Client(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) { + super(iprot, oprot); } public void login(AuthenticationRequest auth_request) throws AuthenticationException, AuthorizationException, org.apache.thrift.TException @@ -444,28 +427,15 @@ public class Cassandra { public void send_login(AuthenticationRequest auth_request) throws org.apache.thrift.TException { - oprot_.writeMessageBegin(new org.apache.thrift.protocol.TMessage("login", org.apache.thrift.protocol.TMessageType.CALL, ++seqid_)); login_args args = new login_args(); args.setAuth_request(auth_request); - args.write(oprot_); - oprot_.writeMessageEnd(); - oprot_.getTransport().flush(); + sendBase("login", args); } public void recv_login() throws AuthenticationException, AuthorizationException, org.apache.thrift.TException { - org.apache.thrift.protocol.TMessage msg = iprot_.readMessageBegin(); - if (msg.type == org.apache.thrift.protocol.TMessageType.EXCEPTION) { - org.apache.thrift.TApplicationException x = org.apache.thrift.TApplicationException.read(iprot_); - iprot_.readMessageEnd(); - throw x; - } - if (msg.seqid != seqid_) { - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.BAD_SEQUENCE_ID, "login failed: out of sequence response"); - } login_result result = new login_result(); - result.read(iprot_); - iprot_.readMessageEnd(); + receiveBase(result, "login"); if (result.authnx != null) { throw result.authnx; } @@ -483,28 +453,15 @@ public class Cassandra { public void send_set_keyspace(String keyspace) throws org.apache.thrift.TException { - oprot_.writeMessageBegin(new org.apache.thrift.protocol.TMessage("set_keyspace", org.apache.thrift.protocol.TMessageType.CALL, ++seqid_)); set_keyspace_args args = new set_keyspace_args(); args.setKeyspace(keyspace); - args.write(oprot_); - oprot_.writeMessageEnd(); - oprot_.getTransport().flush(); + sendBase("set_keyspace", args); } public void recv_set_keyspace() throws InvalidRequestException, org.apache.thrift.TException { - org.apache.thrift.protocol.TMessage msg = iprot_.readMessageBegin(); - if (msg.type == org.apache.thrift.protocol.TMessageType.EXCEPTION) { - org.apache.thrift.TApplicationException x = org.apache.thrift.TApplicationException.read(iprot_); - iprot_.readMessageEnd(); - throw x; - } - if (msg.seqid != seqid_) { - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.BAD_SEQUENCE_ID, "set_keyspace failed: out of sequence response"); - } set_keyspace_result result = new set_keyspace_result(); - result.read(iprot_); - iprot_.readMessageEnd(); + receiveBase(result, "set_keyspace"); if (result.ire != null) { throw result.ire; } @@ -519,30 +476,17 @@ public class Cassandra { public void send_get(ByteBuffer key, ColumnPath column_path, ConsistencyLevel consistency_level) throws org.apache.thrift.TException { - oprot_.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get", org.apache.thrift.protocol.TMessageType.CALL, ++seqid_)); get_args args = new get_args(); args.setKey(key); args.setColumn_path(column_path); args.setConsistency_level(consistency_level); - args.write(oprot_); - oprot_.writeMessageEnd(); - oprot_.getTransport().flush(); + sendBase("get", args); } public ColumnOrSuperColumn recv_get() throws InvalidRequestException, NotFoundException, UnavailableException, TimedOutException, org.apache.thrift.TException { - org.apache.thrift.protocol.TMessage msg = iprot_.readMessageBegin(); - if (msg.type == org.apache.thrift.protocol.TMessageType.EXCEPTION) { - org.apache.thrift.TApplicationException x = org.apache.thrift.TApplicationException.read(iprot_); - iprot_.readMessageEnd(); - throw x; - } - if (msg.seqid != seqid_) { - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.BAD_SEQUENCE_ID, "get failed: out of sequence response"); - } get_result result = new get_result(); - result.read(iprot_); - iprot_.readMessageEnd(); + receiveBase(result, "get"); if (result.isSetSuccess()) { return result.success; } @@ -569,31 +513,18 @@ public class Cassandra { public void send_get_slice(ByteBuffer key, ColumnParent column_parent, SlicePredicate predicate, ConsistencyLevel consistency_level) throws org.apache.thrift.TException { - oprot_.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_slice", org.apache.thrift.protocol.TMessageType.CALL, ++seqid_)); get_slice_args args = new get_slice_args(); args.setKey(key); args.setColumn_parent(column_parent); args.setPredicate(predicate); args.setConsistency_level(consistency_level); - args.write(oprot_); - oprot_.writeMessageEnd(); - oprot_.getTransport().flush(); + sendBase("get_slice", args); } public List recv_get_slice() throws InvalidRequestException, UnavailableException, TimedOutException, org.apache.thrift.TException { - org.apache.thrift.protocol.TMessage msg = iprot_.readMessageBegin(); - if (msg.type == org.apache.thrift.protocol.TMessageType.EXCEPTION) { - org.apache.thrift.TApplicationException x = org.apache.thrift.TApplicationException.read(iprot_); - iprot_.readMessageEnd(); - throw x; - } - if (msg.seqid != seqid_) { - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.BAD_SEQUENCE_ID, "get_slice failed: out of sequence response"); - } get_slice_result result = new get_slice_result(); - result.read(iprot_); - iprot_.readMessageEnd(); + receiveBase(result, "get_slice"); if (result.isSetSuccess()) { return result.success; } @@ -617,31 +548,18 @@ public class Cassandra { public void send_get_count(ByteBuffer key, ColumnParent column_parent, SlicePredicate predicate, ConsistencyLevel consistency_level) throws org.apache.thrift.TException { - oprot_.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_count", org.apache.thrift.protocol.TMessageType.CALL, ++seqid_)); get_count_args args = new get_count_args(); args.setKey(key); args.setColumn_parent(column_parent); args.setPredicate(predicate); args.setConsistency_level(consistency_level); - args.write(oprot_); - oprot_.writeMessageEnd(); - oprot_.getTransport().flush(); + sendBase("get_count", args); } public int recv_get_count() throws InvalidRequestException, UnavailableException, TimedOutException, org.apache.thrift.TException { - org.apache.thrift.protocol.TMessage msg = iprot_.readMessageBegin(); - if (msg.type == org.apache.thrift.protocol.TMessageType.EXCEPTION) { - org.apache.thrift.TApplicationException x = org.apache.thrift.TApplicationException.read(iprot_); - iprot_.readMessageEnd(); - throw x; - } - if (msg.seqid != seqid_) { - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.BAD_SEQUENCE_ID, "get_count failed: out of sequence response"); - } get_count_result result = new get_count_result(); - result.read(iprot_); - iprot_.readMessageEnd(); + receiveBase(result, "get_count"); if (result.isSetSuccess()) { return result.success; } @@ -665,31 +583,18 @@ public class Cassandra { public void send_multiget_slice(List keys, ColumnParent column_parent, SlicePredicate predicate, ConsistencyLevel consistency_level) throws org.apache.thrift.TException { - oprot_.writeMessageBegin(new org.apache.thrift.protocol.TMessage("multiget_slice", org.apache.thrift.protocol.TMessageType.CALL, ++seqid_)); multiget_slice_args args = new multiget_slice_args(); args.setKeys(keys); args.setColumn_parent(column_parent); args.setPredicate(predicate); args.setConsistency_level(consistency_level); - args.write(oprot_); - oprot_.writeMessageEnd(); - oprot_.getTransport().flush(); + sendBase("multiget_slice", args); } public Map> recv_multiget_slice() throws InvalidRequestException, UnavailableException, TimedOutException, org.apache.thrift.TException { - org.apache.thrift.protocol.TMessage msg = iprot_.readMessageBegin(); - if (msg.type == org.apache.thrift.protocol.TMessageType.EXCEPTION) { - org.apache.thrift.TApplicationException x = org.apache.thrift.TApplicationException.read(iprot_); - iprot_.readMessageEnd(); - throw x; - } - if (msg.seqid != seqid_) { - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.BAD_SEQUENCE_ID, "multiget_slice failed: out of sequence response"); - } multiget_slice_result result = new multiget_slice_result(); - result.read(iprot_); - iprot_.readMessageEnd(); + receiveBase(result, "multiget_slice"); if (result.isSetSuccess()) { return result.success; } @@ -713,31 +618,18 @@ public class Cassandra { public void send_multiget_count(List keys, ColumnParent column_parent, SlicePredicate predicate, ConsistencyLevel consistency_level) throws org.apache.thrift.TException { - oprot_.writeMessageBegin(new org.apache.thrift.protocol.TMessage("multiget_count", org.apache.thrift.protocol.TMessageType.CALL, ++seqid_)); multiget_count_args args = new multiget_count_args(); args.setKeys(keys); args.setColumn_parent(column_parent); args.setPredicate(predicate); args.setConsistency_level(consistency_level); - args.write(oprot_); - oprot_.writeMessageEnd(); - oprot_.getTransport().flush(); + sendBase("multiget_count", args); } public Map recv_multiget_count() throws InvalidRequestException, UnavailableException, TimedOutException, org.apache.thrift.TException { - org.apache.thrift.protocol.TMessage msg = iprot_.readMessageBegin(); - if (msg.type == org.apache.thrift.protocol.TMessageType.EXCEPTION) { - org.apache.thrift.TApplicationException x = org.apache.thrift.TApplicationException.read(iprot_); - iprot_.readMessageEnd(); - throw x; - } - if (msg.seqid != seqid_) { - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.BAD_SEQUENCE_ID, "multiget_count failed: out of sequence response"); - } multiget_count_result result = new multiget_count_result(); - result.read(iprot_); - iprot_.readMessageEnd(); + receiveBase(result, "multiget_count"); if (result.isSetSuccess()) { return result.success; } @@ -761,31 +653,18 @@ public class Cassandra { public void send_get_range_slices(ColumnParent column_parent, SlicePredicate predicate, KeyRange range, ConsistencyLevel consistency_level) throws org.apache.thrift.TException { - oprot_.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_range_slices", org.apache.thrift.protocol.TMessageType.CALL, ++seqid_)); get_range_slices_args args = new get_range_slices_args(); args.setColumn_parent(column_parent); args.setPredicate(predicate); args.setRange(range); args.setConsistency_level(consistency_level); - args.write(oprot_); - oprot_.writeMessageEnd(); - oprot_.getTransport().flush(); + sendBase("get_range_slices", args); } public List recv_get_range_slices() throws InvalidRequestException, UnavailableException, TimedOutException, org.apache.thrift.TException { - org.apache.thrift.protocol.TMessage msg = iprot_.readMessageBegin(); - if (msg.type == org.apache.thrift.protocol.TMessageType.EXCEPTION) { - org.apache.thrift.TApplicationException x = org.apache.thrift.TApplicationException.read(iprot_); - iprot_.readMessageEnd(); - throw x; - } - if (msg.seqid != seqid_) { - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.BAD_SEQUENCE_ID, "get_range_slices failed: out of sequence response"); - } get_range_slices_result result = new get_range_slices_result(); - result.read(iprot_); - iprot_.readMessageEnd(); + receiveBase(result, "get_range_slices"); if (result.isSetSuccess()) { return result.success; } @@ -809,31 +688,18 @@ public class Cassandra { public void send_get_indexed_slices(ColumnParent column_parent, IndexClause index_clause, SlicePredicate column_predicate, ConsistencyLevel consistency_level) throws org.apache.thrift.TException { - oprot_.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_indexed_slices", org.apache.thrift.protocol.TMessageType.CALL, ++seqid_)); get_indexed_slices_args args = new get_indexed_slices_args(); args.setColumn_parent(column_parent); args.setIndex_clause(index_clause); args.setColumn_predicate(column_predicate); args.setConsistency_level(consistency_level); - args.write(oprot_); - oprot_.writeMessageEnd(); - oprot_.getTransport().flush(); + sendBase("get_indexed_slices", args); } public List recv_get_indexed_slices() throws InvalidRequestException, UnavailableException, TimedOutException, org.apache.thrift.TException { - org.apache.thrift.protocol.TMessage msg = iprot_.readMessageBegin(); - if (msg.type == org.apache.thrift.protocol.TMessageType.EXCEPTION) { - org.apache.thrift.TApplicationException x = org.apache.thrift.TApplicationException.read(iprot_); - iprot_.readMessageEnd(); - throw x; - } - if (msg.seqid != seqid_) { - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.BAD_SEQUENCE_ID, "get_indexed_slices failed: out of sequence response"); - } get_indexed_slices_result result = new get_indexed_slices_result(); - result.read(iprot_); - iprot_.readMessageEnd(); + receiveBase(result, "get_indexed_slices"); if (result.isSetSuccess()) { return result.success; } @@ -857,31 +723,18 @@ public class Cassandra { public void send_insert(ByteBuffer key, ColumnParent column_parent, Column column, ConsistencyLevel consistency_level) throws org.apache.thrift.TException { - oprot_.writeMessageBegin(new org.apache.thrift.protocol.TMessage("insert", org.apache.thrift.protocol.TMessageType.CALL, ++seqid_)); insert_args args = new insert_args(); args.setKey(key); args.setColumn_parent(column_parent); args.setColumn(column); args.setConsistency_level(consistency_level); - args.write(oprot_); - oprot_.writeMessageEnd(); - oprot_.getTransport().flush(); + sendBase("insert", args); } public void recv_insert() throws InvalidRequestException, UnavailableException, TimedOutException, org.apache.thrift.TException { - org.apache.thrift.protocol.TMessage msg = iprot_.readMessageBegin(); - if (msg.type == org.apache.thrift.protocol.TMessageType.EXCEPTION) { - org.apache.thrift.TApplicationException x = org.apache.thrift.TApplicationException.read(iprot_); - iprot_.readMessageEnd(); - throw x; - } - if (msg.seqid != seqid_) { - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.BAD_SEQUENCE_ID, "insert failed: out of sequence response"); - } insert_result result = new insert_result(); - result.read(iprot_); - iprot_.readMessageEnd(); + receiveBase(result, "insert"); if (result.ire != null) { throw result.ire; } @@ -902,31 +755,18 @@ public class Cassandra { public void send_add(ByteBuffer key, ColumnParent column_parent, CounterColumn column, ConsistencyLevel consistency_level) throws org.apache.thrift.TException { - oprot_.writeMessageBegin(new org.apache.thrift.protocol.TMessage("add", org.apache.thrift.protocol.TMessageType.CALL, ++seqid_)); add_args args = new add_args(); args.setKey(key); args.setColumn_parent(column_parent); args.setColumn(column); args.setConsistency_level(consistency_level); - args.write(oprot_); - oprot_.writeMessageEnd(); - oprot_.getTransport().flush(); + sendBase("add", args); } public void recv_add() throws InvalidRequestException, UnavailableException, TimedOutException, org.apache.thrift.TException { - org.apache.thrift.protocol.TMessage msg = iprot_.readMessageBegin(); - if (msg.type == org.apache.thrift.protocol.TMessageType.EXCEPTION) { - org.apache.thrift.TApplicationException x = org.apache.thrift.TApplicationException.read(iprot_); - iprot_.readMessageEnd(); - throw x; - } - if (msg.seqid != seqid_) { - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.BAD_SEQUENCE_ID, "add failed: out of sequence response"); - } add_result result = new add_result(); - result.read(iprot_); - iprot_.readMessageEnd(); + receiveBase(result, "add"); if (result.ire != null) { throw result.ire; } @@ -947,31 +787,18 @@ public class Cassandra { public void send_remove(ByteBuffer key, ColumnPath column_path, long timestamp, ConsistencyLevel consistency_level) throws org.apache.thrift.TException { - oprot_.writeMessageBegin(new org.apache.thrift.protocol.TMessage("remove", org.apache.thrift.protocol.TMessageType.CALL, ++seqid_)); remove_args args = new remove_args(); args.setKey(key); args.setColumn_path(column_path); args.setTimestamp(timestamp); args.setConsistency_level(consistency_level); - args.write(oprot_); - oprot_.writeMessageEnd(); - oprot_.getTransport().flush(); + sendBase("remove", args); } public void recv_remove() throws InvalidRequestException, UnavailableException, TimedOutException, org.apache.thrift.TException { - org.apache.thrift.protocol.TMessage msg = iprot_.readMessageBegin(); - if (msg.type == org.apache.thrift.protocol.TMessageType.EXCEPTION) { - org.apache.thrift.TApplicationException x = org.apache.thrift.TApplicationException.read(iprot_); - iprot_.readMessageEnd(); - throw x; - } - if (msg.seqid != seqid_) { - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.BAD_SEQUENCE_ID, "remove failed: out of sequence response"); - } remove_result result = new remove_result(); - result.read(iprot_); - iprot_.readMessageEnd(); + receiveBase(result, "remove"); if (result.ire != null) { throw result.ire; } @@ -992,30 +819,17 @@ public class Cassandra { public void send_remove_counter(ByteBuffer key, ColumnPath path, ConsistencyLevel consistency_level) throws org.apache.thrift.TException { - oprot_.writeMessageBegin(new org.apache.thrift.protocol.TMessage("remove_counter", org.apache.thrift.protocol.TMessageType.CALL, ++seqid_)); remove_counter_args args = new remove_counter_args(); args.setKey(key); args.setPath(path); args.setConsistency_level(consistency_level); - args.write(oprot_); - oprot_.writeMessageEnd(); - oprot_.getTransport().flush(); + sendBase("remove_counter", args); } public void recv_remove_counter() throws InvalidRequestException, UnavailableException, TimedOutException, org.apache.thrift.TException { - org.apache.thrift.protocol.TMessage msg = iprot_.readMessageBegin(); - if (msg.type == org.apache.thrift.protocol.TMessageType.EXCEPTION) { - org.apache.thrift.TApplicationException x = org.apache.thrift.TApplicationException.read(iprot_); - iprot_.readMessageEnd(); - throw x; - } - if (msg.seqid != seqid_) { - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.BAD_SEQUENCE_ID, "remove_counter failed: out of sequence response"); - } remove_counter_result result = new remove_counter_result(); - result.read(iprot_); - iprot_.readMessageEnd(); + receiveBase(result, "remove_counter"); if (result.ire != null) { throw result.ire; } @@ -1036,29 +850,16 @@ public class Cassandra { public void send_batch_mutate(Map>> mutation_map, ConsistencyLevel consistency_level) throws org.apache.thrift.TException { - oprot_.writeMessageBegin(new org.apache.thrift.protocol.TMessage("batch_mutate", org.apache.thrift.protocol.TMessageType.CALL, ++seqid_)); batch_mutate_args args = new batch_mutate_args(); args.setMutation_map(mutation_map); args.setConsistency_level(consistency_level); - args.write(oprot_); - oprot_.writeMessageEnd(); - oprot_.getTransport().flush(); + sendBase("batch_mutate", args); } public void recv_batch_mutate() throws InvalidRequestException, UnavailableException, TimedOutException, org.apache.thrift.TException { - org.apache.thrift.protocol.TMessage msg = iprot_.readMessageBegin(); - if (msg.type == org.apache.thrift.protocol.TMessageType.EXCEPTION) { - org.apache.thrift.TApplicationException x = org.apache.thrift.TApplicationException.read(iprot_); - iprot_.readMessageEnd(); - throw x; - } - if (msg.seqid != seqid_) { - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.BAD_SEQUENCE_ID, "batch_mutate failed: out of sequence response"); - } batch_mutate_result result = new batch_mutate_result(); - result.read(iprot_); - iprot_.readMessageEnd(); + receiveBase(result, "batch_mutate"); if (result.ire != null) { throw result.ire; } @@ -1079,28 +880,15 @@ public class Cassandra { public void send_truncate(String cfname) throws org.apache.thrift.TException { - oprot_.writeMessageBegin(new org.apache.thrift.protocol.TMessage("truncate", org.apache.thrift.protocol.TMessageType.CALL, ++seqid_)); truncate_args args = new truncate_args(); args.setCfname(cfname); - args.write(oprot_); - oprot_.writeMessageEnd(); - oprot_.getTransport().flush(); + sendBase("truncate", args); } public void recv_truncate() throws InvalidRequestException, UnavailableException, TimedOutException, org.apache.thrift.TException { - org.apache.thrift.protocol.TMessage msg = iprot_.readMessageBegin(); - if (msg.type == org.apache.thrift.protocol.TMessageType.EXCEPTION) { - org.apache.thrift.TApplicationException x = org.apache.thrift.TApplicationException.read(iprot_); - iprot_.readMessageEnd(); - throw x; - } - if (msg.seqid != seqid_) { - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.BAD_SEQUENCE_ID, "truncate failed: out of sequence response"); - } truncate_result result = new truncate_result(); - result.read(iprot_); - iprot_.readMessageEnd(); + receiveBase(result, "truncate"); if (result.ire != null) { throw result.ire; } @@ -1121,27 +909,14 @@ public class Cassandra { public void send_describe_schema_versions() throws org.apache.thrift.TException { - oprot_.writeMessageBegin(new org.apache.thrift.protocol.TMessage("describe_schema_versions", org.apache.thrift.protocol.TMessageType.CALL, ++seqid_)); describe_schema_versions_args args = new describe_schema_versions_args(); - args.write(oprot_); - oprot_.writeMessageEnd(); - oprot_.getTransport().flush(); + sendBase("describe_schema_versions", args); } public Map> recv_describe_schema_versions() throws InvalidRequestException, org.apache.thrift.TException { - org.apache.thrift.protocol.TMessage msg = iprot_.readMessageBegin(); - if (msg.type == org.apache.thrift.protocol.TMessageType.EXCEPTION) { - org.apache.thrift.TApplicationException x = org.apache.thrift.TApplicationException.read(iprot_); - iprot_.readMessageEnd(); - throw x; - } - if (msg.seqid != seqid_) { - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.BAD_SEQUENCE_ID, "describe_schema_versions failed: out of sequence response"); - } describe_schema_versions_result result = new describe_schema_versions_result(); - result.read(iprot_); - iprot_.readMessageEnd(); + receiveBase(result, "describe_schema_versions"); if (result.isSetSuccess()) { return result.success; } @@ -1159,27 +934,14 @@ public class Cassandra { public void send_describe_keyspaces() throws org.apache.thrift.TException { - oprot_.writeMessageBegin(new org.apache.thrift.protocol.TMessage("describe_keyspaces", org.apache.thrift.protocol.TMessageType.CALL, ++seqid_)); describe_keyspaces_args args = new describe_keyspaces_args(); - args.write(oprot_); - oprot_.writeMessageEnd(); - oprot_.getTransport().flush(); + sendBase("describe_keyspaces", args); } public List recv_describe_keyspaces() throws InvalidRequestException, org.apache.thrift.TException { - org.apache.thrift.protocol.TMessage msg = iprot_.readMessageBegin(); - if (msg.type == org.apache.thrift.protocol.TMessageType.EXCEPTION) { - org.apache.thrift.TApplicationException x = org.apache.thrift.TApplicationException.read(iprot_); - iprot_.readMessageEnd(); - throw x; - } - if (msg.seqid != seqid_) { - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.BAD_SEQUENCE_ID, "describe_keyspaces failed: out of sequence response"); - } describe_keyspaces_result result = new describe_keyspaces_result(); - result.read(iprot_); - iprot_.readMessageEnd(); + receiveBase(result, "describe_keyspaces"); if (result.isSetSuccess()) { return result.success; } @@ -1197,27 +959,14 @@ public class Cassandra { public void send_describe_cluster_name() throws org.apache.thrift.TException { - oprot_.writeMessageBegin(new org.apache.thrift.protocol.TMessage("describe_cluster_name", org.apache.thrift.protocol.TMessageType.CALL, ++seqid_)); describe_cluster_name_args args = new describe_cluster_name_args(); - args.write(oprot_); - oprot_.writeMessageEnd(); - oprot_.getTransport().flush(); + sendBase("describe_cluster_name", args); } public String recv_describe_cluster_name() throws org.apache.thrift.TException { - org.apache.thrift.protocol.TMessage msg = iprot_.readMessageBegin(); - if (msg.type == org.apache.thrift.protocol.TMessageType.EXCEPTION) { - org.apache.thrift.TApplicationException x = org.apache.thrift.TApplicationException.read(iprot_); - iprot_.readMessageEnd(); - throw x; - } - if (msg.seqid != seqid_) { - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.BAD_SEQUENCE_ID, "describe_cluster_name failed: out of sequence response"); - } describe_cluster_name_result result = new describe_cluster_name_result(); - result.read(iprot_); - iprot_.readMessageEnd(); + receiveBase(result, "describe_cluster_name"); if (result.isSetSuccess()) { return result.success; } @@ -1232,27 +981,14 @@ public class Cassandra { public void send_describe_version() throws org.apache.thrift.TException { - oprot_.writeMessageBegin(new org.apache.thrift.protocol.TMessage("describe_version", org.apache.thrift.protocol.TMessageType.CALL, ++seqid_)); describe_version_args args = new describe_version_args(); - args.write(oprot_); - oprot_.writeMessageEnd(); - oprot_.getTransport().flush(); + sendBase("describe_version", args); } public String recv_describe_version() throws org.apache.thrift.TException { - org.apache.thrift.protocol.TMessage msg = iprot_.readMessageBegin(); - if (msg.type == org.apache.thrift.protocol.TMessageType.EXCEPTION) { - org.apache.thrift.TApplicationException x = org.apache.thrift.TApplicationException.read(iprot_); - iprot_.readMessageEnd(); - throw x; - } - if (msg.seqid != seqid_) { - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.BAD_SEQUENCE_ID, "describe_version failed: out of sequence response"); - } describe_version_result result = new describe_version_result(); - result.read(iprot_); - iprot_.readMessageEnd(); + receiveBase(result, "describe_version"); if (result.isSetSuccess()) { return result.success; } @@ -1267,28 +1003,15 @@ public class Cassandra { public void send_describe_ring(String keyspace) throws org.apache.thrift.TException { - oprot_.writeMessageBegin(new org.apache.thrift.protocol.TMessage("describe_ring", org.apache.thrift.protocol.TMessageType.CALL, ++seqid_)); describe_ring_args args = new describe_ring_args(); args.setKeyspace(keyspace); - args.write(oprot_); - oprot_.writeMessageEnd(); - oprot_.getTransport().flush(); + sendBase("describe_ring", args); } public List recv_describe_ring() throws InvalidRequestException, org.apache.thrift.TException { - org.apache.thrift.protocol.TMessage msg = iprot_.readMessageBegin(); - if (msg.type == org.apache.thrift.protocol.TMessageType.EXCEPTION) { - org.apache.thrift.TApplicationException x = org.apache.thrift.TApplicationException.read(iprot_); - iprot_.readMessageEnd(); - throw x; - } - if (msg.seqid != seqid_) { - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.BAD_SEQUENCE_ID, "describe_ring failed: out of sequence response"); - } describe_ring_result result = new describe_ring_result(); - result.read(iprot_); - iprot_.readMessageEnd(); + receiveBase(result, "describe_ring"); if (result.isSetSuccess()) { return result.success; } @@ -1306,27 +1029,14 @@ public class Cassandra { public void send_describe_partitioner() throws org.apache.thrift.TException { - oprot_.writeMessageBegin(new org.apache.thrift.protocol.TMessage("describe_partitioner", org.apache.thrift.protocol.TMessageType.CALL, ++seqid_)); describe_partitioner_args args = new describe_partitioner_args(); - args.write(oprot_); - oprot_.writeMessageEnd(); - oprot_.getTransport().flush(); + sendBase("describe_partitioner", args); } public String recv_describe_partitioner() throws org.apache.thrift.TException { - org.apache.thrift.protocol.TMessage msg = iprot_.readMessageBegin(); - if (msg.type == org.apache.thrift.protocol.TMessageType.EXCEPTION) { - org.apache.thrift.TApplicationException x = org.apache.thrift.TApplicationException.read(iprot_); - iprot_.readMessageEnd(); - throw x; - } - if (msg.seqid != seqid_) { - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.BAD_SEQUENCE_ID, "describe_partitioner failed: out of sequence response"); - } describe_partitioner_result result = new describe_partitioner_result(); - result.read(iprot_); - iprot_.readMessageEnd(); + receiveBase(result, "describe_partitioner"); if (result.isSetSuccess()) { return result.success; } @@ -1341,27 +1051,14 @@ public class Cassandra { public void send_describe_snitch() throws org.apache.thrift.TException { - oprot_.writeMessageBegin(new org.apache.thrift.protocol.TMessage("describe_snitch", org.apache.thrift.protocol.TMessageType.CALL, ++seqid_)); describe_snitch_args args = new describe_snitch_args(); - args.write(oprot_); - oprot_.writeMessageEnd(); - oprot_.getTransport().flush(); + sendBase("describe_snitch", args); } public String recv_describe_snitch() throws org.apache.thrift.TException { - org.apache.thrift.protocol.TMessage msg = iprot_.readMessageBegin(); - if (msg.type == org.apache.thrift.protocol.TMessageType.EXCEPTION) { - org.apache.thrift.TApplicationException x = org.apache.thrift.TApplicationException.read(iprot_); - iprot_.readMessageEnd(); - throw x; - } - if (msg.seqid != seqid_) { - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.BAD_SEQUENCE_ID, "describe_snitch failed: out of sequence response"); - } describe_snitch_result result = new describe_snitch_result(); - result.read(iprot_); - iprot_.readMessageEnd(); + receiveBase(result, "describe_snitch"); if (result.isSetSuccess()) { return result.success; } @@ -1376,28 +1073,15 @@ public class Cassandra { public void send_describe_keyspace(String keyspace) throws org.apache.thrift.TException { - oprot_.writeMessageBegin(new org.apache.thrift.protocol.TMessage("describe_keyspace", org.apache.thrift.protocol.TMessageType.CALL, ++seqid_)); describe_keyspace_args args = new describe_keyspace_args(); args.setKeyspace(keyspace); - args.write(oprot_); - oprot_.writeMessageEnd(); - oprot_.getTransport().flush(); + sendBase("describe_keyspace", args); } public KsDef recv_describe_keyspace() throws NotFoundException, InvalidRequestException, org.apache.thrift.TException { - org.apache.thrift.protocol.TMessage msg = iprot_.readMessageBegin(); - if (msg.type == org.apache.thrift.protocol.TMessageType.EXCEPTION) { - org.apache.thrift.TApplicationException x = org.apache.thrift.TApplicationException.read(iprot_); - iprot_.readMessageEnd(); - throw x; - } - if (msg.seqid != seqid_) { - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.BAD_SEQUENCE_ID, "describe_keyspace failed: out of sequence response"); - } describe_keyspace_result result = new describe_keyspace_result(); - result.read(iprot_); - iprot_.readMessageEnd(); + receiveBase(result, "describe_keyspace"); if (result.isSetSuccess()) { return result.success; } @@ -1418,31 +1102,18 @@ public class Cassandra { public void send_describe_splits(String cfName, String start_token, String end_token, int keys_per_split) throws org.apache.thrift.TException { - oprot_.writeMessageBegin(new org.apache.thrift.protocol.TMessage("describe_splits", org.apache.thrift.protocol.TMessageType.CALL, ++seqid_)); describe_splits_args args = new describe_splits_args(); args.setCfName(cfName); args.setStart_token(start_token); args.setEnd_token(end_token); args.setKeys_per_split(keys_per_split); - args.write(oprot_); - oprot_.writeMessageEnd(); - oprot_.getTransport().flush(); + sendBase("describe_splits", args); } public List recv_describe_splits() throws InvalidRequestException, org.apache.thrift.TException { - org.apache.thrift.protocol.TMessage msg = iprot_.readMessageBegin(); - if (msg.type == org.apache.thrift.protocol.TMessageType.EXCEPTION) { - org.apache.thrift.TApplicationException x = org.apache.thrift.TApplicationException.read(iprot_); - iprot_.readMessageEnd(); - throw x; - } - if (msg.seqid != seqid_) { - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.BAD_SEQUENCE_ID, "describe_splits failed: out of sequence response"); - } describe_splits_result result = new describe_splits_result(); - result.read(iprot_); - iprot_.readMessageEnd(); + receiveBase(result, "describe_splits"); if (result.isSetSuccess()) { return result.success; } @@ -1460,28 +1131,15 @@ public class Cassandra { public void send_system_add_column_family(CfDef cf_def) throws org.apache.thrift.TException { - oprot_.writeMessageBegin(new org.apache.thrift.protocol.TMessage("system_add_column_family", org.apache.thrift.protocol.TMessageType.CALL, ++seqid_)); system_add_column_family_args args = new system_add_column_family_args(); args.setCf_def(cf_def); - args.write(oprot_); - oprot_.writeMessageEnd(); - oprot_.getTransport().flush(); + sendBase("system_add_column_family", args); } public String recv_system_add_column_family() throws InvalidRequestException, SchemaDisagreementException, org.apache.thrift.TException { - org.apache.thrift.protocol.TMessage msg = iprot_.readMessageBegin(); - if (msg.type == org.apache.thrift.protocol.TMessageType.EXCEPTION) { - org.apache.thrift.TApplicationException x = org.apache.thrift.TApplicationException.read(iprot_); - iprot_.readMessageEnd(); - throw x; - } - if (msg.seqid != seqid_) { - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.BAD_SEQUENCE_ID, "system_add_column_family failed: out of sequence response"); - } system_add_column_family_result result = new system_add_column_family_result(); - result.read(iprot_); - iprot_.readMessageEnd(); + receiveBase(result, "system_add_column_family"); if (result.isSetSuccess()) { return result.success; } @@ -1502,28 +1160,15 @@ public class Cassandra { public void send_system_drop_column_family(String column_family) throws org.apache.thrift.TException { - oprot_.writeMessageBegin(new org.apache.thrift.protocol.TMessage("system_drop_column_family", org.apache.thrift.protocol.TMessageType.CALL, ++seqid_)); system_drop_column_family_args args = new system_drop_column_family_args(); args.setColumn_family(column_family); - args.write(oprot_); - oprot_.writeMessageEnd(); - oprot_.getTransport().flush(); + sendBase("system_drop_column_family", args); } public String recv_system_drop_column_family() throws InvalidRequestException, SchemaDisagreementException, org.apache.thrift.TException { - org.apache.thrift.protocol.TMessage msg = iprot_.readMessageBegin(); - if (msg.type == org.apache.thrift.protocol.TMessageType.EXCEPTION) { - org.apache.thrift.TApplicationException x = org.apache.thrift.TApplicationException.read(iprot_); - iprot_.readMessageEnd(); - throw x; - } - if (msg.seqid != seqid_) { - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.BAD_SEQUENCE_ID, "system_drop_column_family failed: out of sequence response"); - } system_drop_column_family_result result = new system_drop_column_family_result(); - result.read(iprot_); - iprot_.readMessageEnd(); + receiveBase(result, "system_drop_column_family"); if (result.isSetSuccess()) { return result.success; } @@ -1544,28 +1189,15 @@ public class Cassandra { public void send_system_add_keyspace(KsDef ks_def) throws org.apache.thrift.TException { - oprot_.writeMessageBegin(new org.apache.thrift.protocol.TMessage("system_add_keyspace", org.apache.thrift.protocol.TMessageType.CALL, ++seqid_)); system_add_keyspace_args args = new system_add_keyspace_args(); args.setKs_def(ks_def); - args.write(oprot_); - oprot_.writeMessageEnd(); - oprot_.getTransport().flush(); + sendBase("system_add_keyspace", args); } public String recv_system_add_keyspace() throws InvalidRequestException, SchemaDisagreementException, org.apache.thrift.TException { - org.apache.thrift.protocol.TMessage msg = iprot_.readMessageBegin(); - if (msg.type == org.apache.thrift.protocol.TMessageType.EXCEPTION) { - org.apache.thrift.TApplicationException x = org.apache.thrift.TApplicationException.read(iprot_); - iprot_.readMessageEnd(); - throw x; - } - if (msg.seqid != seqid_) { - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.BAD_SEQUENCE_ID, "system_add_keyspace failed: out of sequence response"); - } system_add_keyspace_result result = new system_add_keyspace_result(); - result.read(iprot_); - iprot_.readMessageEnd(); + receiveBase(result, "system_add_keyspace"); if (result.isSetSuccess()) { return result.success; } @@ -1586,28 +1218,15 @@ public class Cassandra { public void send_system_drop_keyspace(String keyspace) throws org.apache.thrift.TException { - oprot_.writeMessageBegin(new org.apache.thrift.protocol.TMessage("system_drop_keyspace", org.apache.thrift.protocol.TMessageType.CALL, ++seqid_)); system_drop_keyspace_args args = new system_drop_keyspace_args(); args.setKeyspace(keyspace); - args.write(oprot_); - oprot_.writeMessageEnd(); - oprot_.getTransport().flush(); + sendBase("system_drop_keyspace", args); } public String recv_system_drop_keyspace() throws InvalidRequestException, SchemaDisagreementException, org.apache.thrift.TException { - org.apache.thrift.protocol.TMessage msg = iprot_.readMessageBegin(); - if (msg.type == org.apache.thrift.protocol.TMessageType.EXCEPTION) { - org.apache.thrift.TApplicationException x = org.apache.thrift.TApplicationException.read(iprot_); - iprot_.readMessageEnd(); - throw x; - } - if (msg.seqid != seqid_) { - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.BAD_SEQUENCE_ID, "system_drop_keyspace failed: out of sequence response"); - } system_drop_keyspace_result result = new system_drop_keyspace_result(); - result.read(iprot_); - iprot_.readMessageEnd(); + receiveBase(result, "system_drop_keyspace"); if (result.isSetSuccess()) { return result.success; } @@ -1628,28 +1247,15 @@ public class Cassandra { public void send_system_update_keyspace(KsDef ks_def) throws org.apache.thrift.TException { - oprot_.writeMessageBegin(new org.apache.thrift.protocol.TMessage("system_update_keyspace", org.apache.thrift.protocol.TMessageType.CALL, ++seqid_)); system_update_keyspace_args args = new system_update_keyspace_args(); args.setKs_def(ks_def); - args.write(oprot_); - oprot_.writeMessageEnd(); - oprot_.getTransport().flush(); + sendBase("system_update_keyspace", args); } public String recv_system_update_keyspace() throws InvalidRequestException, SchemaDisagreementException, org.apache.thrift.TException { - org.apache.thrift.protocol.TMessage msg = iprot_.readMessageBegin(); - if (msg.type == org.apache.thrift.protocol.TMessageType.EXCEPTION) { - org.apache.thrift.TApplicationException x = org.apache.thrift.TApplicationException.read(iprot_); - iprot_.readMessageEnd(); - throw x; - } - if (msg.seqid != seqid_) { - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.BAD_SEQUENCE_ID, "system_update_keyspace failed: out of sequence response"); - } system_update_keyspace_result result = new system_update_keyspace_result(); - result.read(iprot_); - iprot_.readMessageEnd(); + receiveBase(result, "system_update_keyspace"); if (result.isSetSuccess()) { return result.success; } @@ -1670,28 +1276,15 @@ public class Cassandra { public void send_system_update_column_family(CfDef cf_def) throws org.apache.thrift.TException { - oprot_.writeMessageBegin(new org.apache.thrift.protocol.TMessage("system_update_column_family", org.apache.thrift.protocol.TMessageType.CALL, ++seqid_)); system_update_column_family_args args = new system_update_column_family_args(); args.setCf_def(cf_def); - args.write(oprot_); - oprot_.writeMessageEnd(); - oprot_.getTransport().flush(); + sendBase("system_update_column_family", args); } public String recv_system_update_column_family() throws InvalidRequestException, SchemaDisagreementException, org.apache.thrift.TException { - org.apache.thrift.protocol.TMessage msg = iprot_.readMessageBegin(); - if (msg.type == org.apache.thrift.protocol.TMessageType.EXCEPTION) { - org.apache.thrift.TApplicationException x = org.apache.thrift.TApplicationException.read(iprot_); - iprot_.readMessageEnd(); - throw x; - } - if (msg.seqid != seqid_) { - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.BAD_SEQUENCE_ID, "system_update_column_family failed: out of sequence response"); - } system_update_column_family_result result = new system_update_column_family_result(); - result.read(iprot_); - iprot_.readMessageEnd(); + receiveBase(result, "system_update_column_family"); if (result.isSetSuccess()) { return result.success; } @@ -1712,29 +1305,16 @@ public class Cassandra { public void send_execute_cql_query(ByteBuffer query, Compression compression) throws org.apache.thrift.TException { - oprot_.writeMessageBegin(new org.apache.thrift.protocol.TMessage("execute_cql_query", org.apache.thrift.protocol.TMessageType.CALL, ++seqid_)); execute_cql_query_args args = new execute_cql_query_args(); args.setQuery(query); args.setCompression(compression); - args.write(oprot_); - oprot_.writeMessageEnd(); - oprot_.getTransport().flush(); + sendBase("execute_cql_query", args); } public CqlResult recv_execute_cql_query() throws InvalidRequestException, UnavailableException, TimedOutException, SchemaDisagreementException, org.apache.thrift.TException { - org.apache.thrift.protocol.TMessage msg = iprot_.readMessageBegin(); - if (msg.type == org.apache.thrift.protocol.TMessageType.EXCEPTION) { - org.apache.thrift.TApplicationException x = org.apache.thrift.TApplicationException.read(iprot_); - iprot_.readMessageEnd(); - throw x; - } - if (msg.seqid != seqid_) { - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.BAD_SEQUENCE_ID, "execute_cql_query failed: out of sequence response"); - } execute_cql_query_result result = new execute_cql_query_result(); - result.read(iprot_); - iprot_.readMessageEnd(); + receiveBase(result, "execute_cql_query"); if (result.isSetSuccess()) { return result.success; } @@ -1761,29 +1341,16 @@ public class Cassandra { public void send_prepare_cql_query(ByteBuffer query, Compression compression) throws org.apache.thrift.TException { - oprot_.writeMessageBegin(new org.apache.thrift.protocol.TMessage("prepare_cql_query", org.apache.thrift.protocol.TMessageType.CALL, ++seqid_)); prepare_cql_query_args args = new prepare_cql_query_args(); args.setQuery(query); args.setCompression(compression); - args.write(oprot_); - oprot_.writeMessageEnd(); - oprot_.getTransport().flush(); + sendBase("prepare_cql_query", args); } public CqlPreparedResult recv_prepare_cql_query() throws InvalidRequestException, org.apache.thrift.TException { - org.apache.thrift.protocol.TMessage msg = iprot_.readMessageBegin(); - if (msg.type == org.apache.thrift.protocol.TMessageType.EXCEPTION) { - org.apache.thrift.TApplicationException x = org.apache.thrift.TApplicationException.read(iprot_); - iprot_.readMessageEnd(); - throw x; - } - if (msg.seqid != seqid_) { - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.BAD_SEQUENCE_ID, "prepare_cql_query failed: out of sequence response"); - } prepare_cql_query_result result = new prepare_cql_query_result(); - result.read(iprot_); - iprot_.readMessageEnd(); + receiveBase(result, "prepare_cql_query"); if (result.isSetSuccess()) { return result.success; } @@ -1801,29 +1368,16 @@ public class Cassandra { public void send_execute_prepared_cql_query(int itemId, List values) throws org.apache.thrift.TException { - oprot_.writeMessageBegin(new org.apache.thrift.protocol.TMessage("execute_prepared_cql_query", org.apache.thrift.protocol.TMessageType.CALL, ++seqid_)); execute_prepared_cql_query_args args = new execute_prepared_cql_query_args(); args.setItemId(itemId); args.setValues(values); - args.write(oprot_); - oprot_.writeMessageEnd(); - oprot_.getTransport().flush(); + sendBase("execute_prepared_cql_query", args); } public CqlResult recv_execute_prepared_cql_query() throws InvalidRequestException, UnavailableException, TimedOutException, SchemaDisagreementException, org.apache.thrift.TException { - org.apache.thrift.protocol.TMessage msg = iprot_.readMessageBegin(); - if (msg.type == org.apache.thrift.protocol.TMessageType.EXCEPTION) { - org.apache.thrift.TApplicationException x = org.apache.thrift.TApplicationException.read(iprot_); - iprot_.readMessageEnd(); - throw x; - } - if (msg.seqid != seqid_) { - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.BAD_SEQUENCE_ID, "execute_prepared_cql_query failed: out of sequence response"); - } execute_prepared_cql_query_result result = new execute_prepared_cql_query_result(); - result.read(iprot_); - iprot_.readMessageEnd(); + receiveBase(result, "execute_prepared_cql_query"); if (result.isSetSuccess()) { return result.success; } @@ -1862,9 +1416,9 @@ public class Cassandra { public void login(AuthenticationRequest auth_request, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - login_call method_call = new login_call(auth_request, resultHandler, this, protocolFactory, transport); - this.currentMethod = method_call; - manager.call(method_call); + login_call method_call = new login_call(auth_request, resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); } public static class login_call extends org.apache.thrift.async.TAsyncMethodCall { @@ -1894,9 +1448,9 @@ public class Cassandra { public void set_keyspace(String keyspace, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - set_keyspace_call method_call = new set_keyspace_call(keyspace, resultHandler, this, protocolFactory, transport); - this.currentMethod = method_call; - manager.call(method_call); + set_keyspace_call method_call = new set_keyspace_call(keyspace, resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); } public static class set_keyspace_call extends org.apache.thrift.async.TAsyncMethodCall { @@ -1926,9 +1480,9 @@ public class Cassandra { public void get(ByteBuffer key, ColumnPath column_path, ConsistencyLevel consistency_level, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - get_call method_call = new get_call(key, column_path, consistency_level, resultHandler, this, protocolFactory, transport); - this.currentMethod = method_call; - manager.call(method_call); + get_call method_call = new get_call(key, column_path, consistency_level, resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); } public static class get_call extends org.apache.thrift.async.TAsyncMethodCall { @@ -1964,9 +1518,9 @@ public class Cassandra { public void get_slice(ByteBuffer key, ColumnParent column_parent, SlicePredicate predicate, ConsistencyLevel consistency_level, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - get_slice_call method_call = new get_slice_call(key, column_parent, predicate, consistency_level, resultHandler, this, protocolFactory, transport); - this.currentMethod = method_call; - manager.call(method_call); + get_slice_call method_call = new get_slice_call(key, column_parent, predicate, consistency_level, resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); } public static class get_slice_call extends org.apache.thrift.async.TAsyncMethodCall { @@ -2005,9 +1559,9 @@ public class Cassandra { public void get_count(ByteBuffer key, ColumnParent column_parent, SlicePredicate predicate, ConsistencyLevel consistency_level, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - get_count_call method_call = new get_count_call(key, column_parent, predicate, consistency_level, resultHandler, this, protocolFactory, transport); - this.currentMethod = method_call; - manager.call(method_call); + get_count_call method_call = new get_count_call(key, column_parent, predicate, consistency_level, resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); } public static class get_count_call extends org.apache.thrift.async.TAsyncMethodCall { @@ -2046,9 +1600,9 @@ public class Cassandra { public void multiget_slice(List keys, ColumnParent column_parent, SlicePredicate predicate, ConsistencyLevel consistency_level, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - multiget_slice_call method_call = new multiget_slice_call(keys, column_parent, predicate, consistency_level, resultHandler, this, protocolFactory, transport); - this.currentMethod = method_call; - manager.call(method_call); + multiget_slice_call method_call = new multiget_slice_call(keys, column_parent, predicate, consistency_level, resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); } public static class multiget_slice_call extends org.apache.thrift.async.TAsyncMethodCall { @@ -2087,9 +1641,9 @@ public class Cassandra { public void multiget_count(List keys, ColumnParent column_parent, SlicePredicate predicate, ConsistencyLevel consistency_level, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - multiget_count_call method_call = new multiget_count_call(keys, column_parent, predicate, consistency_level, resultHandler, this, protocolFactory, transport); - this.currentMethod = method_call; - manager.call(method_call); + multiget_count_call method_call = new multiget_count_call(keys, column_parent, predicate, consistency_level, resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); } public static class multiget_count_call extends org.apache.thrift.async.TAsyncMethodCall { @@ -2128,9 +1682,9 @@ public class Cassandra { public void get_range_slices(ColumnParent column_parent, SlicePredicate predicate, KeyRange range, ConsistencyLevel consistency_level, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - get_range_slices_call method_call = new get_range_slices_call(column_parent, predicate, range, consistency_level, resultHandler, this, protocolFactory, transport); - this.currentMethod = method_call; - manager.call(method_call); + get_range_slices_call method_call = new get_range_slices_call(column_parent, predicate, range, consistency_level, resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); } public static class get_range_slices_call extends org.apache.thrift.async.TAsyncMethodCall { @@ -2169,9 +1723,9 @@ public class Cassandra { public void get_indexed_slices(ColumnParent column_parent, IndexClause index_clause, SlicePredicate column_predicate, ConsistencyLevel consistency_level, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - get_indexed_slices_call method_call = new get_indexed_slices_call(column_parent, index_clause, column_predicate, consistency_level, resultHandler, this, protocolFactory, transport); - this.currentMethod = method_call; - manager.call(method_call); + get_indexed_slices_call method_call = new get_indexed_slices_call(column_parent, index_clause, column_predicate, consistency_level, resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); } public static class get_indexed_slices_call extends org.apache.thrift.async.TAsyncMethodCall { @@ -2210,9 +1764,9 @@ public class Cassandra { public void insert(ByteBuffer key, ColumnParent column_parent, Column column, ConsistencyLevel consistency_level, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - insert_call method_call = new insert_call(key, column_parent, column, consistency_level, resultHandler, this, protocolFactory, transport); - this.currentMethod = method_call; - manager.call(method_call); + insert_call method_call = new insert_call(key, column_parent, column, consistency_level, resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); } public static class insert_call extends org.apache.thrift.async.TAsyncMethodCall { @@ -2251,9 +1805,9 @@ public class Cassandra { public void add(ByteBuffer key, ColumnParent column_parent, CounterColumn column, ConsistencyLevel consistency_level, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - add_call method_call = new add_call(key, column_parent, column, consistency_level, resultHandler, this, protocolFactory, transport); - this.currentMethod = method_call; - manager.call(method_call); + add_call method_call = new add_call(key, column_parent, column, consistency_level, resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); } public static class add_call extends org.apache.thrift.async.TAsyncMethodCall { @@ -2292,9 +1846,9 @@ public class Cassandra { public void remove(ByteBuffer key, ColumnPath column_path, long timestamp, ConsistencyLevel consistency_level, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - remove_call method_call = new remove_call(key, column_path, timestamp, consistency_level, resultHandler, this, protocolFactory, transport); - this.currentMethod = method_call; - manager.call(method_call); + remove_call method_call = new remove_call(key, column_path, timestamp, consistency_level, resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); } public static class remove_call extends org.apache.thrift.async.TAsyncMethodCall { @@ -2333,9 +1887,9 @@ public class Cassandra { public void remove_counter(ByteBuffer key, ColumnPath path, ConsistencyLevel consistency_level, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - remove_counter_call method_call = new remove_counter_call(key, path, consistency_level, resultHandler, this, protocolFactory, transport); - this.currentMethod = method_call; - manager.call(method_call); + remove_counter_call method_call = new remove_counter_call(key, path, consistency_level, resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); } public static class remove_counter_call extends org.apache.thrift.async.TAsyncMethodCall { @@ -2371,9 +1925,9 @@ public class Cassandra { public void batch_mutate(Map>> mutation_map, ConsistencyLevel consistency_level, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - batch_mutate_call method_call = new batch_mutate_call(mutation_map, consistency_level, resultHandler, this, protocolFactory, transport); - this.currentMethod = method_call; - manager.call(method_call); + batch_mutate_call method_call = new batch_mutate_call(mutation_map, consistency_level, resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); } public static class batch_mutate_call extends org.apache.thrift.async.TAsyncMethodCall { @@ -2406,9 +1960,9 @@ public class Cassandra { public void truncate(String cfname, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - truncate_call method_call = new truncate_call(cfname, resultHandler, this, protocolFactory, transport); - this.currentMethod = method_call; - manager.call(method_call); + truncate_call method_call = new truncate_call(cfname, resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); } public static class truncate_call extends org.apache.thrift.async.TAsyncMethodCall { @@ -2438,9 +1992,9 @@ public class Cassandra { public void describe_schema_versions(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - describe_schema_versions_call method_call = new describe_schema_versions_call(resultHandler, this, protocolFactory, transport); - this.currentMethod = method_call; - manager.call(method_call); + describe_schema_versions_call method_call = new describe_schema_versions_call(resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); } public static class describe_schema_versions_call extends org.apache.thrift.async.TAsyncMethodCall { @@ -2467,9 +2021,9 @@ public class Cassandra { public void describe_keyspaces(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - describe_keyspaces_call method_call = new describe_keyspaces_call(resultHandler, this, protocolFactory, transport); - this.currentMethod = method_call; - manager.call(method_call); + describe_keyspaces_call method_call = new describe_keyspaces_call(resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); } public static class describe_keyspaces_call extends org.apache.thrift.async.TAsyncMethodCall { @@ -2496,9 +2050,9 @@ public class Cassandra { public void describe_cluster_name(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - describe_cluster_name_call method_call = new describe_cluster_name_call(resultHandler, this, protocolFactory, transport); - this.currentMethod = method_call; - manager.call(method_call); + describe_cluster_name_call method_call = new describe_cluster_name_call(resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); } public static class describe_cluster_name_call extends org.apache.thrift.async.TAsyncMethodCall { @@ -2525,9 +2079,9 @@ public class Cassandra { public void describe_version(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - describe_version_call method_call = new describe_version_call(resultHandler, this, protocolFactory, transport); - this.currentMethod = method_call; - manager.call(method_call); + describe_version_call method_call = new describe_version_call(resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); } public static class describe_version_call extends org.apache.thrift.async.TAsyncMethodCall { @@ -2554,9 +2108,9 @@ public class Cassandra { public void describe_ring(String keyspace, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - describe_ring_call method_call = new describe_ring_call(keyspace, resultHandler, this, protocolFactory, transport); - this.currentMethod = method_call; - manager.call(method_call); + describe_ring_call method_call = new describe_ring_call(keyspace, resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); } public static class describe_ring_call extends org.apache.thrift.async.TAsyncMethodCall { @@ -2586,9 +2140,9 @@ public class Cassandra { public void describe_partitioner(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - describe_partitioner_call method_call = new describe_partitioner_call(resultHandler, this, protocolFactory, transport); - this.currentMethod = method_call; - manager.call(method_call); + describe_partitioner_call method_call = new describe_partitioner_call(resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); } public static class describe_partitioner_call extends org.apache.thrift.async.TAsyncMethodCall { @@ -2615,9 +2169,9 @@ public class Cassandra { public void describe_snitch(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - describe_snitch_call method_call = new describe_snitch_call(resultHandler, this, protocolFactory, transport); - this.currentMethod = method_call; - manager.call(method_call); + describe_snitch_call method_call = new describe_snitch_call(resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); } public static class describe_snitch_call extends org.apache.thrift.async.TAsyncMethodCall { @@ -2644,9 +2198,9 @@ public class Cassandra { public void describe_keyspace(String keyspace, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - describe_keyspace_call method_call = new describe_keyspace_call(keyspace, resultHandler, this, protocolFactory, transport); - this.currentMethod = method_call; - manager.call(method_call); + describe_keyspace_call method_call = new describe_keyspace_call(keyspace, resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); } public static class describe_keyspace_call extends org.apache.thrift.async.TAsyncMethodCall { @@ -2676,9 +2230,9 @@ public class Cassandra { public void describe_splits(String cfName, String start_token, String end_token, int keys_per_split, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - describe_splits_call method_call = new describe_splits_call(cfName, start_token, end_token, keys_per_split, resultHandler, this, protocolFactory, transport); - this.currentMethod = method_call; - manager.call(method_call); + describe_splits_call method_call = new describe_splits_call(cfName, start_token, end_token, keys_per_split, resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); } public static class describe_splits_call extends org.apache.thrift.async.TAsyncMethodCall { @@ -2717,9 +2271,9 @@ public class Cassandra { public void system_add_column_family(CfDef cf_def, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - system_add_column_family_call method_call = new system_add_column_family_call(cf_def, resultHandler, this, protocolFactory, transport); - this.currentMethod = method_call; - manager.call(method_call); + system_add_column_family_call method_call = new system_add_column_family_call(cf_def, resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); } public static class system_add_column_family_call extends org.apache.thrift.async.TAsyncMethodCall { @@ -2749,9 +2303,9 @@ public class Cassandra { public void system_drop_column_family(String column_family, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - system_drop_column_family_call method_call = new system_drop_column_family_call(column_family, resultHandler, this, protocolFactory, transport); - this.currentMethod = method_call; - manager.call(method_call); + system_drop_column_family_call method_call = new system_drop_column_family_call(column_family, resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); } public static class system_drop_column_family_call extends org.apache.thrift.async.TAsyncMethodCall { @@ -2781,9 +2335,9 @@ public class Cassandra { public void system_add_keyspace(KsDef ks_def, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - system_add_keyspace_call method_call = new system_add_keyspace_call(ks_def, resultHandler, this, protocolFactory, transport); - this.currentMethod = method_call; - manager.call(method_call); + system_add_keyspace_call method_call = new system_add_keyspace_call(ks_def, resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); } public static class system_add_keyspace_call extends org.apache.thrift.async.TAsyncMethodCall { @@ -2813,9 +2367,9 @@ public class Cassandra { public void system_drop_keyspace(String keyspace, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - system_drop_keyspace_call method_call = new system_drop_keyspace_call(keyspace, resultHandler, this, protocolFactory, transport); - this.currentMethod = method_call; - manager.call(method_call); + system_drop_keyspace_call method_call = new system_drop_keyspace_call(keyspace, resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); } public static class system_drop_keyspace_call extends org.apache.thrift.async.TAsyncMethodCall { @@ -2845,9 +2399,9 @@ public class Cassandra { public void system_update_keyspace(KsDef ks_def, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - system_update_keyspace_call method_call = new system_update_keyspace_call(ks_def, resultHandler, this, protocolFactory, transport); - this.currentMethod = method_call; - manager.call(method_call); + system_update_keyspace_call method_call = new system_update_keyspace_call(ks_def, resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); } public static class system_update_keyspace_call extends org.apache.thrift.async.TAsyncMethodCall { @@ -2877,9 +2431,9 @@ public class Cassandra { public void system_update_column_family(CfDef cf_def, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - system_update_column_family_call method_call = new system_update_column_family_call(cf_def, resultHandler, this, protocolFactory, transport); - this.currentMethod = method_call; - manager.call(method_call); + system_update_column_family_call method_call = new system_update_column_family_call(cf_def, resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); } public static class system_update_column_family_call extends org.apache.thrift.async.TAsyncMethodCall { @@ -2909,9 +2463,9 @@ public class Cassandra { public void execute_cql_query(ByteBuffer query, Compression compression, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - execute_cql_query_call method_call = new execute_cql_query_call(query, compression, resultHandler, this, protocolFactory, transport); - this.currentMethod = method_call; - manager.call(method_call); + execute_cql_query_call method_call = new execute_cql_query_call(query, compression, resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); } public static class execute_cql_query_call extends org.apache.thrift.async.TAsyncMethodCall { @@ -2944,9 +2498,9 @@ public class Cassandra { public void prepare_cql_query(ByteBuffer query, Compression compression, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - prepare_cql_query_call method_call = new prepare_cql_query_call(query, compression, resultHandler, this, protocolFactory, transport); - this.currentMethod = method_call; - manager.call(method_call); + prepare_cql_query_call method_call = new prepare_cql_query_call(query, compression, resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); } public static class prepare_cql_query_call extends org.apache.thrift.async.TAsyncMethodCall { @@ -2979,9 +2533,9 @@ public class Cassandra { public void execute_prepared_cql_query(int itemId, List values, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - execute_prepared_cql_query_call method_call = new execute_prepared_cql_query_call(itemId, values, resultHandler, this, protocolFactory, transport); - this.currentMethod = method_call; - manager.call(method_call); + execute_prepared_cql_query_call method_call = new execute_prepared_cql_query_call(itemId, values, resultHandler, this, ___protocolFactory, ___transport); + this.___currentMethod = method_call; + ___manager.call(method_call); } public static class execute_prepared_cql_query_call extends org.apache.thrift.async.TAsyncMethodCall { @@ -3014,168 +2568,108 @@ public class Cassandra { } - public static class Processor implements org.apache.thrift.TProcessor { + public static class Processor extends org.apache.thrift.TBaseProcessor implements org.apache.thrift.TProcessor { private static final Logger LOGGER = LoggerFactory.getLogger(Processor.class.getName()); - public Processor(Iface iface) - { - iface_ = iface; - processMap_.put("login", new login()); - processMap_.put("set_keyspace", new set_keyspace()); - processMap_.put("get", new get()); - processMap_.put("get_slice", new get_slice()); - processMap_.put("get_count", new get_count()); - processMap_.put("multiget_slice", new multiget_slice()); - processMap_.put("multiget_count", new multiget_count()); - processMap_.put("get_range_slices", new get_range_slices()); - processMap_.put("get_indexed_slices", new get_indexed_slices()); - processMap_.put("insert", new insert()); - processMap_.put("add", new add()); - processMap_.put("remove", new remove()); - processMap_.put("remove_counter", new remove_counter()); - processMap_.put("batch_mutate", new batch_mutate()); - processMap_.put("truncate", new truncate()); - processMap_.put("describe_schema_versions", new describe_schema_versions()); - processMap_.put("describe_keyspaces", new describe_keyspaces()); - processMap_.put("describe_cluster_name", new describe_cluster_name()); - processMap_.put("describe_version", new describe_version()); - processMap_.put("describe_ring", new describe_ring()); - processMap_.put("describe_partitioner", new describe_partitioner()); - processMap_.put("describe_snitch", new describe_snitch()); - processMap_.put("describe_keyspace", new describe_keyspace()); - processMap_.put("describe_splits", new describe_splits()); - processMap_.put("system_add_column_family", new system_add_column_family()); - processMap_.put("system_drop_column_family", new system_drop_column_family()); - processMap_.put("system_add_keyspace", new system_add_keyspace()); - processMap_.put("system_drop_keyspace", new system_drop_keyspace()); - processMap_.put("system_update_keyspace", new system_update_keyspace()); - processMap_.put("system_update_column_family", new system_update_column_family()); - processMap_.put("execute_cql_query", new execute_cql_query()); - processMap_.put("prepare_cql_query", new prepare_cql_query()); - processMap_.put("execute_prepared_cql_query", new execute_prepared_cql_query()); + public Processor(I iface) { + super(iface, getProcessMap(new HashMap>())); } - protected static interface ProcessFunction { - public void process(int seqid, org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException; + protected Processor(I iface, Map> processMap) { + super(iface, getProcessMap(processMap)); } - private Iface iface_; - protected final HashMap processMap_ = new HashMap(); + private static Map> getProcessMap(Map> processMap) { + processMap.put("login", new login()); + processMap.put("set_keyspace", new set_keyspace()); + processMap.put("get", new get()); + processMap.put("get_slice", new get_slice()); + processMap.put("get_count", new get_count()); + processMap.put("multiget_slice", new multiget_slice()); + processMap.put("multiget_count", new multiget_count()); + processMap.put("get_range_slices", new get_range_slices()); + processMap.put("get_indexed_slices", new get_indexed_slices()); + processMap.put("insert", new insert()); + processMap.put("add", new add()); + processMap.put("remove", new remove()); + processMap.put("remove_counter", new remove_counter()); + processMap.put("batch_mutate", new batch_mutate()); + processMap.put("truncate", new truncate()); + processMap.put("describe_schema_versions", new describe_schema_versions()); + processMap.put("describe_keyspaces", new describe_keyspaces()); + processMap.put("describe_cluster_name", new describe_cluster_name()); + processMap.put("describe_version", new describe_version()); + processMap.put("describe_ring", new describe_ring()); + processMap.put("describe_partitioner", new describe_partitioner()); + processMap.put("describe_snitch", new describe_snitch()); + processMap.put("describe_keyspace", new describe_keyspace()); + processMap.put("describe_splits", new describe_splits()); + processMap.put("system_add_column_family", new system_add_column_family()); + processMap.put("system_drop_column_family", new system_drop_column_family()); + processMap.put("system_add_keyspace", new system_add_keyspace()); + processMap.put("system_drop_keyspace", new system_drop_keyspace()); + processMap.put("system_update_keyspace", new system_update_keyspace()); + processMap.put("system_update_column_family", new system_update_column_family()); + processMap.put("execute_cql_query", new execute_cql_query()); + processMap.put("prepare_cql_query", new prepare_cql_query()); + processMap.put("execute_prepared_cql_query", new execute_prepared_cql_query()); + return processMap; + } - public boolean process(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException - { - org.apache.thrift.protocol.TMessage msg = iprot.readMessageBegin(); - ProcessFunction fn = processMap_.get(msg.name); - if (fn == null) { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, org.apache.thrift.protocol.TType.STRUCT); - iprot.readMessageEnd(); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.UNKNOWN_METHOD, "Invalid method name: '"+msg.name+"'"); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage(msg.name, org.apache.thrift.protocol.TMessageType.EXCEPTION, msg.seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return true; + private static class login extends org.apache.thrift.ProcessFunction { + public login() { + super("login"); } - fn.process(msg.seqid, iprot, oprot); - return true; - } - private class login implements ProcessFunction { - public void process(int seqid, org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException - { - login_args args = new login_args(); - try { - args.read(iprot); - } catch (org.apache.thrift.protocol.TProtocolException e) { - iprot.readMessageEnd(); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.PROTOCOL_ERROR, e.getMessage()); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("login", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; - } - iprot.readMessageEnd(); + protected login_args getEmptyArgsInstance() { + return new login_args(); + } + + protected login_result getResult(I iface, login_args args) throws org.apache.thrift.TException { login_result result = new login_result(); try { - iface_.login(args.auth_request); + iface.login(args.auth_request); } catch (AuthenticationException authnx) { result.authnx = authnx; } catch (AuthorizationException authzx) { result.authzx = authzx; - } catch (Throwable th) { - LOGGER.error("Internal error processing login", th); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, "Internal error processing login"); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("login", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; } - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("login", org.apache.thrift.protocol.TMessageType.REPLY, seqid)); - result.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); + return result; } - } - private class set_keyspace implements ProcessFunction { - public void process(int seqid, org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException - { - set_keyspace_args args = new set_keyspace_args(); - try { - args.read(iprot); - } catch (org.apache.thrift.protocol.TProtocolException e) { - iprot.readMessageEnd(); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.PROTOCOL_ERROR, e.getMessage()); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("set_keyspace", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; - } - iprot.readMessageEnd(); + private static class set_keyspace extends org.apache.thrift.ProcessFunction { + public set_keyspace() { + super("set_keyspace"); + } + + protected set_keyspace_args getEmptyArgsInstance() { + return new set_keyspace_args(); + } + + protected set_keyspace_result getResult(I iface, set_keyspace_args args) throws org.apache.thrift.TException { set_keyspace_result result = new set_keyspace_result(); try { - iface_.set_keyspace(args.keyspace); + iface.set_keyspace(args.keyspace); } catch (InvalidRequestException ire) { result.ire = ire; - } catch (Throwable th) { - LOGGER.error("Internal error processing set_keyspace", th); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, "Internal error processing set_keyspace"); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("set_keyspace", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; } - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("set_keyspace", org.apache.thrift.protocol.TMessageType.REPLY, seqid)); - result.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); + return result; } - } - private class get implements ProcessFunction { - public void process(int seqid, org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException - { - get_args args = new get_args(); - try { - args.read(iprot); - } catch (org.apache.thrift.protocol.TProtocolException e) { - iprot.readMessageEnd(); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.PROTOCOL_ERROR, e.getMessage()); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; - } - iprot.readMessageEnd(); + private static class get extends org.apache.thrift.ProcessFunction { + public get() { + super("get"); + } + + protected get_args getEmptyArgsInstance() { + return new get_args(); + } + + protected get_result getResult(I iface, get_args args) throws org.apache.thrift.TException { get_result result = new get_result(); try { - result.success = iface_.get(args.key, args.column_path, args.consistency_level); + result.success = iface.get(args.key, args.column_path, args.consistency_level); } catch (InvalidRequestException ire) { result.ire = ire; } catch (NotFoundException nfe) { @@ -3184,84 +2678,48 @@ public class Cassandra { result.ue = ue; } catch (TimedOutException te) { result.te = te; - } catch (Throwable th) { - LOGGER.error("Internal error processing get", th); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, "Internal error processing get"); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; } - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get", org.apache.thrift.protocol.TMessageType.REPLY, seqid)); - result.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); + return result; } - } - private class get_slice implements ProcessFunction { - public void process(int seqid, org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException - { - get_slice_args args = new get_slice_args(); - try { - args.read(iprot); - } catch (org.apache.thrift.protocol.TProtocolException e) { - iprot.readMessageEnd(); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.PROTOCOL_ERROR, e.getMessage()); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_slice", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; - } - iprot.readMessageEnd(); + private static class get_slice extends org.apache.thrift.ProcessFunction { + public get_slice() { + super("get_slice"); + } + + protected get_slice_args getEmptyArgsInstance() { + return new get_slice_args(); + } + + protected get_slice_result getResult(I iface, get_slice_args args) throws org.apache.thrift.TException { get_slice_result result = new get_slice_result(); try { - result.success = iface_.get_slice(args.key, args.column_parent, args.predicate, args.consistency_level); + result.success = iface.get_slice(args.key, args.column_parent, args.predicate, args.consistency_level); } catch (InvalidRequestException ire) { result.ire = ire; } catch (UnavailableException ue) { result.ue = ue; } catch (TimedOutException te) { result.te = te; - } catch (Throwable th) { - LOGGER.error("Internal error processing get_slice", th); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, "Internal error processing get_slice"); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_slice", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; } - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_slice", org.apache.thrift.protocol.TMessageType.REPLY, seqid)); - result.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); + return result; } - } - private class get_count implements ProcessFunction { - public void process(int seqid, org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException - { - get_count_args args = new get_count_args(); - try { - args.read(iprot); - } catch (org.apache.thrift.protocol.TProtocolException e) { - iprot.readMessageEnd(); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.PROTOCOL_ERROR, e.getMessage()); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_count", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; - } - iprot.readMessageEnd(); + private static class get_count extends org.apache.thrift.ProcessFunction { + public get_count() { + super("get_count"); + } + + protected get_count_args getEmptyArgsInstance() { + return new get_count_args(); + } + + protected get_count_result getResult(I iface, get_count_args args) throws org.apache.thrift.TException { get_count_result result = new get_count_result(); try { - result.success = iface_.get_count(args.key, args.column_parent, args.predicate, args.consistency_level); + result.success = iface.get_count(args.key, args.column_parent, args.predicate, args.consistency_level); result.setSuccessIsSet(true); } catch (InvalidRequestException ire) { result.ire = ire; @@ -3269,998 +2727,562 @@ public class Cassandra { result.ue = ue; } catch (TimedOutException te) { result.te = te; - } catch (Throwable th) { - LOGGER.error("Internal error processing get_count", th); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, "Internal error processing get_count"); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_count", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; } - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_count", org.apache.thrift.protocol.TMessageType.REPLY, seqid)); - result.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); + return result; } - } - private class multiget_slice implements ProcessFunction { - public void process(int seqid, org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException - { - multiget_slice_args args = new multiget_slice_args(); - try { - args.read(iprot); - } catch (org.apache.thrift.protocol.TProtocolException e) { - iprot.readMessageEnd(); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.PROTOCOL_ERROR, e.getMessage()); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("multiget_slice", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; - } - iprot.readMessageEnd(); + private static class multiget_slice extends org.apache.thrift.ProcessFunction { + public multiget_slice() { + super("multiget_slice"); + } + + protected multiget_slice_args getEmptyArgsInstance() { + return new multiget_slice_args(); + } + + protected multiget_slice_result getResult(I iface, multiget_slice_args args) throws org.apache.thrift.TException { multiget_slice_result result = new multiget_slice_result(); try { - result.success = iface_.multiget_slice(args.keys, args.column_parent, args.predicate, args.consistency_level); + result.success = iface.multiget_slice(args.keys, args.column_parent, args.predicate, args.consistency_level); } catch (InvalidRequestException ire) { result.ire = ire; } catch (UnavailableException ue) { result.ue = ue; } catch (TimedOutException te) { result.te = te; - } catch (Throwable th) { - LOGGER.error("Internal error processing multiget_slice", th); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, "Internal error processing multiget_slice"); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("multiget_slice", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; } - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("multiget_slice", org.apache.thrift.protocol.TMessageType.REPLY, seqid)); - result.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); + return result; } - } - private class multiget_count implements ProcessFunction { - public void process(int seqid, org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException - { - multiget_count_args args = new multiget_count_args(); - try { - args.read(iprot); - } catch (org.apache.thrift.protocol.TProtocolException e) { - iprot.readMessageEnd(); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.PROTOCOL_ERROR, e.getMessage()); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("multiget_count", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; - } - iprot.readMessageEnd(); + private static class multiget_count extends org.apache.thrift.ProcessFunction { + public multiget_count() { + super("multiget_count"); + } + + protected multiget_count_args getEmptyArgsInstance() { + return new multiget_count_args(); + } + + protected multiget_count_result getResult(I iface, multiget_count_args args) throws org.apache.thrift.TException { multiget_count_result result = new multiget_count_result(); try { - result.success = iface_.multiget_count(args.keys, args.column_parent, args.predicate, args.consistency_level); + result.success = iface.multiget_count(args.keys, args.column_parent, args.predicate, args.consistency_level); } catch (InvalidRequestException ire) { result.ire = ire; } catch (UnavailableException ue) { result.ue = ue; } catch (TimedOutException te) { result.te = te; - } catch (Throwable th) { - LOGGER.error("Internal error processing multiget_count", th); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, "Internal error processing multiget_count"); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("multiget_count", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; } - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("multiget_count", org.apache.thrift.protocol.TMessageType.REPLY, seqid)); - result.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); + return result; } - } - private class get_range_slices implements ProcessFunction { - public void process(int seqid, org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException - { - get_range_slices_args args = new get_range_slices_args(); - try { - args.read(iprot); - } catch (org.apache.thrift.protocol.TProtocolException e) { - iprot.readMessageEnd(); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.PROTOCOL_ERROR, e.getMessage()); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_range_slices", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; - } - iprot.readMessageEnd(); + private static class get_range_slices extends org.apache.thrift.ProcessFunction { + public get_range_slices() { + super("get_range_slices"); + } + + protected get_range_slices_args getEmptyArgsInstance() { + return new get_range_slices_args(); + } + + protected get_range_slices_result getResult(I iface, get_range_slices_args args) throws org.apache.thrift.TException { get_range_slices_result result = new get_range_slices_result(); try { - result.success = iface_.get_range_slices(args.column_parent, args.predicate, args.range, args.consistency_level); + result.success = iface.get_range_slices(args.column_parent, args.predicate, args.range, args.consistency_level); } catch (InvalidRequestException ire) { result.ire = ire; } catch (UnavailableException ue) { result.ue = ue; } catch (TimedOutException te) { result.te = te; - } catch (Throwable th) { - LOGGER.error("Internal error processing get_range_slices", th); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, "Internal error processing get_range_slices"); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_range_slices", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; } - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_range_slices", org.apache.thrift.protocol.TMessageType.REPLY, seqid)); - result.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); + return result; } - } - private class get_indexed_slices implements ProcessFunction { - public void process(int seqid, org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException - { - get_indexed_slices_args args = new get_indexed_slices_args(); - try { - args.read(iprot); - } catch (org.apache.thrift.protocol.TProtocolException e) { - iprot.readMessageEnd(); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.PROTOCOL_ERROR, e.getMessage()); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_indexed_slices", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; - } - iprot.readMessageEnd(); + private static class get_indexed_slices extends org.apache.thrift.ProcessFunction { + public get_indexed_slices() { + super("get_indexed_slices"); + } + + protected get_indexed_slices_args getEmptyArgsInstance() { + return new get_indexed_slices_args(); + } + + protected get_indexed_slices_result getResult(I iface, get_indexed_slices_args args) throws org.apache.thrift.TException { get_indexed_slices_result result = new get_indexed_slices_result(); try { - result.success = iface_.get_indexed_slices(args.column_parent, args.index_clause, args.column_predicate, args.consistency_level); + result.success = iface.get_indexed_slices(args.column_parent, args.index_clause, args.column_predicate, args.consistency_level); } catch (InvalidRequestException ire) { result.ire = ire; } catch (UnavailableException ue) { result.ue = ue; } catch (TimedOutException te) { result.te = te; - } catch (Throwable th) { - LOGGER.error("Internal error processing get_indexed_slices", th); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, "Internal error processing get_indexed_slices"); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_indexed_slices", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; } - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_indexed_slices", org.apache.thrift.protocol.TMessageType.REPLY, seqid)); - result.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); + return result; } - } - private class insert implements ProcessFunction { - public void process(int seqid, org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException - { - insert_args args = new insert_args(); - try { - args.read(iprot); - } catch (org.apache.thrift.protocol.TProtocolException e) { - iprot.readMessageEnd(); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.PROTOCOL_ERROR, e.getMessage()); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("insert", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; - } - iprot.readMessageEnd(); + private static class insert extends org.apache.thrift.ProcessFunction { + public insert() { + super("insert"); + } + + protected insert_args getEmptyArgsInstance() { + return new insert_args(); + } + + protected insert_result getResult(I iface, insert_args args) throws org.apache.thrift.TException { insert_result result = new insert_result(); try { - iface_.insert(args.key, args.column_parent, args.column, args.consistency_level); + iface.insert(args.key, args.column_parent, args.column, args.consistency_level); } catch (InvalidRequestException ire) { result.ire = ire; } catch (UnavailableException ue) { result.ue = ue; } catch (TimedOutException te) { result.te = te; - } catch (Throwable th) { - LOGGER.error("Internal error processing insert", th); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, "Internal error processing insert"); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("insert", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; } - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("insert", org.apache.thrift.protocol.TMessageType.REPLY, seqid)); - result.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); + return result; } - } - private class add implements ProcessFunction { - public void process(int seqid, org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException - { - add_args args = new add_args(); - try { - args.read(iprot); - } catch (org.apache.thrift.protocol.TProtocolException e) { - iprot.readMessageEnd(); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.PROTOCOL_ERROR, e.getMessage()); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("add", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; - } - iprot.readMessageEnd(); + private static class add extends org.apache.thrift.ProcessFunction { + public add() { + super("add"); + } + + protected add_args getEmptyArgsInstance() { + return new add_args(); + } + + protected add_result getResult(I iface, add_args args) throws org.apache.thrift.TException { add_result result = new add_result(); try { - iface_.add(args.key, args.column_parent, args.column, args.consistency_level); + iface.add(args.key, args.column_parent, args.column, args.consistency_level); } catch (InvalidRequestException ire) { result.ire = ire; } catch (UnavailableException ue) { result.ue = ue; } catch (TimedOutException te) { result.te = te; - } catch (Throwable th) { - LOGGER.error("Internal error processing add", th); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, "Internal error processing add"); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("add", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; } - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("add", org.apache.thrift.protocol.TMessageType.REPLY, seqid)); - result.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); + return result; } - } - private class remove implements ProcessFunction { - public void process(int seqid, org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException - { - remove_args args = new remove_args(); - try { - args.read(iprot); - } catch (org.apache.thrift.protocol.TProtocolException e) { - iprot.readMessageEnd(); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.PROTOCOL_ERROR, e.getMessage()); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("remove", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; - } - iprot.readMessageEnd(); + private static class remove extends org.apache.thrift.ProcessFunction { + public remove() { + super("remove"); + } + + protected remove_args getEmptyArgsInstance() { + return new remove_args(); + } + + protected remove_result getResult(I iface, remove_args args) throws org.apache.thrift.TException { remove_result result = new remove_result(); try { - iface_.remove(args.key, args.column_path, args.timestamp, args.consistency_level); + iface.remove(args.key, args.column_path, args.timestamp, args.consistency_level); } catch (InvalidRequestException ire) { result.ire = ire; } catch (UnavailableException ue) { result.ue = ue; } catch (TimedOutException te) { result.te = te; - } catch (Throwable th) { - LOGGER.error("Internal error processing remove", th); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, "Internal error processing remove"); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("remove", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; } - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("remove", org.apache.thrift.protocol.TMessageType.REPLY, seqid)); - result.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); + return result; } - } - private class remove_counter implements ProcessFunction { - public void process(int seqid, org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException - { - remove_counter_args args = new remove_counter_args(); - try { - args.read(iprot); - } catch (org.apache.thrift.protocol.TProtocolException e) { - iprot.readMessageEnd(); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.PROTOCOL_ERROR, e.getMessage()); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("remove_counter", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; - } - iprot.readMessageEnd(); + private static class remove_counter extends org.apache.thrift.ProcessFunction { + public remove_counter() { + super("remove_counter"); + } + + protected remove_counter_args getEmptyArgsInstance() { + return new remove_counter_args(); + } + + protected remove_counter_result getResult(I iface, remove_counter_args args) throws org.apache.thrift.TException { remove_counter_result result = new remove_counter_result(); try { - iface_.remove_counter(args.key, args.path, args.consistency_level); + iface.remove_counter(args.key, args.path, args.consistency_level); } catch (InvalidRequestException ire) { result.ire = ire; } catch (UnavailableException ue) { result.ue = ue; } catch (TimedOutException te) { result.te = te; - } catch (Throwable th) { - LOGGER.error("Internal error processing remove_counter", th); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, "Internal error processing remove_counter"); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("remove_counter", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; } - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("remove_counter", org.apache.thrift.protocol.TMessageType.REPLY, seqid)); - result.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); + return result; } - } - private class batch_mutate implements ProcessFunction { - public void process(int seqid, org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException - { - batch_mutate_args args = new batch_mutate_args(); - try { - args.read(iprot); - } catch (org.apache.thrift.protocol.TProtocolException e) { - iprot.readMessageEnd(); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.PROTOCOL_ERROR, e.getMessage()); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("batch_mutate", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; - } - iprot.readMessageEnd(); + private static class batch_mutate extends org.apache.thrift.ProcessFunction { + public batch_mutate() { + super("batch_mutate"); + } + + protected batch_mutate_args getEmptyArgsInstance() { + return new batch_mutate_args(); + } + + protected batch_mutate_result getResult(I iface, batch_mutate_args args) throws org.apache.thrift.TException { batch_mutate_result result = new batch_mutate_result(); try { - iface_.batch_mutate(args.mutation_map, args.consistency_level); + iface.batch_mutate(args.mutation_map, args.consistency_level); } catch (InvalidRequestException ire) { result.ire = ire; } catch (UnavailableException ue) { result.ue = ue; } catch (TimedOutException te) { result.te = te; - } catch (Throwable th) { - LOGGER.error("Internal error processing batch_mutate", th); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, "Internal error processing batch_mutate"); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("batch_mutate", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; } - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("batch_mutate", org.apache.thrift.protocol.TMessageType.REPLY, seqid)); - result.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); + return result; } - } - private class truncate implements ProcessFunction { - public void process(int seqid, org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException - { - truncate_args args = new truncate_args(); - try { - args.read(iprot); - } catch (org.apache.thrift.protocol.TProtocolException e) { - iprot.readMessageEnd(); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.PROTOCOL_ERROR, e.getMessage()); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("truncate", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; - } - iprot.readMessageEnd(); + private static class truncate extends org.apache.thrift.ProcessFunction { + public truncate() { + super("truncate"); + } + + protected truncate_args getEmptyArgsInstance() { + return new truncate_args(); + } + + protected truncate_result getResult(I iface, truncate_args args) throws org.apache.thrift.TException { truncate_result result = new truncate_result(); try { - iface_.truncate(args.cfname); + iface.truncate(args.cfname); } catch (InvalidRequestException ire) { result.ire = ire; } catch (UnavailableException ue) { result.ue = ue; } catch (TimedOutException te) { result.te = te; - } catch (Throwable th) { - LOGGER.error("Internal error processing truncate", th); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, "Internal error processing truncate"); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("truncate", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; } - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("truncate", org.apache.thrift.protocol.TMessageType.REPLY, seqid)); - result.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); + return result; } - } - private class describe_schema_versions implements ProcessFunction { - public void process(int seqid, org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException - { - describe_schema_versions_args args = new describe_schema_versions_args(); - try { - args.read(iprot); - } catch (org.apache.thrift.protocol.TProtocolException e) { - iprot.readMessageEnd(); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.PROTOCOL_ERROR, e.getMessage()); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("describe_schema_versions", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; - } - iprot.readMessageEnd(); + private static class describe_schema_versions extends org.apache.thrift.ProcessFunction { + public describe_schema_versions() { + super("describe_schema_versions"); + } + + protected describe_schema_versions_args getEmptyArgsInstance() { + return new describe_schema_versions_args(); + } + + protected describe_schema_versions_result getResult(I iface, describe_schema_versions_args args) throws org.apache.thrift.TException { describe_schema_versions_result result = new describe_schema_versions_result(); try { - result.success = iface_.describe_schema_versions(); + result.success = iface.describe_schema_versions(); } catch (InvalidRequestException ire) { result.ire = ire; - } catch (Throwable th) { - LOGGER.error("Internal error processing describe_schema_versions", th); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, "Internal error processing describe_schema_versions"); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("describe_schema_versions", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; } - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("describe_schema_versions", org.apache.thrift.protocol.TMessageType.REPLY, seqid)); - result.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); + return result; } - } - private class describe_keyspaces implements ProcessFunction { - public void process(int seqid, org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException - { - describe_keyspaces_args args = new describe_keyspaces_args(); - try { - args.read(iprot); - } catch (org.apache.thrift.protocol.TProtocolException e) { - iprot.readMessageEnd(); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.PROTOCOL_ERROR, e.getMessage()); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("describe_keyspaces", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; - } - iprot.readMessageEnd(); + private static class describe_keyspaces extends org.apache.thrift.ProcessFunction { + public describe_keyspaces() { + super("describe_keyspaces"); + } + + protected describe_keyspaces_args getEmptyArgsInstance() { + return new describe_keyspaces_args(); + } + + protected describe_keyspaces_result getResult(I iface, describe_keyspaces_args args) throws org.apache.thrift.TException { describe_keyspaces_result result = new describe_keyspaces_result(); try { - result.success = iface_.describe_keyspaces(); + result.success = iface.describe_keyspaces(); } catch (InvalidRequestException ire) { result.ire = ire; - } catch (Throwable th) { - LOGGER.error("Internal error processing describe_keyspaces", th); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, "Internal error processing describe_keyspaces"); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("describe_keyspaces", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; } - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("describe_keyspaces", org.apache.thrift.protocol.TMessageType.REPLY, seqid)); - result.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); + return result; } - } - private class describe_cluster_name implements ProcessFunction { - public void process(int seqid, org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException - { - describe_cluster_name_args args = new describe_cluster_name_args(); - try { - args.read(iprot); - } catch (org.apache.thrift.protocol.TProtocolException e) { - iprot.readMessageEnd(); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.PROTOCOL_ERROR, e.getMessage()); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("describe_cluster_name", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; - } - iprot.readMessageEnd(); + private static class describe_cluster_name extends org.apache.thrift.ProcessFunction { + public describe_cluster_name() { + super("describe_cluster_name"); + } + + protected describe_cluster_name_args getEmptyArgsInstance() { + return new describe_cluster_name_args(); + } + + protected describe_cluster_name_result getResult(I iface, describe_cluster_name_args args) throws org.apache.thrift.TException { describe_cluster_name_result result = new describe_cluster_name_result(); - result.success = iface_.describe_cluster_name(); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("describe_cluster_name", org.apache.thrift.protocol.TMessageType.REPLY, seqid)); - result.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); + result.success = iface.describe_cluster_name(); + return result; } - } - private class describe_version implements ProcessFunction { - public void process(int seqid, org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException - { - describe_version_args args = new describe_version_args(); - try { - args.read(iprot); - } catch (org.apache.thrift.protocol.TProtocolException e) { - iprot.readMessageEnd(); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.PROTOCOL_ERROR, e.getMessage()); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("describe_version", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; - } - iprot.readMessageEnd(); + private static class describe_version extends org.apache.thrift.ProcessFunction { + public describe_version() { + super("describe_version"); + } + + protected describe_version_args getEmptyArgsInstance() { + return new describe_version_args(); + } + + protected describe_version_result getResult(I iface, describe_version_args args) throws org.apache.thrift.TException { describe_version_result result = new describe_version_result(); - result.success = iface_.describe_version(); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("describe_version", org.apache.thrift.protocol.TMessageType.REPLY, seqid)); - result.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); + result.success = iface.describe_version(); + return result; } - } - private class describe_ring implements ProcessFunction { - public void process(int seqid, org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException - { - describe_ring_args args = new describe_ring_args(); - try { - args.read(iprot); - } catch (org.apache.thrift.protocol.TProtocolException e) { - iprot.readMessageEnd(); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.PROTOCOL_ERROR, e.getMessage()); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("describe_ring", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; - } - iprot.readMessageEnd(); + private static class describe_ring extends org.apache.thrift.ProcessFunction { + public describe_ring() { + super("describe_ring"); + } + + protected describe_ring_args getEmptyArgsInstance() { + return new describe_ring_args(); + } + + protected describe_ring_result getResult(I iface, describe_ring_args args) throws org.apache.thrift.TException { describe_ring_result result = new describe_ring_result(); try { - result.success = iface_.describe_ring(args.keyspace); + result.success = iface.describe_ring(args.keyspace); } catch (InvalidRequestException ire) { result.ire = ire; - } catch (Throwable th) { - LOGGER.error("Internal error processing describe_ring", th); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, "Internal error processing describe_ring"); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("describe_ring", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; } - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("describe_ring", org.apache.thrift.protocol.TMessageType.REPLY, seqid)); - result.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); + return result; } - } - private class describe_partitioner implements ProcessFunction { - public void process(int seqid, org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException - { - describe_partitioner_args args = new describe_partitioner_args(); - try { - args.read(iprot); - } catch (org.apache.thrift.protocol.TProtocolException e) { - iprot.readMessageEnd(); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.PROTOCOL_ERROR, e.getMessage()); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("describe_partitioner", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; - } - iprot.readMessageEnd(); + private static class describe_partitioner extends org.apache.thrift.ProcessFunction { + public describe_partitioner() { + super("describe_partitioner"); + } + + protected describe_partitioner_args getEmptyArgsInstance() { + return new describe_partitioner_args(); + } + + protected describe_partitioner_result getResult(I iface, describe_partitioner_args args) throws org.apache.thrift.TException { describe_partitioner_result result = new describe_partitioner_result(); - result.success = iface_.describe_partitioner(); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("describe_partitioner", org.apache.thrift.protocol.TMessageType.REPLY, seqid)); - result.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); + result.success = iface.describe_partitioner(); + return result; } - } - private class describe_snitch implements ProcessFunction { - public void process(int seqid, org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException - { - describe_snitch_args args = new describe_snitch_args(); - try { - args.read(iprot); - } catch (org.apache.thrift.protocol.TProtocolException e) { - iprot.readMessageEnd(); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.PROTOCOL_ERROR, e.getMessage()); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("describe_snitch", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; - } - iprot.readMessageEnd(); + private static class describe_snitch extends org.apache.thrift.ProcessFunction { + public describe_snitch() { + super("describe_snitch"); + } + + protected describe_snitch_args getEmptyArgsInstance() { + return new describe_snitch_args(); + } + + protected describe_snitch_result getResult(I iface, describe_snitch_args args) throws org.apache.thrift.TException { describe_snitch_result result = new describe_snitch_result(); - result.success = iface_.describe_snitch(); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("describe_snitch", org.apache.thrift.protocol.TMessageType.REPLY, seqid)); - result.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); + result.success = iface.describe_snitch(); + return result; } - } - private class describe_keyspace implements ProcessFunction { - public void process(int seqid, org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException - { - describe_keyspace_args args = new describe_keyspace_args(); - try { - args.read(iprot); - } catch (org.apache.thrift.protocol.TProtocolException e) { - iprot.readMessageEnd(); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.PROTOCOL_ERROR, e.getMessage()); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("describe_keyspace", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; - } - iprot.readMessageEnd(); + private static class describe_keyspace extends org.apache.thrift.ProcessFunction { + public describe_keyspace() { + super("describe_keyspace"); + } + + protected describe_keyspace_args getEmptyArgsInstance() { + return new describe_keyspace_args(); + } + + protected describe_keyspace_result getResult(I iface, describe_keyspace_args args) throws org.apache.thrift.TException { describe_keyspace_result result = new describe_keyspace_result(); try { - result.success = iface_.describe_keyspace(args.keyspace); + result.success = iface.describe_keyspace(args.keyspace); } catch (NotFoundException nfe) { result.nfe = nfe; } catch (InvalidRequestException ire) { result.ire = ire; - } catch (Throwable th) { - LOGGER.error("Internal error processing describe_keyspace", th); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, "Internal error processing describe_keyspace"); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("describe_keyspace", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; } - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("describe_keyspace", org.apache.thrift.protocol.TMessageType.REPLY, seqid)); - result.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); + return result; } - } - private class describe_splits implements ProcessFunction { - public void process(int seqid, org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException - { - describe_splits_args args = new describe_splits_args(); - try { - args.read(iprot); - } catch (org.apache.thrift.protocol.TProtocolException e) { - iprot.readMessageEnd(); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.PROTOCOL_ERROR, e.getMessage()); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("describe_splits", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; - } - iprot.readMessageEnd(); + private static class describe_splits extends org.apache.thrift.ProcessFunction { + public describe_splits() { + super("describe_splits"); + } + + protected describe_splits_args getEmptyArgsInstance() { + return new describe_splits_args(); + } + + protected describe_splits_result getResult(I iface, describe_splits_args args) throws org.apache.thrift.TException { describe_splits_result result = new describe_splits_result(); try { - result.success = iface_.describe_splits(args.cfName, args.start_token, args.end_token, args.keys_per_split); + result.success = iface.describe_splits(args.cfName, args.start_token, args.end_token, args.keys_per_split); } catch (InvalidRequestException ire) { result.ire = ire; - } catch (Throwable th) { - LOGGER.error("Internal error processing describe_splits", th); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, "Internal error processing describe_splits"); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("describe_splits", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; } - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("describe_splits", org.apache.thrift.protocol.TMessageType.REPLY, seqid)); - result.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); + return result; } - } - private class system_add_column_family implements ProcessFunction { - public void process(int seqid, org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException - { - system_add_column_family_args args = new system_add_column_family_args(); - try { - args.read(iprot); - } catch (org.apache.thrift.protocol.TProtocolException e) { - iprot.readMessageEnd(); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.PROTOCOL_ERROR, e.getMessage()); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("system_add_column_family", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; - } - iprot.readMessageEnd(); + private static class system_add_column_family extends org.apache.thrift.ProcessFunction { + public system_add_column_family() { + super("system_add_column_family"); + } + + protected system_add_column_family_args getEmptyArgsInstance() { + return new system_add_column_family_args(); + } + + protected system_add_column_family_result getResult(I iface, system_add_column_family_args args) throws org.apache.thrift.TException { system_add_column_family_result result = new system_add_column_family_result(); try { - result.success = iface_.system_add_column_family(args.cf_def); + result.success = iface.system_add_column_family(args.cf_def); } catch (InvalidRequestException ire) { result.ire = ire; } catch (SchemaDisagreementException sde) { result.sde = sde; - } catch (Throwable th) { - LOGGER.error("Internal error processing system_add_column_family", th); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, "Internal error processing system_add_column_family"); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("system_add_column_family", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; } - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("system_add_column_family", org.apache.thrift.protocol.TMessageType.REPLY, seqid)); - result.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); + return result; } - } - private class system_drop_column_family implements ProcessFunction { - public void process(int seqid, org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException - { - system_drop_column_family_args args = new system_drop_column_family_args(); - try { - args.read(iprot); - } catch (org.apache.thrift.protocol.TProtocolException e) { - iprot.readMessageEnd(); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.PROTOCOL_ERROR, e.getMessage()); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("system_drop_column_family", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; - } - iprot.readMessageEnd(); + private static class system_drop_column_family extends org.apache.thrift.ProcessFunction { + public system_drop_column_family() { + super("system_drop_column_family"); + } + + protected system_drop_column_family_args getEmptyArgsInstance() { + return new system_drop_column_family_args(); + } + + protected system_drop_column_family_result getResult(I iface, system_drop_column_family_args args) throws org.apache.thrift.TException { system_drop_column_family_result result = new system_drop_column_family_result(); try { - result.success = iface_.system_drop_column_family(args.column_family); + result.success = iface.system_drop_column_family(args.column_family); } catch (InvalidRequestException ire) { result.ire = ire; } catch (SchemaDisagreementException sde) { result.sde = sde; - } catch (Throwable th) { - LOGGER.error("Internal error processing system_drop_column_family", th); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, "Internal error processing system_drop_column_family"); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("system_drop_column_family", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; } - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("system_drop_column_family", org.apache.thrift.protocol.TMessageType.REPLY, seqid)); - result.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); + return result; } - } - private class system_add_keyspace implements ProcessFunction { - public void process(int seqid, org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException - { - system_add_keyspace_args args = new system_add_keyspace_args(); - try { - args.read(iprot); - } catch (org.apache.thrift.protocol.TProtocolException e) { - iprot.readMessageEnd(); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.PROTOCOL_ERROR, e.getMessage()); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("system_add_keyspace", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; - } - iprot.readMessageEnd(); + private static class system_add_keyspace extends org.apache.thrift.ProcessFunction { + public system_add_keyspace() { + super("system_add_keyspace"); + } + + protected system_add_keyspace_args getEmptyArgsInstance() { + return new system_add_keyspace_args(); + } + + protected system_add_keyspace_result getResult(I iface, system_add_keyspace_args args) throws org.apache.thrift.TException { system_add_keyspace_result result = new system_add_keyspace_result(); try { - result.success = iface_.system_add_keyspace(args.ks_def); + result.success = iface.system_add_keyspace(args.ks_def); } catch (InvalidRequestException ire) { result.ire = ire; } catch (SchemaDisagreementException sde) { result.sde = sde; - } catch (Throwable th) { - LOGGER.error("Internal error processing system_add_keyspace", th); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, "Internal error processing system_add_keyspace"); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("system_add_keyspace", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; } - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("system_add_keyspace", org.apache.thrift.protocol.TMessageType.REPLY, seqid)); - result.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); + return result; } - } - private class system_drop_keyspace implements ProcessFunction { - public void process(int seqid, org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException - { - system_drop_keyspace_args args = new system_drop_keyspace_args(); - try { - args.read(iprot); - } catch (org.apache.thrift.protocol.TProtocolException e) { - iprot.readMessageEnd(); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.PROTOCOL_ERROR, e.getMessage()); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("system_drop_keyspace", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; - } - iprot.readMessageEnd(); + private static class system_drop_keyspace extends org.apache.thrift.ProcessFunction { + public system_drop_keyspace() { + super("system_drop_keyspace"); + } + + protected system_drop_keyspace_args getEmptyArgsInstance() { + return new system_drop_keyspace_args(); + } + + protected system_drop_keyspace_result getResult(I iface, system_drop_keyspace_args args) throws org.apache.thrift.TException { system_drop_keyspace_result result = new system_drop_keyspace_result(); try { - result.success = iface_.system_drop_keyspace(args.keyspace); + result.success = iface.system_drop_keyspace(args.keyspace); } catch (InvalidRequestException ire) { result.ire = ire; } catch (SchemaDisagreementException sde) { result.sde = sde; - } catch (Throwable th) { - LOGGER.error("Internal error processing system_drop_keyspace", th); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, "Internal error processing system_drop_keyspace"); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("system_drop_keyspace", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; } - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("system_drop_keyspace", org.apache.thrift.protocol.TMessageType.REPLY, seqid)); - result.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); + return result; } - } - private class system_update_keyspace implements ProcessFunction { - public void process(int seqid, org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException - { - system_update_keyspace_args args = new system_update_keyspace_args(); - try { - args.read(iprot); - } catch (org.apache.thrift.protocol.TProtocolException e) { - iprot.readMessageEnd(); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.PROTOCOL_ERROR, e.getMessage()); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("system_update_keyspace", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; - } - iprot.readMessageEnd(); + private static class system_update_keyspace extends org.apache.thrift.ProcessFunction { + public system_update_keyspace() { + super("system_update_keyspace"); + } + + protected system_update_keyspace_args getEmptyArgsInstance() { + return new system_update_keyspace_args(); + } + + protected system_update_keyspace_result getResult(I iface, system_update_keyspace_args args) throws org.apache.thrift.TException { system_update_keyspace_result result = new system_update_keyspace_result(); try { - result.success = iface_.system_update_keyspace(args.ks_def); + result.success = iface.system_update_keyspace(args.ks_def); } catch (InvalidRequestException ire) { result.ire = ire; } catch (SchemaDisagreementException sde) { result.sde = sde; - } catch (Throwable th) { - LOGGER.error("Internal error processing system_update_keyspace", th); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, "Internal error processing system_update_keyspace"); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("system_update_keyspace", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; } - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("system_update_keyspace", org.apache.thrift.protocol.TMessageType.REPLY, seqid)); - result.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); + return result; } - } - private class system_update_column_family implements ProcessFunction { - public void process(int seqid, org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException - { - system_update_column_family_args args = new system_update_column_family_args(); - try { - args.read(iprot); - } catch (org.apache.thrift.protocol.TProtocolException e) { - iprot.readMessageEnd(); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.PROTOCOL_ERROR, e.getMessage()); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("system_update_column_family", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; - } - iprot.readMessageEnd(); + private static class system_update_column_family extends org.apache.thrift.ProcessFunction { + public system_update_column_family() { + super("system_update_column_family"); + } + + protected system_update_column_family_args getEmptyArgsInstance() { + return new system_update_column_family_args(); + } + + protected system_update_column_family_result getResult(I iface, system_update_column_family_args args) throws org.apache.thrift.TException { system_update_column_family_result result = new system_update_column_family_result(); try { - result.success = iface_.system_update_column_family(args.cf_def); + result.success = iface.system_update_column_family(args.cf_def); } catch (InvalidRequestException ire) { result.ire = ire; } catch (SchemaDisagreementException sde) { result.sde = sde; - } catch (Throwable th) { - LOGGER.error("Internal error processing system_update_column_family", th); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, "Internal error processing system_update_column_family"); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("system_update_column_family", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; } - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("system_update_column_family", org.apache.thrift.protocol.TMessageType.REPLY, seqid)); - result.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); + return result; } - } - private class execute_cql_query implements ProcessFunction { - public void process(int seqid, org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException - { - execute_cql_query_args args = new execute_cql_query_args(); - try { - args.read(iprot); - } catch (org.apache.thrift.protocol.TProtocolException e) { - iprot.readMessageEnd(); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.PROTOCOL_ERROR, e.getMessage()); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("execute_cql_query", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; - } - iprot.readMessageEnd(); + private static class execute_cql_query extends org.apache.thrift.ProcessFunction { + public execute_cql_query() { + super("execute_cql_query"); + } + + protected execute_cql_query_args getEmptyArgsInstance() { + return new execute_cql_query_args(); + } + + protected execute_cql_query_result getResult(I iface, execute_cql_query_args args) throws org.apache.thrift.TException { execute_cql_query_result result = new execute_cql_query_result(); try { - result.success = iface_.execute_cql_query(args.query, args.compression); + result.success = iface.execute_cql_query(args.query, args.compression); } catch (InvalidRequestException ire) { result.ire = ire; } catch (UnavailableException ue) { @@ -4269,80 +3291,44 @@ public class Cassandra { result.te = te; } catch (SchemaDisagreementException sde) { result.sde = sde; - } catch (Throwable th) { - LOGGER.error("Internal error processing execute_cql_query", th); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, "Internal error processing execute_cql_query"); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("execute_cql_query", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; } - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("execute_cql_query", org.apache.thrift.protocol.TMessageType.REPLY, seqid)); - result.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); + return result; } - } - private class prepare_cql_query implements ProcessFunction { - public void process(int seqid, org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException - { - prepare_cql_query_args args = new prepare_cql_query_args(); - try { - args.read(iprot); - } catch (org.apache.thrift.protocol.TProtocolException e) { - iprot.readMessageEnd(); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.PROTOCOL_ERROR, e.getMessage()); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("prepare_cql_query", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; - } - iprot.readMessageEnd(); + private static class prepare_cql_query extends org.apache.thrift.ProcessFunction { + public prepare_cql_query() { + super("prepare_cql_query"); + } + + protected prepare_cql_query_args getEmptyArgsInstance() { + return new prepare_cql_query_args(); + } + + protected prepare_cql_query_result getResult(I iface, prepare_cql_query_args args) throws org.apache.thrift.TException { prepare_cql_query_result result = new prepare_cql_query_result(); try { - result.success = iface_.prepare_cql_query(args.query, args.compression); + result.success = iface.prepare_cql_query(args.query, args.compression); } catch (InvalidRequestException ire) { result.ire = ire; - } catch (Throwable th) { - LOGGER.error("Internal error processing prepare_cql_query", th); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, "Internal error processing prepare_cql_query"); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("prepare_cql_query", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; } - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("prepare_cql_query", org.apache.thrift.protocol.TMessageType.REPLY, seqid)); - result.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); + return result; } - } - private class execute_prepared_cql_query implements ProcessFunction { - public void process(int seqid, org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException - { - execute_prepared_cql_query_args args = new execute_prepared_cql_query_args(); - try { - args.read(iprot); - } catch (org.apache.thrift.protocol.TProtocolException e) { - iprot.readMessageEnd(); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.PROTOCOL_ERROR, e.getMessage()); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("execute_prepared_cql_query", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; - } - iprot.readMessageEnd(); + private static class execute_prepared_cql_query extends org.apache.thrift.ProcessFunction { + public execute_prepared_cql_query() { + super("execute_prepared_cql_query"); + } + + protected execute_prepared_cql_query_args getEmptyArgsInstance() { + return new execute_prepared_cql_query_args(); + } + + protected execute_prepared_cql_query_result getResult(I iface, execute_prepared_cql_query_args args) throws org.apache.thrift.TException { execute_prepared_cql_query_result result = new execute_prepared_cql_query_result(); try { - result.success = iface_.execute_prepared_cql_query(args.itemId, args.values); + result.success = iface.execute_prepared_cql_query(args.itemId, args.values); } catch (InvalidRequestException ire) { result.ire = ire; } catch (UnavailableException ue) { @@ -4351,21 +3337,9 @@ public class Cassandra { result.te = te; } catch (SchemaDisagreementException sde) { result.sde = sde; - } catch (Throwable th) { - LOGGER.error("Internal error processing execute_prepared_cql_query", th); - org.apache.thrift.TApplicationException x = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, "Internal error processing execute_prepared_cql_query"); - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("execute_prepared_cql_query", org.apache.thrift.protocol.TMessageType.EXCEPTION, seqid)); - x.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - return; } - oprot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("execute_prepared_cql_query", org.apache.thrift.protocol.TMessageType.REPLY, seqid)); - result.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); + return result; } - } } @@ -4375,7 +3349,7 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField AUTH_REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("auth_request", org.apache.thrift.protocol.TType.STRUCT, (short)1); - public AuthenticationRequest auth_request; + public AuthenticationRequest auth_request; // 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 { @@ -4684,8 +3658,8 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField AUTHNX_FIELD_DESC = new org.apache.thrift.protocol.TField("authnx", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField AUTHZX_FIELD_DESC = new org.apache.thrift.protocol.TField("authzx", org.apache.thrift.protocol.TType.STRUCT, (short)2); - public AuthenticationException authnx; - public AuthorizationException authzx; + public AuthenticationException authnx; // required + public AuthorizationException authzx; // 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 { @@ -5081,7 +4055,7 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField KEYSPACE_FIELD_DESC = new org.apache.thrift.protocol.TField("keyspace", org.apache.thrift.protocol.TType.STRING, (short)1); - public String keyspace; + public String keyspace; // 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 { @@ -5388,7 +4362,7 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField IRE_FIELD_DESC = new org.apache.thrift.protocol.TField("ire", org.apache.thrift.protocol.TType.STRUCT, (short)1); - public InvalidRequestException ire; + public InvalidRequestException ire; // 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 { @@ -5694,13 +4668,13 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField COLUMN_PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("column_path", org.apache.thrift.protocol.TType.STRUCT, (short)2); private static final org.apache.thrift.protocol.TField CONSISTENCY_LEVEL_FIELD_DESC = new org.apache.thrift.protocol.TField("consistency_level", org.apache.thrift.protocol.TType.I32, (short)3); - public ByteBuffer key; - public ColumnPath column_path; + public ByteBuffer key; // required + public ColumnPath column_path; // required /** * * @see ConsistencyLevel */ - public ConsistencyLevel consistency_level; + public ConsistencyLevel consistency_level; // 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 { @@ -6228,11 +5202,11 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField UE_FIELD_DESC = new org.apache.thrift.protocol.TField("ue", org.apache.thrift.protocol.TType.STRUCT, (short)3); private static final org.apache.thrift.protocol.TField TE_FIELD_DESC = new org.apache.thrift.protocol.TField("te", org.apache.thrift.protocol.TType.STRUCT, (short)4); - public ColumnOrSuperColumn success; - public InvalidRequestException ire; - public NotFoundException nfe; - public UnavailableException ue; - public TimedOutException te; + public ColumnOrSuperColumn success; // required + public InvalidRequestException ire; // required + public NotFoundException nfe; // required + public UnavailableException ue; // required + public TimedOutException te; // 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 { @@ -6907,14 +5881,14 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField PREDICATE_FIELD_DESC = new org.apache.thrift.protocol.TField("predicate", org.apache.thrift.protocol.TType.STRUCT, (short)3); private static final org.apache.thrift.protocol.TField CONSISTENCY_LEVEL_FIELD_DESC = new org.apache.thrift.protocol.TField("consistency_level", org.apache.thrift.protocol.TType.I32, (short)4); - public ByteBuffer key; - public ColumnParent column_parent; - public SlicePredicate predicate; + public ByteBuffer key; // required + public ColumnParent column_parent; // required + public SlicePredicate predicate; // required /** * * @see ConsistencyLevel */ - public ConsistencyLevel consistency_level; + public ConsistencyLevel consistency_level; // 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 { @@ -7537,10 +6511,10 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField UE_FIELD_DESC = new org.apache.thrift.protocol.TField("ue", org.apache.thrift.protocol.TType.STRUCT, (short)2); private static final org.apache.thrift.protocol.TField TE_FIELD_DESC = new org.apache.thrift.protocol.TField("te", org.apache.thrift.protocol.TType.STRUCT, (short)3); - public List success; - public InvalidRequestException ire; - public UnavailableException ue; - public TimedOutException te; + public List success; // required + public InvalidRequestException ire; // required + public UnavailableException ue; // required + public TimedOutException te; // 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 { @@ -8013,7 +6987,7 @@ public class Cassandra { this.success = new ArrayList(_list87.size); for (int _i88 = 0; _i88 < _list87.size; ++_i88) { - ColumnOrSuperColumn _elem89; + ColumnOrSuperColumn _elem89; // required _elem89 = new ColumnOrSuperColumn(); _elem89.read(iprot); this.success.add(_elem89); @@ -8160,14 +7134,14 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField PREDICATE_FIELD_DESC = new org.apache.thrift.protocol.TField("predicate", org.apache.thrift.protocol.TType.STRUCT, (short)3); private static final org.apache.thrift.protocol.TField CONSISTENCY_LEVEL_FIELD_DESC = new org.apache.thrift.protocol.TField("consistency_level", org.apache.thrift.protocol.TType.I32, (short)4); - public ByteBuffer key; - public ColumnParent column_parent; - public SlicePredicate predicate; + public ByteBuffer key; // required + public ColumnParent column_parent; // required + public SlicePredicate predicate; // required /** * * @see ConsistencyLevel */ - public ConsistencyLevel consistency_level; + public ConsistencyLevel consistency_level; // 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 { @@ -8790,10 +7764,10 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField UE_FIELD_DESC = new org.apache.thrift.protocol.TField("ue", org.apache.thrift.protocol.TType.STRUCT, (short)2); private static final org.apache.thrift.protocol.TField TE_FIELD_DESC = new org.apache.thrift.protocol.TField("te", org.apache.thrift.protocol.TType.STRUCT, (short)3); - public int success; - public InvalidRequestException ire; - public UnavailableException ue; - public TimedOutException te; + public int success; // required + public InvalidRequestException ire; // required + public UnavailableException ue; // required + public TimedOutException te; // 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 { @@ -9064,7 +8038,7 @@ public class Cassandra { public Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: - return new Integer(getSuccess()); + return Integer.valueOf(getSuccess()); case IRE: return getIre(); @@ -9377,14 +8351,14 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField PREDICATE_FIELD_DESC = new org.apache.thrift.protocol.TField("predicate", org.apache.thrift.protocol.TType.STRUCT, (short)3); private static final org.apache.thrift.protocol.TField CONSISTENCY_LEVEL_FIELD_DESC = new org.apache.thrift.protocol.TField("consistency_level", org.apache.thrift.protocol.TType.I32, (short)4); - public List keys; - public ColumnParent column_parent; - public SlicePredicate predicate; + public List keys; // required + public ColumnParent column_parent; // required + public SlicePredicate predicate; // required /** * * @see ConsistencyLevel */ - public ConsistencyLevel consistency_level; + public ConsistencyLevel consistency_level; // 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 { @@ -9874,7 +8848,7 @@ public class Cassandra { this.keys = new ArrayList(_list91.size); for (int _i92 = 0; _i92 < _list91.size; ++_i92) { - ByteBuffer _elem93; + ByteBuffer _elem93; // required _elem93 = iprot.readBinary(); this.keys.add(_elem93); } @@ -10035,10 +9009,10 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField UE_FIELD_DESC = new org.apache.thrift.protocol.TField("ue", org.apache.thrift.protocol.TType.STRUCT, (short)2); private static final org.apache.thrift.protocol.TField TE_FIELD_DESC = new org.apache.thrift.protocol.TField("te", org.apache.thrift.protocol.TType.STRUCT, (short)3); - public Map> success; - public InvalidRequestException ire; - public UnavailableException ue; - public TimedOutException te; + public Map> success; // required + public InvalidRequestException ire; // required + public UnavailableException ue; // required + public TimedOutException te; // 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 { @@ -10521,15 +9495,15 @@ public class Cassandra { this.success = new HashMap>(2*_map95.size); for (int _i96 = 0; _i96 < _map95.size; ++_i96) { - ByteBuffer _key97; - List _val98; + ByteBuffer _key97; // required + List _val98; // required _key97 = iprot.readBinary(); { org.apache.thrift.protocol.TList _list99 = iprot.readListBegin(); _val98 = new ArrayList(_list99.size); for (int _i100 = 0; _i100 < _list99.size; ++_i100) { - ColumnOrSuperColumn _elem101; + ColumnOrSuperColumn _elem101; // required _elem101 = new ColumnOrSuperColumn(); _elem101.read(iprot); _val98.add(_elem101); @@ -10688,14 +9662,14 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField PREDICATE_FIELD_DESC = new org.apache.thrift.protocol.TField("predicate", org.apache.thrift.protocol.TType.STRUCT, (short)3); private static final org.apache.thrift.protocol.TField CONSISTENCY_LEVEL_FIELD_DESC = new org.apache.thrift.protocol.TField("consistency_level", org.apache.thrift.protocol.TType.I32, (short)4); - public List keys; - public ColumnParent column_parent; - public SlicePredicate predicate; + public List keys; // required + public ColumnParent column_parent; // required + public SlicePredicate predicate; // required /** * * @see ConsistencyLevel */ - public ConsistencyLevel consistency_level; + public ConsistencyLevel consistency_level; // 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 { @@ -11185,7 +10159,7 @@ public class Cassandra { this.keys = new ArrayList(_list104.size); for (int _i105 = 0; _i105 < _list104.size; ++_i105) { - ByteBuffer _elem106; + ByteBuffer _elem106; // required _elem106 = iprot.readBinary(); this.keys.add(_elem106); } @@ -11346,10 +10320,10 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField UE_FIELD_DESC = new org.apache.thrift.protocol.TField("ue", org.apache.thrift.protocol.TType.STRUCT, (short)2); private static final org.apache.thrift.protocol.TField TE_FIELD_DESC = new org.apache.thrift.protocol.TField("te", org.apache.thrift.protocol.TType.STRUCT, (short)3); - public Map success; - public InvalidRequestException ire; - public UnavailableException ue; - public TimedOutException te; + public Map success; // required + public InvalidRequestException ire; // required + public UnavailableException ue; // required + public TimedOutException te; // 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 { @@ -11828,8 +10802,8 @@ public class Cassandra { this.success = new HashMap(2*_map108.size); for (int _i109 = 0; _i109 < _map108.size; ++_i109) { - ByteBuffer _key110; - int _val111; + ByteBuffer _key110; // required + int _val111; // required _key110 = iprot.readBinary(); _val111 = iprot.readI32(); this.success.put(_key110, _val111); @@ -11977,14 +10951,14 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField RANGE_FIELD_DESC = new org.apache.thrift.protocol.TField("range", org.apache.thrift.protocol.TType.STRUCT, (short)3); private static final org.apache.thrift.protocol.TField CONSISTENCY_LEVEL_FIELD_DESC = new org.apache.thrift.protocol.TField("consistency_level", org.apache.thrift.protocol.TType.I32, (short)4); - public ColumnParent column_parent; - public SlicePredicate predicate; - public KeyRange range; + public ColumnParent column_parent; // required + public SlicePredicate predicate; // required + public KeyRange range; // required /** * * @see ConsistencyLevel */ - public ConsistencyLevel consistency_level; + public ConsistencyLevel consistency_level; // 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 { @@ -12597,10 +11571,10 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField UE_FIELD_DESC = new org.apache.thrift.protocol.TField("ue", org.apache.thrift.protocol.TType.STRUCT, (short)2); private static final org.apache.thrift.protocol.TField TE_FIELD_DESC = new org.apache.thrift.protocol.TField("te", org.apache.thrift.protocol.TType.STRUCT, (short)3); - public List success; - public InvalidRequestException ire; - public UnavailableException ue; - public TimedOutException te; + public List success; // required + public InvalidRequestException ire; // required + public UnavailableException ue; // required + public TimedOutException te; // 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 { @@ -13073,7 +12047,7 @@ public class Cassandra { this.success = new ArrayList(_list113.size); for (int _i114 = 0; _i114 < _list113.size; ++_i114) { - KeySlice _elem115; + KeySlice _elem115; // required _elem115 = new KeySlice(); _elem115.read(iprot); this.success.add(_elem115); @@ -13220,14 +12194,14 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField COLUMN_PREDICATE_FIELD_DESC = new org.apache.thrift.protocol.TField("column_predicate", org.apache.thrift.protocol.TType.STRUCT, (short)3); private static final org.apache.thrift.protocol.TField CONSISTENCY_LEVEL_FIELD_DESC = new org.apache.thrift.protocol.TField("consistency_level", org.apache.thrift.protocol.TType.I32, (short)4); - public ColumnParent column_parent; - public IndexClause index_clause; - public SlicePredicate column_predicate; + public ColumnParent column_parent; // required + public IndexClause index_clause; // required + public SlicePredicate column_predicate; // required /** * * @see ConsistencyLevel */ - public ConsistencyLevel consistency_level; + public ConsistencyLevel consistency_level; // 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 { @@ -13840,10 +12814,10 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField UE_FIELD_DESC = new org.apache.thrift.protocol.TField("ue", org.apache.thrift.protocol.TType.STRUCT, (short)2); private static final org.apache.thrift.protocol.TField TE_FIELD_DESC = new org.apache.thrift.protocol.TField("te", org.apache.thrift.protocol.TType.STRUCT, (short)3); - public List success; - public InvalidRequestException ire; - public UnavailableException ue; - public TimedOutException te; + public List success; // required + public InvalidRequestException ire; // required + public UnavailableException ue; // required + public TimedOutException te; // 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 { @@ -14316,7 +13290,7 @@ public class Cassandra { this.success = new ArrayList(_list117.size); for (int _i118 = 0; _i118 < _list117.size; ++_i118) { - KeySlice _elem119; + KeySlice _elem119; // required _elem119 = new KeySlice(); _elem119.read(iprot); this.success.add(_elem119); @@ -14463,14 +13437,14 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField COLUMN_FIELD_DESC = new org.apache.thrift.protocol.TField("column", org.apache.thrift.protocol.TType.STRUCT, (short)3); private static final org.apache.thrift.protocol.TField CONSISTENCY_LEVEL_FIELD_DESC = new org.apache.thrift.protocol.TField("consistency_level", org.apache.thrift.protocol.TType.I32, (short)4); - public ByteBuffer key; - public ColumnParent column_parent; - public Column column; + public ByteBuffer key; // required + public ColumnParent column_parent; // required + public Column column; // required /** * * @see ConsistencyLevel */ - public ConsistencyLevel consistency_level; + public ConsistencyLevel consistency_level; // 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 { @@ -15092,9 +14066,9 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField UE_FIELD_DESC = new org.apache.thrift.protocol.TField("ue", org.apache.thrift.protocol.TType.STRUCT, (short)2); private static final org.apache.thrift.protocol.TField TE_FIELD_DESC = new org.apache.thrift.protocol.TField("te", org.apache.thrift.protocol.TType.STRUCT, (short)3); - public InvalidRequestException ire; - public UnavailableException ue; - public TimedOutException te; + public InvalidRequestException ire; // required + public UnavailableException ue; // required + public TimedOutException te; // 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 { @@ -15585,14 +14559,14 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField COLUMN_FIELD_DESC = new org.apache.thrift.protocol.TField("column", org.apache.thrift.protocol.TType.STRUCT, (short)3); private static final org.apache.thrift.protocol.TField CONSISTENCY_LEVEL_FIELD_DESC = new org.apache.thrift.protocol.TField("consistency_level", org.apache.thrift.protocol.TType.I32, (short)4); - public ByteBuffer key; - public ColumnParent column_parent; - public CounterColumn column; + public ByteBuffer key; // required + public ColumnParent column_parent; // required + public CounterColumn column; // required /** * * @see ConsistencyLevel */ - public ConsistencyLevel consistency_level; + public ConsistencyLevel consistency_level; // 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 { @@ -16214,9 +15188,9 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField UE_FIELD_DESC = new org.apache.thrift.protocol.TField("ue", org.apache.thrift.protocol.TType.STRUCT, (short)2); private static final org.apache.thrift.protocol.TField TE_FIELD_DESC = new org.apache.thrift.protocol.TField("te", org.apache.thrift.protocol.TType.STRUCT, (short)3); - public InvalidRequestException ire; - public UnavailableException ue; - public TimedOutException te; + public InvalidRequestException ire; // required + public UnavailableException ue; // required + public TimedOutException te; // 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 { @@ -16707,14 +15681,14 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField TIMESTAMP_FIELD_DESC = new org.apache.thrift.protocol.TField("timestamp", org.apache.thrift.protocol.TType.I64, (short)3); private static final org.apache.thrift.protocol.TField CONSISTENCY_LEVEL_FIELD_DESC = new org.apache.thrift.protocol.TField("consistency_level", org.apache.thrift.protocol.TType.I32, (short)4); - public ByteBuffer key; - public ColumnPath column_path; - public long timestamp; + public ByteBuffer key; // required + public ColumnPath column_path; // required + public long timestamp; // required /** * * @see ConsistencyLevel */ - public ConsistencyLevel consistency_level; + public ConsistencyLevel consistency_level; // 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 { @@ -17017,7 +15991,7 @@ public class Cassandra { return getColumn_path(); case TIMESTAMP: - return new Long(getTimestamp()); + return Long.valueOf(getTimestamp()); case CONSISTENCY_LEVEL: return getConsistency_level(); @@ -17333,9 +16307,9 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField UE_FIELD_DESC = new org.apache.thrift.protocol.TField("ue", org.apache.thrift.protocol.TType.STRUCT, (short)2); private static final org.apache.thrift.protocol.TField TE_FIELD_DESC = new org.apache.thrift.protocol.TField("te", org.apache.thrift.protocol.TType.STRUCT, (short)3); - public InvalidRequestException ire; - public UnavailableException ue; - public TimedOutException te; + public InvalidRequestException ire; // required + public UnavailableException ue; // required + public TimedOutException te; // 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 { @@ -17825,13 +16799,13 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("path", org.apache.thrift.protocol.TType.STRUCT, (short)2); private static final org.apache.thrift.protocol.TField CONSISTENCY_LEVEL_FIELD_DESC = new org.apache.thrift.protocol.TField("consistency_level", org.apache.thrift.protocol.TType.I32, (short)3); - public ByteBuffer key; - public ColumnPath path; + public ByteBuffer key; // required + public ColumnPath path; // required /** * * @see ConsistencyLevel */ - public ConsistencyLevel consistency_level; + public ConsistencyLevel consistency_level; // 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 { @@ -18357,9 +17331,9 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField UE_FIELD_DESC = new org.apache.thrift.protocol.TField("ue", org.apache.thrift.protocol.TType.STRUCT, (short)2); private static final org.apache.thrift.protocol.TField TE_FIELD_DESC = new org.apache.thrift.protocol.TField("te", org.apache.thrift.protocol.TType.STRUCT, (short)3); - public InvalidRequestException ire; - public UnavailableException ue; - public TimedOutException te; + public InvalidRequestException ire; // required + public UnavailableException ue; // required + public TimedOutException te; // 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 { @@ -18848,12 +17822,12 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField MUTATION_MAP_FIELD_DESC = new org.apache.thrift.protocol.TField("mutation_map", org.apache.thrift.protocol.TType.MAP, (short)1); private static final org.apache.thrift.protocol.TField CONSISTENCY_LEVEL_FIELD_DESC = new org.apache.thrift.protocol.TField("consistency_level", org.apache.thrift.protocol.TType.I32, (short)2); - public Map>> mutation_map; + public Map>> mutation_map; // required /** * * @see ConsistencyLevel */ - public ConsistencyLevel consistency_level; + public ConsistencyLevel consistency_level; // 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 { @@ -19220,23 +18194,23 @@ public class Cassandra { this.mutation_map = new HashMap>>(2*_map121.size); for (int _i122 = 0; _i122 < _map121.size; ++_i122) { - ByteBuffer _key123; - Map> _val124; + ByteBuffer _key123; // required + Map> _val124; // required _key123 = iprot.readBinary(); { org.apache.thrift.protocol.TMap _map125 = iprot.readMapBegin(); _val124 = new HashMap>(2*_map125.size); for (int _i126 = 0; _i126 < _map125.size; ++_i126) { - String _key127; - List _val128; + String _key127; // required + List _val128; // required _key127 = iprot.readString(); { org.apache.thrift.protocol.TList _list129 = iprot.readListBegin(); _val128 = new ArrayList(_list129.size); for (int _i130 = 0; _i130 < _list129.size; ++_i130) { - Mutation _elem131; + Mutation _elem131; // required _elem131 = new Mutation(); _elem131.read(iprot); _val128.add(_elem131); @@ -19373,9 +18347,9 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField UE_FIELD_DESC = new org.apache.thrift.protocol.TField("ue", org.apache.thrift.protocol.TType.STRUCT, (short)2); private static final org.apache.thrift.protocol.TField TE_FIELD_DESC = new org.apache.thrift.protocol.TField("te", org.apache.thrift.protocol.TType.STRUCT, (short)3); - public InvalidRequestException ire; - public UnavailableException ue; - public TimedOutException te; + public InvalidRequestException ire; // required + public UnavailableException ue; // required + public TimedOutException te; // 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 { @@ -19863,7 +18837,7 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField CFNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("cfname", org.apache.thrift.protocol.TType.STRING, (short)1); - public String cfname; + public String cfname; // 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 { @@ -20172,9 +19146,9 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField UE_FIELD_DESC = new org.apache.thrift.protocol.TField("ue", org.apache.thrift.protocol.TType.STRUCT, (short)2); private static final org.apache.thrift.protocol.TField TE_FIELD_DESC = new org.apache.thrift.protocol.TField("te", org.apache.thrift.protocol.TType.STRUCT, (short)3); - public InvalidRequestException ire; - public UnavailableException ue; - public TimedOutException te; + public InvalidRequestException ire; // required + public UnavailableException ue; // required + public TimedOutException te; // 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 { @@ -20867,8 +19841,8 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.MAP, (short)0); private static final org.apache.thrift.protocol.TField IRE_FIELD_DESC = new org.apache.thrift.protocol.TField("ire", org.apache.thrift.protocol.TType.STRUCT, (short)1); - public Map> success; - public InvalidRequestException ire; + public Map> success; // required + public InvalidRequestException ire; // 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 { @@ -21206,15 +20180,15 @@ public class Cassandra { this.success = new HashMap>(2*_map135.size); for (int _i136 = 0; _i136 < _map135.size; ++_i136) { - String _key137; - List _val138; + String _key137; // required + List _val138; // required _key137 = iprot.readString(); { org.apache.thrift.protocol.TList _list139 = iprot.readListBegin(); _val138 = new ArrayList(_list139.size); for (int _i140 = 0; _i140 < _list139.size; ++_i140) { - String _elem141; + String _elem141; // required _elem141 = iprot.readString(); _val138.add(_elem141); } @@ -21534,8 +20508,8 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0); private static final org.apache.thrift.protocol.TField IRE_FIELD_DESC = new org.apache.thrift.protocol.TField("ire", org.apache.thrift.protocol.TType.STRUCT, (short)1); - public List success; - public InvalidRequestException ire; + public List success; // required + public InvalidRequestException ire; // 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 { @@ -21864,7 +20838,7 @@ public class Cassandra { this.success = new ArrayList(_list144.size); for (int _i145 = 0; _i145 < _list144.size; ++_i145) { - KsDef _elem146; + KsDef _elem146; // required _elem146 = new KsDef(); _elem146.read(iprot); this.success.add(_elem146); @@ -22172,7 +21146,7 @@ public class Cassandra { 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); - public String success; + public String success; // 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 { @@ -22679,7 +21653,7 @@ public class Cassandra { 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); - public String success; + public String success; // 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 { @@ -22982,7 +21956,7 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField KEYSPACE_FIELD_DESC = new org.apache.thrift.protocol.TField("keyspace", org.apache.thrift.protocol.TType.STRING, (short)1); - public String keyspace; + public String keyspace; // 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 { @@ -23290,8 +22264,8 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0); private static final org.apache.thrift.protocol.TField IRE_FIELD_DESC = new org.apache.thrift.protocol.TField("ire", org.apache.thrift.protocol.TType.STRUCT, (short)1); - public List success; - public InvalidRequestException ire; + public List success; // required + public InvalidRequestException ire; // 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 { @@ -23620,7 +22594,7 @@ public class Cassandra { this.success = new ArrayList(_list148.size); for (int _i149 = 0; _i149 < _list148.size; ++_i149) { - TokenRange _elem150; + TokenRange _elem150; // required _elem150 = new TokenRange(); _elem150.read(iprot); this.success.add(_elem150); @@ -23928,7 +22902,7 @@ public class Cassandra { 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); - public String success; + public String success; // 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 { @@ -24435,7 +23409,7 @@ public class Cassandra { 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); - public String success; + public String success; // 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 { @@ -24738,7 +23712,7 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField KEYSPACE_FIELD_DESC = new org.apache.thrift.protocol.TField("keyspace", org.apache.thrift.protocol.TType.STRING, (short)1); - public String keyspace; + public String keyspace; // 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 { @@ -25047,9 +24021,9 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField NFE_FIELD_DESC = new org.apache.thrift.protocol.TField("nfe", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField IRE_FIELD_DESC = new org.apache.thrift.protocol.TField("ire", org.apache.thrift.protocol.TType.STRUCT, (short)2); - public KsDef success; - public NotFoundException nfe; - public InvalidRequestException ire; + public KsDef success; // required + public NotFoundException nfe; // required + public InvalidRequestException ire; // 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 { @@ -25540,10 +24514,10 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField END_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("end_token", org.apache.thrift.protocol.TType.STRING, (short)3); private static final org.apache.thrift.protocol.TField KEYS_PER_SPLIT_FIELD_DESC = new org.apache.thrift.protocol.TField("keys_per_split", org.apache.thrift.protocol.TType.I32, (short)4); - public String cfName; - public String start_token; - public String end_token; - public int keys_per_split; + public String cfName; // required + public String start_token; // required + public String end_token; // required + public int keys_per_split; // 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 { @@ -25823,7 +24797,7 @@ public class Cassandra { return getEnd_token(); case KEYS_PER_SPLIT: - return new Integer(getKeys_per_split()); + return Integer.valueOf(getKeys_per_split()); } throw new IllegalStateException(); @@ -26135,8 +25109,8 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0); private static final org.apache.thrift.protocol.TField IRE_FIELD_DESC = new org.apache.thrift.protocol.TField("ire", org.apache.thrift.protocol.TType.STRUCT, (short)1); - public List success; - public InvalidRequestException ire; + public List success; // required + public InvalidRequestException ire; // 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 { @@ -26465,7 +25439,7 @@ public class Cassandra { this.success = new ArrayList(_list152.size); for (int _i153 = 0; _i153 < _list152.size; ++_i153) { - String _elem154; + String _elem154; // required _elem154 = iprot.readString(); this.success.add(_elem154); } @@ -26568,7 +25542,7 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField CF_DEF_FIELD_DESC = new org.apache.thrift.protocol.TField("cf_def", org.apache.thrift.protocol.TType.STRUCT, (short)1); - public CfDef cf_def; + public CfDef cf_def; // 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 { @@ -26878,9 +25852,9 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField IRE_FIELD_DESC = new org.apache.thrift.protocol.TField("ire", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField SDE_FIELD_DESC = new org.apache.thrift.protocol.TField("sde", org.apache.thrift.protocol.TType.STRUCT, (short)2); - public String success; - public InvalidRequestException ire; - public SchemaDisagreementException sde; + public String success; // required + public InvalidRequestException ire; // required + public SchemaDisagreementException sde; // 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 { @@ -27367,7 +26341,7 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField COLUMN_FAMILY_FIELD_DESC = new org.apache.thrift.protocol.TField("column_family", org.apache.thrift.protocol.TType.STRING, (short)1); - public String column_family; + public String column_family; // 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 { @@ -27676,9 +26650,9 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField IRE_FIELD_DESC = new org.apache.thrift.protocol.TField("ire", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField SDE_FIELD_DESC = new org.apache.thrift.protocol.TField("sde", org.apache.thrift.protocol.TType.STRUCT, (short)2); - public String success; - public InvalidRequestException ire; - public SchemaDisagreementException sde; + public String success; // required + public InvalidRequestException ire; // required + public SchemaDisagreementException sde; // 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 { @@ -28165,7 +27139,7 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField KS_DEF_FIELD_DESC = new org.apache.thrift.protocol.TField("ks_def", org.apache.thrift.protocol.TType.STRUCT, (short)1); - public KsDef ks_def; + public KsDef ks_def; // 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 { @@ -28475,9 +27449,9 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField IRE_FIELD_DESC = new org.apache.thrift.protocol.TField("ire", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField SDE_FIELD_DESC = new org.apache.thrift.protocol.TField("sde", org.apache.thrift.protocol.TType.STRUCT, (short)2); - public String success; - public InvalidRequestException ire; - public SchemaDisagreementException sde; + public String success; // required + public InvalidRequestException ire; // required + public SchemaDisagreementException sde; // 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 { @@ -28964,7 +27938,7 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField KEYSPACE_FIELD_DESC = new org.apache.thrift.protocol.TField("keyspace", org.apache.thrift.protocol.TType.STRING, (short)1); - public String keyspace; + public String keyspace; // 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 { @@ -29273,9 +28247,9 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField IRE_FIELD_DESC = new org.apache.thrift.protocol.TField("ire", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField SDE_FIELD_DESC = new org.apache.thrift.protocol.TField("sde", org.apache.thrift.protocol.TType.STRUCT, (short)2); - public String success; - public InvalidRequestException ire; - public SchemaDisagreementException sde; + public String success; // required + public InvalidRequestException ire; // required + public SchemaDisagreementException sde; // 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 { @@ -29762,7 +28736,7 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField KS_DEF_FIELD_DESC = new org.apache.thrift.protocol.TField("ks_def", org.apache.thrift.protocol.TType.STRUCT, (short)1); - public KsDef ks_def; + public KsDef ks_def; // 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 { @@ -30072,9 +29046,9 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField IRE_FIELD_DESC = new org.apache.thrift.protocol.TField("ire", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField SDE_FIELD_DESC = new org.apache.thrift.protocol.TField("sde", org.apache.thrift.protocol.TType.STRUCT, (short)2); - public String success; - public InvalidRequestException ire; - public SchemaDisagreementException sde; + public String success; // required + public InvalidRequestException ire; // required + public SchemaDisagreementException sde; // 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 { @@ -30561,7 +29535,7 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField CF_DEF_FIELD_DESC = new org.apache.thrift.protocol.TField("cf_def", org.apache.thrift.protocol.TType.STRUCT, (short)1); - public CfDef cf_def; + public CfDef cf_def; // 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 { @@ -30871,9 +29845,9 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField IRE_FIELD_DESC = new org.apache.thrift.protocol.TField("ire", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField SDE_FIELD_DESC = new org.apache.thrift.protocol.TField("sde", org.apache.thrift.protocol.TType.STRUCT, (short)2); - public String success; - public InvalidRequestException ire; - public SchemaDisagreementException sde; + public String success; // required + public InvalidRequestException ire; // required + public SchemaDisagreementException sde; // 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 { @@ -31361,12 +30335,12 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField QUERY_FIELD_DESC = new org.apache.thrift.protocol.TField("query", org.apache.thrift.protocol.TType.STRING, (short)1); private static final org.apache.thrift.protocol.TField COMPRESSION_FIELD_DESC = new org.apache.thrift.protocol.TField("compression", org.apache.thrift.protocol.TType.I32, (short)2); - public ByteBuffer query; + public ByteBuffer query; // required /** * * @see Compression */ - public Compression compression; + public Compression compression; // 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 { @@ -31795,11 +30769,11 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField TE_FIELD_DESC = new org.apache.thrift.protocol.TField("te", org.apache.thrift.protocol.TType.STRUCT, (short)3); private static final org.apache.thrift.protocol.TField SDE_FIELD_DESC = new org.apache.thrift.protocol.TField("sde", org.apache.thrift.protocol.TType.STRUCT, (short)4); - public CqlResult success; - public InvalidRequestException ire; - public UnavailableException ue; - public TimedOutException te; - public SchemaDisagreementException sde; + public CqlResult success; // required + public InvalidRequestException ire; // required + public UnavailableException ue; // required + public TimedOutException te; // required + public SchemaDisagreementException sde; // 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 { @@ -32472,12 +31446,12 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField QUERY_FIELD_DESC = new org.apache.thrift.protocol.TField("query", org.apache.thrift.protocol.TType.STRING, (short)1); private static final org.apache.thrift.protocol.TField COMPRESSION_FIELD_DESC = new org.apache.thrift.protocol.TField("compression", org.apache.thrift.protocol.TType.I32, (short)2); - public ByteBuffer query; + public ByteBuffer query; // required /** * * @see Compression */ - public Compression compression; + public Compression compression; // 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 { @@ -32903,8 +31877,8 @@ public class Cassandra { 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 IRE_FIELD_DESC = new org.apache.thrift.protocol.TField("ire", org.apache.thrift.protocol.TType.STRUCT, (short)1); - public CqlPreparedResult success; - public InvalidRequestException ire; + public CqlPreparedResult success; // required + public InvalidRequestException ire; // 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 { @@ -33301,8 +32275,8 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField ITEM_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("itemId", org.apache.thrift.protocol.TType.I32, (short)1); private static final org.apache.thrift.protocol.TField VALUES_FIELD_DESC = new org.apache.thrift.protocol.TField("values", org.apache.thrift.protocol.TType.LIST, (short)2); - public int itemId; - public List values; + public int itemId; // required + public List values; // 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 { @@ -33507,7 +32481,7 @@ public class Cassandra { public Object getFieldValue(_Fields field) { switch (field) { case ITEM_ID: - return new Integer(getItemId()); + return Integer.valueOf(getItemId()); case VALUES: return getValues(); @@ -33642,7 +32616,7 @@ public class Cassandra { this.values = new ArrayList(_list156.size); for (int _i157 = 0; _i157 < _list156.size; ++_i157) { - String _elem158; + String _elem158; // required _elem158 = iprot.readString(); this.values.add(_elem158); } @@ -33744,11 +32718,11 @@ public class Cassandra { private static final org.apache.thrift.protocol.TField TE_FIELD_DESC = new org.apache.thrift.protocol.TField("te", org.apache.thrift.protocol.TType.STRUCT, (short)3); private static final org.apache.thrift.protocol.TField SDE_FIELD_DESC = new org.apache.thrift.protocol.TField("sde", org.apache.thrift.protocol.TType.STRUCT, (short)4); - public CqlResult success; - public InvalidRequestException ire; - public UnavailableException ue; - public TimedOutException te; - public SchemaDisagreementException sde; + public CqlResult success; // required + public InvalidRequestException ire; // required + public UnavailableException ue; // required + public TimedOutException te; // required + public SchemaDisagreementException sde; // 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 { diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java index 7062415bd3..2e7d892990 100644 --- a/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java +++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift + * Autogenerated by Thrift Compiler (0.7.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ @@ -68,28 +68,28 @@ public class CfDef implements org.apache.thrift.TBase, jav private static final org.apache.thrift.protocol.TField BLOOM_FILTER_FP_CHANCE_FIELD_DESC = new org.apache.thrift.protocol.TField("bloom_filter_fp_chance", org.apache.thrift.protocol.TType.DOUBLE, (short)33); private static final org.apache.thrift.protocol.TField CACHING_FIELD_DESC = new org.apache.thrift.protocol.TField("caching", org.apache.thrift.protocol.TType.STRING, (short)34); - public String keyspace; - public String name; - public String column_type; - public String comparator_type; - public String subcomparator_type; - public String comment; - public double read_repair_chance; - public List column_metadata; - public int gc_grace_seconds; - public String default_validation_class; - public int id; - public int min_compaction_threshold; - public int max_compaction_threshold; - public boolean replicate_on_write; - public double merge_shards_chance; - public String key_validation_class; - public ByteBuffer key_alias; - public String compaction_strategy; - public Map compaction_strategy_options; - public Map compression_options; - public double bloom_filter_fp_chance; - public String caching; + public String keyspace; // required + public String name; // required + public String column_type; // required + public String comparator_type; // required + public String subcomparator_type; // required + public String comment; // required + public double read_repair_chance; // required + public List column_metadata; // required + public int gc_grace_seconds; // required + public String default_validation_class; // required + public int id; // required + public int min_compaction_threshold; // required + public int max_compaction_threshold; // required + public boolean replicate_on_write; // required + public double merge_shards_chance; // required + public String key_validation_class; // required + public ByteBuffer key_alias; // required + public String compaction_strategy; // required + public Map compaction_strategy_options; // required + public Map compression_options; // required + public double bloom_filter_fp_chance; // required + public String caching; // 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 { @@ -1196,31 +1196,31 @@ public class CfDef implements org.apache.thrift.TBase, jav return getComment(); case READ_REPAIR_CHANCE: - return new Double(getRead_repair_chance()); + return Double.valueOf(getRead_repair_chance()); case COLUMN_METADATA: return getColumn_metadata(); case GC_GRACE_SECONDS: - return new Integer(getGc_grace_seconds()); + return Integer.valueOf(getGc_grace_seconds()); case DEFAULT_VALIDATION_CLASS: return getDefault_validation_class(); case ID: - return new Integer(getId()); + return Integer.valueOf(getId()); case MIN_COMPACTION_THRESHOLD: - return new Integer(getMin_compaction_threshold()); + return Integer.valueOf(getMin_compaction_threshold()); case MAX_COMPACTION_THRESHOLD: - return new Integer(getMax_compaction_threshold()); + return Integer.valueOf(getMax_compaction_threshold()); case REPLICATE_ON_WRITE: - return new Boolean(isReplicate_on_write()); + return Boolean.valueOf(isReplicate_on_write()); case MERGE_SHARDS_CHANCE: - return new Double(getMerge_shards_chance()); + return Double.valueOf(getMerge_shards_chance()); case KEY_VALIDATION_CLASS: return getKey_validation_class(); @@ -1238,7 +1238,7 @@ public class CfDef implements org.apache.thrift.TBase, jav return getCompression_options(); case BLOOM_FILTER_FP_CHANCE: - return new Double(getBloom_filter_fp_chance()); + return Double.valueOf(getBloom_filter_fp_chance()); case CACHING: return getCaching(); @@ -1935,7 +1935,7 @@ public class CfDef implements org.apache.thrift.TBase, jav this.column_metadata = new ArrayList(_list46.size); for (int _i47 = 0; _i47 < _list46.size; ++_i47) { - ColumnDef _elem48; + ColumnDef _elem48; // required _elem48 = new ColumnDef(); _elem48.read(iprot); this.column_metadata.add(_elem48); @@ -2029,8 +2029,8 @@ public class CfDef implements org.apache.thrift.TBase, jav this.compaction_strategy_options = new HashMap(2*_map49.size); for (int _i50 = 0; _i50 < _map49.size; ++_i50) { - String _key51; - String _val52; + String _key51; // required + String _val52; // required _key51 = iprot.readString(); _val52 = iprot.readString(); this.compaction_strategy_options.put(_key51, _val52); @@ -2048,8 +2048,8 @@ public class CfDef implements org.apache.thrift.TBase, jav this.compression_options = new HashMap(2*_map53.size); for (int _i54 = 0; _i54 < _map53.size; ++_i54) { - String _key55; - String _val56; + String _key55; // required + String _val56; // required _key55 = iprot.readString(); _val56 = iprot.readString(); this.compression_options.put(_key55, _val56); diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java index 0a27d336b9..d655124a26 100644 --- a/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java +++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift + * Autogenerated by Thrift Compiler (0.7.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ @@ -57,10 +57,10 @@ public class Column implements org.apache.thrift.TBase, private static final org.apache.thrift.protocol.TField TIMESTAMP_FIELD_DESC = new org.apache.thrift.protocol.TField("timestamp", org.apache.thrift.protocol.TType.I64, (short)3); private static final org.apache.thrift.protocol.TField TTL_FIELD_DESC = new org.apache.thrift.protocol.TField("ttl", org.apache.thrift.protocol.TType.I32, (short)4); - public ByteBuffer name; - public ByteBuffer value; - public long timestamp; - public int ttl; + public ByteBuffer name; // required + public ByteBuffer value; // required + public long timestamp; // required + public int ttl; // 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 { @@ -351,10 +351,10 @@ public class Column implements org.apache.thrift.TBase, return getValue(); case TIMESTAMP: - return new Long(getTimestamp()); + return Long.valueOf(getTimestamp()); case TTL: - return new Integer(getTtl()); + return Integer.valueOf(getTtl()); } throw new IllegalStateException(); diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnDef.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnDef.java index b31b255de5..37d8db6af2 100644 --- a/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnDef.java +++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnDef.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift + * Autogenerated by Thrift Compiler (0.7.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ @@ -51,15 +51,15 @@ public class ColumnDef implements org.apache.thrift.TBase index_options; + public IndexType index_type; // required + public String index_name; // required + public Map index_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 { @@ -654,8 +654,8 @@ public class ColumnDef implements org.apache.thrift.TBase(2*_map41.size); for (int _i42 = 0; _i42 < _map41.size; ++_i42) { - String _key43; - String _val44; + String _key43; // required + String _val44; // required _key43 = iprot.readString(); _val44 = iprot.readString(); this.index_options.put(_key43, _val44); diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java index a689e342f7..2b7f185e6d 100644 --- a/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java +++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift + * Autogenerated by Thrift Compiler (0.7.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ @@ -65,10 +65,10 @@ public class ColumnOrSuperColumn implements org.apache.thrift.TBase columns; + public ByteBuffer name; // required + public List columns; // 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 { @@ -396,7 +396,7 @@ public class CounterSuperColumn implements org.apache.thrift.TBase(_list4.size); for (int _i5 = 0; _i5 < _list4.size; ++_i5) { - CounterColumn _elem6; + CounterColumn _elem6; // required _elem6 = new CounterColumn(); _elem6.read(iprot); this.columns.add(_elem6); diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlMetadata.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlMetadata.java index f3627e3141..f7df6b66f4 100644 --- a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlMetadata.java +++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlMetadata.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift + * Autogenerated by Thrift Compiler (0.7.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ @@ -50,10 +50,10 @@ public class CqlMetadata implements org.apache.thrift.TBase name_types; - public Map value_types; - public String default_name_type; - public String default_value_type; + public Map name_types; // required + public Map value_types; // required + public String default_name_type; // required + public String default_value_type; // 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 { @@ -558,8 +558,8 @@ public class CqlMetadata implements org.apache.thrift.TBase(2*_map73.size); for (int _i74 = 0; _i74 < _map73.size; ++_i74) { - ByteBuffer _key75; - String _val76; + ByteBuffer _key75; // required + String _val76; // required _key75 = iprot.readBinary(); _val76 = iprot.readString(); this.name_types.put(_key75, _val76); @@ -577,8 +577,8 @@ public class CqlMetadata implements org.apache.thrift.TBase(2*_map77.size); for (int _i78 = 0; _i78 < _map77.size; ++_i78) { - ByteBuffer _key79; - String _val80; + ByteBuffer _key79; // required + String _val80; // required _key79 = iprot.readBinary(); _val80 = iprot.readString(); this.value_types.put(_key79, _val80); diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlPreparedResult.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlPreparedResult.java index 15f4be3aef..122449c9f1 100644 --- a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlPreparedResult.java +++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlPreparedResult.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift + * Autogenerated by Thrift Compiler (0.7.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ @@ -48,8 +48,8 @@ public class CqlPreparedResult implements org.apache.thrift.TBase rows; - public int num; - public CqlMetadata schema; + public CqlResultType type; // required + public List rows; // required + public int num; // required + public CqlMetadata schema; // 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 { @@ -359,7 +359,7 @@ public class CqlResult implements org.apache.thrift.TBase(_list83.size); for (int _i84 = 0; _i84 < _list83.size; ++_i84) { - CqlRow _elem85; + CqlRow _elem85; // required _elem85 = new CqlRow(); _elem85.read(iprot); this.rows.add(_elem85); diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResultType.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResultType.java index 07e5032f79..09c37b2033 100644 --- a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResultType.java +++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResultType.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift + * Autogenerated by Thrift Compiler (0.7.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlRow.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlRow.java index ea2fb9bcee..df7ec85951 100644 --- a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlRow.java +++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlRow.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift + * Autogenerated by Thrift Compiler (0.7.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ @@ -51,8 +51,8 @@ public class CqlRow implements org.apache.thrift.TBase, private static final org.apache.thrift.protocol.TField KEY_FIELD_DESC = new org.apache.thrift.protocol.TField("key", org.apache.thrift.protocol.TType.STRING, (short)1); private static final org.apache.thrift.protocol.TField COLUMNS_FIELD_DESC = new org.apache.thrift.protocol.TField("columns", org.apache.thrift.protocol.TType.LIST, (short)2); - public ByteBuffer key; - public List columns; + public ByteBuffer key; // required + public List columns; // 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 { @@ -399,7 +399,7 @@ public class CqlRow implements org.apache.thrift.TBase, this.columns = new ArrayList(_list69.size); for (int _i70 = 0; _i70 < _list69.size; ++_i70) { - Column _elem71; + Column _elem71; // required _elem71 = new Column(); _elem71.read(iprot); this.columns.add(_elem71); diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/Deletion.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/Deletion.java index e36f1800d6..180a2b3fdb 100644 --- a/interface/thrift/gen-java/org/apache/cassandra/thrift/Deletion.java +++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/Deletion.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift + * Autogenerated by Thrift Compiler (0.7.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ @@ -52,9 +52,9 @@ public class Deletion implements org.apache.thrift.TBase expressions; - public ByteBuffer start_key; - public int count; + public List expressions; // required + public ByteBuffer start_key; // required + public int count; // 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 { @@ -321,7 +321,7 @@ public class IndexClause implements org.apache.thrift.TBase(_list12.size); for (int _i13 = 0; _i13 < _list12.size; ++_i13) { - IndexExpression _elem14; + IndexExpression _elem14; // required _elem14 = new IndexExpression(); _elem14.read(iprot); this.expressions.add(_elem14); diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexExpression.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexExpression.java index 7083391c46..43b89a84b9 100644 --- a/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexExpression.java +++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexExpression.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift + * Autogenerated by Thrift Compiler (0.7.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ @@ -49,13 +49,13 @@ public class IndexExpression implements org.apache.thrift.TBase row_filter; - public int count; + public ByteBuffer start_key; // required + public ByteBuffer end_key; // required + public String start_token; // required + public String end_token; // required + public List row_filter; // required + public int count; // 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 { @@ -471,7 +471,7 @@ public class KeyRange implements org.apache.thrift.TBase(_list16.size); for (int _i17 = 0; _i17 < _list16.size; ++_i17) { - IndexExpression _elem18; + IndexExpression _elem18; // required _elem18 = new IndexExpression(); _elem18.read(iprot); this.row_filter.add(_elem18); diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/KeySlice.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/KeySlice.java index 9d7e3059cb..a13c8e01f1 100644 --- a/interface/thrift/gen-java/org/apache/cassandra/thrift/KeySlice.java +++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/KeySlice.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift + * Autogenerated by Thrift Compiler (0.7.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ @@ -55,8 +55,8 @@ public class KeySlice implements org.apache.thrift.TBase columns; + public ByteBuffer key; // required + public List columns; // 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 { @@ -403,7 +403,7 @@ public class KeySlice implements org.apache.thrift.TBase(_list20.size); for (int _i21 = 0; _i21 < _list20.size; ++_i21) { - ColumnOrSuperColumn _elem22; + ColumnOrSuperColumn _elem22; // required _elem22 = new ColumnOrSuperColumn(); _elem22.read(iprot); this.columns.add(_elem22); diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/KsDef.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/KsDef.java index 89ff25a23e..f721a04755 100644 --- a/interface/thrift/gen-java/org/apache/cassandra/thrift/KsDef.java +++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/KsDef.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift + * Autogenerated by Thrift Compiler (0.7.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ @@ -52,15 +52,15 @@ public class KsDef implements org.apache.thrift.TBase, jav private static final org.apache.thrift.protocol.TField CF_DEFS_FIELD_DESC = new org.apache.thrift.protocol.TField("cf_defs", org.apache.thrift.protocol.TType.LIST, (short)5); private static final org.apache.thrift.protocol.TField DURABLE_WRITES_FIELD_DESC = new org.apache.thrift.protocol.TField("durable_writes", org.apache.thrift.protocol.TType.BOOL, (short)6); - public String name; - public String strategy_class; - public Map strategy_options; + public String name; // required + public String strategy_class; // required + public Map strategy_options; // required /** * @deprecated */ - public int replication_factor; - public List cf_defs; - public boolean durable_writes; + public int replication_factor; // required + public List cf_defs; // required + public boolean durable_writes; // 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 { @@ -474,13 +474,13 @@ public class KsDef implements org.apache.thrift.TBase, jav return getStrategy_options(); case REPLICATION_FACTOR: - return new Integer(getReplication_factor()); + return Integer.valueOf(getReplication_factor()); case CF_DEFS: return getCf_defs(); case DURABLE_WRITES: - return new Boolean(isDurable_writes()); + return Boolean.valueOf(isDurable_writes()); } throw new IllegalStateException(); @@ -722,8 +722,8 @@ public class KsDef implements org.apache.thrift.TBase, jav this.strategy_options = new HashMap(2*_map60.size); for (int _i61 = 0; _i61 < _map60.size; ++_i61) { - String _key62; - String _val63; + String _key62; // required + String _val63; // required _key62 = iprot.readString(); _val63 = iprot.readString(); this.strategy_options.put(_key62, _val63); @@ -749,7 +749,7 @@ public class KsDef implements org.apache.thrift.TBase, jav this.cf_defs = new ArrayList(_list64.size); for (int _i65 = 0; _i65 < _list64.size; ++_i65) { - CfDef _elem66; + CfDef _elem66; // required _elem66 = new CfDef(); _elem66.read(iprot); this.cf_defs.add(_elem66); diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/Mutation.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/Mutation.java index 1d1553d755..f267d4baf4 100644 --- a/interface/thrift/gen-java/org/apache/cassandra/thrift/Mutation.java +++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/Mutation.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift + * Autogenerated by Thrift Compiler (0.7.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ @@ -53,8 +53,8 @@ public class Mutation implements org.apache.thrift.TBase column_names; - public SliceRange slice_range; + public List column_names; // required + public SliceRange slice_range; // 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 { @@ -383,7 +383,7 @@ public class SlicePredicate implements org.apache.thrift.TBase(_list8.size); for (int _i9 = 0; _i9 < _list8.size; ++_i9) { - ByteBuffer _elem10; + ByteBuffer _elem10; // required _elem10 = iprot.readBinary(); this.column_names.add(_elem10); } diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/SliceRange.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/SliceRange.java index b1243d33d3..d66ce58f19 100644 --- a/interface/thrift/gen-java/org/apache/cassandra/thrift/SliceRange.java +++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/SliceRange.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift + * Autogenerated by Thrift Compiler (0.7.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ @@ -66,10 +66,10 @@ public class SliceRange implements org.apache.thrift.TBase columns; + public ByteBuffer name; // required + public List columns; // 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 { @@ -402,7 +402,7 @@ public class SuperColumn implements org.apache.thrift.TBase(_list0.size); for (int _i1 = 0; _i1 < _list0.size; ++_i1) { - Column _elem2; + Column _elem2; // required _elem2 = new Column(); _elem2.read(iprot); this.columns.add(_elem2); diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/TimedOutException.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/TimedOutException.java index bf0b329062..ea1d64838c 100644 --- a/interface/thrift/gen-java/org/apache/cassandra/thrift/TimedOutException.java +++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/TimedOutException.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift + * Autogenerated by Thrift Compiler (0.7.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/TokenRange.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/TokenRange.java index 9f7922cf17..bcf57269c5 100644 --- a/interface/thrift/gen-java/org/apache/cassandra/thrift/TokenRange.java +++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/TokenRange.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift + * Autogenerated by Thrift Compiler (0.7.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ @@ -59,11 +59,11 @@ public class TokenRange implements org.apache.thrift.TBase endpoints; - public List rpc_endpoints; - public List endpoint_details; + public String start_token; // required + public String end_token; // required + public List endpoints; // required + public List rpc_endpoints; // required + public List endpoint_details; // 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 { @@ -658,7 +658,7 @@ public class TokenRange implements org.apache.thrift.TBase(_list24.size); for (int _i25 = 0; _i25 < _list24.size; ++_i25) { - String _elem26; + String _elem26; // required _elem26 = iprot.readString(); this.endpoints.add(_elem26); } @@ -675,7 +675,7 @@ public class TokenRange implements org.apache.thrift.TBase(_list27.size); for (int _i28 = 0; _i28 < _list27.size; ++_i28) { - String _elem29; + String _elem29; // required _elem29 = iprot.readString(); this.rpc_endpoints.add(_elem29); } @@ -692,7 +692,7 @@ public class TokenRange implements org.apache.thrift.TBase(_list30.size); for (int _i31 = 0; _i31 < _list30.size; ++_i31) { - EndpointDetails _elem32; + EndpointDetails _elem32; // required _elem32 = new EndpointDetails(); _elem32.read(iprot); this.endpoint_details.add(_elem32); diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/UnavailableException.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/UnavailableException.java index 0b60205446..da4d7a006c 100644 --- a/interface/thrift/gen-java/org/apache/cassandra/thrift/UnavailableException.java +++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/UnavailableException.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift + * Autogenerated by Thrift Compiler (0.7.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ diff --git a/lib/libthrift-0.6.jar b/lib/libthrift-0.7.0.jar similarity index 64% rename from lib/libthrift-0.6.jar rename to lib/libthrift-0.7.0.jar index 0d91fe1c1a..a0cc175620 100644 Binary files a/lib/libthrift-0.6.jar and b/lib/libthrift-0.7.0.jar differ diff --git a/lib/licenses/libthrift-0.5.txt b/lib/licenses/libthrift-0.7.txt similarity index 100% rename from lib/licenses/libthrift-0.5.txt rename to lib/licenses/libthrift-0.7.txt