natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade Thrift to 0.9.1 

patch by Carl Yeksigian and Jake Farrell; reviewed by Aleksey Yeschenko
for CASSANDRA-5923
This commit is contained in:
Aleksey Yeschenko 2013-08-30 02:54:10 +03:00
parent c1e0f3102e
commit bffd9ea8eb
103 changed files with 4477 additions and 1552 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -10,6 +10,7 @@
(CASSANDRA-5722)
* Add ability for CQL3 to list partition keys (CASSANDRA-4536)
* Improve native protocol serialization (CASSANDRA-5664)
* Upgrade Thrift to 0.9.1 (CASSANDRA-5923)
Merged from 1.2:
* Fix CqlRecordWriter with composite keys (CASSANDRA-5949)
* Add snitch, schema version, cluster, partitioner to JMX (CASSANDRA-5881)

4
build.xml
View File

@ -340,7 +340,7 @@
<dependency groupId="com.google.guava" artifactId="guava" version="13.0.1"/>
<dependency groupId="commons-cli" artifactId="commons-cli" version="1.1"/>
<dependency groupId="commons-codec" artifactId="commons-codec" version="1.2"/>
<dependency groupId="commons-lang" artifactId="commons-lang" version="2.6"/>
<dependency groupId="commons-lang" artifactId="commons-lang" version="3.1"/>
<dependency groupId="com.googlecode.concurrentlinkedhashmap" artifactId="concurrentlinkedhashmap-lru" version="1.3"/>
<dependency groupId="org.antlr" artifactId="antlr" version="3.2"/>
<dependency groupId="org.slf4j" artifactId="slf4j-api" version="1.7.2"/>
@ -355,7 +355,7 @@
<dependency groupId="com.github.stephenc" artifactId="jamm" version="0.2.5"/>
<dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.0"/>
<dependency groupId="org.yaml" artifactId="snakeyaml" version="1.11"/>
<dependency groupId="org.apache.thrift" artifactId="libthrift" version="0.9.0"/>
<dependency groupId="org.apache.thrift" artifactId="libthrift" version="0.9.1"/>
<dependency groupId="junit" artifactId="junit" version="4.6" />
<dependency groupId="commons-logging" artifactId="commons-logging" version="1.1.1"/>

25
interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java
View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift Compiler (0.9.0)
* Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@ -27,24 +27,37 @@ package org.apache.cassandra.thrift;
*/
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
import org.apache.thrift.scheme.TupleScheme;
import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
import java.util.HashMap;
import java.util.EnumMap;
import java.util.Set;
import java.util.HashSet;
import java.util.EnumSet;
import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* invalid authentication request (invalid keyspace, user does not exist, or credentials invalid)
*/
public class AuthenticationException extends TException implements org.apache.thrift.TBase<AuthenticationException, AuthenticationException._Fields>, java.io.Serializable, Cloneable {
public class AuthenticationException extends TException implements org.apache.thrift.TBase<AuthenticationException, AuthenticationException._Fields>, java.io.Serializable, Cloneable, Comparable<AuthenticationException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AuthenticationException");
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);
@ -249,20 +262,20 @@ public class AuthenticationException extends TException implements org.apache.th
return builder.toHashCode();
}
@Override
public int compareTo(AuthenticationException other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
AuthenticationException typedOther = (AuthenticationException)other;
lastComparison = Boolean.valueOf(isSetWhy()).compareTo(typedOther.isSetWhy());
lastComparison = Boolean.valueOf(isSetWhy()).compareTo(other.isSetWhy());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetWhy()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.why, typedOther.why);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.why, other.why);
if (lastComparison != 0) {
return lastComparison;
}

