Upgrade Thrift to 0.7.0

Patch by jfarrell; reviewed by tjake for CASSANDRA-3213
This commit is contained in:
T Jake Luciani 2012-01-10 15:46:22 -05:00
parent d48a6c14f3
commit 7c8c57041b
44 changed files with 984 additions and 2012 deletions

View File

@ -41,7 +41,7 @@
in LeveledManifest (CASSANDRA-3691)
* finer-grained control over data directories (CASSANDRA-2749)
* Fix ClassCastException during hinted handoff (CASSANDRA-3694)
* Upgrade Thrift to 0.7 (CASSANDRA-3213)
1.0.7
* fix regression in HH page size calculation (CASSANDRA-3624)

View File

@ -369,9 +369,7 @@ url=${svn.entry.url}?pathrev=${svn.entry.commit.revision}
<exclusion groupId="org.apache.velocity" artifactId="velocity"/>
</dependency>
<dependency groupId="org.apache.thrift" artifactId="libthrift" version="0.6.1">
<exclusion groupId="org.slf4j" artifactId="slf4j-log4j12"/>
</dependency>
<dependency groupId="org.apache.thrift" artifactId="libthrift" version="0.7.0"/>
<dependency groupId="com.thoughtworks.paranamer" artifactId="paranamer-ant" version="2.1"/>
<dependency groupId="junit" artifactId="junit" version="4.6" />