35
interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java
View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift Compiler (0.9.0)
* Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
*/
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
@ -37,6 +37,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@ -55,7 +57,7 @@ import org.slf4j.LoggerFactory;
/**
* Authentication requests can contain any data, dependent on the IAuthenticator used
*/
public class AuthenticationRequest implements org.apache.thrift.TBase<AuthenticationRequest, AuthenticationRequest._Fields>, java.io.Serializable, Cloneable {
public class AuthenticationRequest implements org.apache.thrift.TBase<AuthenticationRequest, AuthenticationRequest._Fields>, java.io.Serializable, Cloneable, Comparable<AuthenticationRequest> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AuthenticationRequest");
private static final org.apache.thrift.protocol.TField CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials", org.apache.thrift.protocol.TType.MAP, (short)1);
@ -153,18 +155,7 @@ public class AuthenticationRequest implements org.apache.thrift.TBase<Authentica
*/
public AuthenticationRequest(AuthenticationRequest other) {
if (other.isSetCredentials()) {
Map<String,String> __this__credentials = new HashMap<String,String>();
for (Map.Entry<String, String> other_element : other.credentials.entrySet()) {
String other_element_key = other_element.getKey();
String other_element_value = other_element.getValue();
String __this__credentials_copy_key = other_element_key;
String __this__credentials_copy_value = other_element_value;
__this__credentials.put(__this__credentials_copy_key, __this__credentials_copy_value);
}
Map<String,String> __this__credentials = new HashMap<String,String>(other.credentials);
this.credentials = __this__credentials;
}
}
@ -285,20 +276,20 @@ public class AuthenticationRequest implements org.apache.thrift.TBase<Authentica
return builder.toHashCode();
}
@Override
public int compareTo(AuthenticationRequest other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
AuthenticationRequest typedOther = (AuthenticationRequest)other;
lastComparison = Boolean.valueOf(isSetCredentials()).compareTo(typedOther.isSetCredentials());
lastComparison = Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetCredentials()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.credentials, typedOther.credentials);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.credentials, other.credentials);
if (lastComparison != 0) {
return lastComparison;
}
@ -383,8 +374,8 @@ public class AuthenticationRequest implements org.apache.thrift.TBase<Authentica
struct.credentials = new HashMap<String,String>(2*_map80.size);
for (int _i81 = 0; _i81 < _map80.size; ++_i81)
{
String _key82; // required
String _val83; // required
String _key82;
String _val83;
_key82 = iprot.readString();
_val83 = iprot.readString();
struct.credentials.put(_key82, _val83);
@ -459,8 +450,8 @@ public class AuthenticationRequest implements org.apache.thrift.TBase<Authentica
struct.credentials = new HashMap<String,String>(2*_map86.size);
for (int _i87 = 0; _i87 < _map86.size; ++_i87)
{
String _key88; // required
String _val89; // required
String _key88;
String _val89;
_key88 = iprot.readString();
_val89 = iprot.readString();
struct.credentials.put(_key88, _val89);

14
interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java
View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift Compiler (0.9.0)
* Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
*/
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
@ -37,6 +37,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@ -55,7 +57,7 @@ import org.slf4j.LoggerFactory;
/**
* invalid authorization request (user does not have access to keyspace)
*/
public class AuthorizationException extends TException implements org.apache.thrift.TBase<AuthorizationException, AuthorizationException._Fields>, java.io.Serializable, Cloneable {
public class AuthorizationException extends TException implements org.apache.thrift.TBase<AuthorizationException, AuthorizationException._Fields>, java.io.Serializable, Cloneable, Comparable<AuthorizationException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AuthorizationException");
private static final org.apache.thrift.protocol.TField WHY_FIELD_DESC = new org.apache.thrift.protocol.TField("why", org.apache.thrift.protocol.TType.STRING, (short)1);
@ -260,20 +262,20 @@ public class AuthorizationException extends TException implements org.apache.thr
return builder.toHashCode();
}
@Override
public int compareTo(AuthorizationException other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
AuthorizationException typedOther = (AuthorizationException)other;
lastComparison = Boolean.valueOf(isSetWhy()).compareTo(typedOther.isSetWhy());
lastComparison = Boolean.valueOf(isSetWhy()).compareTo(other.isSetWhy());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetWhy()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.why, typedOther.why);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.why, other.why);
if (lastComparison != 0) {
return lastComparison;
}

24
interface/thrift/gen-java/org/apache/cassandra/thrift/CASResult.java
View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift Compiler (0.9.0)
* Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
*/
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
@ -37,6 +37,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@ -52,7 +54,7 @@ import java.util.Arrays;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class CASResult implements org.apache.thrift.TBase<CASResult, CASResult._Fields>, java.io.Serializable, Cloneable {
public class CASResult implements org.apache.thrift.TBase<CASResult, CASResult._Fields>, java.io.Serializable, Cloneable, Comparable<CASResult> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CASResult");
private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)1);
@ -162,7 +164,7 @@ public class CASResult implements org.apache.thrift.TBase<CASResult, CASResult._
__isset_bitfield = other.__isset_bitfield;
this.success = other.success;
if (other.isSetCurrent_values()) {
List<Column> __this__current_values = new ArrayList<Column>();
List<Column> __this__current_values = new ArrayList<Column>(other.current_values.size());
for (Column other_element : other.current_values) {
__this__current_values.add(new Column(other_element));
}
@ -342,30 +344,30 @@ public class CASResult implements org.apache.thrift.TBase<CASResult, CASResult._
return builder.toHashCode();
}
@Override
public int compareTo(CASResult other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
CASResult typedOther = (CASResult)other;
lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetSuccess()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetCurrent_values()).compareTo(typedOther.isSetCurrent_values());
lastComparison = Boolean.valueOf(isSetCurrent_values()).compareTo(other.isSetCurrent_values());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetCurrent_values()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.current_values, typedOther.current_values);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.current_values, other.current_values);
if (lastComparison != 0) {
return lastComparison;
}
@ -464,7 +466,7 @@ public class CASResult implements org.apache.thrift.TBase<CASResult, CASResult._
struct.current_values = new ArrayList<Column>(_list48.size);
for (int _i49 = 0; _i49 < _list48.size; ++_i49)
{
Column _elem50; // required
Column _elem50;
_elem50 = new Column();
_elem50.read(iprot);
struct.current_values.add(_elem50);
@ -557,7 +559,7 @@ public class CASResult implements org.apache.thrift.TBase<CASResult, CASResult._
struct.current_values = new ArrayList<Column>(_list53.size);
for (int _i54 = 0; _i54 < _list53.size; ++_i54)
{
Column _elem55; // required
Column _elem55;
_elem55 = new Column();
_elem55.read(iprot);
struct.current_values.add(_elem55);

4471
interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
View File

File diff suppressed because it is too large Load Diff

216
interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java
View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift Compiler (0.9.0)
* Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
*/
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
@ -37,6 +37,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@ -52,7 +54,7 @@ import java.util.Arrays;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, java.io.Serializable, Cloneable {
public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, java.io.Serializable, Cloneable, Comparable<CfDef> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CfDef");
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);
@ -528,7 +530,7 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
}
this.read_repair_chance = other.read_repair_chance;
if (other.isSetColumn_metadata()) {
List<ColumnDef> __this__column_metadata = new ArrayList<ColumnDef>();
List<ColumnDef> __this__column_metadata = new ArrayList<ColumnDef>(other.column_metadata.size());
for (ColumnDef other_element : other.column_metadata) {
__this__column_metadata.add(new ColumnDef(other_element));
}
@ -553,33 +555,11 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
this.compaction_strategy = other.compaction_strategy;
}
if (other.isSetCompaction_strategy_options()) {
Map<String,String> __this__compaction_strategy_options = new HashMap<String,String>();
for (Map.Entry<String, String> other_element : other.compaction_strategy_options.entrySet()) {
String other_element_key = other_element.getKey();
String other_element_value = other_element.getValue();
String __this__compaction_strategy_options_copy_key = other_element_key;
String __this__compaction_strategy_options_copy_value = other_element_value;
__this__compaction_strategy_options.put(__this__compaction_strategy_options_copy_key, __this__compaction_strategy_options_copy_value);
}
Map<String,String> __this__compaction_strategy_options = new HashMap<String,String>(other.compaction_strategy_options);
this.compaction_strategy_options = __this__compaction_strategy_options;
}
if (other.isSetCompression_options()) {
Map<String,String> __this__compression_options = new HashMap<String,String>();
for (Map.Entry<String, String> other_element : other.compression_options.entrySet()) {
String other_element_key = other_element.getKey();
String other_element_value = other_element.getValue();
String __this__compression_options_copy_key = other_element_key;
String __this__compression_options_copy_value = other_element_value;
__this__compression_options.put(__this__compression_options_copy_key, __this__compression_options_copy_value);
}
Map<String,String> __this__compression_options = new HashMap<String,String>(other.compression_options);
this.compression_options = __this__compression_options;
}
this.bloom_filter_fp_chance = other.bloom_filter_fp_chance;
@ -595,7 +575,7 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
this.speculative_retry = other.speculative_retry;
}
if (other.isSetTriggers()) {
List<TriggerDef> __this__triggers = new ArrayList<TriggerDef>();
List<TriggerDef> __this__triggers = new ArrayList<TriggerDef>(other.triggers.size());
for (TriggerDef other_element : other.triggers) {
__this__triggers.add(new TriggerDef(other_element));
}
@ -2770,390 +2750,390 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
return builder.toHashCode();
}
@Override
public int compareTo(CfDef other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
CfDef typedOther = (CfDef)other;
lastComparison = Boolean.valueOf(isSetKeyspace()).compareTo(typedOther.isSetKeyspace());
lastComparison = Boolean.valueOf(isSetKeyspace()).compareTo(other.isSetKeyspace());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetKeyspace()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.keyspace, typedOther.keyspace);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.keyspace, other.keyspace);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetName()).compareTo(typedOther.isSetName());
lastComparison = Boolean.valueOf(isSetName()).compareTo(other.isSetName());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetName()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, typedOther.name);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, other.name);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetColumn_type()).compareTo(typedOther.isSetColumn_type());
lastComparison = Boolean.valueOf(isSetColumn_type()).compareTo(other.isSetColumn_type());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetColumn_type()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column_type, typedOther.column_type);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column_type, other.column_type);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetComparator_type()).compareTo(typedOther.isSetComparator_type());
lastComparison = Boolean.valueOf(isSetComparator_type()).compareTo(other.isSetComparator_type());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetComparator_type()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.comparator_type, typedOther.comparator_type);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.comparator_type, other.comparator_type);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetSubcomparator_type()).compareTo(typedOther.isSetSubcomparator_type());
lastComparison = Boolean.valueOf(isSetSubcomparator_type()).compareTo(other.isSetSubcomparator_type());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetSubcomparator_type()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.subcomparator_type, typedOther.subcomparator_type);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.subcomparator_type, other.subcomparator_type);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetComment()).compareTo(typedOther.isSetComment());
lastComparison = Boolean.valueOf(isSetComment()).compareTo(other.isSetComment());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetComment()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.comment, typedOther.comment);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.comment, other.comment);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetRead_repair_chance()).compareTo(typedOther.isSetRead_repair_chance());
lastComparison = Boolean.valueOf(isSetRead_repair_chance()).compareTo(other.isSetRead_repair_chance());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetRead_repair_chance()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.read_repair_chance, typedOther.read_repair_chance);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.read_repair_chance, other.read_repair_chance);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetColumn_metadata()).compareTo(typedOther.isSetColumn_metadata());
lastComparison = Boolean.valueOf(isSetColumn_metadata()).compareTo(other.isSetColumn_metadata());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetColumn_metadata()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column_metadata, typedOther.column_metadata);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column_metadata, other.column_metadata);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetGc_grace_seconds()).compareTo(typedOther.isSetGc_grace_seconds());
lastComparison = Boolean.valueOf(isSetGc_grace_seconds()).compareTo(other.isSetGc_grace_seconds());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetGc_grace_seconds()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gc_grace_seconds, typedOther.gc_grace_seconds);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gc_grace_seconds, other.gc_grace_seconds);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetDefault_validation_class()).compareTo(typedOther.isSetDefault_validation_class());
lastComparison = Boolean.valueOf(isSetDefault_validation_class()).compareTo(other.isSetDefault_validation_class());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetDefault_validation_class()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.default_validation_class, typedOther.default_validation_class);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.default_validation_class, other.default_validation_class);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetId()).compareTo(typedOther.isSetId());
lastComparison = Boolean.valueOf(isSetId()).compareTo(other.isSetId());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetId()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, typedOther.id);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, other.id);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetMin_compaction_threshold()).compareTo(typedOther.isSetMin_compaction_threshold());
lastComparison = Boolean.valueOf(isSetMin_compaction_threshold()).compareTo(other.isSetMin_compaction_threshold());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetMin_compaction_threshold()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.min_compaction_threshold, typedOther.min_compaction_threshold);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.min_compaction_threshold, other.min_compaction_threshold);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetMax_compaction_threshold()).compareTo(typedOther.isSetMax_compaction_threshold());
lastComparison = Boolean.valueOf(isSetMax_compaction_threshold()).compareTo(other.isSetMax_compaction_threshold());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetMax_compaction_threshold()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.max_compaction_threshold, typedOther.max_compaction_threshold);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.max_compaction_threshold, other.max_compaction_threshold);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetReplicate_on_write()).compareTo(typedOther.isSetReplicate_on_write());
lastComparison = Boolean.valueOf(isSetReplicate_on_write()).compareTo(other.isSetReplicate_on_write());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetReplicate_on_write()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.replicate_on_write, typedOther.replicate_on_write);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.replicate_on_write, other.replicate_on_write);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetKey_validation_class()).compareTo(typedOther.isSetKey_validation_class());
lastComparison = Boolean.valueOf(isSetKey_validation_class()).compareTo(other.isSetKey_validation_class());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetKey_validation_class()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.key_validation_class, typedOther.key_validation_class);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.key_validation_class, other.key_validation_class);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetKey_alias()).compareTo(typedOther.isSetKey_alias());
lastComparison = Boolean.valueOf(isSetKey_alias()).compareTo(other.isSetKey_alias());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetKey_alias()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.key_alias, typedOther.key_alias);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.key_alias, other.key_alias);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetCompaction_strategy()).compareTo(typedOther.isSetCompaction_strategy());
lastComparison = Boolean.valueOf(isSetCompaction_strategy()).compareTo(other.isSetCompaction_strategy());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetCompaction_strategy()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.compaction_strategy, typedOther.compaction_strategy);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.compaction_strategy, other.compaction_strategy);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetCompaction_strategy_options()).compareTo(typedOther.isSetCompaction_strategy_options());
lastComparison = Boolean.valueOf(isSetCompaction_strategy_options()).compareTo(other.isSetCompaction_strategy_options());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetCompaction_strategy_options()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.compaction_strategy_options, typedOther.compaction_strategy_options);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.compaction_strategy_options, other.compaction_strategy_options);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetCompression_options()).compareTo(typedOther.isSetCompression_options());
lastComparison = Boolean.valueOf(isSetCompression_options()).compareTo(other.isSetCompression_options());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetCompression_options()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.compression_options, typedOther.compression_options);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.compression_options, other.compression_options);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetBloom_filter_fp_chance()).compareTo(typedOther.isSetBloom_filter_fp_chance());
lastComparison = Boolean.valueOf(isSetBloom_filter_fp_chance()).compareTo(other.isSetBloom_filter_fp_chance());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetBloom_filter_fp_chance()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.bloom_filter_fp_chance, typedOther.bloom_filter_fp_chance);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.bloom_filter_fp_chance, other.bloom_filter_fp_chance);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetCaching()).compareTo(typedOther.isSetCaching());
lastComparison = Boolean.valueOf(isSetCaching()).compareTo(other.isSetCaching());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetCaching()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.caching, typedOther.caching);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.caching, other.caching);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetDclocal_read_repair_chance()).compareTo(typedOther.isSetDclocal_read_repair_chance());
lastComparison = Boolean.valueOf(isSetDclocal_read_repair_chance()).compareTo(other.isSetDclocal_read_repair_chance());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetDclocal_read_repair_chance()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dclocal_read_repair_chance, typedOther.dclocal_read_repair_chance);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dclocal_read_repair_chance, other.dclocal_read_repair_chance);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetPopulate_io_cache_on_flush()).compareTo(typedOther.isSetPopulate_io_cache_on_flush());
lastComparison = Boolean.valueOf(isSetPopulate_io_cache_on_flush()).compareTo(other.isSetPopulate_io_cache_on_flush());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetPopulate_io_cache_on_flush()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.populate_io_cache_on_flush, typedOther.populate_io_cache_on_flush);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.populate_io_cache_on_flush, other.populate_io_cache_on_flush);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetMemtable_flush_period_in_ms()).compareTo(typedOther.isSetMemtable_flush_period_in_ms());
lastComparison = Boolean.valueOf(isSetMemtable_flush_period_in_ms()).compareTo(other.isSetMemtable_flush_period_in_ms());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetMemtable_flush_period_in_ms()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.memtable_flush_period_in_ms, typedOther.memtable_flush_period_in_ms);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.memtable_flush_period_in_ms, other.memtable_flush_period_in_ms);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetDefault_time_to_live()).compareTo(typedOther.isSetDefault_time_to_live());
lastComparison = Boolean.valueOf(isSetDefault_time_to_live()).compareTo(other.isSetDefault_time_to_live());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetDefault_time_to_live()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.default_time_to_live, typedOther.default_time_to_live);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.default_time_to_live, other.default_time_to_live);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetIndex_interval()).compareTo(typedOther.isSetIndex_interval());
lastComparison = Boolean.valueOf(isSetIndex_interval()).compareTo(other.isSetIndex_interval());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetIndex_interval()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.index_interval, typedOther.index_interval);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.index_interval, other.index_interval);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetSpeculative_retry()).compareTo(typedOther.isSetSpeculative_retry());
lastComparison = Boolean.valueOf(isSetSpeculative_retry()).compareTo(other.isSetSpeculative_retry());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetSpeculative_retry()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.speculative_retry, typedOther.speculative_retry);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.speculative_retry, other.speculative_retry);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetTriggers()).compareTo(typedOther.isSetTriggers());
lastComparison = Boolean.valueOf(isSetTriggers()).compareTo(other.isSetTriggers());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetTriggers()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.triggers, typedOther.triggers);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.triggers, other.triggers);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetRow_cache_size()).compareTo(typedOther.isSetRow_cache_size());
lastComparison = Boolean.valueOf(isSetRow_cache_size()).compareTo(other.isSetRow_cache_size());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetRow_cache_size()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row_cache_size, typedOther.row_cache_size);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row_cache_size, other.row_cache_size);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetKey_cache_size()).compareTo(typedOther.isSetKey_cache_size());
lastComparison = Boolean.valueOf(isSetKey_cache_size()).compareTo(other.isSetKey_cache_size());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetKey_cache_size()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.key_cache_size, typedOther.key_cache_size);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.key_cache_size, other.key_cache_size);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetRow_cache_save_period_in_seconds()).compareTo(typedOther.isSetRow_cache_save_period_in_seconds());
lastComparison = Boolean.valueOf(isSetRow_cache_save_period_in_seconds()).compareTo(other.isSetRow_cache_save_period_in_seconds());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetRow_cache_save_period_in_seconds()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row_cache_save_period_in_seconds, typedOther.row_cache_save_period_in_seconds);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row_cache_save_period_in_seconds, other.row_cache_save_period_in_seconds);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetKey_cache_save_period_in_seconds()).compareTo(typedOther.isSetKey_cache_save_period_in_seconds());
lastComparison = Boolean.valueOf(isSetKey_cache_save_period_in_seconds()).compareTo(other.isSetKey_cache_save_period_in_seconds());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetKey_cache_save_period_in_seconds()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.key_cache_save_period_in_seconds, typedOther.key_cache_save_period_in_seconds);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.key_cache_save_period_in_seconds, other.key_cache_save_period_in_seconds);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetMemtable_flush_after_mins()).compareTo(typedOther.isSetMemtable_flush_after_mins());
lastComparison = Boolean.valueOf(isSetMemtable_flush_after_mins()).compareTo(other.isSetMemtable_flush_after_mins());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetMemtable_flush_after_mins()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.memtable_flush_after_mins, typedOther.memtable_flush_after_mins);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.memtable_flush_after_mins, other.memtable_flush_after_mins);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetMemtable_throughput_in_mb()).compareTo(typedOther.isSetMemtable_throughput_in_mb());
lastComparison = Boolean.valueOf(isSetMemtable_throughput_in_mb()).compareTo(other.isSetMemtable_throughput_in_mb());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetMemtable_throughput_in_mb()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.memtable_throughput_in_mb, typedOther.memtable_throughput_in_mb);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.memtable_throughput_in_mb, other.memtable_throughput_in_mb);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetMemtable_operations_in_millions()).compareTo(typedOther.isSetMemtable_operations_in_millions());
lastComparison = Boolean.valueOf(isSetMemtable_operations_in_millions()).compareTo(other.isSetMemtable_operations_in_millions());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetMemtable_operations_in_millions()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.memtable_operations_in_millions, typedOther.memtable_operations_in_millions);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.memtable_operations_in_millions, other.memtable_operations_in_millions);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetMerge_shards_chance()).compareTo(typedOther.isSetMerge_shards_chance());
lastComparison = Boolean.valueOf(isSetMerge_shards_chance()).compareTo(other.isSetMerge_shards_chance());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetMerge_shards_chance()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.merge_shards_chance, typedOther.merge_shards_chance);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.merge_shards_chance, other.merge_shards_chance);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetRow_cache_provider()).compareTo(typedOther.isSetRow_cache_provider());
lastComparison = Boolean.valueOf(isSetRow_cache_provider()).compareTo(other.isSetRow_cache_provider());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetRow_cache_provider()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row_cache_provider, typedOther.row_cache_provider);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row_cache_provider, other.row_cache_provider);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetRow_cache_keys_to_save()).compareTo(typedOther.isSetRow_cache_keys_to_save());
lastComparison = Boolean.valueOf(isSetRow_cache_keys_to_save()).compareTo(other.isSetRow_cache_keys_to_save());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetRow_cache_keys_to_save()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row_cache_keys_to_save, typedOther.row_cache_keys_to_save);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row_cache_keys_to_save, other.row_cache_keys_to_save);
if (lastComparison != 0) {
return lastComparison;
}
@ -3583,7 +3563,7 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
struct.column_metadata = new ArrayList<ColumnDef>(_list110.size);
for (int _i111 = 0; _i111 < _list110.size; ++_i111)
{
ColumnDef _elem112; // required
ColumnDef _elem112;
_elem112 = new ColumnDef();
_elem112.read(iprot);
struct.column_metadata.add(_elem112);
@ -3674,8 +3654,8 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
struct.compaction_strategy_options = new HashMap<String,String>(2*_map113.size);
for (int _i114 = 0; _i114 < _map113.size; ++_i114)
{
String _key115; // required
String _val116; // required
String _key115;
String _val116;
_key115 = iprot.readString();
_val116 = iprot.readString();
struct.compaction_strategy_options.put(_key115, _val116);
@ -3694,8 +3674,8 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
struct.compression_options = new HashMap<String,String>(2*_map117.size);
for (int _i118 = 0; _i118 < _map117.size; ++_i118)
{
String _key119; // required
String _val120; // required
String _key119;
String _val120;
_key119 = iprot.readString();
_val120 = iprot.readString();
struct.compression_options.put(_key119, _val120);
@ -3778,7 +3758,7 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
struct.triggers = new ArrayList<TriggerDef>(_list121.size);
for (int _i122 = 0; _i122 < _list121.size; ++_i122)
{
TriggerDef _elem123; // required
TriggerDef _elem123;
_elem123 = new TriggerDef();
_elem123.read(iprot);
struct.triggers.add(_elem123);
@ -4434,7 +4414,7 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
struct.column_metadata = new ArrayList<ColumnDef>(_list132.size);
for (int _i133 = 0; _i133 < _list132.size; ++_i133)
{
ColumnDef _elem134; // required
ColumnDef _elem134;
_elem134 = new ColumnDef();
_elem134.read(iprot);
struct.column_metadata.add(_elem134);
@ -4484,8 +4464,8 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
struct.compaction_strategy_options = new HashMap<String,String>(2*_map135.size);
for (int _i136 = 0; _i136 < _map135.size; ++_i136)
{
String _key137; // required
String _val138; // required
String _key137;
String _val138;
_key137 = iprot.readString();
_val138 = iprot.readString();
struct.compaction_strategy_options.put(_key137, _val138);
@ -4499,8 +4479,8 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
struct.compression_options = new HashMap<String,String>(2*_map139.size);
for (int _i140 = 0; _i140 < _map139.size; ++_i140)
{
String _key141; // required
String _val142; // required
String _key141;
String _val142;
_key141 = iprot.readString();
_val142 = iprot.readString();
struct.compression_options.put(_key141, _val142);
@ -4546,7 +4526,7 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
struct.triggers = new ArrayList<TriggerDef>(_list143.size);
for (int _i144 = 0; _i144 < _list143.size; ++_i144)
{
TriggerDef _elem145; // required
TriggerDef _elem145;
_elem145 = new TriggerDef();
_elem145.read(iprot);
struct.triggers.add(_elem145);

22
interface/thrift/gen-java/org/apache/cassandra/thrift/CfSplit.java
View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift Compiler (0.9.0)
* Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
*/
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
@ -37,6 +37,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@ -55,7 +57,7 @@ import org.slf4j.LoggerFactory;
/**
* Represents input splits used by hadoop ColumnFamilyRecordReaders
*/
public class CfSplit implements org.apache.thrift.TBase<CfSplit, CfSplit._Fields>, java.io.Serializable, Cloneable {
public class CfSplit implements org.apache.thrift.TBase<CfSplit, CfSplit._Fields>, java.io.Serializable, Cloneable, Comparable<CfSplit> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CfSplit");
private static final org.apache.thrift.protocol.TField START_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("start_token", org.apache.thrift.protocol.TType.STRING, (short)1);
@ -390,40 +392,40 @@ public class CfSplit implements org.apache.thrift.TBase<CfSplit, CfSplit._Fields
return builder.toHashCode();
}
@Override
public int compareTo(CfSplit other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
CfSplit typedOther = (CfSplit)other;
lastComparison = Boolean.valueOf(isSetStart_token()).compareTo(typedOther.isSetStart_token());
lastComparison = Boolean.valueOf(isSetStart_token()).compareTo(other.isSetStart_token());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetStart_token()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.start_token, typedOther.start_token);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.start_token, other.start_token);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetEnd_token()).compareTo(typedOther.isSetEnd_token());
lastComparison = Boolean.valueOf(isSetEnd_token()).compareTo(other.isSetEnd_token());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetEnd_token()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.end_token, typedOther.end_token);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.end_token, other.end_token);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetRow_count()).compareTo(typedOther.isSetRow_count());
lastComparison = Boolean.valueOf(isSetRow_count()).compareTo(other.isSetRow_count());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetRow_count()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row_count, typedOther.row_count);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row_count, other.row_count);
if (lastComparison != 0) {
return lastComparison;
}

26
interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift Compiler (0.9.0)
* Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
*/
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
@ -37,6 +37,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@ -59,7 +61,7 @@ import org.slf4j.LoggerFactory;
* @param timestamp. The timestamp is used for conflict detection/resolution when two columns with same name need to be compared.
* @param ttl. An optional, positive delay (in seconds) after which the column will be automatically deleted.
*/
public class Column implements org.apache.thrift.TBase<Column, Column._Fields>, java.io.Serializable, Cloneable {
public class Column implements org.apache.thrift.TBase<Column, Column._Fields>, java.io.Serializable, Cloneable, Comparable<Column> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Column");
private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)1);
@ -473,50 +475,50 @@ public class Column implements org.apache.thrift.TBase<Column, Column._Fields>,
return builder.toHashCode();
}
@Override
public int compareTo(Column other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
Column typedOther = (Column)other;
lastComparison = Boolean.valueOf(isSetName()).compareTo(typedOther.isSetName());
lastComparison = Boolean.valueOf(isSetName()).compareTo(other.isSetName());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetName()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, typedOther.name);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, other.name);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetValue()).compareTo(typedOther.isSetValue());
lastComparison = Boolean.valueOf(isSetValue()).compareTo(other.isSetValue());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetValue()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.value, typedOther.value);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.value, other.value);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetTimestamp()).compareTo(typedOther.isSetTimestamp());
lastComparison = Boolean.valueOf(isSetTimestamp()).compareTo(other.isSetTimestamp());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetTimestamp()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, typedOther.timestamp);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, other.timestamp);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetTtl()).compareTo(typedOther.isSetTtl());
lastComparison = Boolean.valueOf(isSetTtl()).compareTo(other.isSetTtl());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetTtl()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ttl, typedOther.ttl);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ttl, other.ttl);
if (lastComparison != 0) {
return lastComparison;
}

51
interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnDef.java
View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift Compiler (0.9.0)
* Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
*/
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
@ -37,6 +37,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@ -52,7 +54,7 @@ import java.util.Arrays;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class ColumnDef implements org.apache.thrift.TBase<ColumnDef, ColumnDef._Fields>, java.io.Serializable, Cloneable {
public class ColumnDef implements org.apache.thrift.TBase<ColumnDef, ColumnDef._Fields>, java.io.Serializable, Cloneable, Comparable<ColumnDef> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ColumnDef");
private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)1);
@ -202,18 +204,7 @@ public class ColumnDef implements org.apache.thrift.TBase<ColumnDef, ColumnDef._
this.index_name = other.index_name;
}
if (other.isSetIndex_options()) {
Map<String,String> __this__index_options = new HashMap<String,String>();
for (Map.Entry<String, String> other_element : other.index_options.entrySet()) {
String other_element_key = other_element.getKey();
String other_element_value = other_element.getValue();
String __this__index_options_copy_key = other_element_key;
String __this__index_options_copy_value = other_element_value;
__this__index_options.put(__this__index_options_copy_key, __this__index_options_copy_value);
}
Map<String,String> __this__index_options = new HashMap<String,String>(other.index_options);
this.index_options = __this__index_options;
}
}
@ -560,60 +551,60 @@ public class ColumnDef implements org.apache.thrift.TBase<ColumnDef, ColumnDef._
return builder.toHashCode();
}
@Override
public int compareTo(ColumnDef other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
ColumnDef typedOther = (ColumnDef)other;
lastComparison = Boolean.valueOf(isSetName()).compareTo(typedOther.isSetName());
lastComparison = Boolean.valueOf(isSetName()).compareTo(other.isSetName());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetName()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, typedOther.name);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, other.name);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetValidation_class()).compareTo(typedOther.isSetValidation_class());
lastComparison = Boolean.valueOf(isSetValidation_class()).compareTo(other.isSetValidation_class());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetValidation_class()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.validation_class, typedOther.validation_class);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.validation_class, other.validation_class);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetIndex_type()).compareTo(typedOther.isSetIndex_type());
lastComparison = Boolean.valueOf(isSetIndex_type()).compareTo(other.isSetIndex_type());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetIndex_type()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.index_type, typedOther.index_type);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.index_type, other.index_type);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetIndex_name()).compareTo(typedOther.isSetIndex_name());
lastComparison = Boolean.valueOf(isSetIndex_name()).compareTo(other.isSetIndex_name());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetIndex_name()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.index_name, typedOther.index_name);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.index_name, other.index_name);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetIndex_options()).compareTo(typedOther.isSetIndex_options());
lastComparison = Boolean.valueOf(isSetIndex_options()).compareTo(other.isSetIndex_options());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetIndex_options()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.index_options, typedOther.index_options);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.index_options, other.index_options);
if (lastComparison != 0) {
return lastComparison;
}
@ -771,8 +762,8 @@ public class ColumnDef implements org.apache.thrift.TBase<ColumnDef, ColumnDef._
struct.index_options = new HashMap<String,String>(2*_map90.size);
for (int _i91 = 0; _i91 < _map90.size; ++_i91)
{
String _key92; // required
String _val93; // required
String _key92;
String _val93;
_key92 = iprot.readString();
_val93 = iprot.readString();
struct.index_options.put(_key92, _val93);
@ -908,8 +899,8 @@ public class ColumnDef implements org.apache.thrift.TBase<ColumnDef, ColumnDef._
struct.index_options = new HashMap<String,String>(2*_map96.size);
for (int _i97 = 0; _i97 < _map96.size; ++_i97)
{
String _key98; // required
String _val99; // required
String _key98;
String _val99;
_key98 = iprot.readString();
_val99 = iprot.readString();
struct.index_options.put(_key98, _val99);

26
interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java
View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift Compiler (0.9.0)
* Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
*/
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
@ -37,6 +37,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@ -67,7 +69,7 @@ import org.slf4j.LoggerFactory;
* @param counter_column. The Counterolumn returned by get() or get_slice().
* @param counter_super_column. The CounterSuperColumn returned by get() or get_slice().
*/
public class ColumnOrSuperColumn implements org.apache.thrift.TBase<ColumnOrSuperColumn, ColumnOrSuperColumn._Fields>, java.io.Serializable, Cloneable {
public class ColumnOrSuperColumn implements org.apache.thrift.TBase<ColumnOrSuperColumn, ColumnOrSuperColumn._Fields>, java.io.Serializable, Cloneable, Comparable<ColumnOrSuperColumn> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ColumnOrSuperColumn");
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)1);
@ -452,50 +454,50 @@ public class ColumnOrSuperColumn implements org.apache.thrift.TBase<ColumnOrSupe
return builder.toHashCode();
}
@Override
public int compareTo(ColumnOrSuperColumn other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
ColumnOrSuperColumn typedOther = (ColumnOrSuperColumn)other;
lastComparison = Boolean.valueOf(isSetColumn()).compareTo(typedOther.isSetColumn());
lastComparison = Boolean.valueOf(isSetColumn()).compareTo(other.isSetColumn());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetColumn()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column, typedOther.column);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column, other.column);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetSuper_column()).compareTo(typedOther.isSetSuper_column());
lastComparison = Boolean.valueOf(isSetSuper_column()).compareTo(other.isSetSuper_column());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetSuper_column()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.super_column, typedOther.super_column);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.super_column, other.super_column);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetCounter_column()).compareTo(typedOther.isSetCounter_column());
lastComparison = Boolean.valueOf(isSetCounter_column()).compareTo(other.isSetCounter_column());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetCounter_column()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.counter_column, typedOther.counter_column);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.counter_column, other.counter_column);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetCounter_super_column()).compareTo(typedOther.isSetCounter_super_column());
lastComparison = Boolean.valueOf(isSetCounter_super_column()).compareTo(other.isSetCounter_super_column());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetCounter_super_column()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.counter_super_column, typedOther.counter_super_column);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.counter_super_column, other.counter_super_column);
if (lastComparison != 0) {
return lastComparison;
}

18
interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnParent.java
View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift Compiler (0.9.0)
* Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
*/
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
@ -37,6 +37,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@ -58,7 +60,7 @@ import org.slf4j.LoggerFactory;
*
* See also <a href="cassandra.html#Struct_ColumnPath">ColumnPath</a>
*/
public class ColumnParent implements org.apache.thrift.TBase<ColumnParent, ColumnParent._Fields>, java.io.Serializable, Cloneable {
public class ColumnParent implements org.apache.thrift.TBase<ColumnParent, ColumnParent._Fields>, java.io.Serializable, Cloneable, Comparable<ColumnParent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ColumnParent");
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)3);
@ -337,30 +339,30 @@ public class ColumnParent implements org.apache.thrift.TBase<ColumnParent, Colum
return builder.toHashCode();
}
@Override
public int compareTo(ColumnParent other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
ColumnParent typedOther = (ColumnParent)other;
lastComparison = Boolean.valueOf(isSetColumn_family()).compareTo(typedOther.isSetColumn_family());
lastComparison = Boolean.valueOf(isSetColumn_family()).compareTo(other.isSetColumn_family());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetColumn_family()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column_family, typedOther.column_family);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column_family, other.column_family);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetSuper_column()).compareTo(typedOther.isSetSuper_column());
lastComparison = Boolean.valueOf(isSetSuper_column()).compareTo(other.isSetSuper_column());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetSuper_column()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.super_column, typedOther.super_column);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.super_column, other.super_column);
if (lastComparison != 0) {
return lastComparison;
}

22
interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnPath.java
View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift Compiler (0.9.0)
* Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
*/
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
@ -37,6 +37,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@ -62,7 +64,7 @@ import org.slf4j.LoggerFactory;
* @param super_column. The super column name.
* @param column. The column name.
*/
public class ColumnPath implements org.apache.thrift.TBase<ColumnPath, ColumnPath._Fields>, java.io.Serializable, Cloneable {
public class ColumnPath implements org.apache.thrift.TBase<ColumnPath, ColumnPath._Fields>, java.io.Serializable, Cloneable, Comparable<ColumnPath> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ColumnPath");
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)3);
@ -414,40 +416,40 @@ public class ColumnPath implements org.apache.thrift.TBase<ColumnPath, ColumnPat
return builder.toHashCode();
}
@Override
public int compareTo(ColumnPath other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
ColumnPath typedOther = (ColumnPath)other;
lastComparison = Boolean.valueOf(isSetColumn_family()).compareTo(typedOther.isSetColumn_family());
lastComparison = Boolean.valueOf(isSetColumn_family()).compareTo(other.isSetColumn_family());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetColumn_family()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column_family, typedOther.column_family);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column_family, other.column_family);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetSuper_column()).compareTo(typedOther.isSetSuper_column());
lastComparison = Boolean.valueOf(isSetSuper_column()).compareTo(other.isSetSuper_column());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetSuper_column()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.super_column, typedOther.super_column);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.super_column, other.super_column);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetColumn()).compareTo(typedOther.isSetColumn());
lastComparison = Boolean.valueOf(isSetColumn()).compareTo(other.isSetColumn());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetColumn()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column, typedOther.column);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column, other.column);
if (lastComparison != 0) {
return lastComparison;
}

2
interface/thrift/gen-java/org/apache/cassandra/thrift/Compression.java
View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift Compiler (0.9.0)
* Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated

2
interface/thrift/gen-java/org/apache/cassandra/thrift/ConsistencyLevel.java
View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift Compiler (0.9.0)
* Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated

18
interface/thrift/gen-java/org/apache/cassandra/thrift/CounterColumn.java
View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift Compiler (0.9.0)
* Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
*/
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
@ -37,6 +37,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@ -52,7 +54,7 @@ import java.util.Arrays;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class CounterColumn implements org.apache.thrift.TBase<CounterColumn, CounterColumn._Fields>, java.io.Serializable, Cloneable {
public class CounterColumn implements org.apache.thrift.TBase<CounterColumn, CounterColumn._Fields>, java.io.Serializable, Cloneable, Comparable<CounterColumn> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CounterColumn");
private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)1);
@ -334,30 +336,30 @@ public class CounterColumn implements org.apache.thrift.TBase<CounterColumn, Cou
return builder.toHashCode();
}
@Override
public int compareTo(CounterColumn other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
CounterColumn typedOther = (CounterColumn)other;
lastComparison = Boolean.valueOf(isSetName()).compareTo(typedOther.isSetName());
lastComparison = Boolean.valueOf(isSetName()).compareTo(other.isSetName());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetName()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, typedOther.name);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, other.name);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetValue()).compareTo(typedOther.isSetValue());
lastComparison = Boolean.valueOf(isSetValue()).compareTo(other.isSetValue());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetValue()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.value, typedOther.value);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.value, other.value);
if (lastComparison != 0) {
return lastComparison;
}