View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift
* Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@ -50,7 +50,7 @@ public class AuthenticationException extends Exception implements org.apache.thr
private static final org.apache.thrift.protocol.TField WHY_FIELD_DESC = new org.apache.thrift.protocol.TField("why", org.apache.thrift.protocol.TType.STRING, (short)1);
public String why;
public String why; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {

View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift
* Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@ -50,7 +50,7 @@ public class AuthenticationRequest implements org.apache.thrift.TBase<Authentica
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);
public Map<String,String> credentials;
public Map<String,String> credentials; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@ -312,8 +312,8 @@ public class AuthenticationRequest implements org.apache.thrift.TBase<Authentica
this.credentials = new HashMap<String,String>(2*_map36.size);
for (int _i37 = 0; _i37 < _map36.size; ++_i37)
{
String _key38;
String _val39;
String _key38; // required
String _val39; // required
_key38 = iprot.readString();
_val39 = iprot.readString();
this.credentials.put(_key38, _val39);

View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift
* Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@ -50,7 +50,7 @@ public class AuthorizationException extends Exception implements org.apache.thri
private static final org.apache.thrift.protocol.TField WHY_FIELD_DESC = new org.apache.thrift.protocol.TField("why", org.apache.thrift.protocol.TType.STRING, (short)1);
public String why;
public String why; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {

View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift
* Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@ -68,28 +68,28 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
private static final org.apache.thrift.protocol.TField BLOOM_FILTER_FP_CHANCE_FIELD_DESC = new org.apache.thrift.protocol.TField("bloom_filter_fp_chance", org.apache.thrift.protocol.TType.DOUBLE, (short)33);
private static final org.apache.thrift.protocol.TField CACHING_FIELD_DESC = new org.apache.thrift.protocol.TField("caching", org.apache.thrift.protocol.TType.STRING, (short)34);
public String keyspace;
public String name;
public String column_type;
public String comparator_type;
public String subcomparator_type;
public String comment;
public double read_repair_chance;
public List<ColumnDef> column_metadata;
public int gc_grace_seconds;
public String default_validation_class;
public int id;
public int min_compaction_threshold;
public int max_compaction_threshold;
public boolean replicate_on_write;
public double merge_shards_chance;
public String key_validation_class;
public ByteBuffer key_alias;
public String compaction_strategy;
public Map<String,String> compaction_strategy_options;
public Map<String,String> compression_options;
public double bloom_filter_fp_chance;
public String caching;
public String keyspace; // required
public String name; // required
public String column_type; // required
public String comparator_type; // required
public String subcomparator_type; // required
public String comment; // required
public double read_repair_chance; // required
public List<ColumnDef> column_metadata; // required
public int gc_grace_seconds; // required
public String default_validation_class; // required
public int id; // required
public int min_compaction_threshold; // required
public int max_compaction_threshold; // required
public boolean replicate_on_write; // required
public double merge_shards_chance; // required
public String key_validation_class; // required
public ByteBuffer key_alias; // required
public String compaction_strategy; // required
public Map<String,String> compaction_strategy_options; // required
public Map<String,String> compression_options; // required
public double bloom_filter_fp_chance; // required
public String caching; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@ -1196,31 +1196,31 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
return getComment();
case READ_REPAIR_CHANCE:
return new Double(getRead_repair_chance());
return Double.valueOf(getRead_repair_chance());
case COLUMN_METADATA:
return getColumn_metadata();
case GC_GRACE_SECONDS:
return new Integer(getGc_grace_seconds());
return Integer.valueOf(getGc_grace_seconds());
case DEFAULT_VALIDATION_CLASS:
return getDefault_validation_class();
case ID:
return new Integer(getId());
return Integer.valueOf(getId());
case MIN_COMPACTION_THRESHOLD:
return new Integer(getMin_compaction_threshold());
return Integer.valueOf(getMin_compaction_threshold());
case MAX_COMPACTION_THRESHOLD:
return new Integer(getMax_compaction_threshold());
return Integer.valueOf(getMax_compaction_threshold());
case REPLICATE_ON_WRITE:
return new Boolean(isReplicate_on_write());
return Boolean.valueOf(isReplicate_on_write());
case MERGE_SHARDS_CHANCE:
return new Double(getMerge_shards_chance());
return Double.valueOf(getMerge_shards_chance());
case KEY_VALIDATION_CLASS:
return getKey_validation_class();
@ -1238,7 +1238,7 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
return getCompression_options();
case BLOOM_FILTER_FP_CHANCE:
return new Double(getBloom_filter_fp_chance());
return Double.valueOf(getBloom_filter_fp_chance());
case CACHING:
return getCaching();
@ -1935,7 +1935,7 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
this.column_metadata = new ArrayList<ColumnDef>(_list46.size);
for (int _i47 = 0; _i47 < _list46.size; ++_i47)
{
ColumnDef _elem48;
ColumnDef _elem48; // required
_elem48 = new ColumnDef();
_elem48.read(iprot);
this.column_metadata.add(_elem48);
@ -2029,8 +2029,8 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
this.compaction_strategy_options = new HashMap<String,String>(2*_map49.size);
for (int _i50 = 0; _i50 < _map49.size; ++_i50)
{
String _key51;
String _val52;
String _key51; // required
String _val52; // required
_key51 = iprot.readString();
_val52 = iprot.readString();
this.compaction_strategy_options.put(_key51, _val52);
@ -2048,8 +2048,8 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
this.compression_options = new HashMap<String,String>(2*_map53.size);
for (int _i54 = 0; _i54 < _map53.size; ++_i54)
{
String _key55;
String _val56;
String _key55; // required
String _val56; // required
_key55 = iprot.readString();
_val56 = iprot.readString();
this.compression_options.put(_key55, _val56);

View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift
* Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@ -57,10 +57,10 @@ public class Column implements org.apache.thrift.TBase<Column, Column._Fields>,
private static final org.apache.thrift.protocol.TField TIMESTAMP_FIELD_DESC = new org.apache.thrift.protocol.TField("timestamp", org.apache.thrift.protocol.TType.I64, (short)3);
private static final org.apache.thrift.protocol.TField TTL_FIELD_DESC = new org.apache.thrift.protocol.TField("ttl", org.apache.thrift.protocol.TType.I32, (short)4);
public ByteBuffer name;
public ByteBuffer value;
public long timestamp;
public int ttl;
public ByteBuffer name; // required
public ByteBuffer value; // required
public long timestamp; // required
public int ttl; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@ -351,10 +351,10 @@ public class Column implements org.apache.thrift.TBase<Column, Column._Fields>,
return getValue();
case TIMESTAMP:
return new Long(getTimestamp());
return Long.valueOf(getTimestamp());
case TTL:
return new Integer(getTtl());
return Integer.valueOf(getTtl());
}
throw new IllegalStateException();

View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift
* Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@ -51,15 +51,15 @@ public class ColumnDef implements org.apache.thrift.TBase<ColumnDef, ColumnDef._
private static final org.apache.thrift.protocol.TField INDEX_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("index_name", org.apache.thrift.protocol.TType.STRING, (short)4);
private static final org.apache.thrift.protocol.TField INDEX_OPTIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("index_options", org.apache.thrift.protocol.TType.MAP, (short)5);
public ByteBuffer name;
public String validation_class;
public ByteBuffer name; // required
public String validation_class; // required
/**
*
* @see IndexType
*/
public IndexType index_type;
public String index_name;
public Map<String,String> index_options;
public IndexType index_type; // required
public String index_name; // required
public Map<String,String> index_options; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@ -654,8 +654,8 @@ public class ColumnDef implements org.apache.thrift.TBase<ColumnDef, ColumnDef._
this.index_options = new HashMap<String,String>(2*_map41.size);
for (int _i42 = 0; _i42 < _map41.size; ++_i42)
{
String _key43;
String _val44;
String _key43; // required
String _val44; // required
_key43 = iprot.readString();
_val44 = iprot.readString();
this.index_options.put(_key43, _val44);

View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift
* Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@ -65,10 +65,10 @@ public class ColumnOrSuperColumn implements org.apache.thrift.TBase<ColumnOrSupe
private static final org.apache.thrift.protocol.TField COUNTER_COLUMN_FIELD_DESC = new org.apache.thrift.protocol.TField("counter_column", org.apache.thrift.protocol.TType.STRUCT, (short)3);
private static final org.apache.thrift.protocol.TField COUNTER_SUPER_COLUMN_FIELD_DESC = new org.apache.thrift.protocol.TField("counter_super_column", org.apache.thrift.protocol.TType.STRUCT, (short)4);
public Column column;
public SuperColumn super_column;
public CounterColumn counter_column;
public CounterSuperColumn counter_super_column;
public Column column; // required
public SuperColumn super_column; // required
public CounterColumn counter_column; // required
public CounterSuperColumn counter_super_column; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {

View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift
* Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@ -54,8 +54,8 @@ public class ColumnParent implements org.apache.thrift.TBase<ColumnParent, Colum
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);
private static final org.apache.thrift.protocol.TField SUPER_COLUMN_FIELD_DESC = new org.apache.thrift.protocol.TField("super_column", org.apache.thrift.protocol.TType.STRING, (short)4);
public String column_family;
public ByteBuffer super_column;
public String column_family; // required
public ByteBuffer super_column; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {

View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift
* Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@ -59,9 +59,9 @@ public class ColumnPath implements org.apache.thrift.TBase<ColumnPath, ColumnPat
private static final org.apache.thrift.protocol.TField SUPER_COLUMN_FIELD_DESC = new org.apache.thrift.protocol.TField("super_column", org.apache.thrift.protocol.TType.STRING, (short)4);
private static final org.apache.thrift.protocol.TField COLUMN_FIELD_DESC = new org.apache.thrift.protocol.TField("column", org.apache.thrift.protocol.TType.STRING, (short)5);
public String column_family;
public ByteBuffer super_column;
public ByteBuffer column;
public String column_family; // required
public ByteBuffer super_column; // required
public ByteBuffer column; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {

View File

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

View File

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

View File

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

View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift
* Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@ -48,8 +48,8 @@ public class CounterColumn implements org.apache.thrift.TBase<CounterColumn, Cou
private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)1);
private static final org.apache.thrift.protocol.TField VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("value", org.apache.thrift.protocol.TType.I64, (short)2);
public ByteBuffer name;
public long value;
public ByteBuffer name; // required
public long value; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@ -248,7 +248,7 @@ public class CounterColumn implements org.apache.thrift.TBase<CounterColumn, Cou
return getName();
case VALUE:
return new Long(getValue());
return Long.valueOf(getValue());
}
throw new IllegalStateException();

View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift
* Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@ -48,8 +48,8 @@ public class CounterSuperColumn implements org.apache.thrift.TBase<CounterSuperC
private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)1);
private static final org.apache.thrift.protocol.TField COLUMNS_FIELD_DESC = new org.apache.thrift.protocol.TField("columns", org.apache.thrift.protocol.TType.LIST, (short)2);
public ByteBuffer name;
public List<CounterColumn> columns;
public ByteBuffer name; // required
public List<CounterColumn> columns; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@ -396,7 +396,7 @@ public class CounterSuperColumn implements org.apache.thrift.TBase<CounterSuperC
this.columns = new ArrayList<CounterColumn>(_list4.size);
for (int _i5 = 0; _i5 < _list4.size; ++_i5)
{
CounterColumn _elem6;
CounterColumn _elem6; // required
_elem6 = new CounterColumn();
_elem6.read(iprot);
this.columns.add(_elem6);

View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift
* Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@ -50,10 +50,10 @@ public class CqlMetadata implements org.apache.thrift.TBase<CqlMetadata, CqlMeta
private static final org.apache.thrift.protocol.TField DEFAULT_NAME_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("default_name_type", org.apache.thrift.protocol.TType.STRING, (short)3);
private static final org.apache.thrift.protocol.TField DEFAULT_VALUE_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("default_value_type", org.apache.thrift.protocol.TType.STRING, (short)4);
public Map<ByteBuffer,String> name_types;
public Map<ByteBuffer,String> value_types;
public String default_name_type;
public String default_value_type;
public Map<ByteBuffer,String> name_types; // required
public Map<ByteBuffer,String> value_types; // required
public String default_name_type; // required
public String default_value_type; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@ -558,8 +558,8 @@ public class CqlMetadata implements org.apache.thrift.TBase<CqlMetadata, CqlMeta
this.name_types = new HashMap<ByteBuffer,String>(2*_map73.size);
for (int _i74 = 0; _i74 < _map73.size; ++_i74)
{
ByteBuffer _key75;
String _val76;
ByteBuffer _key75; // required
String _val76; // required
_key75 = iprot.readBinary();
_val76 = iprot.readString();
this.name_types.put(_key75, _val76);
@ -577,8 +577,8 @@ public class CqlMetadata implements org.apache.thrift.TBase<CqlMetadata, CqlMeta
this.value_types = new HashMap<ByteBuffer,String>(2*_map77.size);
for (int _i78 = 0; _i78 < _map77.size; ++_i78)
{
ByteBuffer _key79;
String _val80;
ByteBuffer _key79; // required
String _val80; // required
_key79 = iprot.readBinary();
_val80 = iprot.readString();
this.value_types.put(_key79, _val80);

View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift
* Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@ -48,8 +48,8 @@ public class CqlPreparedResult implements org.apache.thrift.TBase<CqlPreparedRes
private static final org.apache.thrift.protocol.TField ITEM_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("itemId", org.apache.thrift.protocol.TType.I32, (short)1);
private static final org.apache.thrift.protocol.TField COUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("count", org.apache.thrift.protocol.TType.I32, (short)2);
public int itemId;
public int count;
public int itemId; // required
public int count; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@ -234,10 +234,10 @@ public class CqlPreparedResult implements org.apache.thrift.TBase<CqlPreparedRes
public Object getFieldValue(_Fields field) {
switch (field) {
case ITEM_ID:
return new Integer(getItemId());
return Integer.valueOf(getItemId());
case COUNT:
return new Integer(getCount());
return Integer.valueOf(getCount());
}
throw new IllegalStateException();

View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift
* Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@ -54,10 +54,10 @@ public class CqlResult implements org.apache.thrift.TBase<CqlResult, CqlResult._
*
* @see CqlResultType
*/
public CqlResultType type;
public List<CqlRow> rows;
public int num;
public CqlMetadata schema;
public CqlResultType type; // required
public List<CqlRow> rows; // required
public int num; // required
public CqlMetadata schema; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@ -359,7 +359,7 @@ public class CqlResult implements org.apache.thrift.TBase<CqlResult, CqlResult._
return getRows();
case NUM:
return new Integer(getNum());
return Integer.valueOf(getNum());
case SCHEMA:
return getSchema();
@ -545,7 +545,7 @@ public class CqlResult implements org.apache.thrift.TBase<CqlResult, CqlResult._
this.rows = new ArrayList<CqlRow>(_list83.size);
for (int _i84 = 0; _i84 < _list83.size; ++_i84)
{
CqlRow _elem85;
CqlRow _elem85; // required
_elem85 = new CqlRow();
_elem85.read(iprot);
this.rows.add(_elem85);

View File

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

View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift
* Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@ -51,8 +51,8 @@ public class CqlRow implements org.apache.thrift.TBase<CqlRow, CqlRow._Fields>,
private static final org.apache.thrift.protocol.TField KEY_FIELD_DESC = new org.apache.thrift.protocol.TField("key", org.apache.thrift.protocol.TType.STRING, (short)1);
private static final org.apache.thrift.protocol.TField COLUMNS_FIELD_DESC = new org.apache.thrift.protocol.TField("columns", org.apache.thrift.protocol.TType.LIST, (short)2);
public ByteBuffer key;
public List<Column> columns;
public ByteBuffer key; // required
public List<Column> columns; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@ -399,7 +399,7 @@ public class CqlRow implements org.apache.thrift.TBase<CqlRow, CqlRow._Fields>,
this.columns = new ArrayList<Column>(_list69.size);
for (int _i70 = 0; _i70 < _list69.size; ++_i70)
{
Column _elem71;
Column _elem71; // required
_elem71 = new Column();
_elem71.read(iprot);
this.columns.add(_elem71);

View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift
* Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@ -52,9 +52,9 @@ public class Deletion implements org.apache.thrift.TBase<Deletion, Deletion._Fie
private static final org.apache.thrift.protocol.TField SUPER_COLUMN_FIELD_DESC = new org.apache.thrift.protocol.TField("super_column", org.apache.thrift.protocol.TType.STRING, (short)2);
private static final org.apache.thrift.protocol.TField PREDICATE_FIELD_DESC = new org.apache.thrift.protocol.TField("predicate", org.apache.thrift.protocol.TType.STRUCT, (short)3);
public long timestamp;
public ByteBuffer super_column;
public SlicePredicate predicate;
public long timestamp; // required
public ByteBuffer super_column; // required
public SlicePredicate predicate; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@ -281,7 +281,7 @@ public class Deletion implements org.apache.thrift.TBase<Deletion, Deletion._Fie
public Object getFieldValue(_Fields field) {
switch (field) {
case TIMESTAMP:
return new Long(getTimestamp());
return Long.valueOf(getTimestamp());
case SUPER_COLUMN:
return getSuper_column();

View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift
* Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@ -49,9 +49,9 @@ public class EndpointDetails implements org.apache.thrift.TBase<EndpointDetails,
private static final org.apache.thrift.protocol.TField DATACENTER_FIELD_DESC = new org.apache.thrift.protocol.TField("datacenter", org.apache.thrift.protocol.TType.STRING, (short)2);
private static final org.apache.thrift.protocol.TField RACK_FIELD_DESC = new org.apache.thrift.protocol.TField("rack", org.apache.thrift.protocol.TType.STRING, (short)3);
public String host;
public String datacenter;
public String rack;
public String host; // required
public String datacenter; // required
public String rack; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {

View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift
* Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@ -52,9 +52,9 @@ public class IndexClause implements org.apache.thrift.TBase<IndexClause, IndexCl
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)2);
private static final org.apache.thrift.protocol.TField COUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("count", org.apache.thrift.protocol.TType.I32, (short)3);
public List<IndexExpression> expressions;
public ByteBuffer start_key;
public int count;
public List<IndexExpression> expressions; // required
public ByteBuffer start_key; // required
public int count; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@ -321,7 +321,7 @@ public class IndexClause implements org.apache.thrift.TBase<IndexClause, IndexCl
return getStart_key();
case COUNT:
return new Integer(getCount());
return Integer.valueOf(getCount());
}
throw new IllegalStateException();
@ -471,7 +471,7 @@ public class IndexClause implements org.apache.thrift.TBase<IndexClause, IndexCl
this.expressions = new ArrayList<IndexExpression>(_list12.size);
for (int _i13 = 0; _i13 < _list12.size; ++_i13)
{
IndexExpression _elem14;
IndexExpression _elem14; // required
_elem14 = new IndexExpression();
_elem14.read(iprot);
this.expressions.add(_elem14);

View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift
* Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@ -49,13 +49,13 @@ public class IndexExpression implements org.apache.thrift.TBase<IndexExpression,
private static final org.apache.thrift.protocol.TField OP_FIELD_DESC = new org.apache.thrift.protocol.TField("op", org.apache.thrift.protocol.TType.I32, (short)2);
private static final org.apache.thrift.protocol.TField VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("value", org.apache.thrift.protocol.TType.STRING, (short)3);
public ByteBuffer column_name;
public ByteBuffer column_name; // required
/**
*
* @see IndexOperator
*/
public IndexOperator op;
public ByteBuffer value;
public IndexOperator op; // required
public ByteBuffer value; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {

View File

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

View File

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

View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift
* Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@ -51,7 +51,7 @@ public class InvalidRequestException extends Exception implements org.apache.thr
private static final org.apache.thrift.protocol.TField WHY_FIELD_DESC = new org.apache.thrift.protocol.TField("why", org.apache.thrift.protocol.TType.STRING, (short)1);
public String why;
public String why; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {

View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift
* Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@ -48,8 +48,8 @@ public class KeyCount implements org.apache.thrift.TBase<KeyCount, KeyCount._Fie
private static final org.apache.thrift.protocol.TField KEY_FIELD_DESC = new org.apache.thrift.protocol.TField("key", org.apache.thrift.protocol.TType.STRING, (short)1);
private static final org.apache.thrift.protocol.TField COUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("count", org.apache.thrift.protocol.TType.I32, (short)2);
public ByteBuffer key;
public int count;
public ByteBuffer key; // required
public int count; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@ -248,7 +248,7 @@ public class KeyCount implements org.apache.thrift.TBase<KeyCount, KeyCount._Fie
return getKey();
case COUNT:
return new Integer(getCount());
return Integer.valueOf(getCount());
}
throw new IllegalStateException();

View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift
* Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@ -60,12 +60,12 @@ public class KeyRange implements org.apache.thrift.TBase<KeyRange, KeyRange._Fie
private static final org.apache.thrift.protocol.TField ROW_FILTER_FIELD_DESC = new org.apache.thrift.protocol.TField("row_filter", org.apache.thrift.protocol.TType.LIST, (short)6);
private static final org.apache.thrift.protocol.TField COUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("count", org.apache.thrift.protocol.TType.I32, (short)5);
public ByteBuffer start_key;
public ByteBuffer end_key;
public String start_token;
public String end_token;
public List<IndexExpression> row_filter;
public int count;
public ByteBuffer start_key; // required
public ByteBuffer end_key; // required
public String start_token; // required
public String end_token; // required
public List<IndexExpression> row_filter; // required
public int count; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@ -471,7 +471,7 @@ public class KeyRange implements org.apache.thrift.TBase<KeyRange, KeyRange._Fie
return getRow_filter();
case COUNT:
return new Integer(getCount());
return Integer.valueOf(getCount());
}
throw new IllegalStateException();
@ -727,7 +727,7 @@ public class KeyRange implements org.apache.thrift.TBase<KeyRange, KeyRange._Fie
this.row_filter = new ArrayList<IndexExpression>(_list16.size);
for (int _i17 = 0; _i17 < _list16.size; ++_i17)
{
IndexExpression _elem18;
IndexExpression _elem18; // required
_elem18 = new IndexExpression();
_elem18.read(iprot);
this.row_filter.add(_elem18);

View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift
* Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@ -55,8 +55,8 @@ public class KeySlice implements org.apache.thrift.TBase<KeySlice, KeySlice._Fie
private static final org.apache.thrift.protocol.TField KEY_FIELD_DESC = new org.apache.thrift.protocol.TField("key", org.apache.thrift.protocol.TType.STRING, (short)1);
private static final org.apache.thrift.protocol.TField COLUMNS_FIELD_DESC = new org.apache.thrift.protocol.TField("columns", org.apache.thrift.protocol.TType.LIST, (short)2);
public ByteBuffer key;
public List<ColumnOrSuperColumn> columns;
public ByteBuffer key; // required
public List<ColumnOrSuperColumn> columns; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@ -403,7 +403,7 @@ public class KeySlice implements org.apache.thrift.TBase<KeySlice, KeySlice._Fie
this.columns = new ArrayList<ColumnOrSuperColumn>(_list20.size);
for (int _i21 = 0; _i21 < _list20.size; ++_i21)
{
ColumnOrSuperColumn _elem22;
ColumnOrSuperColumn _elem22; // required
_elem22 = new ColumnOrSuperColumn();
_elem22.read(iprot);
this.columns.add(_elem22);

View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift
* Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@ -52,15 +52,15 @@ public class KsDef implements org.apache.thrift.TBase<KsDef, KsDef._Fields>, jav
private static final org.apache.thrift.protocol.TField CF_DEFS_FIELD_DESC = new org.apache.thrift.protocol.TField("cf_defs", org.apache.thrift.protocol.TType.LIST, (short)5);
private static final org.apache.thrift.protocol.TField DURABLE_WRITES_FIELD_DESC = new org.apache.thrift.protocol.TField("durable_writes", org.apache.thrift.protocol.TType.BOOL, (short)6);
public String name;
public String strategy_class;
public Map<String,String> strategy_options;
public String name; // required
public String strategy_class; // required
public Map<String,String> strategy_options; // required
/**
* @deprecated
*/
public int replication_factor;
public List<CfDef> cf_defs;
public boolean durable_writes;
public int replication_factor; // required
public List<CfDef> cf_defs; // required
public boolean durable_writes; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@ -474,13 +474,13 @@ public class KsDef implements org.apache.thrift.TBase<KsDef, KsDef._Fields>, jav
return getStrategy_options();
case REPLICATION_FACTOR:
return new Integer(getReplication_factor());
return Integer.valueOf(getReplication_factor());
case CF_DEFS:
return getCf_defs();
case DURABLE_WRITES:
return new Boolean(isDurable_writes());
return Boolean.valueOf(isDurable_writes());
}
throw new IllegalStateException();
@ -722,8 +722,8 @@ public class KsDef implements org.apache.thrift.TBase<KsDef, KsDef._Fields>, jav
this.strategy_options = new HashMap<String,String>(2*_map60.size);
for (int _i61 = 0; _i61 < _map60.size; ++_i61)
{
String _key62;
String _val63;
String _key62; // required
String _val63; // required
_key62 = iprot.readString();
_val63 = iprot.readString();
this.strategy_options.put(_key62, _val63);
@ -749,7 +749,7 @@ public class KsDef implements org.apache.thrift.TBase<KsDef, KsDef._Fields>, jav
this.cf_defs = new ArrayList<CfDef>(_list64.size);
for (int _i65 = 0; _i65 < _list64.size; ++_i65)
{
CfDef _elem66;
CfDef _elem66; // required
_elem66 = new CfDef();
_elem66.read(iprot);
this.cf_defs.add(_elem66);

View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift
* Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@ -53,8 +53,8 @@ public class Mutation implements org.apache.thrift.TBase<Mutation, Mutation._Fie
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);
private static final org.apache.thrift.protocol.TField DELETION_FIELD_DESC = new org.apache.thrift.protocol.TField("deletion", org.apache.thrift.protocol.TType.STRUCT, (short)2);
public ColumnOrSuperColumn column_or_supercolumn;
public Deletion deletion;
public ColumnOrSuperColumn column_or_supercolumn; // required
public Deletion deletion; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {

View File

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

View File

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

View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift
* Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@ -60,8 +60,8 @@ public class SlicePredicate implements org.apache.thrift.TBase<SlicePredicate, S
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);
private static final org.apache.thrift.protocol.TField SLICE_RANGE_FIELD_DESC = new org.apache.thrift.protocol.TField("slice_range", org.apache.thrift.protocol.TType.STRUCT, (short)2);
public List<ByteBuffer> column_names;
public SliceRange slice_range;
public List<ByteBuffer> column_names; // required
public SliceRange slice_range; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@ -383,7 +383,7 @@ public class SlicePredicate implements org.apache.thrift.TBase<SlicePredicate, S
this.column_names = new ArrayList<ByteBuffer>(_list8.size);
for (int _i9 = 0; _i9 < _list8.size; ++_i9)
{
ByteBuffer _elem10;
ByteBuffer _elem10; // required
_elem10 = iprot.readBinary();
this.column_names.add(_elem10);
}

View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift
* Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@ -66,10 +66,10 @@ public class SliceRange implements org.apache.thrift.TBase<SliceRange, SliceRang
private static final org.apache.thrift.protocol.TField REVERSED_FIELD_DESC = new org.apache.thrift.protocol.TField("reversed", org.apache.thrift.protocol.TType.BOOL, (short)3);
private static final org.apache.thrift.protocol.TField COUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("count", org.apache.thrift.protocol.TType.I32, (short)4);
public ByteBuffer start;
public ByteBuffer finish;
public boolean reversed;
public int count;
public ByteBuffer start; // required
public ByteBuffer finish; // required
public boolean reversed; // required
public int count; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@ -372,10 +372,10 @@ public class SliceRange implements org.apache.thrift.TBase<SliceRange, SliceRang
return getFinish();
case REVERSED:
return new Boolean(isReversed());
return Boolean.valueOf(isReversed());
case COUNT:
return new Integer(getCount());
return Integer.valueOf(getCount());
}
throw new IllegalStateException();

View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift
* Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@ -54,8 +54,8 @@ public class SuperColumn implements org.apache.thrift.TBase<SuperColumn, SuperCo
private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)1);
private static final org.apache.thrift.protocol.TField COLUMNS_FIELD_DESC = new org.apache.thrift.protocol.TField("columns", org.apache.thrift.protocol.TType.LIST, (short)2);
public ByteBuffer name;
public List<Column> columns;
public ByteBuffer name; // required
public List<Column> columns; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@ -402,7 +402,7 @@ public class SuperColumn implements org.apache.thrift.TBase<SuperColumn, SuperCo
this.columns = new ArrayList<Column>(_list0.size);
for (int _i1 = 0; _i1 < _list0.size; ++_i1)
{
Column _elem2;
Column _elem2; // required
_elem2 = new Column();
_elem2.read(iprot);
this.columns.add(_elem2);

View File

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

View File

@ -1,5 +1,5 @@
/**
* Autogenerated by Thrift
* Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@ -59,11 +59,11 @@ public class TokenRange implements org.apache.thrift.TBase<TokenRange, TokenRang
private static final org.apache.thrift.protocol.TField RPC_ENDPOINTS_FIELD_DESC = new org.apache.thrift.protocol.TField("rpc_endpoints", org.apache.thrift.protocol.TType.LIST, (short)4);
private static final org.apache.thrift.protocol.TField ENDPOINT_DETAILS_FIELD_DESC = new org.apache.thrift.protocol.TField("endpoint_details", org.apache.thrift.protocol.TType.LIST, (short)5);
public String start_token;
public String end_token;
public List<String> endpoints;
public List<String> rpc_endpoints;
public List<EndpointDetails> endpoint_details;
public String start_token; // required
public String end_token; // required
public List<String> endpoints; // required
public List<String> rpc_endpoints; // required
public List<EndpointDetails> endpoint_details; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@ -658,7 +658,7 @@ public class TokenRange implements org.apache.thrift.TBase<TokenRange, TokenRang
this.endpoints = new ArrayList<String>(_list24.size);
for (int _i25 = 0; _i25 < _list24.size; ++_i25)
{
String _elem26;
String _elem26; // required
_elem26 = iprot.readString();
this.endpoints.add(_elem26);
}
@ -675,7 +675,7 @@ public class TokenRange implements org.apache.thrift.TBase<TokenRange, TokenRang
this.rpc_endpoints = new ArrayList<String>(_list27.size);
for (int _i28 = 0; _i28 < _list27.size; ++_i28)
{
String _elem29;
String _elem29; // required
_elem29 = iprot.readString();
this.rpc_endpoints.add(_elem29);
}
@ -692,7 +692,7 @@ public class TokenRange implements org.apache.thrift.TBase<TokenRange, TokenRang
this.endpoint_details = new ArrayList<EndpointDetails>(_list30.size);
for (int _i31 = 0; _i31 < _list30.size; ++_i31)
{
EndpointDetails _elem32;
EndpointDetails _elem32; // required
_elem32 = new EndpointDetails();
_elem32.read(iprot);
this.endpoint_details.add(_elem32);

View File

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