24
interface/thrift/gen-java/org/apache/cassandra/thrift/CounterSuperColumn.java
View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift Compiler (0.9.0)
* Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
*/
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
@ -37,6 +37,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@ -52,7 +54,7 @@ import java.util.Arrays;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class CounterSuperColumn implements org.apache.thrift.TBase<CounterSuperColumn, CounterSuperColumn._Fields>, java.io.Serializable, Cloneable {
public class CounterSuperColumn implements org.apache.thrift.TBase<CounterSuperColumn, CounterSuperColumn._Fields>, java.io.Serializable, Cloneable, Comparable<CounterSuperColumn> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CounterSuperColumn");
private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)1);
@ -162,7 +164,7 @@ public class CounterSuperColumn implements org.apache.thrift.TBase<CounterSuperC
;
}
if (other.isSetColumns()) {
List<CounterColumn> __this__columns = new ArrayList<CounterColumn>();
List<CounterColumn> __this__columns = new ArrayList<CounterColumn>(other.columns.size());
for (CounterColumn other_element : other.columns) {
__this__columns.add(new CounterColumn(other_element));
}
@ -352,30 +354,30 @@ public class CounterSuperColumn implements org.apache.thrift.TBase<CounterSuperC
return builder.toHashCode();
}
@Override
public int compareTo(CounterSuperColumn other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
CounterSuperColumn typedOther = (CounterSuperColumn)other;
lastComparison = Boolean.valueOf(isSetName()).compareTo(typedOther.isSetName());
lastComparison = Boolean.valueOf(isSetName()).compareTo(other.isSetName());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetName()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, typedOther.name);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, other.name);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetColumns()).compareTo(typedOther.isSetColumns());
lastComparison = Boolean.valueOf(isSetColumns()).compareTo(other.isSetColumns());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetColumns()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, typedOther.columns);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, other.columns);
if (lastComparison != 0) {
return lastComparison;
}
@ -479,7 +481,7 @@ public class CounterSuperColumn implements org.apache.thrift.TBase<CounterSuperC
struct.columns = new ArrayList<CounterColumn>(_list8.size);
for (int _i9 = 0; _i9 < _list8.size; ++_i9)
{
CounterColumn _elem10; // required
CounterColumn _elem10;
_elem10 = new CounterColumn();
_elem10.read(iprot);
struct.columns.add(_elem10);
@ -560,7 +562,7 @@ public class CounterSuperColumn implements org.apache.thrift.TBase<CounterSuperC
struct.columns = new ArrayList<CounterColumn>(_list13.size);
for (int _i14 = 0; _i14 < _list13.size; ++_i14)
{
CounterColumn _elem15; // required
CounterColumn _elem15;
_elem15 = new CounterColumn();
_elem15.read(iprot);
struct.columns.add(_elem15);

70
interface/thrift/gen-java/org/apache/cassandra/thrift/CqlMetadata.java
View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift Compiler (0.9.0)
* Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
*/
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
@ -37,6 +37,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@ -52,7 +54,7 @@ import java.util.Arrays;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class CqlMetadata implements org.apache.thrift.TBase<CqlMetadata, CqlMetadata._Fields>, java.io.Serializable, Cloneable {
public class CqlMetadata implements org.apache.thrift.TBase<CqlMetadata, CqlMetadata._Fields>, java.io.Serializable, Cloneable, Comparable<CqlMetadata> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CqlMetadata");
private static final org.apache.thrift.protocol.TField NAME_TYPES_FIELD_DESC = new org.apache.thrift.protocol.TField("name_types", org.apache.thrift.protocol.TType.MAP, (short)1);
@ -179,35 +181,11 @@ public class CqlMetadata implements org.apache.thrift.TBase<CqlMetadata, CqlMeta
*/
public CqlMetadata(CqlMetadata other) {
if (other.isSetName_types()) {
Map<ByteBuffer,String> __this__name_types = new HashMap<ByteBuffer,String>();
for (Map.Entry<ByteBuffer, String> other_element : other.name_types.entrySet()) {
ByteBuffer other_element_key = other_element.getKey();
String other_element_value = other_element.getValue();
ByteBuffer __this__name_types_copy_key = org.apache.thrift.TBaseHelper.copyBinary(other_element_key);
;
String __this__name_types_copy_value = other_element_value;
__this__name_types.put(__this__name_types_copy_key, __this__name_types_copy_value);
}
Map<ByteBuffer,String> __this__name_types = new HashMap<ByteBuffer,String>(other.name_types);
this.name_types = __this__name_types;
}
if (other.isSetValue_types()) {
Map<ByteBuffer,String> __this__value_types = new HashMap<ByteBuffer,String>();
for (Map.Entry<ByteBuffer, String> other_element : other.value_types.entrySet()) {
ByteBuffer other_element_key = other_element.getKey();
String other_element_value = other_element.getValue();
ByteBuffer __this__value_types_copy_key = org.apache.thrift.TBaseHelper.copyBinary(other_element_key);
;
String __this__value_types_copy_value = other_element_value;
__this__value_types.put(__this__value_types_copy_key, __this__value_types_copy_value);
}
Map<ByteBuffer,String> __this__value_types = new HashMap<ByteBuffer,String>(other.value_types);
this.value_types = __this__value_types;
}
if (other.isSetDefault_name_type()) {
@ -501,50 +479,50 @@ public class CqlMetadata implements org.apache.thrift.TBase<CqlMetadata, CqlMeta
return builder.toHashCode();
}
@Override
public int compareTo(CqlMetadata other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
CqlMetadata typedOther = (CqlMetadata)other;
lastComparison = Boolean.valueOf(isSetName_types()).compareTo(typedOther.isSetName_types());
lastComparison = Boolean.valueOf(isSetName_types()).compareTo(other.isSetName_types());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetName_types()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name_types, typedOther.name_types);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name_types, other.name_types);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetValue_types()).compareTo(typedOther.isSetValue_types());
lastComparison = Boolean.valueOf(isSetValue_types()).compareTo(other.isSetValue_types());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetValue_types()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.value_types, typedOther.value_types);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.value_types, other.value_types);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetDefault_name_type()).compareTo(typedOther.isSetDefault_name_type());
lastComparison = Boolean.valueOf(isSetDefault_name_type()).compareTo(other.isSetDefault_name_type());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetDefault_name_type()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.default_name_type, typedOther.default_name_type);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.default_name_type, other.default_name_type);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetDefault_value_type()).compareTo(typedOther.isSetDefault_value_type());
lastComparison = Boolean.valueOf(isSetDefault_value_type()).compareTo(other.isSetDefault_value_type());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetDefault_value_type()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.default_value_type, typedOther.default_value_type);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.default_value_type, other.default_value_type);
if (lastComparison != 0) {
return lastComparison;
}
@ -662,8 +640,8 @@ public class CqlMetadata implements org.apache.thrift.TBase<CqlMetadata, CqlMeta
struct.name_types = new HashMap<ByteBuffer,String>(2*_map172.size);
for (int _i173 = 0; _i173 < _map172.size; ++_i173)
{
ByteBuffer _key174; // required
String _val175; // required
ByteBuffer _key174;
String _val175;
_key174 = iprot.readBinary();
_val175 = iprot.readString();
struct.name_types.put(_key174, _val175);
@ -682,8 +660,8 @@ public class CqlMetadata implements org.apache.thrift.TBase<CqlMetadata, CqlMeta
struct.value_types = new HashMap<ByteBuffer,String>(2*_map176.size);
for (int _i177 = 0; _i177 < _map176.size; ++_i177)
{
ByteBuffer _key178; // required
String _val179; // required
ByteBuffer _key178;
String _val179;
_key178 = iprot.readBinary();
_val179 = iprot.readString();
struct.value_types.put(_key178, _val179);
@ -807,8 +785,8 @@ public class CqlMetadata implements org.apache.thrift.TBase<CqlMetadata, CqlMeta
struct.name_types = new HashMap<ByteBuffer,String>(2*_map184.size);
for (int _i185 = 0; _i185 < _map184.size; ++_i185)
{
ByteBuffer _key186; // required
String _val187; // required
ByteBuffer _key186;
String _val187;
_key186 = iprot.readBinary();
_val187 = iprot.readString();
struct.name_types.put(_key186, _val187);
@ -820,8 +798,8 @@ public class CqlMetadata implements org.apache.thrift.TBase<CqlMetadata, CqlMeta
struct.value_types = new HashMap<ByteBuffer,String>(2*_map188.size);
for (int _i189 = 0; _i189 < _map188.size; ++_i189)
{
ByteBuffer _key190; // required
String _val191; // required
ByteBuffer _key190;
String _val191;
_key190 = iprot.readBinary();
_val191 = iprot.readString();
struct.value_types.put(_key190, _val191);

44
interface/thrift/gen-java/org/apache/cassandra/thrift/CqlPreparedResult.java
View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift Compiler (0.9.0)
* Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
*/
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
@ -37,6 +37,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@ -52,7 +54,7 @@ import java.util.Arrays;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class CqlPreparedResult implements org.apache.thrift.TBase<CqlPreparedResult, CqlPreparedResult._Fields>, java.io.Serializable, Cloneable {
public class CqlPreparedResult implements org.apache.thrift.TBase<CqlPreparedResult, CqlPreparedResult._Fields>, java.io.Serializable, Cloneable, Comparable<CqlPreparedResult> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CqlPreparedResult");
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);
@ -182,17 +184,11 @@ public class CqlPreparedResult implements org.apache.thrift.TBase<CqlPreparedRes
this.itemId = other.itemId;
this.count = other.count;
if (other.isSetVariable_types()) {
List<String> __this__variable_types = new ArrayList<String>();
for (String other_element : other.variable_types) {
__this__variable_types.add(other_element);
}
List<String> __this__variable_types = new ArrayList<String>(other.variable_types);
this.variable_types = __this__variable_types;
}
if (other.isSetVariable_names()) {
List<String> __this__variable_names = new ArrayList<String>();
for (String other_element : other.variable_names) {
__this__variable_names.add(other_element);
}
List<String> __this__variable_names = new ArrayList<String>(other.variable_names);
this.variable_names = __this__variable_names;
}
}
@ -488,50 +484,50 @@ public class CqlPreparedResult implements org.apache.thrift.TBase<CqlPreparedRes
return builder.toHashCode();
}
@Override
public int compareTo(CqlPreparedResult other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
CqlPreparedResult typedOther = (CqlPreparedResult)other;
lastComparison = Boolean.valueOf(isSetItemId()).compareTo(typedOther.isSetItemId());
lastComparison = Boolean.valueOf(isSetItemId()).compareTo(other.isSetItemId());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetItemId()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.itemId, typedOther.itemId);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.itemId, other.itemId);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetCount()).compareTo(typedOther.isSetCount());
lastComparison = Boolean.valueOf(isSetCount()).compareTo(other.isSetCount());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetCount()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.count, typedOther.count);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.count, other.count);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetVariable_types()).compareTo(typedOther.isSetVariable_types());
lastComparison = Boolean.valueOf(isSetVariable_types()).compareTo(other.isSetVariable_types());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetVariable_types()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.variable_types, typedOther.variable_types);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.variable_types, other.variable_types);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetVariable_names()).compareTo(typedOther.isSetVariable_names());
lastComparison = Boolean.valueOf(isSetVariable_names()).compareTo(other.isSetVariable_names());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetVariable_names()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.variable_names, typedOther.variable_names);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.variable_names, other.variable_names);
if (lastComparison != 0) {
return lastComparison;
}
@ -653,7 +649,7 @@ public class CqlPreparedResult implements org.apache.thrift.TBase<CqlPreparedRes
struct.variable_types = new ArrayList<String>(_list200.size);
for (int _i201 = 0; _i201 < _list200.size; ++_i201)
{
String _elem202; // required
String _elem202;
_elem202 = iprot.readString();
struct.variable_types.add(_elem202);
}
@ -671,7 +667,7 @@ public class CqlPreparedResult implements org.apache.thrift.TBase<CqlPreparedRes
struct.variable_names = new ArrayList<String>(_list203.size);
for (int _i204 = 0; _i204 < _list203.size; ++_i204)
{
String _elem205; // required
String _elem205;
_elem205 = iprot.readString();
struct.variable_names.add(_elem205);
}
@ -798,7 +794,7 @@ public class CqlPreparedResult implements org.apache.thrift.TBase<CqlPreparedRes
struct.variable_types = new ArrayList<String>(_list210.size);
for (int _i211 = 0; _i211 < _list210.size; ++_i211)
{
String _elem212; // required
String _elem212;
_elem212 = iprot.readString();
struct.variable_types.add(_elem212);
}
@ -811,7 +807,7 @@ public class CqlPreparedResult implements org.apache.thrift.TBase<CqlPreparedRes
struct.variable_names = new ArrayList<String>(_list213.size);
for (int _i214 = 0; _i214 < _list213.size; ++_i214)
{
String _elem215; // required
String _elem215;
_elem215 = iprot.readString();
struct.variable_names.add(_elem215);
}

32
interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResult.java
View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift Compiler (0.9.0)
* Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
*/
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
@ -37,6 +37,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@ -52,7 +54,7 @@ import java.util.Arrays;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class CqlResult implements org.apache.thrift.TBase<CqlResult, CqlResult._Fields>, java.io.Serializable, Cloneable {
public class CqlResult implements org.apache.thrift.TBase<CqlResult, CqlResult._Fields>, java.io.Serializable, Cloneable, Comparable<CqlResult> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CqlResult");
private static final org.apache.thrift.protocol.TField TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("type", org.apache.thrift.protocol.TType.I32, (short)1);
@ -185,7 +187,7 @@ public class CqlResult implements org.apache.thrift.TBase<CqlResult, CqlResult._
this.type = other.type;
}
if (other.isSetRows()) {
List<CqlRow> __this__rows = new ArrayList<CqlRow>();
List<CqlRow> __this__rows = new ArrayList<CqlRow>(other.rows.size());
for (CqlRow other_element : other.rows) {
__this__rows.add(new CqlRow(other_element));
}
@ -481,50 +483,50 @@ public class CqlResult implements org.apache.thrift.TBase<CqlResult, CqlResult._
return builder.toHashCode();
}
@Override
public int compareTo(CqlResult other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
CqlResult typedOther = (CqlResult)other;
lastComparison = Boolean.valueOf(isSetType()).compareTo(typedOther.isSetType());
lastComparison = Boolean.valueOf(isSetType()).compareTo(other.isSetType());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetType()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.type, typedOther.type);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.type, other.type);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetRows()).compareTo(typedOther.isSetRows());
lastComparison = Boolean.valueOf(isSetRows()).compareTo(other.isSetRows());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetRows()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.rows, typedOther.rows);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.rows, other.rows);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetNum()).compareTo(typedOther.isSetNum());
lastComparison = Boolean.valueOf(isSetNum()).compareTo(other.isSetNum());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetNum()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num, typedOther.num);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.num, other.num);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetSchema()).compareTo(typedOther.isSetSchema());
lastComparison = Boolean.valueOf(isSetSchema()).compareTo(other.isSetSchema());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetSchema()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.schema, typedOther.schema);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.schema, other.schema);
if (lastComparison != 0) {
return lastComparison;
}
@ -648,7 +650,7 @@ public class CqlResult implements org.apache.thrift.TBase<CqlResult, CqlResult._
struct.rows = new ArrayList<CqlRow>(_list192.size);
for (int _i193 = 0; _i193 < _list192.size; ++_i193)
{
CqlRow _elem194; // required
CqlRow _elem194;
_elem194 = new CqlRow();
_elem194.read(iprot);
struct.rows.add(_elem194);
@ -781,7 +783,7 @@ public class CqlResult implements org.apache.thrift.TBase<CqlResult, CqlResult._
struct.rows = new ArrayList<CqlRow>(_list197.size);
for (int _i198 = 0; _i198 < _list197.size; ++_i198)
{
CqlRow _elem199; // required
CqlRow _elem199;
_elem199 = new CqlRow();
_elem199.read(iprot);
struct.rows.add(_elem199);

2
interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResultType.java
View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift Compiler (0.9.0)
* Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated

24
interface/thrift/gen-java/org/apache/cassandra/thrift/CqlRow.java
View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift Compiler (0.9.0)
* Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
*/
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
@ -37,6 +37,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@ -55,7 +57,7 @@ import org.slf4j.LoggerFactory;
/**
* Row returned from a CQL query
*/
public class CqlRow implements org.apache.thrift.TBase<CqlRow, CqlRow._Fields>, java.io.Serializable, Cloneable {
public class CqlRow implements org.apache.thrift.TBase<CqlRow, CqlRow._Fields>, java.io.Serializable, Cloneable, Comparable<CqlRow> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CqlRow");
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);
@ -165,7 +167,7 @@ public class CqlRow implements org.apache.thrift.TBase<CqlRow, CqlRow._Fields>,
;
}
if (other.isSetColumns()) {
List<Column> __this__columns = new ArrayList<Column>();
List<Column> __this__columns = new ArrayList<Column>(other.columns.size());
for (Column other_element : other.columns) {
__this__columns.add(new Column(other_element));
}
@ -355,30 +357,30 @@ public class CqlRow implements org.apache.thrift.TBase<CqlRow, CqlRow._Fields>,
return builder.toHashCode();
}
@Override
public int compareTo(CqlRow other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
CqlRow typedOther = (CqlRow)other;
lastComparison = Boolean.valueOf(isSetKey()).compareTo(typedOther.isSetKey());
lastComparison = Boolean.valueOf(isSetKey()).compareTo(other.isSetKey());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetKey()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.key, typedOther.key);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.key, other.key);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetColumns()).compareTo(typedOther.isSetColumns());
lastComparison = Boolean.valueOf(isSetColumns()).compareTo(other.isSetColumns());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetColumns()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, typedOther.columns);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, other.columns);
if (lastComparison != 0) {
return lastComparison;
}
@ -482,7 +484,7 @@ public class CqlRow implements org.apache.thrift.TBase<CqlRow, CqlRow._Fields>,
struct.columns = new ArrayList<Column>(_list164.size);
for (int _i165 = 0; _i165 < _list164.size; ++_i165)
{
Column _elem166; // required
Column _elem166;
_elem166 = new Column();
_elem166.read(iprot);
struct.columns.add(_elem166);
@ -563,7 +565,7 @@ public class CqlRow implements org.apache.thrift.TBase<CqlRow, CqlRow._Fields>,
struct.columns = new ArrayList<Column>(_list169.size);
for (int _i170 = 0; _i170 < _list169.size; ++_i170)
{
Column _elem171; // required
Column _elem171;
_elem171 = new Column();
_elem171.read(iprot);
struct.columns.add(_elem171);

22
interface/thrift/gen-java/org/apache/cassandra/thrift/Deletion.java
View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift Compiler (0.9.0)
* Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
*/
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
@ -37,6 +37,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@ -55,7 +57,7 @@ import org.slf4j.LoggerFactory;
/**
* Note that the timestamp is only optional in case of counter deletion.
*/
public class Deletion implements org.apache.thrift.TBase<Deletion, Deletion._Fields>, java.io.Serializable, Cloneable {
public class Deletion implements org.apache.thrift.TBase<Deletion, Deletion._Fields>, java.io.Serializable, Cloneable, Comparable<Deletion> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Deletion");
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)1);
@ -390,40 +392,40 @@ public class Deletion implements org.apache.thrift.TBase<Deletion, Deletion._Fie
return builder.toHashCode();
}
@Override
public int compareTo(Deletion other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
Deletion typedOther = (Deletion)other;
lastComparison = Boolean.valueOf(isSetTimestamp()).compareTo(typedOther.isSetTimestamp());
lastComparison = Boolean.valueOf(isSetTimestamp()).compareTo(other.isSetTimestamp());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetTimestamp()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, typedOther.timestamp);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, other.timestamp);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetSuper_column()).compareTo(typedOther.isSetSuper_column());
lastComparison = Boolean.valueOf(isSetSuper_column()).compareTo(other.isSetSuper_column());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetSuper_column()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.super_column, typedOther.super_column);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.super_column, other.super_column);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetPredicate()).compareTo(typedOther.isSetPredicate());
lastComparison = Boolean.valueOf(isSetPredicate()).compareTo(other.isSetPredicate());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetPredicate()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.predicate, typedOther.predicate);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.predicate, other.predicate);
if (lastComparison != 0) {
return lastComparison;
}

22
interface/thrift/gen-java/org/apache/cassandra/thrift/EndpointDetails.java
View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift Compiler (0.9.0)
* Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
*/
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
@ -37,6 +37,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@ -52,7 +54,7 @@ import java.util.Arrays;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class EndpointDetails implements org.apache.thrift.TBase<EndpointDetails, EndpointDetails._Fields>, java.io.Serializable, Cloneable {
public class EndpointDetails implements org.apache.thrift.TBase<EndpointDetails, EndpointDetails._Fields>, java.io.Serializable, Cloneable, Comparable<EndpointDetails> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("EndpointDetails");
private static final org.apache.thrift.protocol.TField HOST_FIELD_DESC = new org.apache.thrift.protocol.TField("host", org.apache.thrift.protocol.TType.STRING, (short)1);
@ -384,40 +386,40 @@ public class EndpointDetails implements org.apache.thrift.TBase<EndpointDetails,
return builder.toHashCode();
}
@Override
public int compareTo(EndpointDetails other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
EndpointDetails typedOther = (EndpointDetails)other;
lastComparison = Boolean.valueOf(isSetHost()).compareTo(typedOther.isSetHost());
lastComparison = Boolean.valueOf(isSetHost()).compareTo(other.isSetHost());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetHost()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.host, typedOther.host);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.host, other.host);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetDatacenter()).compareTo(typedOther.isSetDatacenter());
lastComparison = Boolean.valueOf(isSetDatacenter()).compareTo(other.isSetDatacenter());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetDatacenter()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.datacenter, typedOther.datacenter);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.datacenter, other.datacenter);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetRack()).compareTo(typedOther.isSetRack());
lastComparison = Boolean.valueOf(isSetRack()).compareTo(other.isSetRack());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetRack()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.rack, typedOther.rack);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.rack, other.rack);
if (lastComparison != 0) {
return lastComparison;
}

28
interface/thrift/gen-java/org/apache/cassandra/thrift/IndexClause.java
View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift Compiler (0.9.0)
* Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
*/
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
@ -37,6 +37,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@ -55,7 +57,7 @@ import org.slf4j.LoggerFactory;
/**
* @deprecated use a KeyRange with row_filter in get_range_slices instead
*/
public class IndexClause implements org.apache.thrift.TBase<IndexClause, IndexClause._Fields>, java.io.Serializable, Cloneable {
public class IndexClause implements org.apache.thrift.TBase<IndexClause, IndexClause._Fields>, java.io.Serializable, Cloneable, Comparable<IndexClause> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("IndexClause");
private static final org.apache.thrift.protocol.TField EXPRESSIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("expressions", org.apache.thrift.protocol.TType.LIST, (short)1);
@ -176,7 +178,7 @@ public class IndexClause implements org.apache.thrift.TBase<IndexClause, IndexCl
public IndexClause(IndexClause other) {
__isset_bitfield = other.__isset_bitfield;
if (other.isSetExpressions()) {
List<IndexExpression> __this__expressions = new ArrayList<IndexExpression>();
List<IndexExpression> __this__expressions = new ArrayList<IndexExpression>(other.expressions.size());
for (IndexExpression other_element : other.expressions) {
__this__expressions.add(new IndexExpression(other_element));
}
@ -423,40 +425,40 @@ public class IndexClause implements org.apache.thrift.TBase<IndexClause, IndexCl
return builder.toHashCode();
}
@Override
public int compareTo(IndexClause other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
IndexClause typedOther = (IndexClause)other;
lastComparison = Boolean.valueOf(isSetExpressions()).compareTo(typedOther.isSetExpressions());
lastComparison = Boolean.valueOf(isSetExpressions()).compareTo(other.isSetExpressions());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetExpressions()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.expressions, typedOther.expressions);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.expressions, other.expressions);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetStart_key()).compareTo(typedOther.isSetStart_key());
lastComparison = Boolean.valueOf(isSetStart_key()).compareTo(other.isSetStart_key());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetStart_key()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.start_key, typedOther.start_key);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.start_key, other.start_key);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetCount()).compareTo(typedOther.isSetCount());
lastComparison = Boolean.valueOf(isSetCount()).compareTo(other.isSetCount());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetCount()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.count, typedOther.count);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.count, other.count);
if (lastComparison != 0) {
return lastComparison;
}
@ -559,7 +561,7 @@ public class IndexClause implements org.apache.thrift.TBase<IndexClause, IndexCl
struct.expressions = new ArrayList<IndexExpression>(_list24.size);
for (int _i25 = 0; _i25 < _list24.size; ++_i25)
{
IndexExpression _elem26; // required
IndexExpression _elem26;
_elem26 = new IndexExpression();
_elem26.read(iprot);
struct.expressions.add(_elem26);
@ -661,7 +663,7 @@ public class IndexClause implements org.apache.thrift.TBase<IndexClause, IndexCl
struct.expressions = new ArrayList<IndexExpression>(_list29.size);
for (int _i30 = 0; _i30 < _list29.size; ++_i30)
{
IndexExpression _elem31; // required
IndexExpression _elem31;
_elem31 = new IndexExpression();
_elem31.read(iprot);
struct.expressions.add(_elem31);

22
interface/thrift/gen-java/org/apache/cassandra/thrift/IndexExpression.java
View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift Compiler (0.9.0)
* Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
*/
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
@ -37,6 +37,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@ -52,7 +54,7 @@ import java.util.Arrays;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class IndexExpression implements org.apache.thrift.TBase<IndexExpression, IndexExpression._Fields>, java.io.Serializable, Cloneable {
public class IndexExpression implements org.apache.thrift.TBase<IndexExpression, IndexExpression._Fields>, java.io.Serializable, Cloneable, Comparable<IndexExpression> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("IndexExpression");
private static final org.apache.thrift.protocol.TField COLUMN_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("column_name", org.apache.thrift.protocol.TType.STRING, (short)1);
@ -423,40 +425,40 @@ public class IndexExpression implements org.apache.thrift.TBase<IndexExpression,
return builder.toHashCode();
}
@Override
public int compareTo(IndexExpression other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
IndexExpression typedOther = (IndexExpression)other;
lastComparison = Boolean.valueOf(isSetColumn_name()).compareTo(typedOther.isSetColumn_name());
lastComparison = Boolean.valueOf(isSetColumn_name()).compareTo(other.isSetColumn_name());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetColumn_name()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column_name, typedOther.column_name);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column_name, other.column_name);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetOp()).compareTo(typedOther.isSetOp());
lastComparison = Boolean.valueOf(isSetOp()).compareTo(other.isSetOp());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetOp()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.op, typedOther.op);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.op, other.op);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetValue()).compareTo(typedOther.isSetValue());
lastComparison = Boolean.valueOf(isSetValue()).compareTo(other.isSetValue());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetValue()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.value, typedOther.value);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.value, other.value);
if (lastComparison != 0) {
return lastComparison;
}

2
interface/thrift/gen-java/org/apache/cassandra/thrift/IndexOperator.java
View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift Compiler (0.9.0)
* Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated

2
interface/thrift/gen-java/org/apache/cassandra/thrift/IndexType.java
View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift Compiler (0.9.0)
* Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated

14
interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift Compiler (0.9.0)
* Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
*/
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
@ -37,6 +37,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@ -56,7 +58,7 @@ import org.slf4j.LoggerFactory;
* Invalid request could mean keyspace or column family does not exist, required parameters are missing, or a parameter is malformed.
* why contains an associated error message.
*/
public class InvalidRequestException extends TException implements org.apache.thrift.TBase<InvalidRequestException, InvalidRequestException._Fields>, java.io.Serializable, Cloneable {
public class InvalidRequestException extends TException implements org.apache.thrift.TBase<InvalidRequestException, InvalidRequestException._Fields>, java.io.Serializable, Cloneable, Comparable<InvalidRequestException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InvalidRequestException");
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);
@ -261,20 +263,20 @@ public class InvalidRequestException extends TException implements org.apache.th
return builder.toHashCode();
}
@Override
public int compareTo(InvalidRequestException other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
InvalidRequestException typedOther = (InvalidRequestException)other;
lastComparison = Boolean.valueOf(isSetWhy()).compareTo(typedOther.isSetWhy());
lastComparison = Boolean.valueOf(isSetWhy()).compareTo(other.isSetWhy());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetWhy()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.why, typedOther.why);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.why, other.why);
if (lastComparison != 0) {
return lastComparison;
}

18
interface/thrift/gen-java/org/apache/cassandra/thrift/KeyCount.java
View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift Compiler (0.9.0)
* Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
*/
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
@ -37,6 +37,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@ -52,7 +54,7 @@ import java.util.Arrays;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class KeyCount implements org.apache.thrift.TBase<KeyCount, KeyCount._Fields>, java.io.Serializable, Cloneable {
public class KeyCount implements org.apache.thrift.TBase<KeyCount, KeyCount._Fields>, java.io.Serializable, Cloneable, Comparable<KeyCount> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("KeyCount");
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);
@ -334,30 +336,30 @@ public class KeyCount implements org.apache.thrift.TBase<KeyCount, KeyCount._Fie
return builder.toHashCode();
}
@Override
public int compareTo(KeyCount other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
KeyCount typedOther = (KeyCount)other;
lastComparison = Boolean.valueOf(isSetKey()).compareTo(typedOther.isSetKey());
lastComparison = Boolean.valueOf(isSetKey()).compareTo(other.isSetKey());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetKey()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.key, typedOther.key);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.key, other.key);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetCount()).compareTo(typedOther.isSetCount());
lastComparison = Boolean.valueOf(isSetCount()).compareTo(other.isSetCount());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetCount()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.count, typedOther.count);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.count, other.count);
if (lastComparison != 0) {
return lastComparison;
}

40
interface/thrift/gen-java/org/apache/cassandra/thrift/KeyRange.java
View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift Compiler (0.9.0)
* Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
*/
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
@ -37,6 +37,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@ -60,7 +62,7 @@ import org.slf4j.LoggerFactory;
* one-element range, but a range from tokenY to tokenY is the
* full ring.
*/
public class KeyRange implements org.apache.thrift.TBase<KeyRange, KeyRange._Fields>, java.io.Serializable, Cloneable {
public class KeyRange implements org.apache.thrift.TBase<KeyRange, KeyRange._Fields>, java.io.Serializable, Cloneable, Comparable<KeyRange> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("KeyRange");
private static final org.apache.thrift.protocol.TField START_KEY_FIELD_DESC = new org.apache.thrift.protocol.TField("start_key", org.apache.thrift.protocol.TType.STRING, (short)1);
@ -213,7 +215,7 @@ public class KeyRange implements org.apache.thrift.TBase<KeyRange, KeyRange._Fie
this.end_token = other.end_token;
}
if (other.isSetRow_filter()) {
List<IndexExpression> __this__row_filter = new ArrayList<IndexExpression>();
List<IndexExpression> __this__row_filter = new ArrayList<IndexExpression>(other.row_filter.size());
for (IndexExpression other_element : other.row_filter) {
__this__row_filter.add(new IndexExpression(other_element));
}
@ -622,70 +624,70 @@ public class KeyRange implements org.apache.thrift.TBase<KeyRange, KeyRange._Fie
return builder.toHashCode();
}
@Override
public int compareTo(KeyRange other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
KeyRange typedOther = (KeyRange)other;
lastComparison = Boolean.valueOf(isSetStart_key()).compareTo(typedOther.isSetStart_key());
lastComparison = Boolean.valueOf(isSetStart_key()).compareTo(other.isSetStart_key());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetStart_key()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.start_key, typedOther.start_key);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.start_key, other.start_key);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetEnd_key()).compareTo(typedOther.isSetEnd_key());
lastComparison = Boolean.valueOf(isSetEnd_key()).compareTo(other.isSetEnd_key());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetEnd_key()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.end_key, typedOther.end_key);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.end_key, other.end_key);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetStart_token()).compareTo(typedOther.isSetStart_token());
lastComparison = Boolean.valueOf(isSetStart_token()).compareTo(other.isSetStart_token());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetStart_token()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.start_token, typedOther.start_token);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.start_token, other.start_token);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetEnd_token()).compareTo(typedOther.isSetEnd_token());
lastComparison = Boolean.valueOf(isSetEnd_token()).compareTo(other.isSetEnd_token());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetEnd_token()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.end_token, typedOther.end_token);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.end_token, other.end_token);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetRow_filter()).compareTo(typedOther.isSetRow_filter());
lastComparison = Boolean.valueOf(isSetRow_filter()).compareTo(other.isSetRow_filter());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetRow_filter()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row_filter, typedOther.row_filter);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row_filter, other.row_filter);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetCount()).compareTo(typedOther.isSetCount());
lastComparison = Boolean.valueOf(isSetCount()).compareTo(other.isSetCount());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetCount()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.count, typedOther.count);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.count, other.count);
if (lastComparison != 0) {
return lastComparison;
}
@ -848,7 +850,7 @@ public class KeyRange implements org.apache.thrift.TBase<KeyRange, KeyRange._Fie
struct.row_filter = new ArrayList<IndexExpression>(_list32.size);
for (int _i33 = 0; _i33 < _list32.size; ++_i33)
{
IndexExpression _elem34; // required
IndexExpression _elem34;
_elem34 = new IndexExpression();
_elem34.read(iprot);
struct.row_filter.add(_elem34);
@ -1017,7 +1019,7 @@ public class KeyRange implements org.apache.thrift.TBase<KeyRange, KeyRange._Fie
struct.row_filter = new ArrayList<IndexExpression>(_list37.size);
for (int _i38 = 0; _i38 < _list37.size; ++_i38)
{
IndexExpression _elem39; // required
IndexExpression _elem39;
_elem39 = new IndexExpression();
_elem39.read(iprot);
struct.row_filter.add(_elem39);

24
interface/thrift/gen-java/org/apache/cassandra/thrift/KeySlice.java
View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift Compiler (0.9.0)
* Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
*/
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
@ -37,6 +37,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@ -59,7 +61,7 @@ import org.slf4j.LoggerFactory;
* @param columns. List of data represented by the key. Typically, the list is pared down to only the columns specified by
* a SlicePredicate.
*/
public class KeySlice implements org.apache.thrift.TBase<KeySlice, KeySlice._Fields>, java.io.Serializable, Cloneable {
public class KeySlice implements org.apache.thrift.TBase<KeySlice, KeySlice._Fields>, java.io.Serializable, Cloneable, Comparable<KeySlice> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("KeySlice");
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);
@ -169,7 +171,7 @@ public class KeySlice implements org.apache.thrift.TBase<KeySlice, KeySlice._Fie
;
}
if (other.isSetColumns()) {
List<ColumnOrSuperColumn> __this__columns = new ArrayList<ColumnOrSuperColumn>();
List<ColumnOrSuperColumn> __this__columns = new ArrayList<ColumnOrSuperColumn>(other.columns.size());
for (ColumnOrSuperColumn other_element : other.columns) {
__this__columns.add(new ColumnOrSuperColumn(other_element));
}
@ -359,30 +361,30 @@ public class KeySlice implements org.apache.thrift.TBase<KeySlice, KeySlice._Fie
return builder.toHashCode();
}
@Override
public int compareTo(KeySlice other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
KeySlice typedOther = (KeySlice)other;
lastComparison = Boolean.valueOf(isSetKey()).compareTo(typedOther.isSetKey());
lastComparison = Boolean.valueOf(isSetKey()).compareTo(other.isSetKey());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetKey()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.key, typedOther.key);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.key, other.key);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetColumns()).compareTo(typedOther.isSetColumns());
lastComparison = Boolean.valueOf(isSetColumns()).compareTo(other.isSetColumns());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetColumns()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, typedOther.columns);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, other.columns);
if (lastComparison != 0) {
return lastComparison;
}
@ -486,7 +488,7 @@ public class KeySlice implements org.apache.thrift.TBase<KeySlice, KeySlice._Fie
struct.columns = new ArrayList<ColumnOrSuperColumn>(_list40.size);
for (int _i41 = 0; _i41 < _list40.size; ++_i41)
{
ColumnOrSuperColumn _elem42; // required
ColumnOrSuperColumn _elem42;
_elem42 = new ColumnOrSuperColumn();
_elem42.read(iprot);
struct.columns.add(_elem42);
@ -567,7 +569,7 @@ public class KeySlice implements org.apache.thrift.TBase<KeySlice, KeySlice._Fie
struct.columns = new ArrayList<ColumnOrSuperColumn>(_list45.size);
for (int _i46 = 0; _i46 < _list45.size; ++_i46)
{
ColumnOrSuperColumn _elem47; // required
ColumnOrSuperColumn _elem47;
_elem47 = new ColumnOrSuperColumn();
_elem47.read(iprot);
struct.columns.add(_elem47);

61
interface/thrift/gen-java/org/apache/cassandra/thrift/KsDef.java
View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift Compiler (0.9.0)
* Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
*/
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
@ -37,6 +37,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@ -52,7 +54,7 @@ import java.util.Arrays;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class KsDef implements org.apache.thrift.TBase<KsDef, KsDef._Fields>, java.io.Serializable, Cloneable {
public class KsDef implements org.apache.thrift.TBase<KsDef, KsDef._Fields>, java.io.Serializable, Cloneable, Comparable<KsDef> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("KsDef");
private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)1);
@ -209,23 +211,12 @@ public class KsDef implements org.apache.thrift.TBase<KsDef, KsDef._Fields>, jav
this.strategy_class = other.strategy_class;
}
if (other.isSetStrategy_options()) {
Map<String,String> __this__strategy_options = new HashMap<String,String>();
for (Map.Entry<String, String> other_element : other.strategy_options.entrySet()) {
String other_element_key = other_element.getKey();
String other_element_value = other_element.getValue();
String __this__strategy_options_copy_key = other_element_key;
String __this__strategy_options_copy_value = other_element_value;
__this__strategy_options.put(__this__strategy_options_copy_key, __this__strategy_options_copy_value);
}
Map<String,String> __this__strategy_options = new HashMap<String,String>(other.strategy_options);
this.strategy_options = __this__strategy_options;
}
this.replication_factor = other.replication_factor;
if (other.isSetCf_defs()) {
List<CfDef> __this__cf_defs = new ArrayList<CfDef>();
List<CfDef> __this__cf_defs = new ArrayList<CfDef>(other.cf_defs.size());
for (CfDef other_element : other.cf_defs) {
__this__cf_defs.add(new CfDef(other_element));
}
@ -631,70 +622,70 @@ public class KsDef implements org.apache.thrift.TBase<KsDef, KsDef._Fields>, jav
return builder.toHashCode();
}
@Override
public int compareTo(KsDef other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
KsDef typedOther = (KsDef)other;
lastComparison = Boolean.valueOf(isSetName()).compareTo(typedOther.isSetName());
lastComparison = Boolean.valueOf(isSetName()).compareTo(other.isSetName());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetName()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, typedOther.name);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, other.name);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetStrategy_class()).compareTo(typedOther.isSetStrategy_class());
lastComparison = Boolean.valueOf(isSetStrategy_class()).compareTo(other.isSetStrategy_class());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetStrategy_class()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.strategy_class, typedOther.strategy_class);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.strategy_class, other.strategy_class);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetStrategy_options()).compareTo(typedOther.isSetStrategy_options());
lastComparison = Boolean.valueOf(isSetStrategy_options()).compareTo(other.isSetStrategy_options());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetStrategy_options()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.strategy_options, typedOther.strategy_options);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.strategy_options, other.strategy_options);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetReplication_factor()).compareTo(typedOther.isSetReplication_factor());
lastComparison = Boolean.valueOf(isSetReplication_factor()).compareTo(other.isSetReplication_factor());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetReplication_factor()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.replication_factor, typedOther.replication_factor);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.replication_factor, other.replication_factor);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetCf_defs()).compareTo(typedOther.isSetCf_defs());
lastComparison = Boolean.valueOf(isSetCf_defs()).compareTo(other.isSetCf_defs());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetCf_defs()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cf_defs, typedOther.cf_defs);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cf_defs, other.cf_defs);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetDurable_writes()).compareTo(typedOther.isSetDurable_writes());
lastComparison = Boolean.valueOf(isSetDurable_writes()).compareTo(other.isSetDurable_writes());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetDurable_writes()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.durable_writes, typedOther.durable_writes);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.durable_writes, other.durable_writes);
if (lastComparison != 0) {
return lastComparison;
}
@ -841,8 +832,8 @@ public class KsDef implements org.apache.thrift.TBase<KsDef, KsDef._Fields>, jav
struct.strategy_options = new HashMap<String,String>(2*_map146.size);
for (int _i147 = 0; _i147 < _map146.size; ++_i147)
{
String _key148; // required
String _val149; // required
String _key148;
String _val149;
_key148 = iprot.readString();
_val149 = iprot.readString();
struct.strategy_options.put(_key148, _val149);
@ -869,7 +860,7 @@ public class KsDef implements org.apache.thrift.TBase<KsDef, KsDef._Fields>, jav
struct.cf_defs = new ArrayList<CfDef>(_list150.size);
for (int _i151 = 0; _i151 < _list150.size; ++_i151)
{
CfDef _elem152; // required
CfDef _elem152;
_elem152 = new CfDef();
_elem152.read(iprot);
struct.cf_defs.add(_elem152);
@ -1018,7 +1009,7 @@ public class KsDef implements org.apache.thrift.TBase<KsDef, KsDef._Fields>, jav
struct.cf_defs = new ArrayList<CfDef>(_list157.size);
for (int _i158 = 0; _i158 < _list157.size; ++_i158)
{
CfDef _elem159; // required
CfDef _elem159;
_elem159 = new CfDef();
_elem159.read(iprot);
struct.cf_defs.add(_elem159);
@ -1032,8 +1023,8 @@ public class KsDef implements org.apache.thrift.TBase<KsDef, KsDef._Fields>, jav
struct.strategy_options = new HashMap<String,String>(2*_map160.size);
for (int _i161 = 0; _i161 < _map160.size; ++_i161)
{
String _key162; // required
String _val163; // required
String _key162;
String _val163;
_key162 = iprot.readString();
_val163 = iprot.readString();
struct.strategy_options.put(_key162, _val163);

18
interface/thrift/gen-java/org/apache/cassandra/thrift/Mutation.java
View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift Compiler (0.9.0)
* Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
*/
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
@ -37,6 +37,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@ -57,7 +59,7 @@ import org.slf4j.LoggerFactory;
* @param column_or_supercolumn. An insert to a column or supercolumn (possibly counter column or supercolumn)
* @param deletion. A deletion of a column or supercolumn
*/
public class Mutation implements org.apache.thrift.TBase<Mutation, Mutation._Fields>, java.io.Serializable, Cloneable {
public class Mutation implements org.apache.thrift.TBase<Mutation, Mutation._Fields>, java.io.Serializable, Cloneable, Comparable<Mutation> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Mutation");
private static final org.apache.thrift.protocol.TField COLUMN_OR_SUPERCOLUMN_FIELD_DESC = new org.apache.thrift.protocol.TField("column_or_supercolumn", org.apache.thrift.protocol.TType.STRUCT, (short)1);
@ -318,30 +320,30 @@ public class Mutation implements org.apache.thrift.TBase<Mutation, Mutation._Fie
return builder.toHashCode();
}
@Override
public int compareTo(Mutation other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
Mutation typedOther = (Mutation)other;
lastComparison = Boolean.valueOf(isSetColumn_or_supercolumn()).compareTo(typedOther.isSetColumn_or_supercolumn());
lastComparison = Boolean.valueOf(isSetColumn_or_supercolumn()).compareTo(other.isSetColumn_or_supercolumn());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetColumn_or_supercolumn()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column_or_supercolumn, typedOther.column_or_supercolumn);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column_or_supercolumn, other.column_or_supercolumn);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetDeletion()).compareTo(typedOther.isSetDeletion());
lastComparison = Boolean.valueOf(isSetDeletion()).compareTo(other.isSetDeletion());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetDeletion()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.deletion, typedOther.deletion);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.deletion, other.deletion);
if (lastComparison != 0) {
return lastComparison;
}

10
interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift Compiler (0.9.0)
* Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
*/
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
@ -37,6 +37,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@ -55,7 +57,7 @@ import org.slf4j.LoggerFactory;
/**
* A specific column was requested that does not exist.
*/
public class NotFoundException extends TException implements org.apache.thrift.TBase<NotFoundException, NotFoundException._Fields>, java.io.Serializable, Cloneable {
public class NotFoundException extends TException implements org.apache.thrift.TBase<NotFoundException, NotFoundException._Fields>, java.io.Serializable, Cloneable, Comparable<NotFoundException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NotFoundException");
@ -190,13 +192,13 @@ public class NotFoundException extends TException implements org.apache.thrift.T
return builder.toHashCode();
}
@Override
public int compareTo(NotFoundException other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
NotFoundException typedOther = (NotFoundException)other;
return 0;
}

10
interface/thrift/gen-java/org/apache/cassandra/thrift/SchemaDisagreementException.java
View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift Compiler (0.9.0)
* Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
*/
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
@ -37,6 +37,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@ -58,7 +60,7 @@ import org.slf4j.LoggerFactory;
*
* schemas are not in agreement across all nodes
*/
public class SchemaDisagreementException extends TException implements org.apache.thrift.TBase<SchemaDisagreementException, SchemaDisagreementException._Fields>, java.io.Serializable, Cloneable {
public class SchemaDisagreementException extends TException implements org.apache.thrift.TBase<SchemaDisagreementException, SchemaDisagreementException._Fields>, java.io.Serializable, Cloneable, Comparable<SchemaDisagreementException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SchemaDisagreementException");
@ -193,13 +195,13 @@ public class SchemaDisagreementException extends TException implements org.apach
return builder.toHashCode();
}
@Override
public int compareTo(SchemaDisagreementException other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
SchemaDisagreementException typedOther = (SchemaDisagreementException)other;
return 0;
}

29
interface/thrift/gen-java/org/apache/cassandra/thrift/SlicePredicate.java
View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift Compiler (0.9.0)
* Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
*/
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
@ -37,6 +37,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@ -64,7 +66,7 @@ import org.slf4j.LoggerFactory;
* and 'Jim' you can pass those column names as a list to fetch all three at once.
* @param slice_range. A SliceRange describing how to range, order, and/or limit the slice.
*/
public class SlicePredicate implements org.apache.thrift.TBase<SlicePredicate, SlicePredicate._Fields>, java.io.Serializable, Cloneable {
public class SlicePredicate implements org.apache.thrift.TBase<SlicePredicate, SlicePredicate._Fields>, java.io.Serializable, Cloneable, Comparable<SlicePredicate> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SlicePredicate");
private static final org.apache.thrift.protocol.TField COLUMN_NAMES_FIELD_DESC = new org.apache.thrift.protocol.TField("column_names", org.apache.thrift.protocol.TType.LIST, (short)1);
@ -162,12 +164,7 @@ public class SlicePredicate implements org.apache.thrift.TBase<SlicePredicate, S
*/
public SlicePredicate(SlicePredicate other) {
if (other.isSetColumn_names()) {
List<ByteBuffer> __this__column_names = new ArrayList<ByteBuffer>();
for (ByteBuffer other_element : other.column_names) {
ByteBuffer temp_binary_element = org.apache.thrift.TBaseHelper.copyBinary(other_element);
;
__this__column_names.add(temp_binary_element);
}
List<ByteBuffer> __this__column_names = new ArrayList<ByteBuffer>(other.column_names);
this.column_names = __this__column_names;
}
if (other.isSetSlice_range()) {
@ -347,30 +344,30 @@ public class SlicePredicate implements org.apache.thrift.TBase<SlicePredicate, S
return builder.toHashCode();
}
@Override
public int compareTo(SlicePredicate other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
SlicePredicate typedOther = (SlicePredicate)other;
lastComparison = Boolean.valueOf(isSetColumn_names()).compareTo(typedOther.isSetColumn_names());
lastComparison = Boolean.valueOf(isSetColumn_names()).compareTo(other.isSetColumn_names());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetColumn_names()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column_names, typedOther.column_names);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column_names, other.column_names);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetSlice_range()).compareTo(typedOther.isSetSlice_range());
lastComparison = Boolean.valueOf(isSetSlice_range()).compareTo(other.isSetSlice_range());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetSlice_range()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.slice_range, typedOther.slice_range);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.slice_range, other.slice_range);
if (lastComparison != 0) {
return lastComparison;
}
@ -467,7 +464,7 @@ public class SlicePredicate implements org.apache.thrift.TBase<SlicePredicate, S
struct.column_names = new ArrayList<ByteBuffer>(_list16.size);
for (int _i17 = 0; _i17 < _list16.size; ++_i17)
{
ByteBuffer _elem18; // required
ByteBuffer _elem18;
_elem18 = iprot.readBinary();
struct.column_names.add(_elem18);
}
@ -572,7 +569,7 @@ public class SlicePredicate implements org.apache.thrift.TBase<SlicePredicate, S
struct.column_names = new ArrayList<ByteBuffer>(_list21.size);
for (int _i22 = 0; _i22 < _list21.size; ++_i22)
{
ByteBuffer _elem23; // required
ByteBuffer _elem23;
_elem23 = iprot.readBinary();
struct.column_names.add(_elem23);
}

26
interface/thrift/gen-java/org/apache/cassandra/thrift/SliceRange.java
View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift Compiler (0.9.0)
* Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
*/
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
@ -37,6 +37,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@ -68,7 +70,7 @@ import org.slf4j.LoggerFactory;
* be better served by iterating through slices by passing the last value of one call in as the 'start'
* of the next instead of increasing 'count' arbitrarily large.
*/
public class SliceRange implements org.apache.thrift.TBase<SliceRange, SliceRange._Fields>, java.io.Serializable, Cloneable {
public class SliceRange implements org.apache.thrift.TBase<SliceRange, SliceRange._Fields>, java.io.Serializable, Cloneable, Comparable<SliceRange> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SliceRange");
private static final org.apache.thrift.protocol.TField START_FIELD_DESC = new org.apache.thrift.protocol.TField("start", org.apache.thrift.protocol.TType.STRING, (short)1);
@ -493,50 +495,50 @@ public class SliceRange implements org.apache.thrift.TBase<SliceRange, SliceRang
return builder.toHashCode();
}
@Override
public int compareTo(SliceRange other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
SliceRange typedOther = (SliceRange)other;
lastComparison = Boolean.valueOf(isSetStart()).compareTo(typedOther.isSetStart());
lastComparison = Boolean.valueOf(isSetStart()).compareTo(other.isSetStart());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetStart()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.start, typedOther.start);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.start, other.start);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetFinish()).compareTo(typedOther.isSetFinish());
lastComparison = Boolean.valueOf(isSetFinish()).compareTo(other.isSetFinish());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetFinish()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.finish, typedOther.finish);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.finish, other.finish);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetReversed()).compareTo(typedOther.isSetReversed());
lastComparison = Boolean.valueOf(isSetReversed()).compareTo(other.isSetReversed());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetReversed()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.reversed, typedOther.reversed);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.reversed, other.reversed);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetCount()).compareTo(typedOther.isSetCount());
lastComparison = Boolean.valueOf(isSetCount()).compareTo(other.isSetCount());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetCount()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.count, typedOther.count);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.count, other.count);
if (lastComparison != 0) {
return lastComparison;
}

24
interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift Compiler (0.9.0)
* Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
*/
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
@ -37,6 +37,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@ -58,7 +60,7 @@ import org.slf4j.LoggerFactory;
* @param columns. A collection of standard Columns. The columns within a super column are defined in an adhoc manner.
* Columns within a super column do not have to have matching structures (similarly named child columns).
*/
public class SuperColumn implements org.apache.thrift.TBase<SuperColumn, SuperColumn._Fields>, java.io.Serializable, Cloneable {
public class SuperColumn implements org.apache.thrift.TBase<SuperColumn, SuperColumn._Fields>, java.io.Serializable, Cloneable, Comparable<SuperColumn> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SuperColumn");
private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)1);
@ -168,7 +170,7 @@ public class SuperColumn implements org.apache.thrift.TBase<SuperColumn, SuperCo
;
}
if (other.isSetColumns()) {
List<Column> __this__columns = new ArrayList<Column>();
List<Column> __this__columns = new ArrayList<Column>(other.columns.size());
for (Column other_element : other.columns) {
__this__columns.add(new Column(other_element));
}
@ -358,30 +360,30 @@ public class SuperColumn implements org.apache.thrift.TBase<SuperColumn, SuperCo
return builder.toHashCode();
}
@Override
public int compareTo(SuperColumn other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
SuperColumn typedOther = (SuperColumn)other;
lastComparison = Boolean.valueOf(isSetName()).compareTo(typedOther.isSetName());
lastComparison = Boolean.valueOf(isSetName()).compareTo(other.isSetName());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetName()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, typedOther.name);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, other.name);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetColumns()).compareTo(typedOther.isSetColumns());
lastComparison = Boolean.valueOf(isSetColumns()).compareTo(other.isSetColumns());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetColumns()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, typedOther.columns);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, other.columns);
if (lastComparison != 0) {
return lastComparison;
}
@ -485,7 +487,7 @@ public class SuperColumn implements org.apache.thrift.TBase<SuperColumn, SuperCo
struct.columns = new ArrayList<Column>(_list0.size);
for (int _i1 = 0; _i1 < _list0.size; ++_i1)
{
Column _elem2; // required
Column _elem2;
_elem2 = new Column();
_elem2.read(iprot);
struct.columns.add(_elem2);
@ -566,7 +568,7 @@ public class SuperColumn implements org.apache.thrift.TBase<SuperColumn, SuperCo
struct.columns = new ArrayList<Column>(_list5.size);
for (int _i6 = 0; _i6 < _list5.size; ++_i6)
{
Column _elem7; // required
Column _elem7;
_elem7 = new Column();
_elem7.read(iprot);
struct.columns.add(_elem7);

22
interface/thrift/gen-java/org/apache/cassandra/thrift/TimedOutException.java
View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift Compiler (0.9.0)
* Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
*/
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
@ -37,6 +37,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@ -55,7 +57,7 @@ import org.slf4j.LoggerFactory;
/**
* RPC timeout was exceeded. either a node failed mid-operation, or load was too high, or the requested op was too large.
*/
public class TimedOutException extends TException implements org.apache.thrift.TBase<TimedOutException, TimedOutException._Fields>, java.io.Serializable, Cloneable {
public class TimedOutException extends TException implements org.apache.thrift.TBase<TimedOutException, TimedOutException._Fields>, java.io.Serializable, Cloneable, Comparable<TimedOutException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TimedOutException");
private static final org.apache.thrift.protocol.TField ACKNOWLEDGED_BY_FIELD_DESC = new org.apache.thrift.protocol.TField("acknowledged_by", org.apache.thrift.protocol.TType.I32, (short)1);
@ -433,40 +435,40 @@ public class TimedOutException extends TException implements org.apache.thrift.T
return builder.toHashCode();
}
@Override
public int compareTo(TimedOutException other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
TimedOutException typedOther = (TimedOutException)other;
lastComparison = Boolean.valueOf(isSetAcknowledged_by()).compareTo(typedOther.isSetAcknowledged_by());
lastComparison = Boolean.valueOf(isSetAcknowledged_by()).compareTo(other.isSetAcknowledged_by());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetAcknowledged_by()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.acknowledged_by, typedOther.acknowledged_by);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.acknowledged_by, other.acknowledged_by);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetAcknowledged_by_batchlog()).compareTo(typedOther.isSetAcknowledged_by_batchlog());
lastComparison = Boolean.valueOf(isSetAcknowledged_by_batchlog()).compareTo(other.isSetAcknowledged_by_batchlog());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetAcknowledged_by_batchlog()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.acknowledged_by_batchlog, typedOther.acknowledged_by_batchlog);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.acknowledged_by_batchlog, other.acknowledged_by_batchlog);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetPaxos_in_progress()).compareTo(typedOther.isSetPaxos_in_progress());
lastComparison = Boolean.valueOf(isSetPaxos_in_progress()).compareTo(other.isSetPaxos_in_progress());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetPaxos_in_progress()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.paxos_in_progress, typedOther.paxos_in_progress);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.paxos_in_progress, other.paxos_in_progress);
if (lastComparison != 0) {
return lastComparison;
}

63
interface/thrift/gen-java/org/apache/cassandra/thrift/TokenRange.java
View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift Compiler (0.9.0)
* Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@ -27,21 +27,32 @@ package org.apache.cassandra.thrift;
*/
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
import org.apache.thrift.scheme.TupleScheme;
import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
import java.util.HashMap;
import java.util.EnumMap;
import java.util.Set;
import java.util.HashSet;
import java.util.EnumSet;
import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* A TokenRange describes part of the Cassandra ring, it is a mapping from a range to
@ -51,7 +62,7 @@ import java.util.BitSet;
* @param endpoints The endpoints responsible for the range (listed by their configured listen_address)
* @param rpc_endpoints The endpoints responsible for the range (listed by their configured rpc_address)
*/
public class TokenRange implements org.apache.thrift.TBase<TokenRange, TokenRange._Fields>, java.io.Serializable, Cloneable {
public class TokenRange implements org.apache.thrift.TBase<TokenRange, TokenRange._Fields>, java.io.Serializable, Cloneable, Comparable<TokenRange> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TokenRange");
private static final org.apache.thrift.protocol.TField START_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("start_token", org.apache.thrift.protocol.TType.STRING, (short)1);
@ -189,21 +200,15 @@ public class TokenRange implements org.apache.thrift.TBase<TokenRange, TokenRang
this.end_token = other.end_token;
}
if (other.isSetEndpoints()) {
List<String> __this__endpoints = new ArrayList<String>();
for (String other_element : other.endpoints) {
__this__endpoints.add(other_element);
}
List<String> __this__endpoints = new ArrayList<String>(other.endpoints);
this.endpoints = __this__endpoints;
}
if (other.isSetRpc_endpoints()) {
List<String> __this__rpc_endpoints = new ArrayList<String>();
for (String other_element : other.rpc_endpoints) {
__this__rpc_endpoints.add(other_element);
}
List<String> __this__rpc_endpoints = new ArrayList<String>(other.rpc_endpoints);
this.rpc_endpoints = __this__rpc_endpoints;
}
if (other.isSetEndpoint_details()) {
List<EndpointDetails> __this__endpoint_details = new ArrayList<EndpointDetails>();
List<EndpointDetails> __this__endpoint_details = new ArrayList<EndpointDetails>(other.endpoint_details.size());
for (EndpointDetails other_element : other.endpoint_details) {
__this__endpoint_details.add(new EndpointDetails(other_element));
}
@ -569,60 +574,60 @@ public class TokenRange implements org.apache.thrift.TBase<TokenRange, TokenRang
return builder.toHashCode();
}
@Override
public int compareTo(TokenRange other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
TokenRange typedOther = (TokenRange)other;
lastComparison = Boolean.valueOf(isSetStart_token()).compareTo(typedOther.isSetStart_token());
lastComparison = Boolean.valueOf(isSetStart_token()).compareTo(other.isSetStart_token());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetStart_token()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.start_token, typedOther.start_token);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.start_token, other.start_token);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetEnd_token()).compareTo(typedOther.isSetEnd_token());
lastComparison = Boolean.valueOf(isSetEnd_token()).compareTo(other.isSetEnd_token());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetEnd_token()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.end_token, typedOther.end_token);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.end_token, other.end_token);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetEndpoints()).compareTo(typedOther.isSetEndpoints());
lastComparison = Boolean.valueOf(isSetEndpoints()).compareTo(other.isSetEndpoints());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetEndpoints()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.endpoints, typedOther.endpoints);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.endpoints, other.endpoints);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetRpc_endpoints()).compareTo(typedOther.isSetRpc_endpoints());
lastComparison = Boolean.valueOf(isSetRpc_endpoints()).compareTo(other.isSetRpc_endpoints());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetRpc_endpoints()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.rpc_endpoints, typedOther.rpc_endpoints);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.rpc_endpoints, other.rpc_endpoints);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetEndpoint_details()).compareTo(typedOther.isSetEndpoint_details());
lastComparison = Boolean.valueOf(isSetEndpoint_details()).compareTo(other.isSetEndpoint_details());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetEndpoint_details()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.endpoint_details, typedOther.endpoint_details);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.endpoint_details, other.endpoint_details);
if (lastComparison != 0) {
return lastComparison;
}
@ -765,7 +770,7 @@ public class TokenRange implements org.apache.thrift.TBase<TokenRange, TokenRang
struct.endpoints = new ArrayList<String>(_list56.size);
for (int _i57 = 0; _i57 < _list56.size; ++_i57)
{
String _elem58; // required
String _elem58;
_elem58 = iprot.readString();
struct.endpoints.add(_elem58);
}
@ -783,7 +788,7 @@ public class TokenRange implements org.apache.thrift.TBase<TokenRange, TokenRang
struct.rpc_endpoints = new ArrayList<String>(_list59.size);
for (int _i60 = 0; _i60 < _list59.size; ++_i60)
{
String _elem61; // required
String _elem61;
_elem61 = iprot.readString();
struct.rpc_endpoints.add(_elem61);
}
@ -801,7 +806,7 @@ public class TokenRange implements org.apache.thrift.TBase<TokenRange, TokenRang
struct.endpoint_details = new ArrayList<EndpointDetails>(_list62.size);
for (int _i63 = 0; _i63 < _list62.size; ++_i63)
{
EndpointDetails _elem64; // required
EndpointDetails _elem64;
_elem64 = new EndpointDetails();
_elem64.read(iprot);
struct.endpoint_details.add(_elem64);
@ -944,7 +949,7 @@ public class TokenRange implements org.apache.thrift.TBase<TokenRange, TokenRang
struct.endpoints = new ArrayList<String>(_list71.size);
for (int _i72 = 0; _i72 < _list71.size; ++_i72)
{
String _elem73; // required
String _elem73;
_elem73 = iprot.readString();
struct.endpoints.add(_elem73);
}
@ -957,7 +962,7 @@ public class TokenRange implements org.apache.thrift.TBase<TokenRange, TokenRang
struct.rpc_endpoints = new ArrayList<String>(_list74.size);
for (int _i75 = 0; _i75 < _list74.size; ++_i75)
{
String _elem76; // required
String _elem76;
_elem76 = iprot.readString();
struct.rpc_endpoints.add(_elem76);
}
@ -970,7 +975,7 @@ public class TokenRange implements org.apache.thrift.TBase<TokenRange, TokenRang
struct.endpoint_details = new ArrayList<EndpointDetails>(_list77.size);
for (int _i78 = 0; _i78 < _list77.size; ++_i78)
{
EndpointDetails _elem79; // required
EndpointDetails _elem79;
_elem79 = new EndpointDetails();
_elem79.read(iprot);
struct.endpoint_details.add(_elem79);

39
interface/thrift/gen-java/org/apache/cassandra/thrift/TriggerDef.java
View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift Compiler (0.9.0)
* Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
*/
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
@ -37,6 +37,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@ -57,7 +59,7 @@ import org.slf4j.LoggerFactory;
* `options` should include at least 'class' param.
* Other options are not supported yet.
*/
public class TriggerDef implements org.apache.thrift.TBase<TriggerDef, TriggerDef._Fields>, java.io.Serializable, Cloneable {
public class TriggerDef implements org.apache.thrift.TBase<TriggerDef, TriggerDef._Fields>, java.io.Serializable, Cloneable, Comparable<TriggerDef> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TriggerDef");
private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)1);
@ -167,18 +169,7 @@ public class TriggerDef implements org.apache.thrift.TBase<TriggerDef, TriggerDe
this.name = other.name;
}
if (other.isSetOptions()) {
Map<String,String> __this__options = new HashMap<String,String>();
for (Map.Entry<String, String> other_element : other.options.entrySet()) {
String other_element_key = other_element.getKey();
String other_element_value = other_element.getValue();
String __this__options_copy_key = other_element_key;
String __this__options_copy_value = other_element_value;
__this__options.put(__this__options_copy_key, __this__options_copy_value);
}
Map<String,String> __this__options = new HashMap<String,String>(other.options);
this.options = __this__options;
}
}
@ -351,30 +342,30 @@ public class TriggerDef implements org.apache.thrift.TBase<TriggerDef, TriggerDe
return builder.toHashCode();
}
@Override
public int compareTo(TriggerDef other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
TriggerDef typedOther = (TriggerDef)other;
lastComparison = Boolean.valueOf(isSetName()).compareTo(typedOther.isSetName());
lastComparison = Boolean.valueOf(isSetName()).compareTo(other.isSetName());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetName()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, typedOther.name);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, other.name);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetOptions()).compareTo(typedOther.isSetOptions());
lastComparison = Boolean.valueOf(isSetOptions()).compareTo(other.isSetOptions());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetOptions()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.options, typedOther.options);
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.options, other.options);
if (lastComparison != 0) {
return lastComparison;
}
@ -478,8 +469,8 @@ public class TriggerDef implements org.apache.thrift.TBase<TriggerDef, TriggerDe
struct.options = new HashMap<String,String>(2*_map100.size);
for (int _i101 = 0; _i101 < _map100.size; ++_i101)
{
String _key102; // required
String _val103; // required
String _key102;
String _val103;
_key102 = iprot.readString();
_val103 = iprot.readString();
struct.options.put(_key102, _val103);
@ -562,8 +553,8 @@ public class TriggerDef implements org.apache.thrift.TBase<TriggerDef, TriggerDe
struct.options = new HashMap<String,String>(2*_map106.size);
for (int _i107 = 0; _i107 < _map106.size; ++_i107)
{
String _key108; // required
String _val109; // required
String _key108;
String _val109;
_key108 = iprot.readString();
_val109 = iprot.readString();
struct.options.put(_key108, _val109);

21
interface/thrift/gen-java/org/apache/cassandra/thrift/UnavailableException.java
View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift Compiler (0.9.0)
* Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@ -27,24 +27,37 @@ package org.apache.cassandra.thrift;
*/
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
import org.apache.thrift.scheme.TupleScheme;
import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
import java.util.HashMap;
import java.util.EnumMap;
import java.util.Set;
import java.util.HashSet;
import java.util.EnumSet;
import java.util.Collections;
import java.util.BitSet;
import java.nio.ByteBuffer;
import java.util.Arrays;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Not all the replicas required could be created and/or read.
*/
public class UnavailableException extends TException implements org.apache.thrift.TBase<UnavailableException, UnavailableException._Fields>, java.io.Serializable, Cloneable {
public class UnavailableException extends TException implements org.apache.thrift.TBase<UnavailableException, UnavailableException._Fields>, java.io.Serializable, Cloneable, Comparable<UnavailableException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UnavailableException");
@ -179,13 +192,13 @@ public class UnavailableException extends TException implements org.apache.thrif
return builder.toHashCode();
}
@Override
public int compareTo(UnavailableException other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
UnavailableException typedOther = (UnavailableException)other;
return 0;
}

6
interface/thrift/gen-java/org/apache/cassandra/thrift/cassandraConstants.java
View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift Compiler (0.9.0)
* Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
*/
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
@ -37,6 +37,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;

BIN
lib/commons-lang-2.6.jar
View File

Binary file not shown.

BIN
lib/commons-lang3-3.1.jar Normal file
View File

Binary file not shown.

BIN
lib/libthrift-0.9.0.jar
View File

Binary file not shown.

BIN
lib/libthrift-0.9.1.jar Normal file
View File

Binary file not shown.

0
lib/licenses/libthrift-0.9.txt → lib/licenses/commons-lang-3.1.txt
View File

202
lib/licenses/libthrift-0.9.1.txt Normal file
View File

@ -0,0 +1,202 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

BIN
lib/thrift-python-internal-only-0.7.0.zip
View File

Binary file not shown.

BIN
lib/thrift-python-internal-only-0.9.1.zip Normal file
View File

Binary file not shown.

2
src/java/org/apache/cassandra/auth/Auth.java
View File

@ -21,7 +21,7 @@ import java.util.concurrent.TimeUnit;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
src/java/org/apache/cassandra/auth/CassandraAuthorizer.java
View File

@ -21,7 +21,7 @@ import java.util.*;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
src/java/org/apache/cassandra/auth/DataResource.java
View File

@ -18,7 +18,7 @@
package org.apache.cassandra.auth;
import com.google.common.base.Objects;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.cassandra.config.Schema;

2
src/java/org/apache/cassandra/auth/PasswordAuthenticator.java
View File

@ -26,7 +26,7 @@ import java.util.concurrent.TimeUnit;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
src/java/org/apache/cassandra/cli/CliClient.java
View File

@ -33,7 +33,7 @@ import com.google.common.collect.Collections2;
import com.google.common.collect.Iterables;
import org.apache.cassandra.serializers.MarshalException;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.antlr.runtime.tree.Tree;
import org.apache.cassandra.auth.IAuthenticator;

2
src/java/org/apache/cassandra/cli/CliUtils.java
View File

@ -24,7 +24,7 @@ import java.util.Set;
import org.apache.cassandra.thrift.CfDef;
import org.apache.cassandra.thrift.IndexOperator;
import org.apache.cassandra.thrift.KsDef;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang3.StringEscapeUtils;
public class CliUtils
{

10
src/java/org/apache/cassandra/config/CFMetaData.java
View File

@ -29,11 +29,11 @@ import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Objects;
import com.google.common.collect.MapDifference;
import com.google.common.collect.Maps;
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

4
src/java/org/apache/cassandra/config/KSMetaData.java
View File

@ -20,8 +20,8 @@ package org.apache.cassandra.config;
import java.util.*;
import com.google.common.collect.ImmutableMap;
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.cassandra.cql3.QueryProcessor;
import org.apache.cassandra.cql3.UntypedResultSet;

2
src/java/org/apache/cassandra/cql/CFPropDefs.java
View File

@ -34,7 +34,7 @@ import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.db.marshal.TypeParser;
import org.apache.cassandra.exceptions.InvalidRequestException;
import org.apache.cassandra.exceptions.SyntaxException;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
public class CFPropDefs {
private static final Logger logger = LoggerFactory.getLogger(CFPropDefs.class);

2
src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
View File

@ -21,7 +21,7 @@ import java.nio.ByteBuffer;
import java.util.*;
import org.apache.cassandra.exceptions.*;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import com.google.common.collect.HashMultiset;
import com.google.common.collect.Multiset;

2
src/java/org/apache/cassandra/db/ColumnFamily.java
View File

@ -31,7 +31,7 @@ import java.util.UUID;
import com.google.common.base.Function;
import com.google.common.base.Functions;
import com.google.common.collect.ImmutableMap;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.cassandra.cache.IRowCacheEntry;
import org.apache.cassandra.config.CFMetaData;

2
src/java/org/apache/cassandra/db/Directories.java
View File

@ -29,7 +29,7 @@ import com.google.common.collect.ImmutableMap;
import com.google.common.primitives.Longs;
import com.google.common.util.concurrent.Uninterruptibles;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
src/java/org/apache/cassandra/db/RangeSliceReply.java
View File

@ -24,7 +24,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.cassandra.io.IVersionedSerializer;
import org.apache.cassandra.io.util.FastByteArrayInputStream;

2
src/java/org/apache/cassandra/db/RowMutation.java
View File

@ -23,7 +23,7 @@ import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.*;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.config.Schema;

2
src/java/org/apache/cassandra/db/SystemKeyspace.java
View File

@ -29,7 +29,7 @@ import com.google.common.collect.Iterables;
import com.google.common.collect.SetMultimap;
import com.google.common.collect.Sets;
import org.apache.cassandra.transport.Server;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
src/java/org/apache/cassandra/db/commitlog/CommitLog.java
View File

@ -25,7 +25,7 @@ import java.util.concurrent.Future;
import javax.management.MBeanServer;
import javax.management.ObjectName;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
View File

@ -28,7 +28,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.zip.Checksum;
import com.google.common.collect.Ordering;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
src/java/org/apache/cassandra/db/compaction/CompactionTask.java
View File

@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit;
import com.google.common.base.Throwables;
import com.google.common.collect.Sets;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
src/java/org/apache/cassandra/db/filter/NamesQueryFilter.java
View File

@ -26,7 +26,7 @@ import java.util.Iterator;
import java.util.SortedSet;
import java.util.TreeSet;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import com.google.common.collect.AbstractIterator;
import org.apache.cassandra.db.*;

2
src/java/org/apache/cassandra/db/index/SecondaryIndex.java
View File

@ -21,7 +21,7 @@ import java.nio.ByteBuffer;
import java.util.*;
import java.util.concurrent.*;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
View File

@ -21,7 +21,7 @@ import java.nio.ByteBuffer;
import java.util.*;
import java.util.concurrent.*;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
src/java/org/apache/cassandra/db/marshal/DateType.java
View File

@ -30,7 +30,7 @@ import org.apache.cassandra.serializers.TypeSerializer;
import org.apache.cassandra.serializers.TimestampSerializer;
import org.apache.cassandra.serializers.MarshalException;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.commons.lang.time.DateUtils;
import org.apache.commons.lang3.time.DateUtils;
public class DateType extends AbstractType<Date>
{

3
src/java/org/apache/cassandra/db/marshal/LocalByPartionerType.java
View File

@ -21,7 +21,6 @@ import java.nio.ByteBuffer;
import org.apache.cassandra.serializers.TypeSerializer;
import org.apache.cassandra.serializers.MarshalException;
import org.apache.commons.lang.NotImplementedException;
import org.apache.cassandra.db.RowPosition;
import org.apache.cassandra.dht.IPartitioner;
@ -58,7 +57,7 @@ public class LocalByPartionerType<T extends Token> extends AbstractType<ByteBuff
public ByteBuffer fromString(String source)
{
throw new NotImplementedException();
throw new UnsupportedOperationException();
}
public int compare(ByteBuffer o1, ByteBuffer o2)

2
src/java/org/apache/cassandra/db/marshal/TimestampType.java
View File

@ -29,7 +29,7 @@ import org.apache.cassandra.serializers.TypeSerializer;
import org.apache.cassandra.serializers.MarshalException;
import org.apache.cassandra.serializers.TimestampSerializer;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.commons.lang.time.DateUtils;
import org.apache.commons.lang3.time.DateUtils;
/**
* Type for date-time values.

2
src/java/org/apache/cassandra/db/marshal/TypeParser.java
View File

@ -27,7 +27,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.cassandra.exceptions.*;
import org.apache.cassandra.utils.ByteBufferUtil;

2
src/java/org/apache/cassandra/db/marshal/UUIDType.java
View File

@ -28,7 +28,7 @@ import org.apache.cassandra.serializers.MarshalException;
import org.apache.cassandra.serializers.UUIDSerializer;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.UUIDGen;
import org.apache.commons.lang.time.DateUtils;
import org.apache.commons.lang3.time.DateUtils;
import static org.apache.cassandra.serializers.TimestampSerializer.iso8601Patterns;

2
src/java/org/apache/cassandra/dht/AbstractByteOrderedPartitioner.java
View File

@ -23,7 +23,7 @@ import java.util.*;
import org.apache.cassandra.config.*;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.cassandra.db.DecoratedKey;
import org.apache.cassandra.db.marshal.AbstractType;

2
src/java/org/apache/cassandra/dht/Range.java
View File

@ -20,7 +20,7 @@ package org.apache.cassandra.dht;
import java.io.Serializable;
import java.util.*;
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.cassandra.db.RowPosition;
import org.apache.cassandra.service.StorageService;

2
src/java/org/apache/cassandra/dht/RangeStreamer.java
View File

@ -23,7 +23,7 @@ import java.util.*;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
src/java/org/apache/cassandra/gms/FailureDetector.java
View File

@ -26,7 +26,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
import javax.management.MBeanServer;
import javax.management.ObjectName;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
src/java/org/apache/cassandra/gms/VersionedValue.java
View File

@ -34,7 +34,7 @@ import org.apache.cassandra.io.IVersionedSerializer;
import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
/**

2
src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
View File

@ -40,7 +40,7 @@ import org.apache.cassandra.thrift.CfSplit;
import org.apache.cassandra.thrift.InvalidRequestException;
import org.apache.cassandra.thrift.KeyRange;
import org.apache.cassandra.thrift.TokenRange;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapreduce.InputFormat;

4
src/java/org/apache/cassandra/io/compress/CompressionParameters.java
View File

@ -30,8 +30,8 @@ import java.util.Set;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.db.TypeSizes;

2
src/java/org/apache/cassandra/locator/TokenMetadata.java
View File

@ -31,7 +31,7 @@ import com.google.common.collect.*;
import org.apache.cassandra.utils.BiMultiValMap;
import org.apache.cassandra.utils.Pair;
import org.apache.cassandra.utils.SortedBiMultiValMap;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
src/java/org/apache/cassandra/security/SSLFactory.java
View File

@ -34,7 +34,7 @@ import javax.net.ssl.TrustManagerFactory;
import org.apache.cassandra.config.EncryptionOptions;
import org.apache.cassandra.io.util.FileUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
src/java/org/apache/cassandra/service/ClientState.java
View File

@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit;
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
src/java/org/apache/cassandra/service/ReadCallback.java
View File

@ -23,7 +23,7 @@ import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
src/java/org/apache/cassandra/service/StorageProxy.java
View File

@ -32,7 +32,7 @@ import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.collect.*;
import com.google.common.util.concurrent.Uninterruptibles;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
src/java/org/apache/cassandra/service/StorageService.java
View File

@ -41,7 +41,7 @@ import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.Uninterruptibles;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Level;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

18
src/java/org/apache/cassandra/thrift/CustomTNonBlockingServer.java
View File

@ -19,11 +19,14 @@ package org.apache.cassandra.thrift;
import java.net.InetSocketAddress;
import java.nio.channels.SelectionKey;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.thrift.server.TNonblockingServer;
import org.apache.thrift.server.TServer;
import org.apache.thrift.transport.TNonblockingServerTransport;
import org.apache.thrift.transport.TNonblockingSocket;
import org.apache.thrift.transport.TNonblockingTransport;
import org.apache.thrift.transport.TTransportException;
public class CustomTNonBlockingServer extends TNonblockingServer
@ -36,7 +39,7 @@ public class CustomTNonBlockingServer extends TNonblockingServer
@Override
protected boolean requestInvoke(FrameBuffer frameBuffer)
{
TNonblockingSocket socket = (TNonblockingSocket) frameBuffer.trans_;
TNonblockingSocket socket = (TNonblockingSocket)((CustomFrameBuffer)frameBuffer).getTransport();
ThriftSessionManager.instance.setCurrentSocket(socket.getSocketChannel().socket().getRemoteSocketAddress());
frameBuffer.invoke();
return true;
@ -70,4 +73,17 @@ public class CustomTNonBlockingServer extends TNonblockingServer
return new CustomTNonBlockingServer(serverArgs);
}
}
public class CustomFrameBuffer extends FrameBuffer
{
public CustomFrameBuffer(final TNonblockingTransport trans,
final SelectionKey selectionKey,
final AbstractSelectThread selectThread) {
super(trans, selectionKey, selectThread);
}
public TNonblockingTransport getTransport() {
return this.trans_;
}
}
}

2
src/java/org/apache/cassandra/utils/FBUtilities.java
View File

@ -38,7 +38,7 @@ import java.util.zip.Checksum;
import com.google.common.base.Joiner;
import com.google.common.collect.AbstractIterator;
import org.apache.cassandra.io.util.FileUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
src/java/org/apache/cassandra/utils/SemanticVersion.java
View File

@ -21,7 +21,7 @@ import java.util.regex.Pattern;
import java.util.regex.Matcher;
import java.util.Arrays;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import com.google.common.base.Objects;
/**

BIN
test/data/serialization/2.0/db.RowMutation.bin
View File

Binary file not shown.

2
test/unit/org/apache/cassandra/client/TestRingCache.java
View File

@ -29,7 +29,7 @@ import org.apache.cassandra.thrift.ColumnParent;
import org.apache.cassandra.thrift.ColumnPath;
import org.apache.cassandra.thrift.ConsistencyLevel;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.thrift.protocol.TBinaryProtocol;
import org.apache.thrift.transport.TFramedTransport;

6
test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
View File

@ -29,8 +29,8 @@ import java.util.concurrent.Future;
import com.google.common.base.Function;
import com.google.common.collect.Iterables;
import com.google.common.collect.Sets;
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import org.junit.Test;
import org.junit.runner.RunWith;
@ -57,7 +57,7 @@ import org.apache.cassandra.utils.WrappedRunnable;
import static junit.framework.Assert.*;
import static org.apache.cassandra.Util.*;
import static org.apache.cassandra.utils.ByteBufferUtil.bytes;
import static org.apache.commons.lang.ArrayUtils.EMPTY_BYTE_ARRAY;
import static org.apache.commons.lang3.ArrayUtils.EMPTY_BYTE_ARRAY;
import static org.junit.Assert.assertNull;
@RunWith(OrderedJUnit4ClassRunner.class)

2
test/unit/org/apache/cassandra/db/KeyspaceTest.java
View File

@ -27,7 +27,7 @@ import java.io.IOException;
import java.util.concurrent.ExecutionException;
import com.google.common.collect.Iterables;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.junit.Test;
import static junit.framework.Assert.*;

2
test/unit/org/apache/cassandra/dht/RangeTest.java
View File

@ -24,7 +24,7 @@ import java.util.List;
import java.util.Set;
import static java.util.Arrays.asList;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.junit.Test;
import org.apache.cassandra.db.RowPosition;

Some files were not shown because too many files have changed in this diff Show More